projects / jSite2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add base path textfield to project panel
[jSite2.git] / src / net / pterodactylus / jsite / gui / SwingInterface.java
diff --git a/src/net/pterodactylus/jsite/gui/SwingInterface.java b/src/net/pterodactylus/jsite/gui/SwingInterface.java
index f634fa5..4fb7139 100644 (file)
--- a/src/net/pterodactylus/jsite/gui/SwingInterface.java
+++ b/src/net/pterodactylus/jsite/gui/SwingInterface.java
@@ -26,6 +26,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -45,11 +46,11 @@ import javax.swing.UnsupportedLookAndFeelException;
 
 import net.pterodactylus.jsite.core.Core;
 import net.pterodactylus.jsite.core.CoreListener;
+import net.pterodactylus.jsite.core.JSiteException;
 import net.pterodactylus.jsite.core.Node;
-import net.pterodactylus.jsite.core.Project;
-import net.pterodactylus.jsite.core.Request;
 import net.pterodactylus.jsite.i18n.I18n;
 import net.pterodactylus.jsite.i18n.gui.I18nAction;
+import net.pterodactylus.jsite.project.Project;
 import net.pterodactylus.util.image.IconLoader;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
@@ -163,6 +164,18 @@ public class SwingInterface implements CoreListener, LoggingListener {
        /** The class name of the look and feel. */
        private String lookAndFeel;
 
+       /** X coordinate of the main window. */
+       private int mainWindowX = -1;
+
+       /** Y coordinate of the main window. */
+       private int mainWindowY = -1;
+
+       /** Width of the main window. */
+       private int mainWindowWidth = -1;
+
+       /** Height of the main window. */
+       private int mainWindowHeight = -1;
+
        /**
         * Creates a new swing interface.
         * 
@@ -202,6 +215,10 @@ public class SwingInterface implements CoreListener, LoggingListener {
                initDialogs();
                mainWindow = new MainWindow(this);
                mainWindow.setAdvancedMode(advancedMode);
+               if ((mainWindowX != -1) && (mainWindowY != -1) && (mainWindowWidth != -1) && (mainWindowHeight != -1)) {
+                       mainWindow.setLocation(mainWindowX, mainWindowY);
+                       mainWindow.setSize(mainWindowWidth, mainWindowHeight);
+               }
                logWindow = new LogWindow();
        }
 
@@ -406,6 +423,18 @@ public class SwingInterface implements CoreListener, LoggingListener {
                if (configProperties.containsKey("language")) {
                        I18n.setLocale(new Locale(configProperties.getProperty("language")));
                }
+               if (configProperties.containsKey("mainWindowX")) {
+                       mainWindowX = Integer.valueOf(configProperties.getProperty("mainWindowX"));
+               }
+               if (configProperties.containsKey("mainWindowY")) {
+                       mainWindowY = Integer.valueOf(configProperties.getProperty("mainWindowY"));
+               }
+               if (configProperties.containsKey("mainWindowWidth")) {
+                       mainWindowWidth = Integer.valueOf(configProperties.getProperty("mainWindowWidth"));
+               }
+               if (configProperties.containsKey("mainWindowHeight")) {
+                       mainWindowHeight = Integer.valueOf(configProperties.getProperty("mainWindowHeight"));
+               }
        }
 
        /**
@@ -437,6 +466,10 @@ public class SwingInterface implements CoreListener, LoggingListener {
                        configProperties.setProperty("lookAndFeel", lookAndFeel);
                }
                configProperties.setProperty("language", I18n.getLocale().getLanguage());
+               configProperties.setProperty("mainWindowX", String.valueOf(mainWindowX));
+               configProperties.setProperty("mainWindowY", String.valueOf(mainWindowY));
+               configProperties.setProperty("mainWindowWidth", String.valueOf(mainWindowWidth));
+               configProperties.setProperty("mainWindowHeight", String.valueOf(mainWindowHeight));
                FileOutputStream configOutputStream = null;
                try {
                        configOutputStream = new FileOutputStream(configFile);
@@ -626,6 +659,10 @@ public class SwingInterface implements CoreListener, LoggingListener {
        private void quit() {
                /* TODO - ask */
                core.stop();
+               mainWindowX = mainWindow.getX();
+               mainWindowY = mainWindow.getY();
+               mainWindowWidth = mainWindow.getWidth();
+               mainWindowHeight = mainWindow.getHeight();
                saveConfig();
                System.exit(0);
        }
@@ -645,7 +682,7 @@ public class SwingInterface implements CoreListener, LoggingListener {
                nodeNodeDisconnectActions.clear();
                nodeDisconnectActionNodes.clear();
                for (Node node: nodes) {
-                       logger.finer("adding node “" + node + "” to menu");
+                       logger.finer("adding node “" + node + "” to menus");
                        Action nodeConnectAction = new AbstractAction(node.getName()) {
 
                                /**
@@ -671,7 +708,7 @@ public class SwingInterface implements CoreListener, LoggingListener {
                                        nodeDisconnect(node);
                                }
                        };
-// nodeDisconnectActions.add(nodeDisconnectAction);
+                       // nodeDisconnectActions.add(nodeDisconnectAction);
                        nodeDisconnectActionNodes.put(nodeDisconnectAction, node);
                        nodeNodeDisconnectActions.put(node, nodeDisconnectAction);
                }
@@ -768,9 +805,18 @@ public class SwingInterface implements CoreListener, LoggingListener {
         * Adds a project.
         */
        private void addProject() {
-               Project project = new Project();
-               project.setName("New Project");
-               project.setDescription("");
+               try {
+                       Project project = core.createProject();
+                       project.setName(I18n.get("general.newProject.name"));
+                       project.setDescription(I18n.get("general.newProject.description", new Date()));
+                       mainWindow.addProject(project, true);
+               } catch (JSiteException nne1) {
+                       /* TODO - add i18n */
+                       JOptionPane.showMessageDialog(mainWindow, I18n.get(""), I18n.get(""), JOptionPane.ERROR_MESSAGE);
+               } catch (IOException e) {
+                       /* TODO - add i18n */
+                       JOptionPane.showMessageDialog(mainWindow, I18n.get(""), I18n.get(""), JOptionPane.ERROR_MESSAGE);
+               }
        }
 
        /**
@@ -796,6 +842,9 @@ public class SwingInterface implements CoreListener, LoggingListener {
         */
        public void loadingProjectsDone(String directory) {
                mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.projectLoadingDone"));
+               for (Project project: core.getProjects()) {
+                       mainWindow.addProject(project, false);
+               }
        }
 
        /**
@@ -868,6 +917,7 @@ public class SwingInterface implements CoreListener, LoggingListener {
        public void nodeAdded(Node node) {
                logger.log(Level.INFO, "node added: " + node);
                nodeList.add(node);
+               logger.log(Level.FINE, "nodeList.size(): " + nodeList.size());
                manageNodesDialog.setNodeList(nodeList);
                rebuildNodeActions(nodeList);
                mainWindow.refreshNodeMenuItems();
@@ -899,6 +949,18 @@ public class SwingInterface implements CoreListener, LoggingListener {
        public void nodeConnected(Node node) {
                Action nodeDisconnectAction = nodeNodeDisconnectActions.get(node);
                nodeDisconnectActions.add(nodeDisconnectAction);
+               mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.connectedToNode", node.getName(), node.getHostname(), node.getPort()));
+               mainWindow.refreshNodeMenuItems();
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       public void nodeConnectionFailed(Node node, Throwable cause) {
+               Action nodeConnectAction = nodeNodeConnectActions.get(node);
+               nodeConnectActions.add(nodeConnectAction);
+               mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.connectionToNodeFailed", node.getName(), node.getHostname(), node.getPort(), (cause != null) ? cause.getMessage() : "no reason given"));
+               JOptionPane.showMessageDialog(mainWindow, I18n.get("mainWindow.error.nodeConnectionFailed.message", node.getName(), node.getHostname(), node.getPort(), (cause != null) ? cause.getMessage() : "no reason given"), I18n.get("mainWindow.error.nodeConnectionFailed.title"), JOptionPane.ERROR_MESSAGE);
                mainWindow.refreshNodeMenuItems();
        }
 
@@ -910,22 +972,39 @@ public class SwingInterface implements CoreListener, LoggingListener {
                nodeConnectActions.add(nodeConnectAction);
                Action nodeDisconnectAction = nodeNodeDisconnectActions.get(node);
                nodeDisconnectActions.remove(nodeDisconnectAction);
+               mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.disconnectedFromNode", node.getName(), node.getHostname(), node.getPort()));
                mainWindow.refreshNodeMenuItems();
        }
 
        /**
-        * {@inheritDoc}
+        * @see net.pterodactylus.jsite.core.CoreListener#projectInsertStarted(net.pterodactylus.jsite.project.Project)
         */
-       public void requestAdded(Node node, Request request) {
-               logger.log(Level.INFO, "request added to node: " + request + ", " + node);
-               /* TODO - implement */
+       public void projectInsertStarted(Project project) {
+               mainWindow.projectInsertStarted(project);
        }
 
        /**
-        * {@inheritDoc}
+        * @see net.pterodactylus.jsite.core.CoreListener#projectInsertProgressed(net.pterodactylus.jsite.project.Project,
+        *      int, int, int, int, int, boolean)
+        */
+       public void projectInsertProgressed(Project project, int totalBlocks, int requiredBlocks, int successfulBlocks, int failedBlocks, int fatallyFailedBlocks, boolean finalizedTotal) {
+               mainWindow.projectInsertProgressed(project, totalBlocks, requiredBlocks, successfulBlocks, failedBlocks, fatallyFailedBlocks, finalizedTotal);
+       }
+
+       /**
+        * @see net.pterodactylus.jsite.core.CoreListener#projectInsertGeneratedURI(net.pterodactylus.jsite.project.Project,
+        *      java.lang.String)
+        */
+       public void projectInsertGeneratedURI(Project project, String uri) {
+               mainWindow.projectInsertGeneratedURI(project);
+       }
+
+       /**
+        * @see net.pterodactylus.jsite.core.CoreListener#projectInsertFinished(net.pterodactylus.jsite.project.Project,
+        *      boolean)
         */
-       public void requestProgressed(Request request, int totalBlocks, int requiredBlocks, int successfulBlocks, int failedBlocks, int fatallyFailedBlocks, boolean finalizedTotal) {
-               /* TODO - update table model */
+       public void projectInsertFinished(Project project, boolean success) {
+               mainWindow.projectInsertFinished(project, success);
        }
 
        //
jSite2 – Freenet Site Insertion Tool (defunct)