X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FSwingInterface.java;h=4fb71390be8b1455547ea8a02162e966791d5f19;hb=99ef3764897825a3154cb662b2b81f51c16fdbd2;hp=6f97944ac34a097d3e383a972adb305c38549a02;hpb=10b165ebaa51eccec487500b32f0c7b3106923af;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/gui/SwingInterface.java b/src/net/pterodactylus/jsite/gui/SwingInterface.java
index 6f97944..4fb7139 100644
--- a/src/net/pterodactylus/jsite/gui/SwingInterface.java
+++ b/src/net/pterodactylus/jsite/gui/SwingInterface.java
@@ -48,7 +48,6 @@ 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.Request;
 import net.pterodactylus.jsite.i18n.I18n;
 import net.pterodactylus.jsite.i18n.gui.I18nAction;
 import net.pterodactylus.jsite.project.Project;
@@ -146,9 +145,6 @@ 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
 	//
@@ -375,15 +371,6 @@ public class SwingInterface implements CoreListener, LoggingListener {
 		return deleteProjectAction;
 	}
 
-	/**
-	 * Returns the request table model.
-	 * 
-	 * @return The request table model
-	 */
-	RequestTableModel getRequestTableModel() {
-		return requestTableModel;
-	}
-
 	//
 	// ACTIONS
 	//
@@ -820,9 +807,9 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	private void addProject() {
 		try {
 			Project project = core.createProject();
-			mainWindow.addProject(project);
 			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);
@@ -856,7 +843,7 @@ 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);
+			mainWindow.addProject(project, false);
 		}
 	}
 
@@ -990,26 +977,34 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * @see net.pterodactylus.jsite.core.CoreListener#projectInsertStarted(net.pterodactylus.jsite.project.Project)
 	 */
-	public void requestAdded(Request request) {
-		logger.log(Level.INFO, "request added to node: " + request + ", " + request.getNode());
-		/* TODO - implement */
-		requestTableModel.addRequest(request);
+	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 requestProgressed(Request request) {
-		/* TODO - update table model */
+	public void projectInsertGeneratedURI(Project project, String uri) {
+		mainWindow.projectInsertGeneratedURI(project);
 	}
 
 	/**
-	 * @see net.pterodactylus.jsite.core.CoreListener#requestRemoved(net.pterodactylus.jsite.core.Request)
+	 * @see net.pterodactylus.jsite.core.CoreListener#projectInsertFinished(net.pterodactylus.jsite.project.Project,
+	 *      boolean)
 	 */
-	public void requestRemoved(Request request) {
-		requestTableModel.removeRequest(request);
+	public void projectInsertFinished(Project project, boolean success) {
+		mainWindow.projectInsertFinished(project, success);
 	}
 
 	//