Author: chatellier Date: 2009-08-31 08:52:33 +0000 (Mon, 31 Aug 2009) New Revision: 2559 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx Log: Reajout de la progression de la status bar pour les op?\195?\169rations longues. (pour l'instant elle a l'air bloqu?\195?\169e par l'ui...) Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-08-28 08:01:15 UTC (rev 2558) +++ isis-fish/trunk/changelog.txt 2009-08-31 08:52:33 UTC (rev 2559) @@ -1,5 +1,6 @@ isis-fish (3.2.0.5) stable; urgency=low + * Restore running status progress bar indeterminate state -- Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2009-08-28 08:01:15 UTC (rev 2558) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2009-08-31 08:52:33 UTC (rev 2559) @@ -18,18 +18,42 @@ *##%*/ --> <Table> + <script><![CDATA[ + + /** + * Change status message and stop progress bar if running. + * + * @param message new message + */ + public void setStatusMessage(String message) { + setStatusMessage(message, false); + } + + /** + * Change status message and progress bar state. + * + * @param message new message + */ + public void setStatusMessage(String message, boolean state) { + // use a basic mode, swap indeterminate state + // can't known real progression here + progressStatus.setIndeterminate(state); + labelStatus.setText(message); + } + + ]]></script> <row> - <cell fill="both" weightx="0.2"> + <cell fill="both" weightx="1"> <JProgressBar id="progressStatus" /> </cell> - <cell fill="both" weightx="0.2"> + <cell fill="both" weightx="5"> <JLabel id="labelStatus" /> </cell> - <cell fill="both" weightx="0.2"> + <!-- <cell fill="both" weightx="0.2"> <JButton id="stopCommand" actionCommand="stopCommand" visible="false" text="isisfish.common.stop" toolTipText="Stop the process" /> - </cell> - <cell fill="both" weightx="0.2"> + </cell> --> + <cell fill="both"> <org.codelutin.widget.StatusBar /> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2009-08-28 08:01:15 UTC (rev 2558) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2009-08-31 08:52:33 UTC (rev 2559) @@ -20,27 +20,52 @@ <JPanel layout='{new BorderLayout()}'> <script> <![CDATA[ - import fr.ifremer.isisfish.IsisFish; - public void setContent(Container c){ + public void setContent(Container c) { this.add(c, BorderLayout.CENTER); } - public void setInfoText(String s){ - statusBar.getLabelStatus().setText(s); + + /** + * @deprecated use setStatusMessage(String) instead + */ + public void setInfoText(String message) { + setStatusMessage(message); } + + /** + * Change status message and stop progress bar if running. + * + * @param message new message + */ + public void setStatusMessage(String message) { + statusBar.setStatusMessage(message); + } + + /** + * Change status message and progress bar state. + * + * @param message new message + * @param running progress bar state + */ + public void setStatusMessage(String message, boolean running) { + statusBar.setStatusMessage(message, running); + } + public void close(JFrame f) { - if (getVerifier().allIsSaved()){ + if (getVerifier().allIsSaved()) { exit(f); } } - protected void exit(JFrame f){ + + protected void exit(JFrame f) { f.dispose(); } - protected WelcomeSaveVerifier getVerifier(){ + + protected WelcomeSaveVerifier getVerifier() { return getContextValue(WelcomeSaveVerifier.class); } ]]> </script> - <JPanel layout='{new BorderLayout()}' constraints="BorderLayout.SOUTH"> - <StatusBarUI id='statusBar' constraints="BorderLayout.CENTER" /> - </JPanel> + <!-- JPanel layout='{new BorderLayout()}' constraints="BorderLayout.SOUTH"> --> + <StatusBarUI id='statusBar' constraints="BorderLayout.SOUTH" /> + <!-- </JPanel> --> </JPanel> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-08-28 08:01:15 UTC (rev 2558) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-08-31 08:52:33 UTC (rev 2559) @@ -75,12 +75,14 @@ if (log.isDebugEnabled()) { log.debug("Region change, selected : " + name); } - setInfoText(_("isisfish.message.loading.region", name)); + + // long operation, run status bar + setStatusMessage(_("isisfish.message.loading.region", name), true); SwingUtilities.invokeLater(new Runnable() { public void run() { loadRegion(name); getVerifier().setIsisContext(getContextValue(TopiaContext.class)); - setInfoText(_("isisfish.message.load.finished")); + setStatusMessage(_("isisfish.message.load.finished")); setTreeModel(); } }); @@ -142,22 +144,26 @@ navigation.setSelectionPath(pathToRoot); navigation.scrollPathToVisible(pathToRoot); } -protected void setInfoText(String s) { +protected void setStatusMessage(String s) { WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); - root.setInfoText(s); + root.setStatusMessage(s); } +protected void setStatusMessage(String s, boolean running) { + WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); + root.setStatusMessage(s, running); +} protected void regionChange() { getContextValue(RegionMonitor.class).changeRegion(); } protected void newRegion() { String name = fieldNewRegion.getText(); - setInfoText(_("isisfish.message.creating.region", name)); + setStatusMessage(_("isisfish.message.creating.region", name), true); getContextValue(InputAction.class).newRegion(name); regionChange(); fieldCurrentRegion.setSelectedItem(name); JButtonNewRegion.setEnabled(false); fieldNewRegion.setText(""); - setInfoText(_("isisfish.message.creation.finished")); + setStatusMessage(_("isisfish.message.creation.finished")); } protected void regionNull() { getCardlayoutPrincipal().show(inputPanePrincipal,"none"); @@ -168,45 +174,45 @@ JButtonNewRegion.setEnabled(true); } protected void importRegion() { - setInfoText(_("isisfish.message.import.zip")); + setStatusMessage(_("isisfish.message.import.zip"), true); getContextValue(InputAction.class).importRegion(); regionChange(); - setInfoText(_("isisfish.message.import.finished")); + setStatusMessage(_("isisfish.message.import.finished")); } protected void importRegionAndRename() { - setInfoText(_("isisfish.message.import.zip")); + setStatusMessage(_("isisfish.message.import.zip"), true); getContextValue(InputAction.class).importRegionAndRename(); regionChange(); - setInfoText(_("isisfish.message.import.finished")); + setStatusMessage(_("isisfish.message.import.finished")); } protected void importV2Region() { - setInfoText(_("isisfish.message.import.xml.v2.file") + getContextValue(InputAction.class).importV2Region()); + setStatusMessage(_("isisfish.message.import.xml.v2.file") + getContextValue(InputAction.class).importV2Region(), true); regionChange(); - setInfoText(_("isisfish.message.import.finished")); + setStatusMessage(_("isisfish.message.import.finished")); } protected void importRegionFromSimulation() { - setInfoText(_("isisfish.message.import", getContextValue(InputAction.class).importRegionFromSimulation())); + setStatusMessage(_("isisfish.message.import", getContextValue(InputAction.class).importRegionFromSimulation()), true); regionChange(); - setInfoText(_("isisfish.message.export.done")); + setStatusMessage(_("isisfish.message.export.done")); } protected void exportRegion() { - setInfoText(_("isisfish.message.export.zip", getContextValue(InputAction.class).exportRegion(getRegionStorage()))); - setInfoText(_("isisfish.message.export.done")); + setStatusMessage(_("isisfish.message.export.zip", getContextValue(InputAction.class).exportRegion(getRegionStorage())), true); + setStatusMessage(_("isisfish.message.export.done")); } protected void copyRegion() { - setInfoText(_("isisfish.message.copy.region", getContextValue(InputAction.class).copyRegion(getRegionStorage()))); + setStatusMessage(_("isisfish.message.copy.region", getContextValue(InputAction.class).copyRegion(getRegionStorage())), true); regionChange(); - setInfoText(_("isisfish.message.copy.finished")); + setStatusMessage(_("isisfish.message.copy.finished")); } protected void removeRegion() { - setInfoText(_("isisfish.message.removing.region", getRegionStorage().getName())); - setInfoText(getContextValue(InputAction.class).removeRegion(getRegionStorage(), false)); + setStatusMessage(_("isisfish.message.removing.region", getRegionStorage().getName()), true); + setStatusMessage(getContextValue(InputAction.class).removeRegion(getRegionStorage(), false)); regionChange(); regionNull(); } protected void commitRegionInCVS() { - setInfoText(_("isisfish.message.commiting.region", getRegionStorage().getName())); - setInfoText(getContextValue(InputAction.class).commitRegionInCVS(getRegionStorage())); + setStatusMessage(_("isisfish.message.commiting.region", getRegionStorage().getName()), true); + setStatusMessage(getContextValue(InputAction.class).commitRegionInCVS(getRegionStorage())); } ]]> </script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-08-28 08:01:15 UTC (rev 2558) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-08-31 08:52:33 UTC (rev 2559) @@ -114,12 +114,12 @@ node.add(childNode); } } - protected void setEditor(File f){ + protected void setEditor(File f) { editor.open(f); editor.validate(); } - protected DefaultMutableTreeNode findNode(DefaultMutableTreeNode root, String value){ - DefaultMutableTreeNode result= null; + protected DefaultMutableTreeNode findNode(DefaultMutableTreeNode root, String value) { + DefaultMutableTreeNode result = null; for (Enumeration e = root.children(); e.hasMoreElements();){ DefaultMutableTreeNode node = (DefaultMutableTreeNode)e.nextElement(); GenericCell g = (GenericCell)node.getUserObject(); @@ -153,10 +153,14 @@ buttonScriptEval.setEnabled(isJavaScript); miEvaluate.setEnabled(isJavaScript); } - protected void setInfoText(String msg) { + protected void setStatusMessage(String msg) { WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); - root.setInfoText(msg); + root.setStatusMessage(msg); } + protected void setStatusMessage(String msg, boolean running) { + WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); + root.setStatusMessage(msg, running); + } /* * JButton and JMenu Action */ @@ -184,7 +188,7 @@ if (fileName != null){ getContextValue(ScriptAction.class).newScript(equationModelTypePath + fileName, scriptType); setTreeModel(); - setInfoText(_("isisfish.message.creation.done", fileName)); + setStatusMessage(_("isisfish.message.creation.done", fileName)); DefaultMutableTreeNode element = null; element = findNode((DefaultMutableTreeNode) tree.getModel().getRoot(), scriptType); if (!equationModelTypePath.equals("")){ @@ -202,11 +206,11 @@ } protected void saveScript(){ getContextValue(ScriptAction.class).saveScript(editor.getText()); - setInfoText(_("isisfish.message.save.finished")); + setStatusMessage(_("isisfish.message.save.finished")); } protected void importScript() { String importMessage = getContextValue(ScriptAction.class).showImportScriptDialog(); - setInfoText(importMessage); + setStatusMessage(importMessage); } protected void exportScript() { TreePath[] selectedFilesPath = tree.getSelectionPaths(); @@ -215,12 +219,12 @@ protected void commitScript(){ new IsisFishRuntimeException("Not yet implemented"); getContextValue(ScriptAction.class).commitScript(editor.getText()); - setInfoText(_("isisfish.message.commit.finished")); + setStatusMessage(_("isisfish.message.commit.finished")); } protected void updateScript(){ new IsisFishRuntimeException("Not yet implemented"); getContextValue(ScriptAction.class).updateScript(); - setInfoText(_("isisfish.message.update.finished")); + setStatusMessage(_("isisfish.message.update.finished")); } protected void cut(){ } @@ -243,12 +247,12 @@ actionLogArea.setBackground(new Color(255, 210, 210)); } - setInfoText(_("isisfish.message.check.finished")); + setStatusMessage(_("isisfish.message.check.finished")); } protected void evaluateScript(){ actionLogArea.setText(getContextValue(ScriptAction.class).evaluateScript(editor.getText())); actionLogArea.setBackground(null); - setInfoText(_("isisfish.message.evaluation.finished")); + setStatusMessage(_("isisfish.message.evaluation.finished")); } protected void deleteScript(boolean deleteRemote) { // reste in UI even if deleted @@ -256,7 +260,7 @@ int resp = JOptionPane.showConfirmDialog(this,_("isisfish.message.confirm.remove.script", getContextValue(ScriptAction.class).getCode().getName()), null, JOptionPane.YES_NO_OPTION); - setInfoText(getContextValue(ScriptAction.class).deleteScript(resp, deleteRemote)); + setStatusMessage(getContextValue(ScriptAction.class).deleteScript(resp, deleteRemote)); setTreeModel(); } @@ -265,14 +269,14 @@ */ protected void diffScript(){ String diffMessage = getContextValue(ScriptAction.class).diffScript(editor.getText()); - setInfoText(diffMessage); + setStatusMessage(diffMessage); } /** * Generate javadoc and disply output in UI. */ protected void generateScriptJavadoc() { - setInfoText(_("isisfish.script.menu.javadocgenerating", fr.ifremer.isisfish.IsisFish.config.getJavadocDirectory())); + setStatusMessage(_("isisfish.script.menu.javadocgenerating", fr.ifremer.isisfish.IsisFish.config.getJavadocDirectory()), true); SwingUtilities.invokeLater(new Runnable() { public void run() { @@ -290,7 +294,7 @@ // rouge leger actionLogArea.setBackground(new Color(255, 210, 210)); } - setInfoText(_("isisfish.script.menu.javadocgenerated", fr.ifremer.isisfish.IsisFish.config.getJavadocDirectory())); + setStatusMessage(_("isisfish.script.menu.javadocgenerated", fr.ifremer.isisfish.IsisFish.config.getJavadocDirectory())); } }); }