add type to request

[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 0a945db..65fcebe 100644 (file)
--- a/src/net/pterodactylus/jsite/gui/SwingInterface.java
+++ b/src/net/pterodactylus/jsite/gui/SwingInterface.java
@@ -144,6 +144,9 @@ public class SwingInterface implements CoreListener, LoggingListener {
        /** The list of all defined nodes. */
        private List<Node> nodeList = Collections.synchronizedList(new ArrayList<Node>());
 
+       /** The request table model. */
+       private RequestTableModel requestTableModel = new RequestTableModel();
+
        //
        // CONFIGURATION
        //
@@ -217,7 +220,6 @@ public class SwingInterface implements CoreListener, LoggingListener {
                if ((mainWindowX != -1) && (mainWindowY != -1) && (mainWindowWidth != -1) && (mainWindowHeight != -1)) {
                        mainWindow.setLocation(mainWindowX, mainWindowY);
                        mainWindow.setSize(mainWindowWidth, mainWindowHeight);
-                       mainWindow.validate();
                }
                logWindow = new LogWindow();
        }
@@ -371,6 +373,15 @@ public class SwingInterface implements CoreListener, LoggingListener {
                return deleteProjectAction;
        }
 
+       /**
+        * Returns the request table model.
+        * 
+        * @return The request table model
+        */
+       RequestTableModel getRequestTableModel() {
+               return requestTableModel;
+       }
+
        //
        // ACTIONS
        //
@@ -951,7 +962,7 @@ public class SwingInterface implements CoreListener, LoggingListener {
                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();
        }
-       
+
        /**
         * {@inheritDoc}
         */
@@ -967,17 +978,24 @@ public class SwingInterface implements CoreListener, LoggingListener {
        /**
         * {@inheritDoc}
         */
-       public void requestAdded(Node node, Request request) {
-               logger.log(Level.INFO, "request added to node: " + request + ", " + node);
+       public void requestAdded(Request request) {
+               logger.log(Level.INFO, "request added to node: " + request + ", " + request.getNode());
                /* TODO - implement */
+               requestTableModel.addRequest(request);
        }
 
        /**
         * {@inheritDoc}
         */
-       public void requestProgressed(Request request, int totalBlocks, int requiredBlocks, int successfulBlocks, int failedBlocks, int fatallyFailedBlocks, boolean finalizedTotal) {
+       public void requestProgressed(Request request) {
                /* TODO - update table model */
-               mainWindow.setStatusBarText(request.getIdentifier() + " @ " + ((10000 * successfulBlocks / requiredBlocks) / 100.0) + "%");
+       }
+
+       /**
+        * @see net.pterodactylus.jsite.core.CoreListener#requestRemoved(net.pterodactylus.jsite.core.Request)
+        */
+       public void requestRemoved(Request request) {
+               requestTableModel.removeRequest(request);
        }
 
        //