June 2015 - Isis-fish-commits - mailman.cloud.codelutin.com

r4257 - in branches/isis-fish-4.4.0-editor/src/main: java/fr/ifremer/isisfish/ui/widget/text resources/i18n
by echatellier＠users.forge.codelutin.com 10 Jun '15

10 Jun '15

Author: echatellier Date: 2015-06-10 13:14:55 +0000 (Wed, 10 Jun 2015) New Revision: 4257 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4257 Log: Fix label when no file is not displayed Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditor.java branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_en_GB.properties branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditor.java =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditor.java 2015-06-10 12:52:23 UTC (rev 4256) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditor.java 2015-06-10 13:14:55 UTC (rev 4257) @@ -194,7 +194,6 @@ public boolean close() { boolean result = askAndSaveOrCancel(); - setText("Select a file to open"); setFile(null); return result; } Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java 2015-06-10 12:52:23 UTC (rev 4256) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java 2015-06-10 13:14:55 UTC (rev 4257) @@ -33,6 +33,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; +import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.KeyStroke; import javax.swing.UIManager; @@ -70,6 +71,7 @@ protected RTextScrollPane textScrollpane; protected RSyntaxTextArea textArea; + protected JLabel noFileLabel; protected FindDialog findDialog; protected ReplaceDialog replaceDialog; @@ -86,8 +88,10 @@ textArea = new RSyntaxTextArea(); textScrollpane = new RTextScrollPane(textArea); - add(textScrollpane); + noFileLabel = new JLabel(t("isisfish.editor.noselectedfile"), JLabel.CENTER); + noFileLabel.setEnabled(false); + // for error/warning markers ErrorStrip errorStrip = new ErrorStrip(textArea); add(errorStrip, BorderLayout.LINE_END); @@ -103,6 +107,8 @@ textArea.setTabSize(4); initActions(); + + setEnabled(false); } protected void initActions() { @@ -167,11 +173,22 @@ @Override public void setEnabled(boolean enabled) { + if (enabled) { + remove(noFileLabel); + add(textScrollpane); + } else { + remove(textScrollpane); + add(noFileLabel); + } + // workarround for http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4286743 - textScrollpane.getHorizontalScrollBar().setEnabled(enabled); - textScrollpane.getVerticalScrollBar().setEnabled(enabled); - textScrollpane.getViewport().getView().setEnabled(enabled); - textScrollpane.setEnabled(enabled); + //textScrollpane.getHorizontalScrollBar().setEnabled(enabled); + //textScrollpane.getVerticalScrollBar().setEnabled(enabled); + //textScrollpane.getViewport().getView().setEnabled(enabled); + //textScrollpane.setEnabled(enabled); + + revalidate(); + repaint(); } private class GoToLineAction extends AbstractAction { Modified: branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-10 12:52:23 UTC (rev 4256) +++ branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-10 13:14:55 UTC (rev 4257) @@ -253,6 +253,7 @@ isisfish.editor.cancel=Cancel isisfish.editor.copy=Copy isisfish.editor.cut=Cut +isisfish.editor.noselectedfile=No file selected \! isisfish.editor.parametersnameandtypes=Parameters (name and type) isisfish.editor.paste=Paste isisfish.editor.reload=Reload Modified: branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-10 12:52:23 UTC (rev 4256) +++ branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-10 13:14:55 UTC (rev 4257) @@ -253,6 +253,7 @@ isisfish.editor.cancel=Annuler isisfish.editor.copy=Copier isisfish.editor.cut=Couper +isisfish.editor.noselectedfile=Aucun fichier sélectionné \! isisfish.editor.parametersnameandtypes=Paramètres (nom et type) isisfish.editor.paste=Coller isisfish.editor.reload=Recharger

1 0

r4256 - branches/isis-fish-4.4.0-editor
by echatellier＠users.forge.codelutin.com 10 Jun '15

10 Jun '15

Author: echatellier Date: 2015-06-10 12:52:23 +0000 (Wed, 10 Jun 2015) New Revision: 4256 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4256 Log: Update assertj Modified: branches/isis-fish-4.4.0-editor/pom.xml Modified: branches/isis-fish-4.4.0-editor/pom.xml =================================================================== --- branches/isis-fish-4.4.0-editor/pom.xml 2015-06-10 12:34:40 UTC (rev 4255) +++ branches/isis-fish-4.4.0-editor/pom.xml 2015-06-10 12:52:23 UTC (rev 4256) @@ -402,13 +402,13 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-swing</artifactId> - <version>2.0.0</version> + <version>2.0.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-swing-junit</artifactId> - <version>2.0.0</version> + <version>2.0.2</version> <scope>test</scope> </dependency> </dependencies>

1 0

r4255 - branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text
by echatellier＠users.forge.codelutin.com 10 Jun '15

10 Jun '15

Author: echatellier Date: 2015-06-10 12:34:40 +0000 (Wed, 10 Jun 2015) New Revision: 4255 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4255 Log: Redo lost SyntaxEditor class :( Added: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditor.java Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java Added: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditor.java =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditor.java (rev 0) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditor.java 2015-06-10 12:34:40 UTC (rev 4255) @@ -0,0 +1,361 @@ +package fr.ifremer.isisfish.ui.widget.text; + +import static org.nuiton.i18n.I18n.t; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.Writer; +import java.nio.charset.StandardCharsets; +import java.nio.file.FileSystems; +import java.nio.file.Path; +import java.nio.file.StandardWatchEventKinds; +import java.nio.file.WatchEvent; +import java.nio.file.WatchKey; +import java.nio.file.WatchService; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.KeyStroke; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.fife.ui.rsyntaxtextarea.SyntaxConstants; +import org.nuiton.util.FileUtil; + +/** + * Add custom behavior to RSyntaxEditor UI. + * + * Like : + * <ul> + * <li>copy/paste</li> + * <li>file change detection</li> + * </ul> + * + * @author Eric Chatellier + */ +public class SyntaxEditor extends SyntaxEditorUI implements DocumentListener { + + /** serialVersionUID. */ + private static final long serialVersionUID = 8010988112139944408L; + + /** class logger */ + private static Log log = LogFactory.getLog(SyntaxEditor.class); + + /** Will ask user to perform save on close. */ + protected boolean askIfNotSaved = false; + + /** Currently edited file. */ + protected File file; + + /** Flag is file has been modified. */ + protected transient boolean modified; + + /** Timestamp when saved has been performed from editor. */ + protected transient long lastSaveTimestamp; + + /** Save action instance. */ + protected Action saveAction; + + /** Single watch service instance. */ + protected WatchService watchService; + + /** Watch service thread. */ + protected Thread watchThread; + + /** Ask reload file panel (not null if displayed). */ + protected JPanel askReloadPanel; + + public SyntaxEditor() { + // to listen for user modification + textArea.getDocument().addDocumentListener(this); + + // save action + int c = getToolkit().getMenuShortcutKeyMask(); + saveAction = new AbstractAction(t("isisfish.editor.save"), new ImageIcon(getClass().getResource("/icons/script_save.png"))) { + public void actionPerformed(ActionEvent e) { + save(); + } + }; + saveAction.setEnabled(false); + saveAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, c)); + } + + @Override + protected void finalize() throws Throwable { + try { + watchService.close(); + } finally { + super.finalize(); + } + } + + public boolean isAskIfNotSaved() { + return askIfNotSaved; + } + + public void setAskIfNotSaved(boolean askIfNotSaved) { + this.askIfNotSaved = askIfNotSaved; + } + + protected void setModified(boolean modified) { + this.modified = modified; + saveAction.setEnabled(modified); + } + + public boolean isModified() { + return modified; + } + + public void addDocumentListener(DocumentListener listener) { + textArea.getDocument().addDocumentListener(listener); + } + + public void removeDocumentListener(DocumentListener listener) { + textArea.getDocument().removeDocumentListener(listener); + } + + public boolean open(File file) { + // try to save previous file if necessary + boolean result = askAndSaveOrCancel(); + + if (result) { + + clearReloadPanel(); + + //try (Reader in = new BufferedReader(new FileReader(file), "utf-8")) { + try (Reader in = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8))) { + + String ext = FileUtil.extension(file); + if ("java".equalsIgnoreCase(ext)) { + textArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA); + } else if ("xml".equalsIgnoreCase(ext)) { + textArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_XML); + } else if ("sql".equalsIgnoreCase(ext)) { + textArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_SQL); + } else if ("r".equalsIgnoreCase(ext)) { + textArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_PERL); + } + + textArea.read(in, null); + textArea.setCaretPosition(0); + + setFile(file); // after textArea.read + } catch (Exception eee) { + if (log.isWarnEnabled()) { + log.warn("Can't read file", eee); + } + } + } + + return result; + } + + protected boolean askAndSaveOrCancel() { + boolean result = true; + if (isAskIfNotSaved() && isModified()) { + int val = JOptionPane.showConfirmDialog(this, + t("isisfish.editor.saveorcancel.message", file.getName()), + t("isisfish.editor.saveorcancel.title"), + JOptionPane.YES_NO_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE); + switch (val) { + case JOptionPane.YES_OPTION: + save(); + result = true; + break; + case JOptionPane.NO_OPTION: + result = true; + break; + case JOptionPane.CANCEL_OPTION: + result = false; + break; + } + } + return result; + } + + public boolean close() { + boolean result = askAndSaveOrCancel(); + setText("Select a file to open"); + setFile(null); + return result; + } + + protected void setFile(File file) { + // XXX maybe remove old file watch service ? + this.file = file; + + setEnabled(file != null); + setModified(false); + + // detect external changes + if (file != null) { + detectExternalChanges(file); + } + } + + public void save() { + clearReloadPanel(); + + try (Writer out = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) { + lastSaveTimestamp = System.currentTimeMillis(); + + textArea.write(out); + setModified(false); + } catch (IOException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't save file", eee); + } + } + } + + public String getText() { + return textArea.getText(); + } + + public void copy() { + textArea.copy(); + } + + public void paste() { + textArea.paste(); + } + + public void cut() { + textArea.cut(); + } + + @Override + public void insertUpdate(DocumentEvent e) { + setModified(true); + } + + @Override + public void removeUpdate(DocumentEvent e) { + setModified(true); + } + + @Override + public void changedUpdate(DocumentEvent e) { + setModified(true); + } + + public Action getSaveAction() { + return saveAction; + } + + protected void clearReloadPanel() { + if (askReloadPanel != null) { + hideBottomComponent(); + askReloadPanel = null; + } + } + + protected void detectExternalChanges(File file) { + if (askIfNotSaved) { + try { + if (watchService == null) { + watchService = FileSystems.getDefault().newWatchService(); + } + if (watchThread == null) { + watchThread = new WatchThread(); + watchThread.start(); + } + + // register new file to watch service + Path filePath = file.toPath(); + Path parentPath = filePath.getParent(); + parentPath.register(watchService, StandardWatchEventKinds.ENTRY_MODIFY, StandardWatchEventKinds.ENTRY_CREATE); + } catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't listen for file", ex); + } + } + } + } + + protected void notifyFileChanged(final File file) { + if (askReloadPanel == null && file.equals(this.file)) { + + // check to not display self save + if (file.lastModified() - lastSaveTimestamp < 1000) { + return; + } + + setModified(true); // to allow erasure + + askReloadPanel = new JPanel(new BorderLayout()); + + askReloadPanel.setBackground(new Color(242, 242, 189)); // dark yellow + + askReloadPanel.add(new JLabel(t("isisfish.editor.reloadExternal"), + new ImageIcon(getClass().getResource("/icons/database_error.png")), JLabel.LEFT), BorderLayout.CENTER); + + JPanel actionsPanel = new JPanel(new FlowLayout()); + actionsPanel.setBackground(new Color(242, 242, 189)); // dark yellow + actionsPanel.add(new JButton(new AbstractAction(t("isisfish.editor.reload")) { + @Override + public void actionPerformed(ActionEvent e) { + setModified(false); // to never ask + open(file); + } + })); + actionsPanel.add(new JButton(new AbstractAction(t("isisfish.editor.cancel")) { + @Override + public void actionPerformed(ActionEvent e) { + clearReloadPanel(); + } + })); + + askReloadPanel.add(actionsPanel, BorderLayout.EAST); + addBottomComponent(askReloadPanel); + showBottomComponent(askReloadPanel); + } + } + + class WatchThread extends Thread { + public void run() { + try { + while (true) { + final WatchKey wk = watchService.take(); + for (WatchEvent<?> event : wk.pollEvents()) { + //we only register "ENTRY_MODIFY" so the context is always a Path. + Path changed = (Path)event.context(); + Path watchPath = (Path)wk.watchable(); + File fullFile = new File(watchPath.toFile(), changed.toString()); + notifyFileChanged(fullFile); + } + // reset the key + boolean valid = wk.reset(); + if (!valid) { + if (log.isErrorEnabled()) { + log.error("Watch service unregistered"); + } + } + } + } catch (InterruptedException ex) { + if (log.isErrorEnabled()) { + log.error("Thread interrupted", ex); + } + } + } + } +} Property changes on: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java 2015-06-10 08:16:42 UTC (rev 4254) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java 2015-06-10 12:34:40 UTC (rev 4255) @@ -115,6 +115,7 @@ replaceAction = new ShowReplaceDialogAction(); gotoAction = new GoToLineAction(parent); + int c = getToolkit().getMenuShortcutKeyMask(); // caret update will update setEnabled state textArea.addCaretListener(this); cutAction = new AbstractAction(t("isisfish.editor.cut"), new ImageIcon(getClass().getResource("/icons/cut.png"))) { @@ -124,12 +125,14 @@ } }; cutAction.setEnabled(false); + cutAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C, c)); pasteAction = new AbstractAction(t("isisfish.editor.paste"), new ImageIcon(getClass().getResource("/icons/page_paste.png"))) { @Override public void actionPerformed(ActionEvent e) { textArea.paste(); } }; + pasteAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V, c)); copyAction = new AbstractAction(t("isisfish.editor.copy"), new ImageIcon(getClass().getResource("/icons/page_copy.png"))) { @Override public void actionPerformed(ActionEvent e) { @@ -137,9 +140,8 @@ } }; copyAction.setEnabled(false); + copyAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C, c)); } - - /** * Set highligth style.

1 0

r4254 - branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui
by echatellier＠users.forge.codelutin.com 10 Jun '15

10 Jun '15

Author: echatellier Date: 2015-06-10 08:16:42 +0000 (Wed, 10 Jun 2015) New Revision: 4254 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4254 Log: Fix NPE Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/SimulationHandler.java branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/SimulationHandler.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/SimulationHandler.java 2015-06-09 13:55:33 UTC (rev 4253) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/SimulationHandler.java 2015-06-10 08:16:42 UTC (rev 4254) @@ -25,6 +25,8 @@ import static org.nuiton.i18n.I18n.t; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -60,7 +62,19 @@ protected SimulationParameter getParameters() { return simulationUI.getContextValue(SimulationParameter.class); } + + public void afterInit() { + simulationUI.addPropertyChangeListener(SimulationUI.PROPERTY_REGION_STORAGE, new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + simulationUI.regionStorageChanged(); + } + }); + // FIXME c'est un hack qu'il faudrait supprimer + // c'est utilisé à l'arrache par certaines interfaces pour mettre à jour l'arbre de facteur + simulationUI.setContextValue(simulationUI, "SimulationUI"); + } + /** * Open user dialog to selected a parameter file. * Reload it, and call {@link SimulationUI#refresh()}. Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2015-06-09 13:55:33 UTC (rev 4253) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2015-06-10 08:16:42 UTC (rev 4254) @@ -26,23 +26,12 @@ <SimulationHandler id="handler" constructorParams="this" /> - <import> - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener - javax.swing.JFileChooser - java.io.File - </import> - <fr.ifremer.isisfish.datastore.RegionStorage id="regionStorage" javaBean="null" /> <script><![CDATA[ protected void $afterCompleteSetup() { - addPropertyChangeListener(PROPERTY_REGION_STORAGE, new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - regionStorageChanged(); - } - }); + handler.afterInit(); } /**

1 0

r4253 - in branches/isis-fish-4.4.0-ui-refactoring/src/main: java/fr/ifremer/isisfish/ui/simulator resources/i18n
by echatellier＠users.forge.codelutin.com 09 Jun '15

09 Jun '15

Author: echatellier Date: 2015-06-09 13:55:33 +0000 (Tue, 09 Jun 2015) New Revision: 4253 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4253 Log: Add rule tooltip Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_en_GB.properties branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2015-06-09 13:32:19 UTC (rev 4252) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2015-06-09 13:55:33 UTC (rev 4253) @@ -48,9 +48,12 @@ <cell> <JPanel /> </cell> - <cell fill="horizontal"> + <cell fill="horizontal" weightx="1"> <JLabel text="isisfish.params.rules.selected" enabled="{isActive()}"/> </cell> + <cell> + <JLabel icon="common/information-small.png" toolTipText="isisfish.params.rules.tooltip" enabled="{isActive()}"/> + </cell> </row> <row> <cell fill="both" rows="3" weightx="1" weighty="1"> @@ -66,7 +69,7 @@ <cell fill='horizontal'> <JButton id="addRulesButton" text="isisfish.common.add" enabled="false" onActionPerformed='handler.addSelectedRules()'/> </cell> - <cell fill="both" rows="3" weightx="1" weighty="1"> + <cell fill="both" rows="3" columns="2" weightx="1" weighty="1"> <JScrollPane enabled="{isActive()}"> <fr.ifremer.isisfish.ui.models.common.GenericListModel id="selectedRulesListModel" genericType="fr.ifremer.isisfish.rule.Rule" /> <JList id="selectedRulesList" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" @@ -88,7 +91,7 @@ enabled="false" onActionPerformed='handler.clearAllRules()'/> </cell> </row> - <row weightx="2" weighty="2" columns="3"> + <row weightx="2" weighty="2" columns="4"> <cell fill='both'> <JScrollPane enabled="{isActive()}"> <fr.ifremer.isisfish.ui.models.common.ScriptParametersTableModel Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-09 13:32:19 UTC (rev 4252) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-09 13:55:33 UTC (rev 4253) @@ -620,6 +620,7 @@ isisfish.params.rules=Rules isisfish.params.rules.availables=Available rules isisfish.params.rules.selected=Selected rules +isisfish.params.rules.tooltip=Rules are executed ordered \! You can change order using drag and drop. isisfish.params.sensitivityName=Sensitivity name isisfish.params.sensitivityOnlyKeepFirstResult=Only keep results for first simulation isisfish.params.simulationLauncher=Simulation launcher Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-09 13:32:19 UTC (rev 4252) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-09 13:55:33 UTC (rev 4253) @@ -620,6 +620,7 @@ isisfish.params.rules=Règles isisfish.params.rules.availables=Règles disponibles isisfish.params.rules.selected=Règles sélectionnées +isisfish.params.rules.tooltip=Les règles sont executées dans l'ordre défini \! Vous pouvez modifier l'ordre à l'aide du glisser-déposer. isisfish.params.sensitivityName=Nom de l'analyse de sensibilité isisfish.params.sensitivityOnlyKeepFirstResult=Ne conserver les résultats que pour la première simulation. isisfish.params.simulationLauncher=Lanceur de simulation

1 0

09 Jun '15

Author: echatellier Date: 2015-06-09 13:32:19 +0000 (Tue, 09 Jun 2015) New Revision: 4252 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4252 Log: Replace icons by Fugue icon theme Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/README.txt branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/broom.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/camera.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/cross-button.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/information-small.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/minus-button.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/pencil-button.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/plug-connect.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/plus-button.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/table--plus.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/tick-button.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/map_add.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/map_delete.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/clipboard-paste.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/compile.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database--minus.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database-import.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/disk-black.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/document-copy.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/edit-diff.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/folder-zipper.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/gear.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/scissors.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script--minus.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script--plus.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script-code.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/terminal.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/flag--plus.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/flag.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/table-export.png Removed: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/accept.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/add.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/arrow_undo.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building_add.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/camera.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/cancel.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/connect.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/cut.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_add.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_connect.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_delete.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_edit.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_error.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_gear.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_go.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_key.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_lightning.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_link.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_refresh.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_save.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_table.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/delete.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/page_copy.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/page_paste.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/page_white_compressed.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/paintbrush.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/resultset_next.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/resultset_previous.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_add.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_code.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_code_red.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_delete.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_edit.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_error.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_gear.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_go.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_key.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_lightning.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_link.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_palette.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_save.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/table.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/table_multiple.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/tick.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/wrench.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/wrench_orange.png Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -62,7 +62,7 @@ toolTipText="Stop the process" /> </cell> --> <cell> - <JLabel icon="camera.png" toolTipText="isisfish.status.screenshot" onMouseClicked="handler.screenshot()" /> + <JLabel icon="common/camera.png" toolTipText="isisfish.status.screenshot" onMouseClicked="handler.screenshot()" /> </cell> <cell fill="both"> <jaxx.runtime.swing.StatusMessagePanel /> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -185,16 +185,16 @@ <Table> <row fill='horizontal'> <cell fill='horizontal' weightx="1.0"> - <JButton id='testButton' text='isisfish.simulator.ssh.configuration.test' onActionPerformed="handler.testSSHConfiguration()" icon="connect.png" /> + <JButton id='testButton' text='isisfish.simulator.ssh.configuration.test' onActionPerformed="handler.testSSHConfiguration()" icon="common/plug-connect.png" /> </cell> <cell fill='horizontal' weightx="1.0"> - <JButton id='validButton' text='isisfish.common.valid' onActionPerformed="handler.saveSSHConfiguration()" icon="accept.png" enabled='{isConnected()}' /> + <JButton id='validButton' text='isisfish.common.valid' onActionPerformed="handler.saveSSHConfiguration()" icon="common/tick-button.png" enabled='{isConnected()}' /> </cell> <cell fill='horizontal' weightx="1.0"> - <JButton id='resetButton' text='isisfish.common.reset' onActionPerformed="handler.resetSSHConfiguration()" icon="arrow_undo.png" /> + <JButton id='resetButton' text='isisfish.common.reset' onActionPerformed="handler.resetSSHConfiguration()" icon="common/pencil-button.png" /> </cell> <cell fill='horizontal' weightx="1.0"> - <JButton id='cancelButton' text='isisfish.common.cancel' onActionPerformed="handler.cancelSSHConfiguration()" icon="cancel.png" /> + <JButton id='cancelButton' text='isisfish.common.cancel' onActionPerformed="handler.cancelSSHConfiguration()" icon="common/cross-button.png" /> </cell> </row> </Table> @@ -215,7 +215,7 @@ <JLabel id='statusFreeDatabaseLabel' enabled='{isConnected()}' /> </cell> <cell> - <JButton id='clearDatabaseButton' text='isisfish.common.clear' icon="paintbrush.png" + <JButton id='clearDatabaseButton' text='isisfish.common.clear' icon="common/broom.png" onActionPerformed="handler.clearDatabase()" enabled='{isConnected()}' /> </cell> </row> @@ -224,7 +224,7 @@ <JLabel id='statusFreeTempLabel' enabled='{isConnected()}' /> </cell> <cell> - <JButton id='clearTempButton' text='isisfish.common.clear' icon="paintbrush.png" + <JButton id='clearTempButton' text='isisfish.common.clear' icon="common/broom.png" onActionPerformed="handler.clearTempDirectory()" enabled='{isConnected()}' /> </cell> </row> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -42,8 +42,8 @@  <jaxx.runtime.swing.BlockingLayerUI2 id='layerUI2' - blockIcon='{SwingUtil.createImageIcon("building.png")}' - acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' + blockIcon='{SwingUtil.createImageIcon("sensitivity/flag.png")}' + acceptIcon='{SwingUtil.createImageIcon("sensitivity/flag--plus.png")}' acceptAction='{new AbstractAction() { private static final long serialVersionUID = 1L; @Override Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -79,7 +79,7 @@ onMatrixChanged="handler.populationRecruitmentDistributionMatrixChanged(event)" /> </cell> <cell> - <JButton icon="table.png" toolTipText="isisfish.common.newMatrix" + <JButton icon="common/table--plus.png" toolTipText="isisfish.common.newMatrix" onActionPerformed="handler.createRecruitmentDistribution(getBean())" enabled='{isActive()}' decorator='boxed' /> </cell> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java 2015-06-09 13:32:19 UTC (rev 4252) @@ -99,7 +99,7 @@ Class paramType = RuleStorage.getParameterType(rule, paramName); boolean canBeFactor = SensitivityUtils.canBeFactor(paramType); if (canBeFactor) { - JButton button = new JButton(Resource.getIcon("/icons/building_add.png")); + JButton button = new JButton(Resource.getIcon("/icons/sensitivity/flag--plus.png")); button.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java 2015-06-09 13:32:19 UTC (rev 4252) @@ -81,7 +81,7 @@ Class paramType = RuleStorage.getParameterType(rule, paramName); boolean canBeFactor = SensitivityUtils.canBeFactor(paramType); if (canBeFactor) { - comp = new JButton(Resource.getIcon("/icons/building_add.png")); + comp = new JButton(Resource.getIcon("/icons/sensitivity/flag--plus.png")); } } catch (IsisFishException ex) { if (log.isWarnEnabled()) { Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -44,59 +44,59 @@  <JMenuBar id="scriptMenuBar" constraints='BorderLayout.NORTH'> <JMenu id="scriptTxtFile" text="isisfish.script.menu.file"> - <JMenu id="scriptNewMenu" text="isisfish.script.menu.new" icon="script.png"> + <JMenu id="scriptNewMenu" text="isisfish.script.menu.new" icon="script/script.png"> <JMenuItem id="miNewScript" text="isisfish.script.menu.txtNewScript" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityScript)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityScript)' icon="script/script.png" /> <JMenuItem id="miNewSimulator" text="isisfish.script.menu.txtNewSimulator" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySimulator)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySimulator)' icon="script/script.png" /> <JMenuItem id="miNewExport" text="isisfish.script.menu.txtNewExport" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityExport)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityExport)' icon="script/script.png" /> <JMenuItem id="miNewExportStep" text="isisfish.script.menu.txtNewExportStep" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityExportStep)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityExportStep)' icon="script/script.png" /> <JMenuItem id="miNewRule" text="isisfish.script.menu.txtNewRule" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityRule)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityRule)' icon="script/script.png" /> <JMenuItem id="miNewSImulationPlan" text="isisfish.script.menu.txtNewSimulationPlan" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySimulationPlan)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySimulationPlan)' icon="script/script.png" /> <JMenuItem id="miNewSensitivity" text="isisfish.script.menu.txtNewSensitivity" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySensitivity)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySensitivity)' icon="script/script.png" /> <JMenuItem id="miNewSensitivityExport" text="isisfish.script.menu.txtNewSensitivityExport" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySensitivityExport)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySensitivityExport)' icon="script/script.png" /> <JMenuItem text="isisfish.script.menu.txtNewObjective" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityObjective)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityObjective)' icon="script/script.png" /> <JMenuItem text="isisfish.script.menu.txtNewOptimization" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityOptimization)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityOptimization)' icon="script/script.png" /> <JMenuItem id="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityFormule)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityFormule)' icon="script/script.png" /> </JMenu> <JMenuItem id="miSave" text="isisfish.script.menu.save" - onActionPerformed="handler.saveScript()" icon="script_save.png" enabled='{isSingleFileSelected()}' /> + onActionPerformed="handler.saveScript()" icon="script/disk-black.png" enabled='{isSingleFileSelected()}' /> <JSeparator/> <JMenuItem id="miDelete" text="isisfish.script.menu.deleteLocaly" - onActionPerformed='handler.deleteScript(false)' icon="script_delete.png" enabled='{isSingleFileSelected()}' /> + onActionPerformed='handler.deleteScript(false)' icon="script/script--minus.png" enabled='{isSingleFileSelected()}' /> </JMenu> <JMenu id="scriptTxtEdit" text="isisfish.script.menu.edit"> <JMenuItem id="miCut" text="isisfish.script.menu.cut" - onActionPerformed="handler.cut()" icon="cut.png" enabled='{isTextSelected()}' /> + onActionPerformed="handler.cut()" icon="script/scissors.png" enabled='{isTextSelected()}' /> <JMenuItem id="miCopy" text="isisfish.script.menu.copy" - onActionPerformed="handler.copy()" icon="page_copy.png" enabled='{isTextSelected()}' /> + onActionPerformed="handler.copy()" icon="script/document-copy.png" enabled='{isTextSelected()}' /> <JMenuItem id="miPaste" text="isisfish.script.menu.paste" - onActionPerformed="handler.paste()" icon="page_paste.png" enabled='{isSingleFileSelected()}' /> + onActionPerformed="handler.paste()" icon="script/clipboard-paste.png" enabled='{isSingleFileSelected()}' /> </JMenu> <JMenu id="scriptTxtVCS" text="isisfish.script.menu.txtVCS"> - <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" icon="database_go.png" + <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" icon="script/database-import.png" onActionPerformed="handler.commitScript()" enabled='{isSingleFileSelected()}' /> - <JMenuItem id="miDiffVCS" text="isisfish.script.menu.diff" accelerator="mnDiffVCS" + <JMenuItem id="miDiffVCS" text="isisfish.script.menu.diff" accelerator="mnDiffVCS" icon="script/edit-diff.png" onActionPerformed="handler.diffScript()" enabled='{isSingleFileSelected()}' /> <JSeparator/> <JMenuItem id="miDeleteVCS" text="isisfish.script.menu.deleteLocalyServer" - onActionPerformed='handler.deleteScript(true)' icon="database_delete.png"/> + onActionPerformed='handler.deleteScript(true)' icon="script/database--minus.png"/> </JMenu> <JMenu id="scriptTxtCode" text="isisfish.script.menu.code"> - <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" icon="script_code_red.png" + <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" icon="script/compile.png" onActionPerformed="handler.checkScript()" enabled='{isJavaFileSelected()}' /> - <JMenuItem id="miCheckAllSyntax" text="isisfish.script.menu.checkAllSyntax" icon="script_code_red.png" + <JMenuItem id="miCheckAllSyntax" text="isisfish.script.menu.checkAllSyntax" icon="script/script-code.png" onActionPerformed="handler.checkAllScripts()" /> - <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" icon="script_gear.png" + <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" icon="script/terminal.png" onActionPerformed="handler.evaluateScript()" enabled='{isJavaFileSelected()}' /> <JSeparator/> <JMenuItem id="miGenerateJavadoc" text="isisfish.script.menu.javadocgenerate" @@ -110,23 +110,23 @@ <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JPanel id="buttonBar" layout='{new GridLayout()}' constraints='BorderLayout.NORTH'> <JButton id="buttonScriptNew" text="isisfish.script.newplus" toolTipText='isisfish.script.new.tooltip' - onMousePressed='handler.newScript(event)' icon="script.png" /> + onMousePressed='handler.newScript(event)' icon="script/script.png" /> <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip" - enabled='{isSingleFileSelected()}' onActionPerformed='handler.saveScript()' icon="script_save.png" /> + enabled='{isSingleFileSelected()}' onActionPerformed='handler.saveScript()' icon="script/disk-black.png" /> <JButton id="buttonScriptExport" text="isisfish.script.export" toolTipText="isisfish.script.export.tooltip" enabled='false' - onActionPerformed='handler.exportScript()' icon="page_white_compressed.png" /> + onActionPerformed='handler.exportScript()' icon="script/folder-zipper.png" /> <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='{isSingleFileSelected()}' - onActionPerformed='handler.commitScript()' icon="database_go.png" /> + onActionPerformed='handler.commitScript()' icon="script/database-import.png" /> <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" enabled='{isTextSelected()}' - onActionPerformed='handler.cut()' icon="cut.png" /> + onActionPerformed='handler.cut()' icon="script/scissors.png" /> <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" enabled='{isTextSelected()}' - onActionPerformed='handler.copy()' icon="page_copy.png" /> + onActionPerformed='handler.copy()' icon="script/document-copy.png" /> <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='{isSingleFileSelected()}' - onActionPerformed='handler.paste()' icon="page_paste.png" /> + onActionPerformed='handler.paste()' icon="script/clipboard-paste.png" /> <JButton id="buttonScriptCheck" text="isisfish.script.check" toolTipText="isisfish.script.check.tooltip" enabled='{isJavaFileSelected()}' - onActionPerformed='handler.checkScript()' icon="script_code_red.png" /> + onActionPerformed='handler.checkScript()' icon="script/compile.png" /> <JButton id="buttonScriptEval" text="isisfish.script.evaluate" toolTipText="isisfish.script.evaluate.tooltip" enabled='{isJavaFileSelected()}' - onActionPerformed='handler.evaluateScript()' icon="script_gear.png" /> + onActionPerformed='handler.evaluateScript()' icon="script/terminal.png" /> </JPanel> <JSplitPane oneTouchExpandable="true" dividerLocation="250" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> <JScrollPane> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java 2015-06-09 13:32:19 UTC (rev 4252) @@ -64,7 +64,7 @@ /** Class logger. */ private static Log log = LogFactory.getLog(ScriptTreeCellRenderer.class); - protected static final Icon VCS_ICON = Resource.getIcon("/icons/database_key.png"); + protected static final Icon VCS_ICON = Resource.getIcon("/icons/script/database.png"); /* * @see javax.swing.tree.TreeCellRenderer#getTreeCellRendererComponent(javax.swing.JTree, java.lang.Object, boolean, boolean, boolean, int, boolean) Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -56,7 +56,7 @@ onActionPerformed="handler.addNewFactorGroup(true)"/> </cell> <cell anchor='west' weightx='1'> - <JButton icon="script_go.png" toolTipText="isisfish.sensitivity.mexico.exporttoxml.tip" + <JButton icon="sensitivity/table-export.png" toolTipText="isisfish.sensitivity.mexico.exporttoxml.tip" onActionPerformed="handler.exportFactorsToMexico()"/> </cell> </row> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java 2015-06-09 13:32:19 UTC (rev 4252) @@ -507,7 +507,7 @@ public Object getValue(String key) { Object result = null; if (key.equals(Action.SMALL_ICON)) { - result = SwingUtil.createImageIcon("building_add.png"); + result = SwingUtil.createImageIcon("sensitivity/flag--plus.png"); } return result; } Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -210,7 +210,7 @@ </cell> <cell anchor="north"> <JButton id="addRuleFactorButton" - icon='{SwingUtil.createImageIcon("building_add.png")}' + icon='{SwingUtil.createImageIcon("sensitivity/flag--plus.png")}' onActionPerformed="handler.addFactorWithComponent(ruleChooser)" visible="{isSensitivity()}" enabled="{getRegionStorage() != null}" /> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2015-06-09 13:32:19 UTC (rev 4252) @@ -200,7 +200,7 @@ * Build layout. */ private void buildLayout() { - dataBox = new JComboBox<T>(); + dataBox = new JComboBox<>(); dataBox.setName("filterBox"); dataBox.addActionListener(new ComboBoxActionListener()); filterField = new JXTextField(t("isisfish.common.filter")); @@ -208,7 +208,7 @@ filterField.getDocument().addDocumentListener(new FilterDocumentListener()); // fix size filterField.setPreferredSize(new Dimension(200, 0)); - resetButton = new JButton(Resource.getIcon("/icons/cancel.png")); + resetButton = new JButton(Resource.getIcon("/icons/common/cross-button.png")); resetButton.addActionListener(new FilterActionListener()); resetButton.setEnabled(false); resetButton.setName("filterReset"); Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/README.txt =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/README.txt (rev 0) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/README.txt 2015-06-09 13:32:19 UTC (rev 4252) @@ -0,0 +1,80 @@ +Fugue Icons + +(C) 2013 Yusuke Kamiyamane. All rights reserved. + +These icons are licensed under a Creative Commons +Attribution 3.0 License. +<http://creativecommons.org/licenses/by/3.0/> + +If you can't or don't want to provide attribution, please +purchase a royalty-free license. +<http://p.yusukekamiyamane.com/> + +I'm unavailable for custom icon design work. But your +suggestions are always welcome! +<mailto:p@yusukekamiyamane.com> + +------------------------------------------------------------ + +All logos and trademarks in some icons are property of their +respective owners. + +------------------------------------------------------------ + +- geotag + + (C) Geotag Icon Project. All rights reserved. + <http://www.geotagicons.com/> + + Geotag icon is licensed under a Creative Commons + Attribution-Share Alike 3.0 License or LGPL. + <http://creativecommons.org/licenses/by-sa/3.0/> + <http://opensource.org/licenses/lgpl-license.php> + +- language + + (C) Language Icon Project. All rights reserved. + <http://www.languageicon.org/> + + Language icon is licensed under a Creative Commons + Attribution-Share Alike 3.0 License. + <http://creativecommons.org/licenses/by-sa/3.0/> + +- open-share + + (C) Open Share Icon Project. All rights reserved. + <http://www.openshareicons.com/> + + Open Share icon is licensed under a Creative Commons + Attribution-Share Alike 3.0 License. + <http://creativecommons.org/licenses/by-sa/3.0/> + +- opml + + (C) OPML Icon Project. All rights reserved. + <http://opmlicons.com/> + + OPML icon is licensed under a Creative Commons + Attribution-Share Alike 2.5 License. + <http://creativecommons.org/licenses/by-sa/2.5/> + +- share + + (C) Share Icon Project. All rights reserved. + <http://shareicons.com/> + + Share icon is licensed under a GPL or LGPL or BSD or + Creative Commons Attribution 2.5 License. + <http://opensource.org/licenses/gpl-license.php> + <http://opensource.org/licenses/lgpl-license.php> + <http://opensource.org/licenses/bsd-license.php> + <http://creativecommons.org/licenses/by/2.5/> + +- xfn + + (C) Wolfgang Bartelme. All rights reserved. + <http://www.bartelme.at/> + + XFN icon is licensed under a Creative Commons + Attribution-Share Alike 2.5 License. + <http://creativecommons.org/licenses/by-sa/2.5/> \ No newline at end of file Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/accept.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/add.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/arrow_undo.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building.png =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building.png 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building.png 2015-06-09 13:32:19 UTC (rev 4252) @@ -1,15 +0,0 @@ -�PNG - - -IHDR�� -sRGB��bKGD�� pHYs��tIME� :1�5��IDAT8�͔�O\U��}��TB�4�1i�5�BYY�ݴ��.��ڤK��U�n��bB��Blb��eTQk)�a��7��I��.�Y|�NιG�p�S144��eK)��ڦ��!��dll\��{�\fԶ��-�7��Ե�+�W�|�� -|�ۆR -) -�@��F��'��瓓�}?3s� �Ν��s�d2��XV�i� @��r]�8N��l6�>��Q��&}}��T�T�"�"�� 5�Z��u�bq -}��}r��F��ZXV�@JI,f<)徙�4��B��S)$phP��>=�j.==lۢ��ƶc@�5B�a�i��x�rY��$��bq�ry�ioOR�Ԑ��4��g��4̓�Vs �à:;�c��r*��_;;::�d��/��A:�F,f��8N�� -׭�<|��-��Q*=? -l��aQ,�q�:�m��[[[loo��&�͒Nw`�6�z�j�%�ω��a1?��a�g30pl[��L�1�֚(��:$�cY1��)��tww�ܺu�y��q��t��Ҡ�5N[[) -� Q�u66*XV��b�J��H$Doo��[�Pȱ��h� C -DX��R{��Z��*�e��|�*��)N�x#�V}</ #|?`}}�R��֚B!O6��4M��bp��ƍe��pw7��ˏ.]��2�H�b��.�FDH��>Bg��vwb�˟WW�M-K@�+m�[K -}�Z��VkA��{��O��=*g��o�߾}s��,{��ٱw�c��Hon:JkMww�N$��{S��je� -x)��9`P)՗H�� !� ��σ�_޿0/�2��JHfmIEND�B`� \ No newline at end of file Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building_add.png =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building_add.png 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building_add.png 2015-06-09 13:32:19 UTC (rev 4252) @@ -1,14 +0,0 @@ -�PNG - - -IHDR�� -sRGB��bKGD�� pHYs��tIME� -2��IDAT8˵�MLcU��s��mo��Ď,2��H��ְ��Y`\3ꚨvƍ��И �h!�)VK[~�{{齧��L��&��;�˓s��ZZZb�d2 -BǱ��revvV�)"O6+++Z2�|3��)�(�,۶w��w�b񛉉 ��[�@��P(�*��a��`��e�?<<�˿wvv�J��P�&!��ח<�S�inZ�55::��=�\.7�� "�)�Js[[[�f��b�أ��c�1pΡi�u]! ��B��L&C�K@˲��c��b��u��8�V��j��ڥ�SS��ǰm��C�u�|��b�]�;�A�|��`�=�J`>��B�4 -�<��^J�#�c��W��{�^�w�JSJ�8��`�RHy�cJ)�� }�ނa�X��?��q��x<�T*��Ct:ض -J)��J�f ׇP��f��M&''��z��9�h6��: -�Tq��AG5��3�y�bENY2�$�R�r9^��.��zu?��È(��0��2��p=Լ{g0~�P��B��0J)��b}}�T -��h�P(��^A"ꇏyИ�I��F&�)Ӱ��5-!��y`�A)�V��w��ב��' �:. -J��gB�^�H,C8��Ͽ��f�UJ -(��9�m�h�6��f�D.��k��;{�a��gu��Mq�S�;.�N��j5�j��Lfefff�1v��$utt��4 -��N$)Պ��?7z��{��r4��O��k��uqVo��w��uw?��O$�T�ՊB�i��<==M��ɤA�@`�4�۔҇��G\�gT:��1�"�)��6��ʗ�u��|��l�A9��IEND�B`� \ No newline at end of file Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/camera.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/cancel.png =================================================================== (Binary files differ) Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/broom.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/broom.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/camera.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/camera.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/cross-button.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/cross-button.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/information-small.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/information-small.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/minus-button.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/minus-button.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/pencil-button.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/pencil-button.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/plug-connect.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/plug-connect.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/plus-button.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/plus-button.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/table--plus.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/table--plus.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/tick-button.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/tick-button.png ___________________________________________________________________ Added: svn:mime-type + image/png Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/connect.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/cut.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_add.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_connect.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_delete.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_edit.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_error.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_gear.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_go.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_key.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_lightning.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_link.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_refresh.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_save.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_table.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/delete.png =================================================================== (Binary files differ) Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/map_add.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/map_add.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/map_delete.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/map_delete.png ___________________________________________________________________ Added: svn:mime-type + image/png Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/page_copy.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/page_paste.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/page_white_compressed.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/paintbrush.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/resultset_next.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/resultset_previous.png =================================================================== (Binary files differ) Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/clipboard-paste.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/clipboard-paste.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/compile.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/compile.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database--minus.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database--minus.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database-import.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database-import.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/disk-black.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/disk-black.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/document-copy.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/document-copy.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/edit-diff.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/edit-diff.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/folder-zipper.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/folder-zipper.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/gear.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/gear.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/scissors.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/scissors.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script--minus.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script--minus.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script--plus.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script--plus.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script-code.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script-code.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/terminal.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/terminal.png ___________________________________________________________________ Added: svn:mime-type + image/png Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_add.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_code.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_code_red.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_delete.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_edit.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_error.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_gear.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_go.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_key.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_lightning.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_link.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_palette.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_save.png =================================================================== (Binary files differ) Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/flag--plus.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/flag--plus.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/flag.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/flag.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/table-export.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/table-export.png ___________________________________________________________________ Added: svn:mime-type + image/png Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/table.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/table_multiple.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/tick.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/wrench.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/wrench_orange.png =================================================================== (Binary files differ)

1 0

r4251 - in branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui: . result
by echatellier＠users.forge.codelutin.com 09 Jun '15

09 Jun '15

Author: echatellier Date: 2015-06-09 08:25:37 +0000 (Tue, 09 Jun 2015) New Revision: 4251 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4251 Log: Fix UIs Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2015-06-09 08:20:12 UTC (rev 4250) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) @@ -28,7 +28,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - hanlder.afterInit(); + handler.afterInit(); } ]]></script> <JMenuBar> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2015-06-09 08:20:12 UTC (rev 4250) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2015-06-09 08:25:37 UTC (rev 4251) @@ -85,7 +85,7 @@ * Initialise la vue avec les liste des simulations disponible. */ public void afterInit() { - initSimulationList(resultUI); + initSimulationList(); // reference must stay allocated listener = new SimulationServiceListener() { @@ -110,10 +110,8 @@ /** * Reload simulation combo box model. - * - * @param resultUI resultUI */ - protected void initSimulationList(ResultUI resultUI) { + protected void initSimulationList() { List<String> value = SimulationStorage.getSimulationNames(); //resultUI.getSimulationComboBox().setEditable(false); @@ -124,10 +122,8 @@ /** * Open selected simulation item in new internal frame. - * - * @param resultUI resultUI */ - public void openNewSimulation(ResultUI resultUI) { + public void openNewSimulation() { String selected = (String)resultUI.getSimulationComboBox().getSelectedItem(); SimulationStorage simulation = SimulationStorage.getSimulation(selected); @@ -148,10 +144,8 @@ /** * Delete selected simulation. - * - * @param resultUI resultUI */ - public void deleteSimulation(ResultUI resultUI) { + public void deleteSimulation() { String selected = (String)resultUI.getSimulationComboBox().getSelectedItem(); SimulationStorage simulation = SimulationStorage.getSimulation(selected); try { @@ -159,15 +153,13 @@ } catch (StorageException ex) { throw new IsisFishRuntimeException("Can't delete simulation", ex); } - initSimulationList(resultUI); + initSimulationList(); } /** * Display simulation log. - * - * @param resultUI resultUI */ - public void showLog(ResultUI resultUI) { + public void showLog() { String selected = (String)resultUI.getSimulationComboBox().getSelectedItem(); try { SimulationLoggerUtil.showSimulationLogConsole(resultUI, selected); Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2015-06-09 08:20:12 UTC (rev 4250) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) @@ -43,15 +43,15 @@ </cell> <cell> <JButton id="openButton" text="isisfish.result.new.window" - onActionPerformed="handler.openNewSimulation(this)"/> + onActionPerformed="handler.openNewSimulation()"/> </cell> <cell> <JButton id="removeButton" text="isisfish.result.remove.simulation" - onActionPerformed="handler.deleteSimulation(this)"/> + onActionPerformed="handler.deleteSimulation()"/> </cell> <cell> <JButton id="logButton" text="isisfish.result.show.simulation.log" - onActionPerformed="handler.showLog(this)"/> + onActionPerformed="handler.showLog()"/> </cell> </row> </Table>

1 0

r4250 - branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule
by echatellier＠users.forge.codelutin.com 09 Jun '15

09 Jun '15

Author: echatellier Date: 2015-06-09 08:20:12 +0000 (Tue, 09 Jun 2015) New Revision: 4250 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4250 Log: Highligth non compilable rule in red Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2015-06-08 14:34:30 UTC (rev 4249) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2015-06-09 08:20:12 UTC (rev 4250) @@ -27,6 +27,7 @@ import static org.nuiton.i18n.I18n.t; +import java.awt.Color; import java.awt.Component; import java.util.HashMap; import java.util.Map; @@ -76,7 +77,7 @@ String ruleName = (String)value; c.setText(ruleName); - + // c'est tres couteux d'avoir une instance // on les met en cache try { @@ -88,9 +89,11 @@ } c.setToolTipText(rule.getDescription()); + c.setForeground(null); } catch (Exception e) { String errorTooltip = TooltipHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", ruleName)); c.setToolTipText(errorTooltip); + c.setForeground(Color.RED); } return c;

1 0

r4249 - in branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui: . result
by echatellier＠users.forge.codelutin.com 08 Jun '15

08 Jun '15

Author: echatellier Date: 2015-06-08 14:34:30 +0000 (Mon, 08 Jun 2015) New Revision: 4249 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4249 Log: Useless getter Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2015-06-08 14:34:19 UTC (rev 4248) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2015-06-08 14:34:30 UTC (rev 4249) @@ -28,40 +28,40 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - getHandler().afterInit(); + hanlder.afterInit(); } ]]></script> <JMenuBar> <JMenu text='isisfish.welcome.menu.file'> - <JMenuItem text="isisfish.welcome.menu.synchro" enabled='false' onActionPerformed='getHandler().updateVCS(this)'/> + <JMenuItem text="isisfish.welcome.menu.synchro" enabled='false' onActionPerformed='handler.updateVCS(this)'/> <JSeparator/> - <JMenuItem text="isisfish.welcome.menu.close" onActionPerformed='getHandler().close(this)'/> + <JMenuItem text="isisfish.welcome.menu.close" onActionPerformed='handler.close(this)'/> </JMenu> <JMenu text="isisfish.welcome.menu.frame"> - <JMenuItem text="isisfish.welcome.menu.simulation" onActionPerformed='getHandler().newSimulationFrame(this)'/> - <JMenuItem text="isisfish.welcome.menu.result" onActionPerformed='getHandler().newResultFrame(this)'/> - <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='getHandler().newInputFrame(this)'/> - <JMenuItem text="isisfish.welcome.menu.script" onActionPerformed='getHandler().newScriptFrame(this)'/> - <JMenuItem text="isisfish.sensitivity.title" onActionPerformed='getHandler().newSensitivityFrame(this)'/> + <JMenuItem text="isisfish.welcome.menu.simulation" onActionPerformed='handler.newSimulationFrame(this)'/> + <JMenuItem text="isisfish.welcome.menu.result" onActionPerformed='handler.newResultFrame(this)'/> + <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='handler.newInputFrame(this)'/> + <JMenuItem text="isisfish.welcome.menu.script" onActionPerformed='handler.newScriptFrame(this)'/> + <JMenuItem text="isisfish.sensitivity.title" onActionPerformed='handler.newSensitivityFrame(this)'/> <JSeparator/> - <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='getHandler().newQueueFrame(this)'/> + <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='handler.newQueueFrame(this)'/> </JMenu> <JMenu text="isisfish.welcome.menu.configuration"> - <JMenuItem text="isisfish.welcome.menu.configuration" onActionPerformed='getHandler().config(this)'/> - <JMenuItem text="isisfish.welcome.menu.configuration.vcs" onActionPerformed='getHandler().configVCS(this)' enabled="false"/> - <JMenuItem text="isisfish.welcome.menu.configuration.sshlauncher" onActionPerformed='getHandler().configurationSSHLauncher(this)'/> - <JMenuItem text="isisfish.welcome.menu.configuration.r" onActionPerformed='getHandler().configurationR(this)'/> + <JMenuItem text="isisfish.welcome.menu.configuration" onActionPerformed='handler.config(this)'/> + <JMenuItem text="isisfish.welcome.menu.configuration.vcs" onActionPerformed='handler.configVCS(this)' enabled="false"/> + <JMenuItem text="isisfish.welcome.menu.configuration.sshlauncher" onActionPerformed='handler.configurationSSHLauncher(this)'/> + <JMenuItem text="isisfish.welcome.menu.configuration.r" onActionPerformed='handler.configurationR(this)'/> </JMenu> <JMenu text="isisfish.welcome.menu.help"> - <JMenuItem text="isisfish.welcome.menu.help.isisfish" onActionPerformed='getHandler().help(this, "ISISFISH")'/> + <JMenuItem text="isisfish.welcome.menu.help.isisfish" onActionPerformed='handler.help(this, "ISISFISH")'/> <JMenu text="isisfish.welcome.menu.api"> - <JMenuItem text="isisfish.welcome.menu.help.javaapi" onActionPerformed='getHandler().help(this, "JAVA_API")'/> - <JMenuItem text="isisfish.welcome.menu.help.isisfishapi" onActionPerformed='getHandler().help(this, "ISIS_API")'/> - <JMenuItem text="isisfish.welcome.menu.help.matrixapi" onActionPerformed='getHandler().help(this, "MATRIX_API")'/> - <JMenuItem text="isisfish.welcome.menu.help.topiaapi" onActionPerformed='getHandler().help(this, "TOPIA_API")'/> + <JMenuItem text="isisfish.welcome.menu.help.javaapi" onActionPerformed='handler.help(this, "JAVA_API")'/> + <JMenuItem text="isisfish.welcome.menu.help.isisfishapi" onActionPerformed='handler.help(this, "ISIS_API")'/> + <JMenuItem text="isisfish.welcome.menu.help.matrixapi" onActionPerformed='handler.help(this, "MATRIX_API")'/> + <JMenuItem text="isisfish.welcome.menu.help.topiaapi" onActionPerformed='handler.help(this, "TOPIA_API")'/> </JMenu> <JSeparator/> - <JMenuItem text="isisfish.welcome.menu.about" onActionPerformed='getHandler().about(this)'/> + <JMenuItem text="isisfish.welcome.menu.about" onActionPerformed='handler.about(this)'/> </JMenu> </JMenuBar> <WelcomePanelUI id="welcomePanelUI" constructorParams='this'/> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2015-06-08 14:34:19 UTC (rev 4248) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2015-06-08 14:34:30 UTC (rev 4249) @@ -43,15 +43,15 @@ </cell> <cell> <JButton id="openButton" text="isisfish.result.new.window" - onActionPerformed="getHandler().openNewSimulation(this)"/> + onActionPerformed="handler.openNewSimulation(this)"/> </cell> <cell> <JButton id="removeButton" text="isisfish.result.remove.simulation" - onActionPerformed="getHandler().deleteSimulation(this)"/> + onActionPerformed="handler.deleteSimulation(this)"/> </cell> <cell> <JButton id="logButton" text="isisfish.result.show.simulation.log" - onActionPerformed="getHandler().showLog(this)"/> + onActionPerformed="handler.showLog(this)"/> </cell> </row> </Table>

1 0

r4248 - branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui
by echatellier＠users.forge.codelutin.com 08 Jun '15

08 Jun '15

Author: echatellier Date: 2015-06-08 14:34:19 +0000 (Mon, 08 Jun 2015) New Revision: 4248 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4248 Log: Misc imports Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/SimulationHandler.java Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/SimulationHandler.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/SimulationHandler.java 2015-06-08 14:34:10 UTC (rev 4247) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/SimulationHandler.java 2015-06-08 14:34:19 UTC (rev 4248) @@ -32,12 +32,10 @@ import javax.swing.JFileChooser; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import fr.ifremer.isisfish.simulator.SimulationParameter; -import fr.ifremer.isisfish.ui.simulator.RuleChooserHandler; import fr.ifremer.isisfish.ui.util.ErrorHelper; /**

1 0