X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FSwingInterface.java;h=3df6402153204d4579d7c45a84ed004b6961b3c1;hb=2c2e370f0d6c24654a39e8d5657cb6c216ec9651;hp=be9b22d48eb27f5fe917bd83be01859bbe21e98c;hpb=6343df567ec832112927bfd218afe6fa98fa89a6;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/gui/SwingInterface.java b/src/net/pterodactylus/jsite/gui/SwingInterface.java index be9b22d..3df6402 100644 --- a/src/net/pterodactylus/jsite/gui/SwingInterface.java +++ b/src/net/pterodactylus/jsite/gui/SwingInterface.java @@ -41,6 +41,8 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JComboBox; import javax.swing.JOptionPane; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -49,9 +51,9 @@ 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.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; @@ -59,7 +61,7 @@ import net.pterodactylus.util.logging.LoggingListener; /** * The Swing user interface. - * + * * @author David ‘Bombe’ Roden <bombe@freenetproject.org> */ public class SwingInterface implements CoreListener, LoggingListener, PropertyChangeListener { @@ -115,6 +117,9 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** The “add project” action. */ private I18nAction addProjectAction; + /** The “insert project” actions. */ + private Map insertProjectActions = new HashMap(); + /** The “clone project” actions. */ private Map cloneProjectActions = new HashMap(); @@ -169,7 +174,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Creates a new swing interface. - * + * * @param core * The core to operate on * @param configDirectory @@ -219,7 +224,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the core that is controlled by the Swing interface. - * + * * @return The core */ Core getCore() { @@ -228,7 +233,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the main window of the Swing interface. - * + * * @return The main window */ MainWindow getMainWindow() { @@ -237,7 +242,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns whether the advanced mode is activated. - * + * * @return true if the advanced mode is activated, * false if the simple mode is activated */ @@ -247,7 +252,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the “configure” action. - * + * * @return The “configure” action */ I18nAction getConfigureAction() { @@ -256,7 +261,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the “import config” action. - * + * * @return The “import config” action */ I18nAction getImportConfigAction() { @@ -265,7 +270,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the “quit” action. - * + * * @return The “quit” action */ I18nAction getQuitAction() { @@ -274,7 +279,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the “add node” action. - * + * * @return The “add node” action */ I18nAction getAddNodeAction() { @@ -283,7 +288,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the “connect to node” action for the given node. - * + * * @param node * The node go get the “connect” action for * @return The “connect to node” action @@ -294,7 +299,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the “disconnect from node” action for the given node. - * + * * @param node * The node go get the “disconnect” action for * @return The “disconnect from node” action @@ -305,7 +310,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the “edit node” action for the given node. - * + * * @param node * The node to edit * @return The “edit node” action @@ -316,7 +321,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the “delete node” action for the given node. - * + * * @param node * The node to delete * @return The “delete node” action @@ -327,7 +332,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns all language actions. - * + * * @return All language actions */ List getLanguageActions() { @@ -336,7 +341,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the “about” action. - * + * * @return The “about” action */ I18nAction getHelpAboutAction() { @@ -345,7 +350,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the “add project” action. - * + * * @return The “add project” action */ I18nAction getAddProjectAction() { @@ -353,8 +358,19 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh } /** + * Returns the “insert project” action for the given project. + * + * @param project + * The project to get the “insert project” action for + * @return The “insert project” action + */ + I18nAction getInsertProjectAction(Project project) { + return insertProjectActions.get(project); + } + + /** * Returns the “clone project” action for the given project. - * + * * @param project * The project to get the “clone project” action for * @return The “clone project” action @@ -365,7 +381,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the “delete project” action for the given project. - * + * * @param project * The project to get the “delete project” action for * @return The “delete project” action @@ -376,7 +392,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns all currently configured nodes. - * + * * @return All configured nodes */ List getNodes() { @@ -385,7 +401,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns a list of all projects. - * + * * @return All projects */ List getProjects() { @@ -394,7 +410,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Returns the thread pool used for off-thread processes. - * + * * @return The thread pool */ Executor getThreadPool() { @@ -546,8 +562,9 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh } }; List availableLanguages = I18n.findAvailableLanguages(); - for (final Locale locale: availableLanguages) { - I18nAction languageAction = new I18nAction("general.language." + locale.getLanguage()) { + for (final Locale locale : availableLanguages) { + String language = locale.getLanguage(); + I18nAction languageAction = new I18nAction("general.language." + language, IconLoader.loadIcon("/flag-" + language + ".png")) { @SuppressWarnings("synthetic-access") public void actionPerformed(ActionEvent e) { @@ -555,7 +572,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh } }; - if (I18n.getLocale().getLanguage().equals(locale.getLanguage())) { + if (I18n.getLocale().getLanguage().equals(language)) { languageAction.setEnabled(false); } languageActions.add(languageAction); @@ -673,7 +690,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Edits the given node. - * + * * @param node * The node to edit */ @@ -691,7 +708,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Deletes the given node. - * + * * @param node * The node to delete */ @@ -704,7 +721,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Connects to the node. - * + * * @param node * The node to connect to */ @@ -724,7 +741,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Disconnects from the node. - * + * * @param node * The node to disconnect from */ @@ -736,14 +753,14 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Changes the language of the interface. This method also disables the * action for the newly set language and enables all others. - * + * * @param newLocale * The new language * @param languageAction * The action that triggered the change */ private void changeLanguage(Locale newLocale, I18nAction languageAction) { - for (I18nAction i18nAction: languageActions) { + for (I18nAction i18nAction : languageActions) { i18nAction.setEnabled(i18nAction != languageAction); } I18n.setLocale(newLocale); @@ -762,9 +779,8 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh private void addProject() { try { core.createProject(); - } catch (JSiteException nne1) { - /* TODO - add i18n */ - JOptionPane.showMessageDialog(mainWindow, I18n.get(""), I18n.get(""), JOptionPane.ERROR_MESSAGE); + } catch (JSiteException jse1) { + JOptionPane.showMessageDialog(mainWindow, I18n.get("mainWindow.error.notConnected.message"), I18n.get("mainWindow.error.notConnected.title"), JOptionPane.ERROR_MESSAGE); } catch (IOException e) { /* TODO - add i18n */ JOptionPane.showMessageDialog(mainWindow, I18n.get(""), I18n.get(""), JOptionPane.ERROR_MESSAGE); @@ -772,8 +788,37 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh } /** + * Inserts the given project. + * + * @param project + * The project to insert + */ + private void insertProject(Project project) { + Node targetNode = project.getNode(); + if (targetNode == null) { + JComboBox nodeComboBox = new JComboBox(); + for (Node node : nodeList) { + ((DefaultComboBoxModel) nodeComboBox.getModel()).addElement(node.getName() + " (" + node.getHostname() + ":" + node.getPort() + ")"); + } + int selectedOption = JOptionPane.showConfirmDialog(mainWindow, new Object[] { I18n.get("nodeSelectionDialog.selectNode.text"), nodeComboBox }, I18n.get("nodeSelectionDialog.noNodeSelected.text"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); + if (selectedOption == JOptionPane.CANCEL_OPTION) { + return; + } + int selectedNodeIndex = nodeComboBox.getSelectedIndex(); + logger.log(Level.FINE, "selected node index: " + selectedNodeIndex); + targetNode = nodeList.get(selectedNodeIndex); + } + logger.log(Level.INFO, "Inserting project “" + project.getName() + "” to node “" + targetNode.getName() + "”..."); + if (!core.isNodeConnected(targetNode)) { + JOptionPane.showMessageDialog(mainWindow, I18n.get("mainWindow.error.nodeNotConnected.message", targetNode.getName()), I18n.get("mainWindow.error.nodeNotConnected.title", targetNode.getName()), JOptionPane.ERROR_MESSAGE); + return; + } + core.insertProject(targetNode, project); + } + + /** * Clones a project. - * + * * @param project * The project to clone */ @@ -783,7 +828,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh /** * Deletes a project. - * + * * @param project * The project to delete */ @@ -804,7 +849,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh */ public void loadingProjectsDone(String directory) { mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.projectLoadingDone")); - for (Project project: core.getProjects()) { + for (Project project : core.getProjects()) { projectAdded(project, false); } } @@ -844,6 +889,16 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh * @param switchToProject */ private void projectAdded(final Project project, boolean switchToProject) { + insertProjectActions.put(project, new I18nAction("mainWindow.button.insertProject") { + + /** + * {@inheritDoc} + */ + @SuppressWarnings("synthetic-access") + public void actionPerformed(ActionEvent actionEvent) { + insertProject(project); + } + }); cloneProjectActions.put(project, new I18nAction("mainWindow.button.cloneProject") { /** @@ -1037,14 +1092,14 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh } /** - * @see net.pterodactylus.jsite.core.CoreListener#projectInsertStarted(net.pterodactylus.jsite.project.Project) + * @see net.pterodactylus.jsite.core.CoreListener#projectInsertStarted(net.pterodactylus.jsite.core.Project) */ public void projectInsertStarted(Project project) { mainWindow.projectInsertStarted(project); } /** - * @see net.pterodactylus.jsite.core.CoreListener#projectInsertProgressed(net.pterodactylus.jsite.project.Project, + * @see net.pterodactylus.jsite.core.CoreListener#projectInsertProgressed(net.pterodactylus.jsite.core.Project, * int, int, int, int, int, boolean) */ public void projectInsertProgressed(Project project, int totalBlocks, int requiredBlocks, int successfulBlocks, int failedBlocks, int fatallyFailedBlocks, boolean finalizedTotal) { @@ -1052,7 +1107,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh } /** - * @see net.pterodactylus.jsite.core.CoreListener#projectInsertGeneratedURI(net.pterodactylus.jsite.project.Project, + * @see net.pterodactylus.jsite.core.CoreListener#projectInsertGeneratedURI(net.pterodactylus.jsite.core.Project, * java.lang.String) */ public void projectInsertGeneratedURI(Project project, String uri) { @@ -1060,7 +1115,7 @@ public class SwingInterface implements CoreListener, LoggingListener, PropertyCh } /** - * @see net.pterodactylus.jsite.core.CoreListener#projectInsertFinished(net.pterodactylus.jsite.project.Project, + * @see net.pterodactylus.jsite.core.CoreListener#projectInsertFinished(net.pterodactylus.jsite.core.Project, * boolean) */ public void projectInsertFinished(Project project, boolean success) {