X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FSwingInterface.java;h=65fcebeebd356d3d6f2d5155336436dc144cefc5;hb=e99f6d1dafdf8733125537e8ab36d0fedc325630;hp=7d0a96dcfacf53abc6499441cfd4342617806c92;hpb=d9babeba262240417325c00535e4c91c24520f2c;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/gui/SwingInterface.java b/src/net/pterodactylus/jsite/gui/SwingInterface.java
index 7d0a96d..65fcebe 100644
--- 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
 	//
@@ -370,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
 	//
@@ -950,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}
 	 */
@@ -966,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);
 	}
 
 	//