X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FSwingInterface.java;h=dff6f3a2ae3c6942bce6f424ec0c68441282b519;hb=83250636518e229320ac696ff580b710ea8207b7;hp=2f6f96538b456b358ad2fb2b0a485c7b1f93da81;hpb=c7561c631f4bbb94ee0ac9047e953ce56f1df8bb;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/gui/SwingInterface.java b/src/net/pterodactylus/jsite/gui/SwingInterface.java index 2f6f965..dff6f3a 100644 --- a/src/net/pterodactylus/jsite/gui/SwingInterface.java +++ b/src/net/pterodactylus/jsite/gui/SwingInterface.java @@ -25,11 +25,23 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Properties; - +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; + +import javax.swing.AbstractAction; +import javax.swing.Action; import javax.swing.JOptionPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; import net.pterodactylus.jsite.core.Core; import net.pterodactylus.jsite.core.CoreListener; @@ -38,14 +50,19 @@ import net.pterodactylus.jsite.core.Project; import net.pterodactylus.jsite.i18n.I18n; import net.pterodactylus.jsite.i18n.gui.I18nAction; import net.pterodactylus.util.io.Closer; +import net.pterodactylus.util.logging.Logging; +import net.pterodactylus.util.logging.LoggingListener; /** * The Swing user interface. - * + * * @author David ‘Bombe’ Roden <bombe@freenetproject.org> * @version $Id$ */ -public class SwingInterface implements CoreListener { +public class SwingInterface implements CoreListener, LoggingListener { + + /** The logger. */ + private static final Logger logger = Logging.getLogger(SwingInterface.class.getName()); /** The application core. */ private final Core core; @@ -56,6 +73,12 @@ public class SwingInterface implements CoreListener { /** The main window. */ private MainWindow mainWindow; + /** Thread pool. */ + private Executor threadPool = Executors.newCachedThreadPool(); + + /** The logger window. */ + private LogWindow logWindow; + /** The “configure” action. */ private I18nAction configureAction; @@ -68,12 +91,30 @@ public class SwingInterface implements CoreListener { /** The “manage nodes” action. */ private I18nAction manageNodesAction; - /** The “connect to node” action. */ + /** The “connect to node” (simple mode) action. */ private I18nAction nodeConnectAction; - /** The “disconnect from node” action. */ + /** The “disconnect from node” (simple mode) action. */ private I18nAction nodeDisconnectAction; + /** All node menu items. */ + private List nodeConnectActions = Collections.synchronizedList(new ArrayList()); + + /** Mapping from nodes to node connect actions. */ + private Map nodeNodeConnectActions = Collections.synchronizedMap(new HashMap()); + + /** Mapping from node connect actions to nodes. */ + private Map nodeConnectActionNodes = Collections.synchronizedMap(new HashMap()); + + /** All node disconnect actions. */ + private List nodeDisconnectActions = Collections.synchronizedList(new ArrayList()); + + /** Mapping from nodes to node disconnect actions. */ + private Map nodeNodeDisconnectActions = Collections.synchronizedMap(new HashMap()); + + /** Mapping from node disconnect actions to nodes. */ + private Map nodeDisconnectActionNodes = Collections.synchronizedMap(new HashMap()); + /** The node manager dialog. */ private ManageNodesDialog manageNodesDialog; @@ -105,6 +146,9 @@ public class SwingInterface implements CoreListener { // CONFIGURATION // + /** The advanced mode. */ + private boolean advancedMode; + /** Whether to antialias the GUI. */ private boolean antialias; @@ -114,9 +158,12 @@ public class SwingInterface implements CoreListener { /** The user font. */ private String userFont; + /** The class name of the look and feel. */ + private String lookAndFeel; + /** * Creates a new swing interface. - * + * * @param core * The core to operate on * @param configDirectory @@ -127,6 +174,19 @@ public class SwingInterface implements CoreListener { this.configDirectory = configDirectory; I18n.setLocale(Locale.ENGLISH); loadConfig(); + if (lookAndFeel != null) { + try { + UIManager.setLookAndFeel(lookAndFeel); + } catch (ClassNotFoundException cnfe1) { + logger.log(Level.WARNING, "could not load look and feel", cnfe1); + } catch (InstantiationException ie1) { + logger.log(Level.WARNING, "could not load look and feel", ie1); + } catch (IllegalAccessException iae1) { + logger.log(Level.WARNING, "could not load look and feel", iae1); + } catch (UnsupportedLookAndFeelException ulafe1) { + logger.log(Level.WARNING, "could not load look and feel", ulafe1); + } + } if (antialias) { System.setProperty("swing.aatext", "true"); } @@ -138,6 +198,9 @@ public class SwingInterface implements CoreListener { } initActions(); initDialogs(); + mainWindow = new MainWindow(this); + mainWindow.setAdvancedMode(advancedMode); + logWindow = new LogWindow(); } // @@ -146,7 +209,7 @@ public class SwingInterface implements CoreListener { /** * Returns the core that is controlled by the Swing interface. - * + * * @return The core */ Core getCore() { @@ -155,7 +218,7 @@ public class SwingInterface implements CoreListener { /** * Returns the main window of the Swing interface. - * + * * @return The main window */ MainWindow getMainWindow() { @@ -163,8 +226,18 @@ public class SwingInterface implements CoreListener { } /** + * Returns whether the advanced mode is activated. + * + * @return true if the advanced mode is activated, + * false if the simple mode is activated + */ + boolean isAdvancedMode() { + return advancedMode; + } + + /** * Returns the “configure” action. - * + * * @return The “configure” action */ I18nAction getConfigureAction() { @@ -173,7 +246,7 @@ public class SwingInterface implements CoreListener { /** * Returns the “import config” action. - * + * * @return The “import config” action */ I18nAction getImportConfigAction() { @@ -182,7 +255,7 @@ public class SwingInterface implements CoreListener { /** * Returns the “quit” action. - * + * * @return The “quit” action */ I18nAction getQuitAction() { @@ -191,7 +264,7 @@ public class SwingInterface implements CoreListener { /** * Returns the “manage nodes” action. - * + * * @return The “manage nodes” action */ I18nAction getManageNodesAction() { @@ -200,7 +273,7 @@ public class SwingInterface implements CoreListener { /** * Returns the “connect to node” action. - * + * * @return The “connect to node” action */ I18nAction getNodeConnectAction() { @@ -208,8 +281,17 @@ public class SwingInterface implements CoreListener { } /** + * Returns all “connect node” actions. + * + * @return All “connect node” actions + */ + List getNodeConnectActions() { + return nodeConnectActions; + } + + /** * Returns the “disconnect from node” action. - * + * * @return The “disconnect from node” action */ I18nAction getNodeDisconnectAction() { @@ -217,8 +299,17 @@ public class SwingInterface implements CoreListener { } /** + * Returns all “disconnect node” actions. + * + * @return All “disconnect node” action + */ + List getNodeDisconnectActions() { + return nodeDisconnectActions; + } + + /** * Returns all language actions. - * + * * @return All language actions */ List getLanguageActions() { @@ -227,7 +318,7 @@ public class SwingInterface implements CoreListener { /** * Returns the “about” action. - * + * * @return The “about” action */ I18nAction getHelpAboutAction() { @@ -236,7 +327,7 @@ public class SwingInterface implements CoreListener { /** * Returns the “add project” action. - * + * * @return The “add project” action */ I18nAction getAddProjectAction() { @@ -245,7 +336,7 @@ public class SwingInterface implements CoreListener { /** * Returns the “clone project” action. - * + * * @return The “clone project” action */ I18nAction getCloneProjectAction() { @@ -254,7 +345,7 @@ public class SwingInterface implements CoreListener { /** * Returns the “delete project” action. - * + * * @return The “delete project” action */ I18nAction getDeleteProjectAction() { @@ -269,13 +360,6 @@ public class SwingInterface implements CoreListener { // SERVICE METHODS // - /** - * Starts the interface. - */ - public void start() { - mainWindow = new MainWindow(this); - } - // // PRIVATE METHODS // @@ -302,6 +386,9 @@ public class SwingInterface implements CoreListener { } finally { Closer.close(configInputStream); } + if (configProperties.containsKey("advancedMode")) { + advancedMode = Boolean.valueOf(configProperties.getProperty("advancedMode")); + } if (configProperties.containsKey("antialias")) { antialias = Boolean.valueOf(configProperties.getProperty("antialias")); } @@ -311,6 +398,9 @@ public class SwingInterface implements CoreListener { if (configProperties.containsKey("userFont")) { userFont = configProperties.getProperty("userFont"); } + if (configProperties.containsKey("lookAndFeel")) { + lookAndFeel = configProperties.getProperty("lookAndFeel"); + } if (configProperties.containsKey("language")) { I18n.setLocale(new Locale(configProperties.getProperty("language"))); } @@ -333,6 +423,7 @@ public class SwingInterface implements CoreListener { } File configFile = new File(configDirectory, "swing-interface.properties"); Properties configProperties = new Properties(); + configProperties.setProperty("advancedMode", String.valueOf(advancedMode)); configProperties.setProperty("antialias", String.valueOf(antialias)); if (controlFont != null) { configProperties.setProperty("controlFont", controlFont); @@ -340,6 +431,9 @@ public class SwingInterface implements CoreListener { if (userFont != null) { configProperties.setProperty("userFont", userFont); } + if (lookAndFeel != null) { + configProperties.setProperty("lookAndFeel", lookAndFeel); + } configProperties.setProperty("language", I18n.getLocale().getLanguage()); FileOutputStream configOutputStream = null; try { @@ -400,7 +494,11 @@ public class SwingInterface implements CoreListener { @SuppressWarnings("synthetic-access") public void actionPerformed(ActionEvent actionEvent) { - nodeConnect(); + List nodes = core.getNodes(); + if (nodes.isEmpty()) { + return; + } + nodeConnect(nodes.get(0)); } }; @@ -411,9 +509,14 @@ public class SwingInterface implements CoreListener { */ @SuppressWarnings("synthetic-access") public void actionPerformed(ActionEvent e) { - nodeDisconnect(); + List nodes = core.getNodes(); + if (nodes.isEmpty()) { + return; + } + nodeDisconnect(nodes.get(0)); } }; + rebuildNodeActions(core.getNodes()); List availableLanguages = I18n.findAvailableLanguages(); for (final Locale locale: availableLanguages) { I18nAction languageAction = new I18nAction("general.language." + locale.getLanguage()) { @@ -488,14 +591,22 @@ public class SwingInterface implements CoreListener { * Shows the configuration dialog. */ private void configure() { + configurationDialog.setAdvancedMode(advancedMode); configurationDialog.setAntialias(antialias); configurationDialog.setControlFont(controlFont); configurationDialog.setUserFont(userFont); + configurationDialog.setLookAndFeel(lookAndFeel); configurationDialog.setVisible(true); if (!configurationDialog.wasCancelled()) { + advancedMode = configurationDialog.isAdvancedMode(); + if (!advancedMode && (nodeList.size() > 1)) { + JOptionPane.showMessageDialog(mainWindow, I18n.get("mainWindow.warning.multipleNodesNotAdvancedMode.message"), I18n.get("mainWindow.warning.multipleNodesNotAdvancedMode.title"), JOptionPane.WARNING_MESSAGE); + } + mainWindow.setAdvancedMode(advancedMode); antialias = configurationDialog.isAntialias(); controlFont = configurationDialog.getControlFont(); userFont = configurationDialog.getUserFont(); + lookAndFeel = configurationDialog.getLookAndFeel(); saveConfig(); } } @@ -516,32 +627,118 @@ public class SwingInterface implements CoreListener { } /** + * Rebuilds all node connect and disconnect actions. + * + * @param nodes + * The list of nodes + */ + private void rebuildNodeActions(List nodes) { + nodeConnectActions.clear(); + nodeNodeConnectActions.clear(); + nodeConnectActionNodes.clear(); + nodeDisconnectActions.clear(); + nodeNodeDisconnectActions.clear(); + nodeDisconnectActionNodes.clear(); + for (Node node: nodes) { + Action nodeConnectAction = new AbstractAction(node.getName()) { + + /** + * {@inheritDoc} + */ + @SuppressWarnings("synthetic-access") + public void actionPerformed(ActionEvent e) { + Node node = nodeConnectActionNodes.get(this); + nodeConnect(node); + } + }; + nodeConnectActions.add(nodeConnectAction); + nodeConnectActionNodes.put(nodeConnectAction, node); + nodeNodeConnectActions.put(node, nodeConnectAction); + Action nodeDisconnectAction = new AbstractAction(node.getName()) { + + /** + * {@inheritDoc} + */ + @SuppressWarnings("synthetic-access") + public void actionPerformed(ActionEvent e) { + Node node = nodeDisconnectActionNodes.get(this); + nodeDisconnect(node); + } + }; +// nodeDisconnectActions.add(nodeDisconnectAction); + nodeDisconnectActionNodes.put(nodeDisconnectAction, node); + nodeNodeDisconnectActions.put(node, nodeDisconnectAction); + } + } + + /** * Pops up the “manage nodes” dialog. */ private void manageNodes() { - manageNodesDialog.setNodeList(nodeList); - manageNodesDialog.setVisible(true); - nodeList = manageNodesDialog.getNodeList(); + if (advancedMode) { + manageNodesDialog.setNodeList(nodeList); + manageNodesDialog.setVisible(true); + nodeList = manageNodesDialog.getNodeList(); + rebuildNodeActions(nodeList); + mainWindow.refreshNodeMenuItems(); + } else { + if (nodeList.isEmpty()) { + Node newNode = new Node(); + newNode.setName(I18n.get("general.defaultNode.name")); + newNode.setHostname("localhost"); + newNode.setPort(9481); + nodeList.add(newNode); + } + Node firstNode = nodeList.get(0); + EditNodeDialog editNodeDialog = manageNodesDialog.getEditNodeDialog(); + editNodeDialog.setNodeName(firstNode.getName()); + editNodeDialog.setNodeHostname(firstNode.getHostname()); + editNodeDialog.setNodePort(firstNode.getPort()); + editNodeDialog.setVisible(true); + if (!editNodeDialog.wasCancelled()) { + firstNode.setName(editNodeDialog.getNodeName()); + firstNode.setHostname(editNodeDialog.getNodeHostname()); + firstNode.setPort(editNodeDialog.getNodePort()); + /* TODO - give to core. */ + } + } } /** * Connects to the node. + * + * @param node + * The node to connect to */ - private void nodeConnect() { - /* TODO */ + private void nodeConnect(final Node node) { + threadPool.execute(new Runnable() { + + /** + * {@inheritDoc} + */ + @SuppressWarnings("synthetic-access") + public void run() { + logger.log(Level.INFO, "connecting to node “" + node.getName() + "”…"); + core.connectToNode(node); + } + }); } /** * Disconnects from the node. + * + * @param node + * The node to disconnect from */ - private void nodeDisconnect() { - /* TODO */ + private void nodeDisconnect(Node node) { + logger.log(Level.INFO, "disconnecting from node “" + node.getName() + "”…"); + core.disconnectFromNode(node); } /** * 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 @@ -591,6 +788,13 @@ public class SwingInterface implements CoreListener { /** * {@inheritDoc} */ + public void loadingProjectsDone(String directory) { + mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.projectLoadingDone")); + } + + /** + * {@inheritDoc} + */ public void loadingProjectsFailed(String directory, Throwable throwable) { JOptionPane.showMessageDialog(mainWindow, I18n.get("mainWindow.error.projectLoadingFailed.message", directory), I18n.get("mainWindow.error.projectLoadingFailed.title"), JOptionPane.ERROR_MESSAGE); } @@ -612,6 +816,34 @@ public class SwingInterface implements CoreListener { /** * {@inheritDoc} */ + public void loadingNodesDone(String directory) { + mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.loadingNodesDone")); + } + + /** + * {@inheritDoc} + */ + public void loadingNodesFailed(String directory, Throwable throwable) { + /* TODO */ + } + + /** + * {@inheritDoc} + */ + public void savingNodesDone(String directory) { + mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.savingNodesDone")); + } + + /** + * {@inheritDoc} + */ + public void savingNodesFailed(String directory, Throwable throwable) { + /* TODO */ + } + + /** + * {@inheritDoc} + */ public void coreLoaded() { this.nodeList = core.getNodes(); manageNodesDialog.setNodeList(nodeList); @@ -629,22 +861,42 @@ public class SwingInterface implements CoreListener { /** * {@inheritDoc} */ + public void nodeConnecting(Node node) { + Action nodeConnectAction = nodeNodeConnectActions.get(node); + nodeConnectActions.remove(nodeConnectAction); + mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.connectingToNode", node.getName(), node.getHostname(), node.getPort())); + mainWindow.refreshNodeMenuItems(); + } + + /** + * {@inheritDoc} + */ public void nodeConnected(Node node) { - /* TODO */ + Action nodeDisconnectAction = nodeNodeDisconnectActions.get(node); + nodeDisconnectActions.add(nodeDisconnectAction); + mainWindow.refreshNodeMenuItems(); } /** * {@inheritDoc} */ - public void nodeConnecting(Node node) { - /* TODO */ + public void nodeDisconnected(Node node, Throwable throwable) { + Action nodeConnectAction = nodeNodeConnectActions.get(node); + nodeConnectActions.add(nodeConnectAction); + Action nodeDisconnectAction = nodeNodeDisconnectActions.get(node); + nodeDisconnectActions.remove(nodeDisconnectAction); + mainWindow.refreshNodeMenuItems(); } + // + // INTERFACE LoggingListener + // + /** * {@inheritDoc} */ - public void nodeDisconnected(Node node) { - /* TODO */ + public void logged(LogRecord logRecord) { + logWindow.logged(logRecord); } }