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

r4245 - trunk
by echatellier＠users.forge.codelutin.com June 8, 2015

June 8, 2015

Author: echatellier Date: 2015-06-08 08:51:56 +0000 (Mon, 08 Jun 2015) New Revision: 4245 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4245 Log: Update jsch and aspectj Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-06-04 14:02:08 UTC (rev 4244) +++ trunk/pom.xml 2015-06-08 08:51:56 UTC (rev 4245) @@ -292,7 +292,7 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.52</version> + <version>0.1.53</version> <scope>compile</scope> </dependency> @@ -314,7 +314,7 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.8.5</version> + <version>1.8.6</version> </dependency> <dependency>

1 0

r4244 - in trunk/src/main/java/fr/ifremer/isisfish: datastore ui/input
by echatellier＠users.forge.codelutin.com June 4, 2015

June 4, 2015

Author: echatellier Date: 2015-06-04 14:02:08 +0000 (Thu, 04 Jun 2015) New Revision: 4244 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4244 Log: Fix javadoc Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2015-06-04 12:35:23 UTC (rev 4243) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2015-06-04 14:02:08 UTC (rev 4244) @@ -54,7 +54,7 @@ * * Check for result name returned by : * <ul> - * <li>{@link Export#getNecessaryResult()}</li> + * <li>{@link ExportInfo#getNecessaryResult()}</li> * <li>{@link SensitivityExport#getNecessaryResult()}</li> * <li>{@link Rule#getNecessaryResult()}</li> * <li>{@link SimulationPlan#getNecessaryResult()}</li> Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java 2015-06-04 12:35:23 UTC (rev 4243) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java 2015-06-04 14:02:08 UTC (rev 4244) @@ -366,7 +366,7 @@ * * Check for result name returned by : * <ul> - * <li>{@link Export#getNecessaryResult()}</li> + * <li>{@link ExportInfo#getNecessaryResult()}</li> * <li>{@link SensitivityExport#getNecessaryResult()}</li> * <li>{@link Rule#getNecessaryResult()}</li> * <li>{@link SimulationPlan#getNecessaryResult()}</li> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2015-06-04 12:35:23 UTC (rev 4243) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2015-06-04 14:02:08 UTC (rev 4244) @@ -290,8 +290,6 @@ /** * Extract from a simulation the region, and rename it with name given * by user. - * - * @param inputUI inputUI */ public void importRegionFromSimulation() {

1 0

r4243 - in branches: . isis-fish-4.4.0-editor isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/equation isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/logging isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/script isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/editor isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text isis-fish-
by echatellier＠users.forge.codelutin.com June 4, 2015

June 4, 2015

Author: echatellier Date: 2015-06-04 12:35:23 +0000 (Thu, 04 Jun 2015) New Revision: 4243 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4243 Log: Copy in progress editor modifications in branche Added: branches/isis-fish-4.4.0-editor/ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxConstants.java branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/LogTokenMarker.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/java/fr/ifremer/isisfish/ui/widget/text/SyntaxTokenManagerFactory.java Removed: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxContants.java branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxEditor.java branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisTokenManagerFactory.java branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisTokenMarker.java Modified: branches/isis-fish-4.4.0-editor/pom.xml branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneUI.jaxx branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationUI.jaxx branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/logging/LoggingFrame.java branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.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/pom.xml =================================================================== --- trunk/pom.xml 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/pom.xml 2015-06-04 12:35:23 UTC (rev 4243) @@ -112,15 +112,26 @@ <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>2.5.0</version> - <scope>compile</scope> + <version>2.5.6</version> </dependency> <dependency> <groupId>com.fifesoft</groupId> <artifactId>rstaui</artifactId> - <version>2.5.0</version> + <version>2.5.4</version> </dependency> + + <dependency> + <groupId>com.fifesoft</groupId> + <artifactId>autocomplete</artifactId> + <version>2.5.4</version> + </dependency> + + <dependency> + <groupId>com.fifesoft</groupId> + <artifactId>languagesupport</artifactId> + <version>2.6.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>javax.mail</groupId> @@ -595,14 +606,6 @@ <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-maven-plugin</artifactId> <version>${jaxxVersion}</version> - <dependencies> - <dependency> - <groupId>com.fifesoft</groupId> - <artifactId>rsyntaxtextarea</artifactId> - <version>2.5.0</version> - <scope>compile</scope> - </dependency> - </dependencies> </plugin> <plugin> Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneUI.jaxx 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneUI.jaxx 2015-06-04 12:35:23 UTC (rev 4243) @@ -49,7 +49,8 @@ <cell> <JSplitPane id='split' orientation='vertical' oneTouchExpandable='true' resizeWeight='0.8'> - <org.nuiton.widget.editor.Editor id="editor" askIfNotSaved="false" /> +  + <fr.ifremer.isisfish.ui.widget.text.SyntaxEditor id='editor' askIfNotSaved="false" /> <JScrollPane> <JTextArea id="checkWindow" editable="false" /> </JScrollPane> Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java 2015-06-04 12:35:23 UTC (rev 4243) @@ -42,7 +42,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.util.FileUtil; -import org.nuiton.widget.editor.Editor; import fr.ifremer.isisfish.datastore.FormuleStorage; import fr.ifremer.isisfish.entities.Equation; @@ -50,6 +49,7 @@ import fr.ifremer.isisfish.ui.input.InputContentHandler; import fr.ifremer.isisfish.ui.models.common.GenericComboModel; import fr.ifremer.isisfish.ui.util.ErrorHelper; +import fr.ifremer.isisfish.ui.widget.text.SyntaxEditor; /** * Equation handler. @@ -162,7 +162,7 @@ inputContentUI.setText(t("isisfish.common.equation")); } - inputContentUI.editor.getCurrentEditor().removeDocumentListener(listener); + inputContentUI.editor.removeDocumentListener(listener); try { File equationContentFile = FileUtil.getTempFile("", ".java"); inputContentUI.editor.open(equationContentFile); @@ -184,7 +184,7 @@ // le contenu de l'equation ne doit pas automatiquement // etre sauvé dans l'entité (pas de sens pour un facteur discret de type equation) if (inputContentUI.autoSaveModification) { - inputContentUI.editor.getCurrentEditor().addDocumentListener(listener); + inputContentUI.editor.addDocumentListener(listener); } } @@ -252,7 +252,7 @@ } public void openEditor(InputOneEquationUI ui, String category, String name, Class<?> javaInterface, - String content, Editor editor) { + String content, SyntaxEditor editor) { if (log.isTraceEnabled()) { log.trace("openEditor"); } Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationUI.jaxx 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationUI.jaxx 2015-06-04 12:35:23 UTC (rev 4243) @@ -67,7 +67,8 @@ <JButton text="isisfish.common.saveModel" onActionPerformed='handler.saveModel()' enabled='{isActive() && formuleCategory != null}'/> </cell> <cell fill='both' weightx='1.0' weighty='1.0' rows="2"> - <org.nuiton.widget.editor.Editor id='editor' askIfNotSaved="false" enabled='{isActive()}'/> +  + <fr.ifremer.isisfish.ui.widget.text.SyntaxEditor id='editor' askIfNotSaved="false" enabled='{isActive()}' /> </cell> </row> <row> Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java 2015-06-04 12:35:23 UTC (rev 4243) @@ -40,7 +40,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.util.FileUtil; -import org.nuiton.widget.SwingUtil; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.datastore.RegionStorage; @@ -252,7 +251,7 @@ CheckRegion.check(fisheryRegion, result); CheckResultFrame dialog = new CheckResultFrame(); dialog.setCheckResult(result); - SwingUtil.center(dialog); + dialog.setLocationByPlatform(true); dialog.setVisible(true); } catch (Exception eee) { if (log.isErrorEnabled()) { Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/logging/LoggingFrame.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/logging/LoggingFrame.java 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/logging/LoggingFrame.java 2015-06-04 12:35:23 UTC (rev 4243) @@ -24,16 +24,20 @@ import static org.nuiton.i18n.I18n.t; +import java.awt.Frame; import java.io.File; import java.io.IOException; import javax.swing.JFrame; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; import org.apache.commons.io.FileUtils; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.ui.widget.text.IsisSyntaxContants; -import fr.ifremer.isisfish.ui.widget.text.IsisSyntaxEditor; +import fr.ifremer.isisfish.ui.widget.text.IsisSyntaxConstants; +import fr.ifremer.isisfish.ui.widget.text.SyntaxEditorUI; /** * Standalone frame to display log file with syntax highlight. @@ -45,18 +49,34 @@ /** serialVersionUID. */ private static final long serialVersionUID = -655585012872692567L; - protected IsisSyntaxEditor editor; + protected SyntaxEditorUI editor; public LoggingFrame() { - editor = new IsisSyntaxEditor(); - editor.setStyle(IsisSyntaxContants.SYNTAX_STYLE_LOG); + editor = new SyntaxEditorUI(); + editor.setStyle(IsisSyntaxConstants.SYNTAX_STYLE_LOG); add(editor); - setJMenuBar(editor.createMenuBar(this)); setSize(800, 600); } + + /** + * Return menu bar configured for {@code textArea} component. + * + * @param parent parent + * @return JMenuBar instance + */ + public JMenuBar createMenuBar(Frame parent) { + JMenuBar mb = new JMenuBar(); + JMenu menu = new JMenu(t("isisfish.script.search")); + menu.add(new JMenuItem(editor.getFindAction())); + menu.add(new JMenuItem(editor.getReplaceAction())); + menu.add(new JMenuItem(editor.getGotoAction())); + mb.add(menu); + return mb; + } + public void loadSimulationLog(String simulationName) throws IOException { setTitle(t("isisfish.simulation.log.console.title", simulationName)); Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java 2015-06-04 12:35:23 UTC (rev 4243) @@ -30,6 +30,7 @@ import java.awt.Color; import java.awt.Component; import java.awt.Desktop; +import java.awt.Dimension; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.io.ByteArrayOutputStream; @@ -55,8 +56,6 @@ import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; -import javax.swing.event.CaretEvent; -import javax.swing.event.CaretListener; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; @@ -107,7 +106,7 @@ * Last update: $Date$ * by : $Author$ */ -public class ScriptHandler implements TreeSelectionListener, CaretListener { +public class ScriptHandler implements TreeSelectionListener { /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(ScriptHandler.class); @@ -145,7 +144,6 @@ // specific template loader to get template from jars (classpath) ClassTemplateLoader templateLoader = new ClassTemplateLoader(ScriptHandler.class, "/"); freemarkerConfiguration.setTemplateLoader(templateLoader); - } /** @@ -157,10 +155,26 @@ // add listeners scriptTree.addTreeSelectionListener(this); - this.scriptUI.getEditor().addCaretListener(this); // expand official VCS tree node scriptTree.expandRow(0); + + // bind actions + scriptUI.getMiSearch().setAction(scriptUI.getEditor().getFindAction()); + scriptUI.getMiReplace().setAction(scriptUI.getEditor().getReplaceAction()); + scriptUI.getMiGoto().setAction(scriptUI.getEditor().getGotoAction()); + scriptUI.getMiSave().setAction(scriptUI.getEditor().getSaveAction()); + scriptUI.getMiCopy().setAction(scriptUI.getEditor().getCopyAction()); + scriptUI.getMiCut().setAction(scriptUI.getEditor().getCutAction()); + scriptUI.getMiPaste().setAction(scriptUI.getEditor().getPasteAction()); + scriptUI.buttonScriptCut.setAction(scriptUI.getEditor().getCutAction()); + scriptUI.buttonScriptCopy.setAction(scriptUI.getEditor().getCopyAction()); + scriptUI.buttonScriptPaste.setAction(scriptUI.getEditor().getPasteAction()); + scriptUI.buttonScriptSave.setAction(scriptUI.getEditor().getSaveAction()); + + // hide check log + scriptUI.getActionLogSplitPane().getBottomComponent().setMinimumSize(new Dimension()); + scriptUI.getActionLogSplitPane().setDividerLocation(1.0d); } /** @@ -184,6 +198,7 @@ WelcomePanelUI parentUI = scriptUI.getParentContainer(WelcomePanelUI.class); parentUI.setStatusMessage(msg); } + protected void setStatusMessage(String msg, boolean running) { // FIXME remove all parent container reference WelcomePanelUI parentUI = scriptUI.getParentContainer(WelcomePanelUI.class); @@ -412,24 +427,16 @@ @Override public void valueChanged(TreeSelectionEvent e) { if (e.getNewLeadSelectionPath() != null) { + Object selectedNode = e.getNewLeadSelectionPath().getLastPathComponent(); if (selectedNode instanceof File && ((File)selectedNode).isFile()) { File selectedFile = (File)selectedNode; // load file into current action codeStorage loadScript(selectedFile); scriptUI.getEditor().open(selectedFile); - // force refresh - scriptUI.getEditor().repaint(); - scriptUI.getEditor().validate(); - setButton(); - } - else { + } else { scriptUI.getEditor().close(); - // force refresh - scriptUI.getEditor().repaint(); - scriptUI.getEditor().validate(); - setButton(); } } @@ -669,27 +676,6 @@ return result; } - /** - * Cut selection in current editor. - */ - public void cut() { - scriptUI.getEditor().cut(); - } - - /** - * Copy selection in current editor. - */ - public void copy() { - scriptUI.getEditor().copy(); - } - - /** - * Paste clipboard content in editor. - */ - public void paste() { - scriptUI.getEditor().paste(); - } - protected static FileFilter scriptFileFilter; public static FileFilter getScriptFileFilter() { @@ -708,6 +694,8 @@ boolean check = false; + resetCheckLogArea(); + // can't compile formule if (codeStorage instanceof FormuleStorage) { return false; @@ -754,12 +742,22 @@ public void checkAllScripts() { new SwingWorker<Void, Void>() { public Void doInBackground() { - checkAllScripts(); + checkAllScriptsAsync(); return null; } }.execute(); } - + + protected void resetCheckLogArea() { + // hidden by default + int maxLocation = scriptUI.getActionLogSplitPane().getMaximumDividerLocation(); + if (scriptUI.getActionLogSplitPane().getBottomComponent().getHeight() == 0) { + scriptUI.getActionLogSplitPane().setDividerLocation((int)(maxLocation * 0.75)); + } + scriptUI.getActionLogArea().setBackground(null); + scriptUI.getActionLogArea().setText(""); + } + protected void checkAllScriptsAsync() { setStatusMessage(t("isisfish.message.check.inprogress"), true); @@ -767,8 +765,7 @@ boolean allSuccess = true; // reste previous state - scriptUI.getActionLogArea().setBackground(null); - scriptUI.getActionLogArea().setText(""); + resetCheckLogArea(); for (ScriptMapping scriptMapping : ScriptMapping.values()) { // normalement ne match pas les formules @@ -1130,15 +1127,6 @@ } } - /* - * @see javax.swing.event.CaretListener#caretUpdate(javax.swing.event.CaretEvent) - */ - @Override - public void caretUpdate(CaretEvent e) { - // selection pas vide si dot = mark - scriptUI.setTextSelected(e.getDot() != e.getMark()); - } - /** * Move files. * (called by drag and drop handler). Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2015-06-04 12:35:23 UTC (rev 4243) @@ -68,19 +68,19 @@ <JMenuItem id="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel" onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityFormule)' icon="script.png" /> </JMenu> - <JMenuItem id="miSave" text="isisfish.script.menu.save" - onActionPerformed="handler.saveScript()" icon="script_save.png" enabled='{isSingleFileSelected()}' /> + <JMenuItem id="miSave" text="isisfish.script.menu.save" enabled='{isSingleFileSelected()}' /> <JSeparator/> <JMenuItem id="miDelete" text="isisfish.script.menu.deleteLocaly" onActionPerformed='handler.deleteScript(false)' icon="script_delete.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()}' /> - <JMenuItem id="miCopy" text="isisfish.script.menu.copy" - onActionPerformed="handler.copy()" icon="page_copy.png" enabled='{isTextSelected()}' /> - <JMenuItem id="miPaste" text="isisfish.script.menu.paste" - onActionPerformed="handler.paste()" icon="page_paste.png" enabled='{isSingleFileSelected()}' /> + <JMenuItem id="miCut" /> + <JMenuItem id="miCopy" /> + <JMenuItem id="miPaste" /> + <JSeparator/> + <JMenuItem id="miSearch" /> + <JMenuItem id="miReplace" /> + <JMenuItem id="miGoto" /> </JMenu> <JMenu id="scriptTxtVCS" text="isisfish.script.menu.txtVCS"> <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" icon="database_go.png" @@ -111,18 +111,14 @@ <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" /> - <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip" - enabled='{isSingleFileSelected()}' onActionPerformed='handler.saveScript()' icon="script_save.png" /> + <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip" /> <JButton id="buttonScriptExport" text="isisfish.script.export" toolTipText="isisfish.script.export.tooltip" enabled='false' onActionPerformed='handler.exportScript()' icon="page_white_compressed.png" /> <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='handler.commitScript()' icon="database_go.png" /> - <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" enabled='{isTextSelected()}' - onActionPerformed='handler.cut()' icon="cut.png" /> - <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" enabled='{isTextSelected()}' - onActionPerformed='handler.copy()' icon="page_copy.png" /> - <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='{isSingleFileSelected()}' - onActionPerformed='handler.paste()' icon="page_paste.png" /> + <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" /> + <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" /> + <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='{isSingleFileSelected()}' /> <JButton id="buttonScriptCheck" text="isisfish.script.check" toolTipText="isisfish.script.check.tooltip" enabled='{isJavaFileSelected()}' onActionPerformed='handler.checkScript()' icon="script_code_red.png" /> <JButton id="buttonScriptEval" text="isisfish.script.evaluate" toolTipText="isisfish.script.evaluate.tooltip" enabled='{isJavaFileSelected()}' @@ -135,8 +131,8 @@ rootVisible="false" model='{scriptTreeModel}' cellRenderer='{new fr.ifremer.isisfish.ui.script.model.ScriptTreeCellRenderer()}' /> </JScrollPane> - <JSplitPane oneTouchExpandable="true" resizeWeight="0.75" orientation="VERTICAL"> - <org.nuiton.widget.editor.Editor id='editor'/> + <JSplitPane id="actionLogSplitPane" oneTouchExpandable="true" orientation="VERTICAL"> + <fr.ifremer.isisfish.ui.widget.text.SyntaxEditor id='editor' askIfNotSaved="true" /> <JScrollPane> <JTextArea id="actionLogArea" editable="false" font='{new Font("Monospaced", Font.PLAIN, 12)}' /> </JScrollPane> Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2015-06-04 12:35:23 UTC (rev 4243) @@ -40,8 +40,6 @@ import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; -import org.nuiton.widget.SwingUtil; - import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.ui.input.equation.EquationEditorPaneUI; @@ -72,7 +70,7 @@ addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Window editorFrame = getFrame(); - SwingUtil.center(editorFrame); + editorFrame.setLocationByPlatform(true); editorFrame.setVisible(true); } }); Copied: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxConstants.java (from rev 4226, trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxContants.java) =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxConstants.java (rev 0) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxConstants.java 2015-06-04 12:35:23 UTC (rev 4243) @@ -0,0 +1,36 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2015 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.ui.widget.text; + +import org.fife.ui.rsyntaxtextarea.SyntaxConstants; + +/** + * Extends rsyntaxtextarea contantx to add isis specific. + * + * @author Eric Chatellier + */ +public interface IsisSyntaxConstants extends SyntaxConstants { + + public static final String SYNTAX_STYLE_LOG = "isisfish-log"; + +} Deleted: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxContants.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxContants.java 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxContants.java 2015-06-04 12:35:23 UTC (rev 4243) @@ -1,36 +0,0 @@ -/* - * #%L - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2015 Ifremer, Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ifremer.isisfish.ui.widget.text; - -import org.fife.ui.rsyntaxtextarea.SyntaxConstants; - -/** - * Extends rsyntaxtextarea contantx to add isis specific. - * - * @author Eric Chatellier - */ -public interface IsisSyntaxContants extends SyntaxConstants { - - public static final String SYNTAX_STYLE_LOG = "isisfish-log"; - -} Deleted: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxEditor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxEditor.java 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxEditor.java 2015-06-04 12:35:23 UTC (rev 4243) @@ -1,221 +0,0 @@ -/* - * #%L - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2015 Ifremer, Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -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.Frame; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; - -import javax.swing.AbstractAction; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.KeyStroke; -import javax.swing.UIManager; -import javax.swing.text.BadLocationException; - -import org.fife.rsta.ui.GoToDialog; -import org.fife.rsta.ui.search.FindDialog; -import org.fife.rsta.ui.search.ReplaceDialog; -import org.fife.rsta.ui.search.SearchDialogSearchContext; -import org.fife.ui.rsyntaxtextarea.RSyntaxDocument; -import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; -import org.fife.ui.rsyntaxtextarea.SyntaxScheme; -import org.fife.ui.rsyntaxtextarea.Token; -import org.fife.ui.rtextarea.RTextScrollPane; -import org.fife.ui.rtextarea.SearchEngine; - -/** - * {@link RSyntaxTextArea} component property configured for isis fish. - * - * @author Eric Chatellier - */ -public class IsisSyntaxEditor extends JPanel implements ActionListener { - - /** serialVersionUID. */ - private static final long serialVersionUID = 1427883892685276516L; - - protected RSyntaxTextArea textArea; - private FindDialog findDialog; - private ReplaceDialog replaceDialog; - - public IsisSyntaxEditor() { - super(new BorderLayout()); - textArea = new RSyntaxTextArea(); - add(new RTextScrollPane(textArea), BorderLayout.CENTER); - setAutoscrolls(false); - } - - /** - * Set highligth style. - * - * @param style new style - * @see IsisSyntaxContants - */ - public void setStyle(String style) { - RSyntaxDocument doc = new RSyntaxDocument(new IsisTokenManagerFactory(), style); - textArea.setDocument(doc); - - // special theme for log - if (IsisSyntaxContants.SYNTAX_STYLE_LOG.equals(style)) { - SyntaxScheme scheme = textArea.getSyntaxScheme(); - scheme.getStyle(Token.RESERVED_WORD_2).foreground = Color.RED; - } - } - - public void setText(String text) { - textArea.setText(text); - textArea.invalidate(); - } - - /** - * Return menu bar configured for {@code textArea} component. - * - * @param parent parent - * @return JMenuBar instance - */ - public JMenuBar createMenuBar(Frame parent) { - JMenuBar mb = new JMenuBar(); - JMenu menu = new JMenu(t("isisfish.script.search")); - menu.add(new JMenuItem(new ShowFindDialogAction())); - menu.add(new JMenuItem(new ShowReplaceDialogAction())); - menu.add(new JMenuItem(new GoToLineAction(parent))); - mb.add(menu); - - initSearchDialogs(parent); - - return mb; - } - - /** - * Creates our Find and Replace dialogs. - */ - protected void initSearchDialogs(Frame parent) { - - findDialog = new FindDialog(parent, this); - replaceDialog = new ReplaceDialog(parent, this); - - // This ties the properties of the two dialogs together (match - // case, regex, etc.). - replaceDialog.setSearchContext(findDialog.getSearchContext()); - - } - - private class GoToLineAction extends AbstractAction { - protected Frame parent; - public GoToLineAction(Frame parent) { - super(t("isisfish.script.gotoline")); - this.parent = parent; - int c = getToolkit().getMenuShortcutKeyMask(); - putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_L, c)); - } - - public void actionPerformed(ActionEvent e) { - if (findDialog.isVisible()) { - findDialog.setVisible(false); - } - if (replaceDialog.isVisible()) { - replaceDialog.setVisible(false); - } - GoToDialog dialog = new GoToDialog(this.parent); - dialog.setMaxLineNumberAllowed(textArea.getLineCount()); - dialog.setVisible(true); - int line = dialog.getLineNumber(); - if (line>0) { - try { - textArea.setCaretPosition(textArea.getLineStartOffset(line-1)); - } catch (BadLocationException ble) { // Never happens - UIManager.getLookAndFeel().provideErrorFeedback(textArea); - ble.printStackTrace(); - } - } - } - - } - - private class ShowFindDialogAction extends AbstractAction { - - public ShowFindDialogAction() { - super(t("isisfish.script.find")); - int c = getToolkit().getMenuShortcutKeyMask(); - putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_F, c)); - } - - public void actionPerformed(ActionEvent e) { - if (replaceDialog.isVisible()) { - replaceDialog.setVisible(false); - } - findDialog.setVisible(true); - } - - } - - private class ShowReplaceDialogAction extends AbstractAction { - - public ShowReplaceDialogAction() { - super(t("isisfish.script.replace")); - int c = getToolkit().getMenuShortcutKeyMask(); - putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_H, c)); - } - - public void actionPerformed(ActionEvent e) { - if (findDialog.isVisible()) { - findDialog.setVisible(false); - } - replaceDialog.setVisible(true); - } - - } - - /** - * Listens for events from our search dialogs and actually does the dirty - * work. - */ - public void actionPerformed(ActionEvent e) { - - String command = e.getActionCommand(); - SearchDialogSearchContext context = findDialog.getSearchContext(); - - if (FindDialog.ACTION_FIND.equals(command)) { - if (!SearchEngine.find(textArea, context)) { - UIManager.getLookAndFeel().provideErrorFeedback(textArea); - } - } else if (ReplaceDialog.ACTION_REPLACE.equals(command)) { - if (!SearchEngine.replace(textArea, context)) { - UIManager.getLookAndFeel().provideErrorFeedback(textArea); - } - } else if (ReplaceDialog.ACTION_REPLACE_ALL.equals(command)) { - int count = SearchEngine.replaceAll(textArea, context); - JOptionPane.showMessageDialog(null, count - + " occurrences replaced."); - } - - } -} Deleted: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisTokenManagerFactory.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisTokenManagerFactory.java 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisTokenManagerFactory.java 2015-06-04 12:35:23 UTC (rev 4243) @@ -1,82 +0,0 @@ -package fr.ifremer.isisfish.ui.widget.text; - -/* - * #%L - * ISIS-Fish - * %% - * Copyright (C) 2015 Ifremer, Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory; - -/** - * Extends rsyntaxtextarea factory to add Isis fish specific style. - * - * @author Eric Chatellier - */ -public class IsisTokenManagerFactory extends AbstractTokenMakerFactory implements IsisSyntaxContants { - - @Override - protected void initTokenMakerMap() { - // isis support for log - putMapping(SYNTAX_STYLE_LOG, IsisTokenMarker.class.getName()); - - // default code - String pkg = "org.fife.ui.rsyntaxtextarea.modes."; - - putMapping(SYNTAX_STYLE_NONE, pkg + "PlainTextTokenMaker"); - putMapping(SYNTAX_STYLE_ACTIONSCRIPT, pkg + "ActionScriptTokenMaker"); - putMapping(SYNTAX_STYLE_ASSEMBLER_X86, pkg + "AssemblerX86TokenMaker"); - putMapping(SYNTAX_STYLE_BBCODE, pkg + "BBCodeTokenMaker"); - putMapping(SYNTAX_STYLE_C, pkg + "CTokenMaker"); - putMapping(SYNTAX_STYLE_CLOJURE, pkg + "ClojureTokenMaker"); - putMapping(SYNTAX_STYLE_CPLUSPLUS, pkg + "CPlusPlusTokenMaker"); - putMapping(SYNTAX_STYLE_CSHARP, pkg + "CSharpTokenMaker"); - putMapping(SYNTAX_STYLE_CSS, pkg + "CSSTokenMaker"); - putMapping(SYNTAX_STYLE_DELPHI, pkg + "DelphiTokenMaker"); - putMapping(SYNTAX_STYLE_DTD, pkg + "DtdTokenMaker"); - putMapping(SYNTAX_STYLE_FORTRAN, pkg + "FortranTokenMaker"); - putMapping(SYNTAX_STYLE_GROOVY, pkg + "GroovyTokenMaker"); - putMapping(SYNTAX_STYLE_HTACCESS, pkg + "HtaccessTokenMaker"); - putMapping(SYNTAX_STYLE_HTML, pkg + "HTMLTokenMaker"); - putMapping(SYNTAX_STYLE_JAVA, pkg + "JavaTokenMaker"); - putMapping(SYNTAX_STYLE_JAVASCRIPT, pkg + "JavaScriptTokenMaker"); - putMapping(SYNTAX_STYLE_JSON, pkg + "JsonTokenMaker"); - putMapping(SYNTAX_STYLE_JSP, pkg + "JSPTokenMaker"); - putMapping(SYNTAX_STYLE_LATEX, pkg + "LatexTokenMaker"); - putMapping(SYNTAX_STYLE_LISP, pkg + "LispTokenMaker"); - putMapping(SYNTAX_STYLE_LUA, pkg + "LuaTokenMaker"); - putMapping(SYNTAX_STYLE_MAKEFILE, pkg + "MakefileTokenMaker"); - putMapping(SYNTAX_STYLE_MXML, pkg + "MxmlTokenMaker"); - putMapping(SYNTAX_STYLE_NSIS, pkg + "NSISTokenMaker"); - putMapping(SYNTAX_STYLE_PERL, pkg + "PerlTokenMaker"); - putMapping(SYNTAX_STYLE_PHP, pkg + "PHPTokenMaker"); - putMapping(SYNTAX_STYLE_PROPERTIES_FILE,pkg + "PropertiesFileTokenMaker"); - putMapping(SYNTAX_STYLE_PYTHON, pkg + "PythonTokenMaker"); - putMapping(SYNTAX_STYLE_RUBY, pkg + "RubyTokenMaker"); - putMapping(SYNTAX_STYLE_SAS, pkg + "SASTokenMaker"); - putMapping(SYNTAX_STYLE_SCALA, pkg + "ScalaTokenMaker"); - putMapping(SYNTAX_STYLE_SQL, pkg + "SQLTokenMaker"); - putMapping(SYNTAX_STYLE_TCL, pkg + "TclTokenMaker"); - putMapping(SYNTAX_STYLE_UNIX_SHELL, pkg + "UnixShellTokenMaker"); - putMapping(SYNTAX_STYLE_VISUAL_BASIC, pkg + "VisualBasicTokenMaker"); - putMapping(SYNTAX_STYLE_WINDOWS_BATCH, pkg + "WindowsBatchTokenMaker"); - putMapping(SYNTAX_STYLE_XML, pkg + "XMLTokenMaker"); - } - -} Deleted: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisTokenMarker.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisTokenMarker.java 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisTokenMarker.java 2015-06-04 12:35:23 UTC (rev 4243) @@ -1,266 +0,0 @@ -package fr.ifremer.isisfish.ui.widget.text; - -/* - * #%L - * ISIS-Fish - * %% - * Copyright (C) 2015 Ifremer, Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import javax.swing.text.Segment; - -import org.fife.ui.rsyntaxtextarea.AbstractTokenMaker; -import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities; -import org.fife.ui.rsyntaxtextarea.Token; -import org.fife.ui.rsyntaxtextarea.TokenMap; - -public class IsisTokenMarker extends AbstractTokenMaker { - - private int currentTokenStart; - private int currentTokenType; - - @Override - public Token getTokenList(Segment text, int initialTokenType, int startOffset) { - resetTokenList(); - - char[] array = text.array; - int offset = text.offset; - int count = text.count; - int end = offset + count; - - // See, when we find a token, its starting position is always of the form: - // 'startOffset + (currentTokenStart-offset)'; but since startOffset and - // offset are constant, tokens' starting positions become: - // 'newStartOffset+currentTokenStart' for one less subtraction operation. - int newStartOffset = startOffset - offset; - - currentTokenStart = offset; - currentTokenType = initialTokenType; - -//beginning: - for (int i=offset; i<end; i++) { - - char c = array[i]; - - switch (currentTokenType) { - - case Token.NULL: - - currentTokenStart = i; // Starting a new token here. - - switch (c) { - - case ' ': - case '\t': - currentTokenType = Token.WHITESPACE; - break; - - case '"': - currentTokenType = Token.ERROR_STRING_DOUBLE; - break; - - // The "separators". - case '|': - addToken(text, currentTokenStart,i, Token.SEPARATOR, newStartOffset+currentTokenStart); - currentTokenType = Token.NULL; - break; - - default: - - // Just to speed things up a tad, as this will usually be the case (if spaces above failed). - if (RSyntaxUtilities.isLetterOrDigit(c) || c=='\\') { - currentTokenType = Token.IDENTIFIER; - break; - } - - - currentTokenType = Token.IDENTIFIER; - break; - - } // End of switch (c). - - break; - - case Token.WHITESPACE: - - switch (c) { - - case ' ': - case '\t': - break; // Still whitespace. - - case '"': - addToken(text, currentTokenStart,i-1, Token.WHITESPACE, newStartOffset+currentTokenStart); - currentTokenStart = i; - currentTokenType = Token.ERROR_STRING_DOUBLE; - break; - - // The "separators". - case '|': - addToken(text, currentTokenStart,i-1, Token.WHITESPACE, newStartOffset+currentTokenStart); - addToken(text, i,i, Token.SEPARATOR, newStartOffset+i); - currentTokenType = Token.NULL; - break; - - default: // Add the whitespace token and start anew. - - addToken(text, currentTokenStart,i-1, Token.WHITESPACE, newStartOffset+currentTokenStart); - currentTokenStart = i; - - // Just to speed things up a tad, as this will usually be the case (if spaces above failed). - if (RSyntaxUtilities.isLetterOrDigit(c) || c=='\\') { - currentTokenType = Token.IDENTIFIER; - break; - } - - - currentTokenType = Token.IDENTIFIER; - - } // End of switch (c). - - break; - - default: // Should never happen - case Token.IDENTIFIER: - - switch (c) { - - case ' ': - case '\t': - // Check for REM comments. - if (i-currentTokenStart==3 && - (array[i-3]=='r' || array[i-3]=='R') && - (array[i-2]=='e' || array[i-2]=='E') && - (array[i-1]=='m' || array[i-1]=='M')) { - currentTokenType = Token.COMMENT_EOL; - break; - } - addToken(text, currentTokenStart,i-1, Token.IDENTIFIER, newStartOffset+currentTokenStart); - currentTokenStart = i; - currentTokenType = Token.WHITESPACE; - break; - - case '"': - addToken(text, currentTokenStart,i-1, Token.IDENTIFIER, newStartOffset+currentTokenStart); - currentTokenStart = i; - currentTokenType = Token.ERROR_STRING_DOUBLE; - break; - - // The "separators". - case '|': - addToken(text, currentTokenStart,i-1, Token.IDENTIFIER, newStartOffset+currentTokenStart); - addToken(text, i,i, Token.SEPARATOR, newStartOffset+i); - currentTokenType = Token.NULL; - break; - - - default: - - // Just to speed things up a tad, as this will usually be the case. - if (RSyntaxUtilities.isLetterOrDigit(c) || c=='\\') { - break; - } - - // Otherwise, fall through and assume we're still okay as an IDENTIFIER... - - } // End of switch (c). - - break; - - case Token.COMMENT_EOL: - i = end - 1; - addToken(text, currentTokenStart,i, Token.COMMENT_EOL, newStartOffset+currentTokenStart); - // We need to set token type to null so at the bottom we don't add one more token. - currentTokenType = Token.NULL; - break; - - case Token.PREPROCESSOR: // Used for labels - i = end - 1; - addToken(text, currentTokenStart,i, Token.PREPROCESSOR, newStartOffset+currentTokenStart); - // We need to set token type to null so at the bottom we don't add one more token. - currentTokenType = Token.NULL; - break; - - case Token.ERROR_STRING_DOUBLE: - - if (c=='"') { - addToken(text, currentTokenStart,i, Token.LITERAL_STRING_DOUBLE_QUOTE, newStartOffset+currentTokenStart); - currentTokenStart = i + 1; - currentTokenType = Token.NULL; - } - // Otherwise, we're still an unclosed string... - - break; - - } // End of switch (currentTokenType). - - } // End of for (int i=offset; i<end; i++). - - // Deal with the (possibly there) last token. - if (currentTokenType != Token.NULL) { - - // Check for REM comments. - if (end-currentTokenStart==3 && - (array[end-3]=='r' || array[end-3]=='R') && - (array[end-2]=='e' || array[end-2]=='E') && - (array[end-1]=='m' || array[end-1]=='M')) { - currentTokenType = Token.COMMENT_EOL; - } - - addToken(text, currentTokenStart,end-1, currentTokenType, newStartOffset+currentTokenStart); - } - - addNullToken(); - - // Return the first token in our linked list. - return firstToken; - - } - - @Override - public TokenMap getWordsToHighlight() { - TokenMap tokenMap = new TokenMap(); - - tokenMap.put("FATAL", Token.RESERVED_WORD_2); - tokenMap.put("ERROR", Token.RESERVED_WORD_2); - tokenMap.put("INFO", Token.RESERVED_WORD); - tokenMap.put("DEBUG", Token.RESERVED_WORD); - tokenMap.put("TRACE", Token.RESERVED_WORD); - - return tokenMap; - } - - @Override - public void addToken(Segment segment, int start, int end, int tokenType, int startOffset) { - - switch (tokenType) { - // Since reserved words, functions, and data types are all passed - // into here as "identifiers," we have to see what the token - // really is... - case Token.IDENTIFIER: - int value = wordsToHighlight.get(segment, start,end); - if (value!=-1) - tokenType = value; - break; - } - - super.addToken(segment, start, end, tokenType, startOffset); - - } - -} Copied: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/LogTokenMarker.java (from rev 4226, trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisTokenMarker.java) =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/LogTokenMarker.java (rev 0) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/LogTokenMarker.java 2015-06-04 12:35:23 UTC (rev 4243) @@ -0,0 +1,271 @@ +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2015 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.ui.widget.text; + +import javax.swing.text.Segment; + +import org.fife.ui.rsyntaxtextarea.AbstractTokenMaker; +import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities; +import org.fife.ui.rsyntaxtextarea.Token; +import org.fife.ui.rsyntaxtextarea.TokenMap; + +/** + * Token marker for Isis Log files. + * + * @author Eric Chatellier + */ +public class LogTokenMarker extends AbstractTokenMaker { + + private int currentTokenStart; + private int currentTokenType; + + @Override + public Token getTokenList(Segment text, int initialTokenType, int startOffset) { + resetTokenList(); + + char[] array = text.array; + int offset = text.offset; + int count = text.count; + int end = offset + count; + + // See, when we find a token, its starting position is always of the form: + // 'startOffset + (currentTokenStart-offset)'; but since startOffset and + // offset are constant, tokens' starting positions become: + // 'newStartOffset+currentTokenStart' for one less subtraction operation. + int newStartOffset = startOffset - offset; + + currentTokenStart = offset; + currentTokenType = initialTokenType; + +//beginning: + for (int i=offset; i<end; i++) { + + char c = array[i]; + + switch (currentTokenType) { + + case Token.NULL: + + currentTokenStart = i; // Starting a new token here. + + switch (c) { + + case ' ': + case '\t': + currentTokenType = Token.WHITESPACE; + break; + + case '"': + currentTokenType = Token.ERROR_STRING_DOUBLE; + break; + + // The "separators". + case '|': + addToken(text, currentTokenStart,i, Token.SEPARATOR, newStartOffset+currentTokenStart); + currentTokenType = Token.NULL; + break; + + default: + + // Just to speed things up a tad, as this will usually be the case (if spaces above failed). + if (RSyntaxUtilities.isLetterOrDigit(c) || c=='\\') { + currentTokenType = Token.IDENTIFIER; + break; + } + + + currentTokenType = Token.IDENTIFIER; + break; + + } // End of switch (c). + + break; + + case Token.WHITESPACE: + + switch (c) { + + case ' ': + case '\t': + break; // Still whitespace. + + case '"': + addToken(text, currentTokenStart,i-1, Token.WHITESPACE, newStartOffset+currentTokenStart); + currentTokenStart = i; + currentTokenType = Token.ERROR_STRING_DOUBLE; + break; + + // The "separators". + case '|': + addToken(text, currentTokenStart,i-1, Token.WHITESPACE, newStartOffset+currentTokenStart); + addToken(text, i,i, Token.SEPARATOR, newStartOffset+i); + currentTokenType = Token.NULL; + break; + + default: // Add the whitespace token and start anew. + + addToken(text, currentTokenStart,i-1, Token.WHITESPACE, newStartOffset+currentTokenStart); + currentTokenStart = i; + + // Just to speed things up a tad, as this will usually be the case (if spaces above failed). + if (RSyntaxUtilities.isLetterOrDigit(c) || c=='\\') { + currentTokenType = Token.IDENTIFIER; + break; + } + + + currentTokenType = Token.IDENTIFIER; + + } // End of switch (c). + + break; + + default: // Should never happen + case Token.IDENTIFIER: + + switch (c) { + + case ' ': + case '\t': + // Check for REM comments. + if (i-currentTokenStart==3 && + (array[i-3]=='r' || array[i-3]=='R') && + (array[i-2]=='e' || array[i-2]=='E') && + (array[i-1]=='m' || array[i-1]=='M')) { + currentTokenType = Token.COMMENT_EOL; + break; + } + addToken(text, currentTokenStart,i-1, Token.IDENTIFIER, newStartOffset+currentTokenStart); + currentTokenStart = i; + currentTokenType = Token.WHITESPACE; + break; + + case '"': + addToken(text, currentTokenStart,i-1, Token.IDENTIFIER, newStartOffset+currentTokenStart); + currentTokenStart = i; + currentTokenType = Token.ERROR_STRING_DOUBLE; + break; + + // The "separators". + case '|': + addToken(text, currentTokenStart,i-1, Token.IDENTIFIER, newStartOffset+currentTokenStart); + addToken(text, i,i, Token.SEPARATOR, newStartOffset+i); + currentTokenType = Token.NULL; + break; + + + default: + + // Just to speed things up a tad, as this will usually be the case. + if (RSyntaxUtilities.isLetterOrDigit(c) || c=='\\') { + break; + } + + // Otherwise, fall through and assume we're still okay as an IDENTIFIER... + + } // End of switch (c). + + break; + + case Token.COMMENT_EOL: + i = end - 1; + addToken(text, currentTokenStart,i, Token.COMMENT_EOL, newStartOffset+currentTokenStart); + // We need to set token type to null so at the bottom we don't add one more token. + currentTokenType = Token.NULL; + break; + + case Token.PREPROCESSOR: // Used for labels + i = end - 1; + addToken(text, currentTokenStart,i, Token.PREPROCESSOR, newStartOffset+currentTokenStart); + // We need to set token type to null so at the bottom we don't add one more token. + currentTokenType = Token.NULL; + break; + + case Token.ERROR_STRING_DOUBLE: + + if (c=='"') { + addToken(text, currentTokenStart,i, Token.LITERAL_STRING_DOUBLE_QUOTE, newStartOffset+currentTokenStart); + currentTokenStart = i + 1; + currentTokenType = Token.NULL; + } + // Otherwise, we're still an unclosed string... + + break; + + } // End of switch (currentTokenType). + + } // End of for (int i=offset; i<end; i++). + + // Deal with the (possibly there) last token. + if (currentTokenType != Token.NULL) { + + // Check for REM comments. + if (end-currentTokenStart==3 && + (array[end-3]=='r' || array[end-3]=='R') && + (array[end-2]=='e' || array[end-2]=='E') && + (array[end-1]=='m' || array[end-1]=='M')) { + currentTokenType = Token.COMMENT_EOL; + } + + addToken(text, currentTokenStart,end-1, currentTokenType, newStartOffset+currentTokenStart); + } + + addNullToken(); + + // Return the first token in our linked list. + return firstToken; + + } + + @Override + public TokenMap getWordsToHighlight() { + TokenMap tokenMap = new TokenMap(); + + tokenMap.put("FATAL", Token.RESERVED_WORD_2); + tokenMap.put("ERROR", Token.RESERVED_WORD_2); + tokenMap.put("INFO", Token.RESERVED_WORD); + tokenMap.put("DEBUG", Token.RESERVED_WORD); + tokenMap.put("TRACE", Token.RESERVED_WORD); + + return tokenMap; + } + + @Override + public void addToken(Segment segment, int start, int end, int tokenType, int startOffset) { + + switch (tokenType) { + // Since reserved words, functions, and data types are all passed + // into here as "identifiers," we have to see what the token + // really is... + case Token.IDENTIFIER: + int value = wordsToHighlight.get(segment, start,end); + if (value!=-1) + tokenType = value; + break; + } + + super.addToken(segment, start, end, tokenType, startOffset); + + } + +} Copied: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java (from rev 4226, trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisSyntaxEditor.java) =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java (rev 0) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java 2015-06-04 12:35:23 UTC (rev 4243) @@ -0,0 +1,316 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2015 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +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.Frame; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.ImageIcon; +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; +import javax.swing.UIManager; +import javax.swing.event.CaretEvent; +import javax.swing.event.CaretListener; +import javax.swing.text.BadLocationException; + +import org.fife.rsta.ui.CollapsibleSectionPanel; +import org.fife.rsta.ui.GoToDialog; +import org.fife.rsta.ui.search.FindDialog; +import org.fife.rsta.ui.search.ReplaceDialog; +import org.fife.rsta.ui.search.SearchEvent; +import org.fife.rsta.ui.search.SearchListener; +import org.fife.ui.rsyntaxtextarea.ErrorStrip; +import org.fife.ui.rsyntaxtextarea.RSyntaxDocument; +import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; +import org.fife.ui.rsyntaxtextarea.SyntaxScheme; +import org.fife.ui.rsyntaxtextarea.Token; +import org.fife.ui.rtextarea.RTextScrollPane; +import org.fife.ui.rtextarea.SearchContext; +import org.fife.ui.rtextarea.SearchEngine; +import org.fife.ui.rtextarea.SearchResult; + +/** + * {@link RSyntaxTextArea} component property configured for isis fish. + * + * An intermediate panel is used here to allow displaying user action panel to user. + * + * @author Eric Chatellier + */ +public class SyntaxEditorUI extends CollapsibleSectionPanel implements SearchListener, CaretListener { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1427883892685276516L; + + protected RTextScrollPane textScrollpane; + protected RSyntaxTextArea textArea; + + protected FindDialog findDialog; + protected ReplaceDialog replaceDialog; + + protected Action findAction; + protected Action replaceAction; + protected Action gotoAction; + protected Action cutAction; + protected Action pasteAction; + protected Action copyAction; + + public SyntaxEditorUI() { + super(true); + + textArea = new RSyntaxTextArea(); + textScrollpane = new RTextScrollPane(textArea); + add(textScrollpane); + + // for error/warning markers + ErrorStrip errorStrip = new ErrorStrip(textArea); + add(errorStrip, BorderLayout.LINE_END); + + // highlight marked occurence after small period of time + textArea.setMarkOccurrences(true); + + // display line number + textScrollpane.setLineNumbersEnabled(true); + + // tab is evil + textArea.setTabsEmulated(true); + textArea.setTabSize(4); + + initActions(); + } + + protected void initActions() { + Frame parent = null; + + findDialog = new FindDialog(parent, this); + replaceDialog = new ReplaceDialog(parent, this); + + findAction = new ShowFindDialogAction(); + replaceAction = new ShowReplaceDialogAction(); + gotoAction = new GoToLineAction(parent); + + // caret update will update setEnabled state + textArea.addCaretListener(this); + cutAction = new AbstractAction(t("isisfish.editor.cut"), new ImageIcon(getClass().getResource("/icons/cut.png"))) { + @Override + public void actionPerformed(ActionEvent e) { + textArea.cut(); + } + }; + cutAction.setEnabled(false); + pasteAction = new AbstractAction(t("isisfish.editor.paste"), new ImageIcon(getClass().getResource("/icons/page_paste.png"))) { + @Override + public void actionPerformed(ActionEvent e) { + textArea.paste(); + } + }; + copyAction = new AbstractAction(t("isisfish.editor.copy"), new ImageIcon(getClass().getResource("/icons/page_copy.png"))) { + @Override + public void actionPerformed(ActionEvent e) { + textArea.copy(); + } + }; + copyAction.setEnabled(false); + } + + + + /** + * Set highligth style. + * + * @param style new style + * @see IsisSyntaxConstants + */ + public void setStyle(String style) { + RSyntaxDocument doc = new RSyntaxDocument(new SyntaxTokenManagerFactory(), style); + textArea.setDocument(doc); + + // special theme for log + if (IsisSyntaxConstants.SYNTAX_STYLE_LOG.equals(style)) { + SyntaxScheme scheme = textArea.getSyntaxScheme(); + scheme.getStyle(Token.RESERVED_WORD_2).foreground = Color.RED; + } + } + + public void setText(String text) { + textArea.setText(text); + textArea.invalidate(); + } + + @Override + public void setEnabled(boolean enabled) { + // 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); + } + + private class GoToLineAction extends AbstractAction { + protected Frame parent; + public GoToLineAction(Frame parent) { + super(t("isisfish.script.gotoline")); + this.parent = parent; + int c = getToolkit().getMenuShortcutKeyMask(); + putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_L, c)); + } + + public void actionPerformed(ActionEvent e) { + if (findDialog.isVisible()) { + findDialog.setVisible(false); + } + if (replaceDialog.isVisible()) { + replaceDialog.setVisible(false); + } + GoToDialog dialog = new GoToDialog(this.parent); + dialog.setMaxLineNumberAllowed(textArea.getLineCount()); + dialog.setVisible(true); + int line = dialog.getLineNumber(); + if (line>0) { + try { + textArea.setCaretPosition(textArea.getLineStartOffset(line-1)); + } catch (BadLocationException ble) { // Never happens + UIManager.getLookAndFeel().provideErrorFeedback(textArea); + ble.printStackTrace(); + } + } + } + + } + + private class ShowFindDialogAction extends AbstractAction { + + public ShowFindDialogAction() { + super(t("isisfish.script.find")); + int c = getToolkit().getMenuShortcutKeyMask(); + putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_F, c)); + } + + public void actionPerformed(ActionEvent e) { + if (replaceDialog.isVisible()) { + replaceDialog.setVisible(false); + } + findDialog.setVisible(true); + } + + } + + private class ShowReplaceDialogAction extends AbstractAction { + + public ShowReplaceDialogAction() { + super(t("isisfish.script.replace")); + int c = getToolkit().getMenuShortcutKeyMask(); + putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_H, c)); + } + + public void actionPerformed(ActionEvent e) { + if (findDialog.isVisible()) { + findDialog.setVisible(false); + } + replaceDialog.setVisible(true); + } + + } + + public Action getFindAction() { + return findAction; + } + + public Action getReplaceAction() { + return replaceAction; + } + + public Action getGotoAction() { + return gotoAction; + } + + public Action getPasteAction() { + return pasteAction; + } + + public Action getCopyAction() { + return copyAction; + } + + public Action getCutAction() { + return cutAction; + } + + @Override + public String getSelectedText() { + return textArea.getSelectedText(); + } + + /** + * Listens for events from our search dialogs and actually does the dirty + * work. + */ + @Override + public void searchEvent(SearchEvent e) { + + SearchEvent.Type type = e.getType(); + SearchContext context = e.getSearchContext(); + SearchResult result = null; + + switch (type) { + default: // Prevent FindBugs warning later + case MARK_ALL: + result = SearchEngine.markAll(textArea, context); + break; + case FIND: + result = SearchEngine.find(textArea, context); + if (!result.wasFound()) { + UIManager.getLookAndFeel().provideErrorFeedback(textArea); + } + break; + case REPLACE: + result = SearchEngine.replace(textArea, context); + if (!result.wasFound()) { + UIManager.getLookAndFeel().provideErrorFeedback(textArea); + } + break; + case REPLACE_ALL: + result = SearchEngine.replaceAll(textArea, context); + JOptionPane.showMessageDialog(null, result.getCount() + + " occurrences replaced."); + break; + } + } + + /* + * @see javax.swing.event.CaretListener#caretUpdate(javax.swing.event.CaretEvent) + */ + @Override + public void caretUpdate(CaretEvent e) { + // selection pas vide si dot = mark + boolean selected = e.getDot() != e.getMark(); + cutAction.setEnabled(selected); + copyAction.setEnabled(selected); + } +} Copied: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxTokenManagerFactory.java (from rev 4226, trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/IsisTokenManagerFactory.java) =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxTokenManagerFactory.java (rev 0) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxTokenManagerFactory.java 2015-06-04 12:35:23 UTC (rev 4243) @@ -0,0 +1,82 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2015 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.ui.widget.text; + +import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory; + +/** + * Extends rsyntaxtextarea factory to add Isis fish specific style. + * + * @author Eric Chatellier + */ +public class SyntaxTokenManagerFactory extends AbstractTokenMakerFactory implements IsisSyntaxConstants { + + @Override + protected void initTokenMakerMap() { + // isis support for log + putMapping(SYNTAX_STYLE_LOG, LogTokenMarker.class.getName()); + + // default code + String pkg = "org.fife.ui.rsyntaxtextarea.modes."; + + putMapping(SYNTAX_STYLE_NONE, pkg + "PlainTextTokenMaker"); + putMapping(SYNTAX_STYLE_ACTIONSCRIPT, pkg + "ActionScriptTokenMaker"); + putMapping(SYNTAX_STYLE_ASSEMBLER_X86, pkg + "AssemblerX86TokenMaker"); + putMapping(SYNTAX_STYLE_BBCODE, pkg + "BBCodeTokenMaker"); + putMapping(SYNTAX_STYLE_C, pkg + "CTokenMaker"); + putMapping(SYNTAX_STYLE_CLOJURE, pkg + "ClojureTokenMaker"); + putMapping(SYNTAX_STYLE_CPLUSPLUS, pkg + "CPlusPlusTokenMaker"); + putMapping(SYNTAX_STYLE_CSHARP, pkg + "CSharpTokenMaker"); + putMapping(SYNTAX_STYLE_CSS, pkg + "CSSTokenMaker"); + putMapping(SYNTAX_STYLE_DELPHI, pkg + "DelphiTokenMaker"); + putMapping(SYNTAX_STYLE_DTD, pkg + "DtdTokenMaker"); + putMapping(SYNTAX_STYLE_FORTRAN, pkg + "FortranTokenMaker"); + putMapping(SYNTAX_STYLE_GROOVY, pkg + "GroovyTokenMaker"); + putMapping(SYNTAX_STYLE_HTACCESS, pkg + "HtaccessTokenMaker"); + putMapping(SYNTAX_STYLE_HTML, pkg + "HTMLTokenMaker"); + putMapping(SYNTAX_STYLE_JAVA, pkg + "JavaTokenMaker"); + putMapping(SYNTAX_STYLE_JAVASCRIPT, pkg + "JavaScriptTokenMaker"); + putMapping(SYNTAX_STYLE_JSON, pkg + "JsonTokenMaker"); + putMapping(SYNTAX_STYLE_JSP, pkg + "JSPTokenMaker"); + putMapping(SYNTAX_STYLE_LATEX, pkg + "LatexTokenMaker"); + putMapping(SYNTAX_STYLE_LISP, pkg + "LispTokenMaker"); + putMapping(SYNTAX_STYLE_LUA, pkg + "LuaTokenMaker"); + putMapping(SYNTAX_STYLE_MAKEFILE, pkg + "MakefileTokenMaker"); + putMapping(SYNTAX_STYLE_MXML, pkg + "MxmlTokenMaker"); + putMapping(SYNTAX_STYLE_NSIS, pkg + "NSISTokenMaker"); + putMapping(SYNTAX_STYLE_PERL, pkg + "PerlTokenMaker"); + putMapping(SYNTAX_STYLE_PHP, pkg + "PHPTokenMaker"); + putMapping(SYNTAX_STYLE_PROPERTIES_FILE,pkg + "PropertiesFileTokenMaker"); + putMapping(SYNTAX_STYLE_PYTHON, pkg + "PythonTokenMaker"); + putMapping(SYNTAX_STYLE_RUBY, pkg + "RubyTokenMaker"); + putMapping(SYNTAX_STYLE_SAS, pkg + "SASTokenMaker"); + putMapping(SYNTAX_STYLE_SCALA, pkg + "ScalaTokenMaker"); + putMapping(SYNTAX_STYLE_SQL, pkg + "SQLTokenMaker"); + putMapping(SYNTAX_STYLE_TCL, pkg + "TclTokenMaker"); + putMapping(SYNTAX_STYLE_UNIX_SHELL, pkg + "UnixShellTokenMaker"); + putMapping(SYNTAX_STYLE_VISUAL_BASIC, pkg + "VisualBasicTokenMaker"); + putMapping(SYNTAX_STYLE_WINDOWS_BATCH, pkg + "WindowsBatchTokenMaker"); + putMapping(SYNTAX_STYLE_XML, pkg + "XMLTokenMaker"); + } + +} Modified: branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-04 12:35:23 UTC (rev 4243) @@ -250,7 +250,16 @@ isisfish.config.vcs.userName.description=Official VCS user name isisfish.config.vcs.userPassword.description=Official VCS password isisfish.date.toString=%1$s %2$s +isisfish.editor.cancel=Cancel +isisfish.editor.copy=Copy +isisfish.editor.cut=Cut isisfish.editor.parametersnameandtypes=Parameters (name and type) +isisfish.editor.paste=Paste +isisfish.editor.reload=Reload +isisfish.editor.reloadExternal=File has been modified by external application +isisfish.editor.save=Save +isisfish.editor.saveorcancel.message=File '%s' has been modified, do you want to save file ? +isisfish.editor.saveorcancel.title=Save file isisfish.effortDescription.crewFoodCost=Crew food cost isisfish.effortDescription.crewShareRate=Crew share rate isisfish.effortDescription.crewSize=Crew size @@ -794,7 +803,7 @@ isisfish.script.export.tooltip.checkAll=(Un)Check all scripts to export isisfish.script.export.tooltip.chooseDir=Choose directory to export script to isisfish.script.find=Find... -isisfish.script.gotoline=Got to line... +isisfish.script.gotoline=Go to line... isisfish.script.import=Import scripts from archive isisfish.script.import.cancel=Cancel isisfish.script.import.checkAll=(Un)Check all script to import Modified: branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-04 12:33:54 UTC (rev 4242) +++ branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-04 12:35:23 UTC (rev 4243) @@ -250,7 +250,16 @@ isisfish.config.vcs.userName.description=le login de l'utilisateur sur le serveur vcs isisfish.config.vcs.userPassword.description=le mot de passe de l'utilsateur sur le serveur vcs isisfish.date.toString=%1$s %2$s +isisfish.editor.cancel=Annuler +isisfish.editor.copy=Copier +isisfish.editor.cut=Couper isisfish.editor.parametersnameandtypes=Paramètres (nom et type) +isisfish.editor.paste=Coller +isisfish.editor.reload=Recharger +isisfish.editor.reloadExternal=Le fichier a été modifié par une autre application +isisfish.editor.save=Sauvegarder +isisfish.editor.saveorcancel.message=Le fichier '%s' a été modifié, voulez-vous le sauvegarder ? +isisfish.editor.saveorcancel.title=Sauvegarder le fichier isisfish.effortDescription.crewFoodCost=Coût de l'alimentation pour l'équipage isisfish.effortDescription.crewShareRate=Taux de partage de l'équipage isisfish.effortDescription.crewSize=Taille de l'équipage

1 0

r4242 - trunk
by echatellier＠users.forge.codelutin.com June 4, 2015

June 4, 2015

Author: echatellier Date: 2015-06-04 12:33:54 +0000 (Thu, 04 Jun 2015) New Revision: 4242 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4242 Log: clear merge info Modified: trunk/ Property changes on: trunk ___________________________________________________________________ Deleted: svn:mergeinfo - /branches/4.0.0-svnkit:3665-3698 /branches/4.0.1:3616-3968 /branches/4.1:3601-3670 /branches/4.3.0-log4j2:4048-4129 /branches/isis-fish-4.3.1.x:4144-4183

1 0

r4241 - branches
by echatellier＠users.forge.codelutin.com June 4, 2015

June 4, 2015

Author: echatellier Date: 2015-06-04 12:31:43 +0000 (Thu, 04 Jun 2015) New Revision: 4241 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4241 Log: Reove all branches Removed: branches/4.3.0-log4j2/ branches/isis-fish-4.3.1.x/

1 0

r4240 - trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by echatellier＠users.forge.codelutin.com May 29, 2015

May 29, 2015

Author: echatellier Date: 2015-05-29 14:34:11 +0000 (Fri, 29 May 2015) New Revision: 4240 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4240 Log: refs #7172: Pouvoir r?\195?\169ordonner les regles Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2015-05-29 14:13:59 UTC (rev 4239) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2015-05-29 14:34:11 UTC (rev 4240) @@ -70,7 +70,6 @@ <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}" - dragEnabled="true" dropMode="{DropMode.INSERT}" genericType="fr.ifremer.isisfish.rule.Rule" model='{selectedRulesListModel}' cellRenderer='{new fr.ifremer.isisfish.ui.models.rule.RuleListCellRenderer()}' onValueChanged='removeRuleButton.setEnabled(selectedRulesList.getSelectedIndex() != -1);clearRulesButton.setEnabled(selectedRulesList.getSelectedIndex() != -1);handler.displayRuleParameters()' /> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2015-05-29 14:13:59 UTC (rev 4239) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2015-05-29 14:34:11 UTC (rev 4240) @@ -30,14 +30,12 @@ import java.awt.dnd.DragGestureEvent; import java.awt.dnd.DragGestureListener; import java.awt.dnd.DragSource; -import java.awt.dnd.DragSourceAdapter; -import java.awt.dnd.DragSourceDropEvent; -import java.awt.dnd.DragSourceListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; +import javax.swing.DropMode; import javax.swing.JList; import javax.swing.TransferHandler; @@ -98,6 +96,10 @@ */ protected void setupSelectedListDnD() { final JList<Rule> selectedRuleList = ruleChooser.getSelectedRulesList(); + + // params + selectedRuleList.setDragEnabled(true); + selectedRuleList.setDropMode(DropMode.INSERT); // transfert handler selectedRuleList.setTransferHandler(new TransferHandler() { @@ -133,6 +135,8 @@ Rule rule = rules.remove(index); rules.add(dropTargetIndex, rule); + selectedRuleList.setSelectedIndex(dropTargetIndex); + result = true; } catch (Exception e) { result = false; @@ -143,24 +147,14 @@ } }); - // drag source listener - final DragSourceListener dsl = new DragSourceAdapter() { - @Override - public void dragDropEnd(DragSourceDropEvent dsde) { - // update ui if move were successful - if (dsde.getDropSuccess()) { - ruleChooser.selectedRulesListModel.setElementList(ruleChooser.getRulesList()); - } - } - }; - // drag gesture final DragSource ds = new DragSource(); ds.createDefaultDragGestureRecognizer(selectedRuleList, DnDConstants.ACTION_MOVE, new DragGestureListener() { @Override public void dragGestureRecognized(DragGestureEvent dge) { StringSelection transferable = new StringSelection(Integer.toString(selectedRuleList.getSelectedIndex())); - ds.startDrag(dge, DragSource.DefaultCopyDrop, transferable, dsl); + // use null because gragsource listener is not used here (could be) + ds.startDrag(dge, DragSource.DefaultCopyDrop, transferable, null); } }); }

1 0

r4239 - trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by echatellier＠users.forge.codelutin.com May 29, 2015

May 29, 2015

Author: echatellier Date: 2015-05-29 14:13:59 +0000 (Fri, 29 May 2015) New Revision: 4239 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4239 Log: fixes #7172: Pouvoir r?\195?\169ordonner les regles Using drag and drop Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2015-05-27 13:01:38 UTC (rev 4238) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2015-05-29 14:13:59 UTC (rev 4239) @@ -28,7 +28,7 @@ <RuleChooserHandler id="handler" constructorParams="this" />  - <java.util.List genericType='fr.ifremer.isisfish.rule.Rule' id="rulesList" javaBean='new java.util.ArrayList<fr.ifremer.isisfish.rule.Rule>()'/> + <java.util.List genericType='fr.ifremer.isisfish.rule.Rule' id="rulesList" javaBean='new java.util.ArrayList<>()'/>  <Boolean id="active" javaBean="true"/> @@ -70,6 +70,7 @@ <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}" + dragEnabled="true" dropMode="{DropMode.INSERT}" genericType="fr.ifremer.isisfish.rule.Rule" model='{selectedRulesListModel}' cellRenderer='{new fr.ifremer.isisfish.ui.models.rule.RuleListCellRenderer()}' onValueChanged='removeRuleButton.setEnabled(selectedRulesList.getSelectedIndex() != -1);clearRulesButton.setEnabled(selectedRulesList.getSelectedIndex() != -1);handler.displayRuleParameters()' /> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2015-05-27 13:01:38 UTC (rev 4238) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2015-05-29 14:13:59 UTC (rev 4239) @@ -23,11 +23,24 @@ package fr.ifremer.isisfish.ui.simulator; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.StringSelection; +import java.awt.datatransfer.Transferable; +import java.awt.dnd.DnDConstants; +import java.awt.dnd.DragGestureEvent; +import java.awt.dnd.DragGestureListener; +import java.awt.dnd.DragSource; +import java.awt.dnd.DragSourceAdapter; +import java.awt.dnd.DragSourceDropEvent; +import java.awt.dnd.DragSourceListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; +import javax.swing.JList; +import javax.swing.TransferHandler; + import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; @@ -76,9 +89,83 @@ if (ruleChooser.isShowFactorColumn()) { SwingUtil.fixTableColumnWidth(ruleChooser.selectedRuleParameterTable, 2, 30); } + + setupSelectedListDnD(); } /** + * Setup drag and drop support on selected list. + */ + protected void setupSelectedListDnD() { + final JList<Rule> selectedRuleList = ruleChooser.getSelectedRulesList(); + + // transfert handler + selectedRuleList.setTransferHandler(new TransferHandler() { + private static final long serialVersionUID = 7821083182552085625L; + @Override + public boolean canImport(TransferHandler.TransferSupport support) { + boolean result = false; + + if (support.isDataFlavorSupported(DataFlavor.stringFlavor)) { + JList.DropLocation dl = (JList.DropLocation) support.getDropLocation(); + if (dl.getIndex() != -1) { + return true; + } + } + + return result; + } + @Override + public boolean importData(TransferHandler.TransferSupport support) { + boolean result = false; + + if (canImport(support)) { + Transferable transferable = support.getTransferable(); + try { + String indexString = (String) transferable.getTransferData(DataFlavor.stringFlavor); + + int index = Integer.parseInt(indexString); + JList.DropLocation dl = (JList.DropLocation) support.getDropLocation(); + int dropTargetIndex = dl.getIndex(); + + // perform real move + List<Rule> rules = ruleChooser.getRulesList(); + Rule rule = rules.remove(index); + rules.add(dropTargetIndex, rule); + + result = true; + } catch (Exception e) { + result = false; + } + } + + return result; + } + }); + + // drag source listener + final DragSourceListener dsl = new DragSourceAdapter() { + @Override + public void dragDropEnd(DragSourceDropEvent dsde) { + // update ui if move were successful + if (dsde.getDropSuccess()) { + ruleChooser.selectedRulesListModel.setElementList(ruleChooser.getRulesList()); + } + } + }; + + // drag gesture + final DragSource ds = new DragSource(); + ds.createDefaultDragGestureRecognizer(selectedRuleList, DnDConstants.ACTION_MOVE, new DragGestureListener() { + @Override + public void dragGestureRecognized(DragGestureEvent dge) { + StringSelection transferable = new StringSelection(Integer.toString(selectedRuleList.getSelectedIndex())); + ds.startDrag(dge, DragSource.DefaultCopyDrop, transferable, dsl); + } + }); + } + + /** * Get new instance for selected rules names and add it to {@code rulesList} list. */ protected void addSelectedRules() {

1 0

r4238 - trunk/src/main/java/fr/ifremer/isisfish/util/ssh
by echatellier＠users.forge.codelutin.com May 27, 2015

May 27, 2015

Author: echatellier Date: 2015-05-27 13:01:38 +0000 (Wed, 27 May 2015) New Revision: 4238 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4238 Log: char array can't be cleared (otherwize totally removed) Modified: trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java Modified: trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2015-05-27 13:00:56 UTC (rev 4237) +++ trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2015-05-27 13:01:38 UTC (rev 4238) @@ -185,7 +185,7 @@ ByteBuffer byteBuffer = StandardCharsets.UTF_8.encode(charBuffer); byte[] bytes = Arrays.copyOfRange(byteBuffer.array(), byteBuffer.position(), byteBuffer.limit()); - Arrays.fill(charBuffer.array(), '\u0000'); // clear sensitive data + //Arrays.fill(charBuffer.array(), '\u0000'); // clear sensitive data Arrays.fill(byteBuffer.array(), (byte) 0); // clear sensitive data return bytes; }

1 0

r4237 - in trunk/src/main/java/fr/ifremer/isisfish/ui: input input/cell input/equation input/fisheryregion input/gear input/metier input/observation input/population input/port input/setofvessels input/species input/strategy input/triptype input/variable input/vesseltype input/zone queue
by echatellier＠users.forge.codelutin.com May 27, 2015

May 27, 2015

Author: echatellier Date: 2015-05-27 13:00:56 +0000 (Wed, 27 May 2015) New Revision: 4237 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4237 Log: Move script code to dedicated handler (all) Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -45,7 +45,7 @@ protected T inputContentUI; - protected void init(final T inputContentUI) { + protected InputContentHandler(T inputContentUI) { this.inputContentUI = inputContentUI; } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -84,10 +84,7 @@ */ public abstract B getBean(); -public <U extends InputContentHandler<? extends InputContentUI<B>>> U getHandler() { - // FIXME remove this and set it abstract - return (U)new InputContentHandler<InputContentUI<B>>(); -} +public abstract <U extends InputContentHandler<? extends InputContentUI<B>>> U getHandler(); /** * Pas très safe, le bean doit s'appeler changeModel dans l'heritage "FORCEMENT" Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -92,13 +92,17 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(InputHandler.class); + protected InputUI inputUI; + + public InputHandler(InputUI inputUI) { + this.inputUI = inputUI; + } + /** * Post init ui. - * - * @param ui ui */ - public void init(InputUI ui) { - PromptSupport.setPrompt(t("isisfish.input.newRegion"), ui.getFieldNewRegion()); + public void afterInit() { + PromptSupport.setPrompt(t("isisfish.input.newRegion"), inputUI.getFieldNewRegion()); } /** @@ -106,10 +110,9 @@ * * Before loading region, try to close old one. * - * @param inputUI input ui * @param name region name to load */ - protected void loadRegion(InputUI inputUI, String name) { + protected void loadRegion(String name) { if (log.isDebugEnabled()) { log.debug("Load region " + name); } @@ -165,10 +168,8 @@ /** * Reload current loaded fishery tree. - * - * @param inputUI inputUI */ - public void reloadFisheryTree(InputUI inputUI) { + public void reloadFisheryTree() { FisheryTreeHelper fisheryTreeHelper = inputUI.getContextValue(FisheryTreeHelper.class); TreeModel fisheryTreeModel = inputUI.getContextValue(TreeModel.class); fisheryTreeHelper.refreshNode((FisheryTreeNode)fisheryTreeModel.getRoot(), true); @@ -177,10 +178,9 @@ /** * Main ui fishery region selection changed. * - * @param inputUI inputUI * @param e event */ - public void regionChange(final InputUI inputUI, ItemEvent e) { + public void regionChange(ItemEvent e) { // event launched twice with itemchange listener if (e.getStateChange() == ItemEvent.SELECTED) { final String name = (String)inputUI.getFieldCurrentRegion().getSelectedItem(); @@ -194,7 +194,7 @@ SwingUtilities.invokeLater(new Runnable() { public void run() { - loadRegion(inputUI, name); + loadRegion(name); setStatusMessage(inputUI, t("isisfish.message.load.finished")); inputUI.setCursor(Cursor.getDefaultCursor()); } @@ -204,24 +204,21 @@ /** * Create new region (called if region name is not empty). - * - * @param inputUI inputUI */ - public void createNewRegion(InputUI inputUI) { + public void createNewRegion() { String name = inputUI.getFieldNewRegion().getText(); setStatusMessage(inputUI, t("isisfish.message.creating.region", name), true); if (RegionStorage.getRegionNames().contains(name)) { JOptionPane.showMessageDialog(inputUI, t("isisfish.error.region.already.exists")); - } - else { + } else { try { RegionStorage.create(name); } catch (StorageException ex) { throw new IsisFishRuntimeException("Can't create region", ex); } inputUI.getFieldNewRegion().setText(""); - refreshRegionList(inputUI, name); + refreshRegionList(name); } setStatusMessage(inputUI, t("isisfish.message.creation.finished")); @@ -230,28 +227,24 @@ /** * Rafraichit la liste des regions. * - * @param inputUI inputUI * @param selectedItem region to select */ - protected void refreshRegionList(InputUI inputUI, String selectedItem) { + protected void refreshRegionList(String selectedItem) { // refresh region list GenericComboModel<String> regionsModel = new GenericComboModel<>(RegionStorage.getRegionNames()); inputUI.getFieldCurrentRegion().setModel(regionsModel); // event is fired by setSelectedItem to call #regionChange if (selectedItem != null) { inputUI.getFieldCurrentRegion().setSelectedItem(selectedItem); + } else { + loadRegion(null); } - else { - loadRegion(inputUI, null); - } } /** * Exporter la region dans un zip. - * - * @param inputUI inputUI */ - public void importRegion(InputUI inputUI) { + public void importRegion() { setStatusMessage(inputUI, t("isisfish.message.import.zip"), true); try { @@ -260,7 +253,7 @@ if (file != null) { RegionStorage.importZip(file); - refreshRegionList(inputUI, null); + refreshRegionList(null); } } catch (Exception eee) { @@ -272,10 +265,8 @@ /** * Exporter la region dans un zip. - * - * @param inputUI inputUI */ - public void importRegionAndRename(InputUI inputUI) { + public void importRegionAndRename() { setStatusMessage(inputUI, t("isisfish.message.import.zip"), true); try { @@ -287,7 +278,7 @@ .showInputDialog(t("isisfish.message.name.imported.region")); RegionStorage.importAndRenameZip(file, newName); - refreshRegionList(inputUI, null); + refreshRegionList(null); } } catch (Exception eee) { throw new IsisFishRuntimeException(t("isisfish.error.region.import"), eee); @@ -302,7 +293,7 @@ * * @param inputUI inputUI */ - public void importRegionFromSimulation(InputUI inputUI) { + public void importRegionFromSimulation() { /*setStatusMessage(inputUI, t("isisfish.message.import"), true); @@ -342,10 +333,8 @@ * Exporter la region dans un zip * * Call only if region is loaded. - * - * @param inputUI inputUI */ - public void exportRegion(InputUI inputUI) { + public void exportRegion() { try { File file = FileUtil.getFile(".*.zip$", t("isisfish.message.import.region.zipped")); @@ -374,17 +363,16 @@ /** * Remove region. * - * @param inputUI input ui * @param vcsDelete if true delete region in CVS too */ - public void removeRegion(InputUI inputUI, boolean vcsDelete) { + public void removeRegion(boolean vcsDelete) { try { RegionStorage regionStorage = inputUI.getContextValue(RegionStorage.class); int resp = JOptionPane.showConfirmDialog(inputUI, t("isisfish.message.confirm.remove.region", regionStorage.getName())); if (resp == JOptionPane.YES_OPTION) { regionStorage.delete(vcsDelete); - refreshRegionList(inputUI, null); + refreshRegionList(null); } } catch (StorageException eee) { throw new IsisFishRuntimeException("Can't delete region", eee); @@ -393,10 +381,8 @@ /** * Copy la region avec un autre nom. - * - * @param inputUI input ui */ - public void copyRegion(InputUI inputUI) { + public void copyRegion() { try { String newName = JOptionPane .showInputDialog(t("isisfish.message.new.region.name")); @@ -416,10 +402,8 @@ /** * Commit region. - * - * @param inputUI input ui */ - public void commitRegionInCVS(InputUI inputUI) { + public void commitRegionInCVS() { try { RegionStorage regionStorage = inputUI.getContextValue(RegionStorage.class); setStatusMessage(inputUI, t("isisfish.message.commiting.region", regionStorage.getName()), true); @@ -447,10 +431,8 @@ /** * Explore region and export any enabled sensitivity factor name with value. - * - * @param inputUI input ui */ - public void exportRegionSensitivityFactors(InputUI inputUI) { + public void exportRegionSensitivityFactors() { try { File exportFile = FileUtil.getFile(t("isisfish.input.sensitivity.export.title"), @@ -480,10 +462,9 @@ /** * Changement de selection dans l'arbre de la pecherie. * - * @param inputUI * @param event */ - public void nodeSelectionChanged(InputUI inputUI, TreeSelectionEvent event) { + public void nodeSelectionChanged(TreeSelectionEvent event) { TreePath newTreePath = event.getNewLeadSelectionPath(); if (newTreePath != null) { @@ -531,10 +512,9 @@ /** * Delete tree node referenced by parent, and auto select parent node. * - * @param inputUI ui containing tree * @param topiaId node id to delete */ - public void deleteTreeNode(InputUI inputUI, String topiaId) { + public void deleteTreeNode(String topiaId) { FisheryTreeHelper fisheryTreeHelper = inputUI.getContextValue(FisheryTreeHelper.class); TreeModel fisheryTreeModel = inputUI.getContextValue(TreeModel.class); FisheryTreeNode newSelectNode = fisheryTreeHelper.findNode((FisheryTreeNode)fisheryTreeModel.getRoot(), topiaId); @@ -546,11 +526,10 @@ /** * Insert new tree node and select it. * - * @param inputUI ui containing tree * @param nodeClass node type to create * @param topiaEntity node to insert */ - public void insertTreeNode(InputUI inputUI, Class nodeClass, TopiaEntityContextable topiaEntity) { + public void insertTreeNode(Class nodeClass, TopiaEntityContextable topiaEntity) { FisheryTreeHelper fisheryTreeHelper = inputUI.getContextValue(FisheryTreeHelper.class); // on part du principe que pour ne pas compliquer les ui est les lier @@ -588,10 +567,9 @@ /** * Update tree node for topiaId. * - * @param inputUI ui containing tree * @param topiaId node id to update */ - public void updateTreeNode(InputUI inputUI, String topiaId) { + public void updateTreeNode(String topiaId) { FisheryTreeHelper fisheryTreeHelper = inputUI.getContextValue(FisheryTreeHelper.class); TreeModel fisheryTreeModel = inputUI.getContextValue(TreeModel.class); FisheryTreeNode newSelectNode = fisheryTreeHelper.findNode((FisheryTreeNode)fisheryTreeModel.getRoot(), topiaId); @@ -602,10 +580,9 @@ * Dans le cas d'une creation de population, on doit la creer dans * une espèce. On doit rechercher celle qui est sélectionnée dans l'arbre. * - * @param inputUI input ui * @return selected species */ - public Species findSpecies(InputUI inputUI) { + public Species findSpecies() { // get selected node FisheryTreeHelper treeHelper = inputUI.getContextValue(FisheryTreeHelper.class); FisheryTreeNode selectedNode = treeHelper.getSelectedNode(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -181,7 +181,7 @@ noModif(); InputUI inputUI = inputContentUI.getParentContainer(InputUI.class); - inputUI.getHandler().deleteTreeNode(inputUI, topiaEntity.getTopiaId()); + inputUI.getHandler().deleteTreeNode(topiaEntity.getTopiaId()); } } catch (TopiaException eee) { throw new IsisFishRuntimeException("Can't remove entity: " + currentEntities.get(0), eee); @@ -233,7 +233,7 @@ topiaContext.commitTransaction(); InputUI inputUI = inputContentUI.getContextValue(InputUI.class, JAXXUtil.PARENT); - inputUI.getHandler().insertTreeNode(inputUI, type, topiaEntity); + inputUI.getHandler().insertTreeNode(type, topiaEntity); //rootUI.setStatusMessage(t("isisfish.message.creation.finished")); } catch (Exception eee) { @@ -261,7 +261,7 @@ topiaContext.commitTransaction(); InputUI inputUI = inputContentUI.getParentContainer(InputUI.class); - inputUI.getHandler().updateTreeNode(inputUI, topiaEntity.getTopiaId()); + inputUI.getHandler().updateTreeNode(topiaEntity.getTopiaId()); // FIXME echatellier 20111201 small fix because save // button has to reset internal ui change model state @@ -306,7 +306,7 @@ } InputUI inputUI = inputContentUI.getParentContainer(InputUI.class); - inputUI.getHandler().updateTreeNode(inputUI, topiaEntity.getTopiaId()); + inputUI.getHandler().updateTreeNode(topiaEntity.getTopiaId()); // FIXME echatellier 20111201 small fix because save // button has to reset internal ui change model state Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -24,40 +24,40 @@ --> <fr.ifremer.isisfish.ui.NavigationUI> - <InputHandler id="handler" /> + <InputHandler id="handler" constructorParams="this" /> <Boolean id="regionLoaded" javaBean="false" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> <JMenuBar id="menu" constraints='BorderLayout.NORTH'> <JMenu text="isisfish.common.region" id="menuRegion"> - <JMenuItem id="menuRegionImport" text="isisfish.input.menu.importRegion" onActionPerformed="handler.importRegion(this)" /> - <JMenuItem id="menuRegionImportRename" text="isisfish.input.menu.importRenameRegion" onActionPerformed="handler.importRegionAndRename(this)" /> - <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="handler.importRegionFromSimulation(this)" enabled="false"/> - <JMenuItem id="menuRegionExport" text="isisfish.input.menu.exportRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.exportRegion(this)" /> - <JMenuItem id="menuRegionCopy" text="isisfish.input.menu.copyRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.copyRegion(this)" /> + <JMenuItem id="menuRegionImport" text="isisfish.input.menu.importRegion" onActionPerformed="handler.importRegion()" /> + <JMenuItem id="menuRegionImportRename" text="isisfish.input.menu.importRenameRegion" onActionPerformed="handler.importRegionAndRename()" /> + <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="handler.importRegionFromSimulation()" enabled="false"/> + <JMenuItem id="menuRegionExport" text="isisfish.input.menu.exportRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.exportRegion()" /> + <JMenuItem id="menuRegionCopy" text="isisfish.input.menu.copyRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.copyRegion()" /> <JSeparator/> - <JMenuItem text="isisfish.input.menu.removeLocaly" enabled='{isRegionLoaded()}' onActionPerformed="handler.removeRegion(this, false)" /> + <JMenuItem text="isisfish.input.menu.removeLocaly" enabled='{isRegionLoaded()}' onActionPerformed="handler.removeRegion(false)" /> </JMenu> <JMenu text="isisfish.input.menu.server"> - <JMenuItem text="isisfish.input.menu.addRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.commitRegionInCVS(this)" /> - <JMenuItem text="isisfish.input.menu.commit" enabled='{isRegionLoaded()}' onActionPerformed="handler.commitRegionInCVS(this)" /> + <JMenuItem text="isisfish.input.menu.addRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.commitRegionInCVS()" /> + <JMenuItem text="isisfish.input.menu.commit" enabled='{isRegionLoaded()}' onActionPerformed="handler.commitRegionInCVS()" /> <JSeparator/> - <JMenuItem text="isisfish.input.menu.removeLocalyRemotely" enabled='{isRegionLoaded()}' onActionPerformed="handler.removeRegion(this, true)" /> + <JMenuItem text="isisfish.input.menu.removeLocalyRemotely" enabled='{isRegionLoaded()}' onActionPerformed="handler.removeRegion(true)" /> </JMenu> <JMenu text="isisfish.input.menu.sensitivity"> - <JMenuItem text="isisfish.input.menu.sensitivity.export" enabled='{isRegionLoaded()}' onActionPerformed="handler.exportRegionSensitivityFactors(this)" /> + <JMenuItem text="isisfish.input.menu.sensitivity.export" enabled='{isRegionLoaded()}' onActionPerformed="handler.exportRegionSensitivityFactors()" /> </JMenu> </JMenuBar> <JSplitPane oneTouchExpandable="true" dividerLocation="200" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> <JPanel layout='{new BorderLayout()}' minimumSize="{new java.awt.Dimension(0,0)}"> <org.jdesktop.swingx.JXComboBox id="fieldCurrentRegion" constraints='BorderLayout.NORTH' - onItemStateChanged='handler.regionChange(this, event)' + onItemStateChanged='handler.regionChange(event)' model='{new fr.ifremer.isisfish.ui.models.common.GenericComboModel<String>(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames())}'/> <JPanel id="treePanel" name="treePanel" layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JScrollPane constraints='BorderLayout.CENTER'> @@ -65,7 +65,7 @@ selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> <JTree id="fisheryRegionTree" selectionModel='{fisheryRegionTreeSelectionModel}' rootVisible="true" selectionRow='0' model='{new javax.swing.tree.DefaultTreeModel(null)}' rowHeight="0" - onValueChanged="handler.nodeSelectionChanged(this, event)" /> + onValueChanged="handler.nodeSelectionChanged(event)" /> </JScrollPane> </JPanel> <Table constraints='BorderLayout.SOUTH'> @@ -75,7 +75,7 @@ </cell> <cell fill='horizontal'> <JButton id="buttonNewRegion" text="isisfish.input.createNewRegion" - onActionPerformed='handler.createNewRegion(this)' enabled='{getFieldNewRegion().getText().length() > 0}'/> + onActionPerformed='handler.createNewRegion()' enabled='{getFieldNewRegion().getText().length() > 0}'/> </cell> </row> </Table> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -48,24 +48,27 @@ protected boolean init; - protected void init(final CellUI cellUI) { - super.init(cellUI); + protected CellHandler(CellUI inputContentUI) { + super(inputContentUI); + } - cellUI.setButtonTitle(t("isisfish.input.continueZones")); - cellUI.setNextPath(n("isisfish.input.tree.zones")); + protected void afterInit() { + inputContentUI.setButtonTitle(t("isisfish.input.continueZones")); + inputContentUI.setNextPath(n("isisfish.input.tree.zones")); + //cellMap.init(cellMapInfo); - new OpenMapEvents(cellUI.getCellMap(), new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { + new OpenMapEvents(inputContentUI.getCellMap(), new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { boolean result = false; // TODO a fixer, le clic droit du menu contextuel // passe aussi par ici et change la selection //if (e.getButton() == MouseEvent.BUTTON1) { - if (cellUI.getBean() != null) { // impossible de desactiver la carte :( - for (Cell c : cellUI.getCellMap().getSelectedCells()) { - if (!c.getTopiaId().equals(cellUI.getBean().getTopiaId())) { - cellUI.getFieldCell().setSelectedItem(c); + if (inputContentUI.getBean() != null) { // impossible de desactiver la carte :( + for (Cell c : inputContentUI.getCellMap().getSelectedCells()) { + if (!c.getTopiaId().equals(inputContentUI.getBean().getTopiaId())) { + inputContentUI.getFieldCell().setSelectedItem(c); result = true; } } @@ -75,23 +78,23 @@ } }; - cellUI.addPropertyChangeListener(CellUI.PROPERTY_BEAN, new PropertyChangeListener() { + inputContentUI.addPropertyChangeListener(CellUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { init = true; GenericComboModel<Cell> cellModel = new GenericComboModel<>(); if (evt.getNewValue() == null) { - cellUI.fieldCellName.setText(""); - cellUI.fieldCellLatitude.setText(""); - cellUI.fieldCellLongitude.setText(""); - cellUI.fieldCellComment.setText(""); - cellUI.fieldCellLand.setSelected(false); + inputContentUI.fieldCellName.setText(""); + inputContentUI.fieldCellLatitude.setText(""); + inputContentUI.fieldCellLongitude.setText(""); + inputContentUI.fieldCellComment.setText(""); + inputContentUI.fieldCellLand.setSelected(false); } if (evt.getNewValue() != null) { //jaxx.runtime.SwingUtil.fillComboBox(cellUI.fieldCell, cellUI.getFisheryRegion().getCell(), cellUI.getBean()); - cellModel.setElementList(cellUI.getFisheryRegion().getCell()); - cellModel.setSelectedItem(cellUI.getBean()); + cellModel.setElementList(inputContentUI.getFisheryRegion().getCell()); + cellModel.setSelectedItem(inputContentUI.getBean()); } - cellUI.fieldCell.setModel(cellModel); + inputContentUI.fieldCell.setModel(cellModel); init = false; } }); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Cell id='bean' javaBean='null'/> - <CellHandler id="handler" /> + <CellHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Cell' @@ -37,7 +37,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -51,9 +51,11 @@ protected Class javaInterface = null; - protected void init(final EquationEditorPaneUI equationUI) { + public EquationEditorPaneHandler(EquationEditorPaneUI equationUI) { this.equationUI = equationUI; + } + protected void afterInit() { equationUI.split.setDividerLocation(0.8); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -28,11 +28,11 @@ <Boolean id="resultOk" javaBean="false" /> - <EquationEditorPaneHandler id="handler" /> + <EquationEditorPaneHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -61,9 +61,12 @@ protected DocumentListener listener = null; - protected void init(final InputOneEquationUI inputContentUI) { - super.init(inputContentUI); + protected InputOneEquationHandler(InputOneEquationUI inputContentUI) { + super(inputContentUI); + // TODO Auto-generated constructor stub + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(InputOneEquationUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -42,11 +42,11 @@ <Boolean id="autoSaveModification" javaBean="true" /> - <InputOneEquationHandler id="handler" /> + <InputOneEquationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -63,21 +63,23 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(FisheryRegionHandler.class); - protected void init(final FisheryRegionUI fisheryRegionUI) { - super.init(fisheryRegionUI); + protected FisheryRegionHandler(FisheryRegionUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { //cellMap.init(cellMapInfo); - fisheryRegionUI.setButtonTitle(t("isisfish.input.continueCells")); - fisheryRegionUI.setNextPath(n("isisfish.input.tree.cells")); + inputContentUI.setButtonTitle(t("isisfish.input.continueCells")); + inputContentUI.setNextPath(n("isisfish.input.tree.cells")); - fisheryRegionUI.addPropertyChangeListener(FisheryRegionUI.PROPERTY_BEAN, new PropertyChangeListener() { + inputContentUI.addPropertyChangeListener(FisheryRegionUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { } if (evt.getNewValue() != null) { - setFieldMapfilesModel(fisheryRegionUI.getBean()); + setFieldMapfilesModel(inputContentUI.getBean()); /* numberEditor is not working fieldLatMin.init(); fieldLatMax.init(); @@ -272,7 +274,7 @@ // reload tree InputUI inputUI = inputContentUI.getParentContainer(InputUI.class); - inputUI.getHandler().reloadFisheryTree(inputUI); + inputUI.getHandler().reloadFisheryTree(); inputContentUI.setInfoText(t("isisfish.message.save.finished")); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.FisheryRegion id='bean' javaBean='null'/> - <FisheryRegionHandler id="handler" /> + <FisheryRegionHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.FisheryRegion' @@ -37,7 +37,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -36,13 +36,15 @@ */ public class GearHandler extends InputContentHandler<GearUI> { - protected void init(final GearUI gearUI) { - super.init(gearUI); + protected GearHandler(GearUI inputContentUI) { + super(inputContentUI); + } - gearUI.setButtonTitle(t("isisfish.input.continueMetiers")); - gearUI.setNextPath(n("isisfish.input.tree.metiers")); + protected void afterInit() { + inputContentUI.setButtonTitle(t("isisfish.input.continueMetiers")); + inputContentUI.setNextPath(n("isisfish.input.tree.metiers")); - gearUI.addPropertyChangeListener(GearUI.PROPERTY_BEAN, new PropertyChangeListener() { + inputContentUI.addPropertyChangeListener(GearUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { @@ -55,6 +57,6 @@ // install change listener // (depends on sensitivity can't be done on constructor) - gearUI.installChangeListener(gearUI.gearTab); + inputContentUI.installChangeListener(inputContentUI.gearTab); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,17 +33,20 @@ */ public class GearTabHandler extends InputContentHandler<GearTabUI> { - protected void init(final GearTabUI gearTabUI) { - super.init(gearTabUI); + protected GearTabHandler(GearTabUI inputContentUI) { + super(inputContentUI); + } - gearTabUI.addPropertyChangeListener(GearTabUI.PROPERTY_BEAN, new PropertyChangeListener() { + protected void afterInit() { + + inputContentUI.addPropertyChangeListener(GearTabUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { - gearTabUI.fieldGearName.setText(""); - gearTabUI.fieldGearEffortUnit.setText(""); - gearTabUI.fieldGearStandardisationFactor.setText(""); - gearTabUI.fieldGearParamName.setText(""); - gearTabUI.fieldGearComment.setText(""); + inputContentUI.fieldGearName.setText(""); + inputContentUI.fieldGearEffortUnit.setText(""); + inputContentUI.fieldGearStandardisationFactor.setText(""); + inputContentUI.fieldGearParamName.setText(""); + inputContentUI.fieldGearComment.setText(""); } if (evt.getNewValue() != null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> - <GearTabHandler id="handler" /> + <GearTabHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="gear" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Gear' @@ -38,7 +38,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -26,11 +26,11 @@ <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> - <GearHandler id="handler" /> + <GearHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -45,9 +45,12 @@ protected boolean init; - protected void init(final RangeOfValuesUI inputContentUI) { - super.init(inputContentUI); + protected RangeOfValuesHandler(RangeOfValuesUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(RangeOfValuesUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,11 +27,11 @@  <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> - <RangeOfValuesHandler id="handler" /> + <RangeOfValuesHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> <JPanel id='body'> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -53,14 +53,16 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(SelectivityHandler.class); - protected void init(final SelectivityUI selectivityUI) { - super.init(selectivityUI); + protected SelectivityHandler(SelectivityUI inputContentUI) { + super(inputContentUI); + } - selectivityUI.addPropertyChangeListener(SelectivityUI.PROPERTY_BEAN, new PropertyChangeListener() { + protected void afterInit() { + inputContentUI.addPropertyChangeListener(SelectivityUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { - selectivityUI.setPopulation(null); - selectivityUI.selectivityTable.setModel(new GearPopulationSelectivityModel()); + inputContentUI.setPopulation(null); + inputContentUI.selectivityTable.setModel(new GearPopulationSelectivityModel()); } if (evt.getNewValue() != null) { refresh(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,7 +29,7 @@ <fr.ifremer.isisfish.entities.Population id='population' javaBean='null'/> - <SelectivityHandler id="handler" /> + <SelectivityHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="selectivity" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Gear' @@ -41,7 +41,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,14 +33,16 @@ */ public class MetierHandler extends InputContentHandler<MetierUI> { - protected void init(final MetierUI metierUI) { - super.init(metierUI); + protected MetierHandler(MetierUI inputContentUI) { + super(inputContentUI); + } - metierUI.setButtonTitle(t("isisfish.input.continueTripTypes")); - metierUI.setNextPath(n("isisfish.input.tree.triptypes")); + protected void afterInit() { + inputContentUI.setButtonTitle(t("isisfish.input.continueTripTypes")); + inputContentUI.setNextPath(n("isisfish.input.tree.triptypes")); // install change listener // (depends on sensitivity can't be done on constructor) - metierUI.installChangeListener(metierUI.metierTab); + inputContentUI.installChangeListener(inputContentUI.metierTab); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -53,9 +53,12 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(MetierSeasonInfoSpeciesHandler.class); - protected void init(final MetierSeasonInfoSpeciesUI inputContentUI) { - super.init(inputContentUI); + protected MetierSeasonInfoSpeciesHandler(MetierSeasonInfoSpeciesUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(MetierSeasonInfoSpeciesUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { setSeasonModel(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -31,7 +31,7 @@ <fr.ifremer.isisfish.entities.Species id='species' javaBean='null'/> - <MetierSeasonInfoSpeciesHandler id="handler" /> + <MetierSeasonInfoSpeciesHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="metier" bean='{getMetierSeasonInfo()}' beanClass='fr.ifremer.isisfish.entities.MetierSeasonInfo' @@ -47,7 +47,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -60,9 +60,11 @@ protected Interval interval = null; protected boolean init = false; - protected void init(final MetierSeasonInfoZoneUI inputContentUI) { - super.init(inputContentUI); + protected MetierSeasonInfoZoneHandler(MetierSeasonInfoZoneUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { /* * Don't add both in same listener. * When first is set, last value from getPopulationSeasonInfo() Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,7 +29,7 @@ <fr.ifremer.isisfish.entities.MetierSeasonInfo id='metierSeasonInfo' javaBean='null'/> - <MetierSeasonInfoZoneHandler id="handler" /> + <MetierSeasonInfoZoneHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="metier" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Metier' @@ -50,7 +50,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -37,21 +37,23 @@ protected boolean init; - protected void init(final MetierTabUI metierTabUI) { - super.init(metierTabUI); + protected MetierTabHandler(MetierTabUI inputContentUI) { + super(inputContentUI); + } - metierTabUI.addPropertyChangeListener(MetierTabUI.PROPERTY_BEAN, new PropertyChangeListener() { + protected void afterInit() { + inputContentUI.addPropertyChangeListener(MetierTabUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { - GenericComboModel<Gear> model = new GenericComboModel<>(metierTabUI.getFisheryRegion().getGear()); + GenericComboModel<Gear> model = new GenericComboModel<>(inputContentUI.getFisheryRegion().getGear()); if (evt.getNewValue() == null) { } if (evt.getNewValue() != null) { init = true; - model.setSelectedItem(metierTabUI.bean.getGear()); + model.setSelectedItem(inputContentUI.bean.getGear()); init = false; } - metierTabUI.fieldMetierGear.setModel(model); + inputContentUI.fieldMetierGear.setModel(model); } }); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Metier id='bean' javaBean='null'/> - <MetierTabHandler id="handler" /> + <MetierTabHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="metier" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Metier' @@ -41,7 +41,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -26,11 +26,11 @@ <fr.ifremer.isisfish.entities.Metier id='bean' javaBean='null'/> - <MetierHandler id="handler" /> + <MetierHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -41,7 +41,6 @@ import fr.ifremer.isisfish.entities.Observation; import fr.ifremer.isisfish.ui.input.InputContentHandler; -import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoSpeciesHandler; import fr.ifremer.isisfish.ui.util.ErrorHelper; /** @@ -52,9 +51,11 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(ObservationHandler.class); - protected void init(final ObservationUI inputContentUI) { - super.init(inputContentUI); + protected ObservationHandler(ObservationUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(ObservationUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -28,7 +28,7 @@  <fr.ifremer.isisfish.entities.Observation id='bean' javaBean='null' /> - <ObservationHandler id="handler" /> + <ObservationHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Observation' @@ -38,7 +38,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -57,9 +57,11 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationBasicsHandler.class); - protected void init(final PopulationBasicsUI inputContentUI) { - super.init(inputContentUI); + protected PopulationBasicsHandler(PopulationBasicsUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(PopulationBasicsUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { @@ -138,10 +140,10 @@ protected void create() { // find species node InputUI inputUI = inputContentUI.getContextValue(InputUI.class, JAXXUtil.PARENT); - Species species = inputUI.getHandler().findSpecies(inputUI); + Species species = inputUI.getHandler().findSpecies(); // create node and select it Population population = createPopulation(inputContentUI.getTopiaContext(), species); - inputUI.getHandler().insertTreeNode(inputUI, Population.class, population); + inputUI.getHandler().insertTreeNode(Population.class, population); inputContentUI.setInfoText(t("isisfish.message.creation.finished")); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationBasicsHandler id="handler" /> + <PopulationBasicsHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="basics" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -37,7 +37,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -36,9 +36,11 @@ */ public class PopulationCapturabilityHandler extends InputContentHandler<PopulationCapturabilityUI> { - protected void init(final PopulationCapturabilityUI inputContentUI) { - super.init(inputContentUI); + protected PopulationCapturabilityHandler(PopulationCapturabilityUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(PopulationCapturabilityUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationCapturabilityHandler id="handler" /> + <PopulationCapturabilityHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="capturability" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -36,7 +36,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -30,7 +30,11 @@ */ public class PopulationEquationHandler extends InputContentHandler<PopulationEquationUI> { - protected void init(final PopulationEquationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationEquationHandler(PopulationEquationUI inputContentUI) { + super(inputContentUI); } + + protected void afterInit() { + + } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationEquationHandler id="handler" /> + <PopulationEquationHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="equation" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -36,7 +36,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -43,9 +43,11 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationGroupHandler.class); - protected void init(final PopulationGroupUI inputContentUI) { - super.init(inputContentUI); + protected PopulationGroupHandler(PopulationGroupUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(PopulationGroupUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -39,7 +39,7 @@ <fr.ifremer.isisfish.entities.PopulationGroup id='populationGroup' javaBean='null'/> - <PopulationGroupHandler id="handler" /> + <PopulationGroupHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="group" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -57,7 +57,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,9 +33,12 @@ */ public class PopulationHandler extends InputContentHandler<PopulationUI> { - protected void init(final PopulationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationHandler(PopulationUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.setButtonTitle(t("isisfish.input.continueGears")); inputContentUI.setNextPath(n("isisfish.input.tree.gears")); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -48,9 +48,12 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationMigrationEmigrationHandler.class); - protected void init(final PopulationMigrationEmigrationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationMigrationEmigrationHandler(PopulationMigrationEmigrationUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(PopulationMigrationEmigrationUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -28,11 +28,11 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> - <PopulationMigrationEmigrationHandler id="handler" /> + <PopulationMigrationEmigrationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -31,9 +31,13 @@ */ public class PopulationMigrationEquationHandler extends InputContentHandler<PopulationMigrationEquationUI> { - protected void init(final PopulationMigrationEquationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationMigrationEquationHandler(PopulationMigrationEquationUI inputContentUI) { + super(inputContentUI); } + + protected void afterInit() { + + } public void init(PopulationSeasonInfo pi) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,18 +29,12 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> - <PopulationMigrationEquationHandler id="handler" /> + <PopulationMigrationEquationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } - /*public void init(PopulationSeasonInfo populationSeasonInfo) { - // add null before, for second to be considered as a changed event - // otherwize, setBean has no effect - //setPopInfo(null); - //setPopInfo(populationSeasonInfo); - }*/ ]]></script> <JPanel id="body"> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -36,9 +36,12 @@ */ public class PopulationMigrationHandler extends InputContentHandler<PopulationMigrationUI> { - protected void init(final PopulationMigrationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationMigrationHandler(PopulationMigrationUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(PopulationMigrationUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -48,9 +48,12 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationMigrationImmigrationHandler.class); - protected void init(final PopulationMigrationImmigrationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationMigrationImmigrationHandler(PopulationMigrationImmigrationUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(PopulationMigrationImmigrationUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -28,11 +28,11 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> - <PopulationMigrationImmigrationHandler id="handler" /> + <PopulationMigrationImmigrationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -48,9 +48,12 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationMigrationMigrationHandler.class); - protected void init(final PopulationMigrationMigrationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationMigrationMigrationHandler(PopulationMigrationMigrationUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(PopulationMigrationMigrationUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,11 +33,11 @@ <Boolean id='zoneArrivalSelected' javaBean='false'/> <Boolean id='coefNonVide' javaBean='false'/> - <PopulationMigrationMigrationHandler id="handler" /> + <PopulationMigrationMigrationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,7 +29,7 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> - <PopulationMigrationHandler id="handler" /> + <PopulationMigrationHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="migration" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -46,7 +46,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -30,7 +30,11 @@ */ public class PopulationPriceHandler extends InputContentHandler<PopulationPriceUI> { - protected void init(final PopulationPriceUI inputContentUI) { - super.init(inputContentUI); + protected PopulationPriceHandler(PopulationPriceUI inputContentUI) { + super(inputContentUI); } + + protected void afterInit() { + + } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationPriceHandler id="handler" /> + <PopulationPriceHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="equation" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -36,7 +36,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -50,9 +50,12 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationRecruitmentHandler.class); - protected void init(final PopulationRecruitmentUI inputContentUI) { - super.init(inputContentUI); + protected PopulationRecruitmentHandler(PopulationRecruitmentUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(PopulationRecruitmentUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationRecruitmentHandler id="handler" /> + <PopulationRecruitmentHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="recruitement" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -36,7 +36,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -45,9 +45,14 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationSeasonsHandler.class); - protected void init(final PopulationSeasonSpacializedUI inputContentUI) { - super.init(inputContentUI); + protected PopulationSeasonSpacializedHandler(PopulationSeasonSpacializedUI inputContentUI) { + super(inputContentUI); + // TODO Auto-generated constructor stub } + + protected void afterInit() { + + } protected void populationSeasonLengthMatrixChanged(MatrixPanelEvent event) { if (inputContentUI.getPopulationSeasonInfo() != null && inputContentUI.matrixPanelPopulationSeasonLengthChange.getMatrix() != null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -31,11 +31,11 @@ <Boolean id='ageGroupType' javaBean='false'/> - <PopulationSeasonSpacializedHandler id="handler" /> + <PopulationSeasonSpacializedHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -55,8 +55,11 @@ protected boolean init = false; - protected void init(final PopulationSeasonsUI inputContentUI) { - super.init(inputContentUI); + protected PopulationSeasonsHandler(PopulationSeasonsUI inputContentUI) { + super(inputContentUI); + } + + protected void afterInit() { inputContentUI.addPropertyChangeListener(PopulationSeasonsUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,7 +29,7 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='populationSeasonInfo' javaBean='null'/> - <PopulationSeasonsHandler id="handler" /> + <PopulationSeasonsHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="seasons" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -47,7 +47,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,11 +27,11 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationHandler id="handler" /> + <PopulationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -43,9 +43,12 @@ protected boolean init = false; - protected void init(final PopulationZonesEditorUI inputContentUI) { - super.init(inputContentUI); + protected PopulationZonesEditorHandler(PopulationZonesEditorUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(PopulationZonesEditorUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationZonesEditorHandler id="handler" /> + <PopulationZonesEditorHandler id="handler" constructorParams="this" /> <import> java.awt.Dimension @@ -35,7 +35,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -30,8 +30,11 @@ */ public class PopulationZonesHandler extends InputContentHandler<PopulationZonesUI> { - protected void init(final PopulationZonesUI inputContentUI) { - super.init(inputContentUI); + protected PopulationZonesHandler(PopulationZonesUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationZonesHandler id="handler" /> + <PopulationZonesHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="zones" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -36,7 +36,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -63,10 +63,14 @@ protected double step = 1; protected PopulationBasicsUI popBasic; - protected void init(final WizardGroupCreationUI wizardUI) { + public WizardGroupCreationHandler(WizardGroupCreationUI wizardUI) { this.wizardUI = wizardUI; } + protected void afterInit() { + + } + public void initParent(PopulationBasicsUI popBasic) { this.popBasic = popBasic; } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -24,11 +24,11 @@ --> <JPanel id="wizardGroup" layout='{new BorderLayout()}'> - <WizardGroupCreationHandler id="handler" /> + <WizardGroupCreationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -45,9 +45,11 @@ protected boolean init = false; - protected void init(final PortUI inputContentUI) { - super.init(inputContentUI); + protected PortHandler(PortUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { new OpenMapEvents(inputContentUI.portMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Port id='bean' javaBean='null'/> - <PortHandler id="handler" /> + <PortHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Port' @@ -38,7 +38,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -50,9 +50,12 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(EffortDescriptionHandler.class); - protected void init(final EffortDescriptionUI inputContentUI) { - super.init(inputContentUI); + protected EffortDescriptionHandler(EffortDescriptionUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(EffortDescriptionUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { GenericListModel<Metier> metierModel = (GenericListModel<Metier>)inputContentUI.fieldEffortDescriptionMetierList.getModel(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -37,9 +37,12 @@ */ public class EffortDescriptionParametersHandler extends InputContentHandler<EffortDescriptionParametersUI> { - protected void init(final EffortDescriptionParametersUI inputContentUI) { - super.init(inputContentUI); + protected EffortDescriptionParametersHandler(EffortDescriptionParametersUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(EffortDescriptionParametersUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,7 +29,7 @@ <fr.ifremer.isisfish.entities.EffortDescription id='effortDescription' javaBean='null'/> - <EffortDescriptionParametersHandler id="handler" /> + <EffortDescriptionParametersHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="effortdescriptionparameters" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.SetOfVessels' @@ -50,7 +50,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> - <EffortDescriptionHandler id="handler" /> + <EffortDescriptionHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="effortdescription" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.SetOfVessels' @@ -36,7 +36,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -38,9 +38,12 @@ protected boolean init; - protected void init(final SetOfVesselsBasicsUI inputContentUI) { - super.init(inputContentUI); + protected SetOfVesselsBasicsHandler(SetOfVesselsBasicsUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(SetOfVesselsBasicsUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> - <SetOfVesselsBasicsHandler id="handler" /> + <SetOfVesselsBasicsHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="basics" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.SetOfVessels' @@ -37,7 +37,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,9 +33,11 @@ */ public class SetOfVesselsHandler extends InputContentHandler<SetOfVesselsUI> { - protected void init(final SetOfVesselsUI inputContentUI) { - super.init(inputContentUI); + protected SetOfVesselsHandler(SetOfVesselsUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.setButtonTitle(t("isisfish.input.continueStrategies")); inputContentUI.setNextPath(n("isisfish.input.tree.strategies")); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -26,11 +26,11 @@ <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> - <SetOfVesselsHandler id="handler" /> + <SetOfVesselsHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -37,9 +37,11 @@ */ public class SpeciesHandler extends InputContentHandler<SpeciesUI> { - protected void init(final SpeciesUI inputContentUI) { - super.init(inputContentUI); - + protected SpeciesHandler(SpeciesUI inputContentUI) { + super(inputContentUI); + } + + protected void afterInit() { inputContentUI.setButtonTitle(t("isisfish.input.continuePopulations")); inputContentUI.addPropertyChangeListener(SpeciesUI.PROPERTY_BEAN, new PropertyChangeListener() { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -30,10 +30,14 @@ */ public class SpeciesStructuredHandler extends InputContentHandler<SpeciesStructuredUI> { - protected void init(final SpeciesStructuredUI inputContentUI) { - super.init(inputContentUI); + protected SpeciesStructuredHandler(SpeciesStructuredUI inputContentUI) { + super(inputContentUI); } + protected void afterInit() { + + } + protected void dynamicChanged() { if (inputContentUI.getBean() != null) { inputContentUI.getBean().setAgeGroupType(inputContentUI.fieldSpeciesDynamicAge.isSelected()); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -26,11 +26,11 @@ <fr.ifremer.isisfish.entities.Species id='bean' javaBean='null'/> - <SpeciesStructuredHandler id="handler" /> + <SpeciesStructuredHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Species id='bean' javaBean='null'/> - <SpeciesHandler id="handler" /> + <SpeciesHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Species' @@ -37,7 +37,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,9 +33,11 @@ */ public class StrategyHandler extends InputContentHandler<StrategyUI> { - protected void init(final StrategyUI inputContentUI) { - super.init(inputContentUI); + protected StrategyHandler(StrategyUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.setButtonTitle(t("isisfish.input.continueObservations")); inputContentUI.setNextPath(n("isisfish.input.tree.observations")); // install change listener Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -36,9 +36,12 @@ */ public class StrategyMonthInfoHandler extends InputContentHandler<StrategyMonthInfoUI> { - protected void init(final StrategyMonthInfoUI inputContentUI) { - super.init(inputContentUI); + protected StrategyMonthInfoHandler(StrategyMonthInfoUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(StrategyMonthInfoUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -39,7 +39,7 @@ <fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo10' javaBean='null'/> <fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo11' javaBean='null'/> - <StrategyMonthInfoHandler id="handler" /> + <StrategyMonthInfoHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="month" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Strategy' @@ -104,7 +104,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -37,9 +37,11 @@ protected boolean init; - protected void init(final StrategyOneMonthInfoUI inputContentUI) { - super.init(inputContentUI); + protected StrategyOneMonthInfoHandler(StrategyOneMonthInfoUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(StrategyOneMonthInfoUI.PROPERTY_STRATEGY_MONTH_INFO, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -31,11 +31,11 @@ <fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo' javaBean='null'/> - <StrategyOneMonthInfoHandler id="handler" /> + <StrategyOneMonthInfoHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -37,9 +37,11 @@ protected boolean init; - protected void init(final StrategyTabUI inputContentUI) { - super.init(inputContentUI); + protected StrategyTabHandler(StrategyTabUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(StrategyTabUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> - <StrategyTabHandler id="handler" /> + <StrategyTabHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="basics" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Strategy' @@ -37,7 +37,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -26,11 +26,11 @@ <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> - <StrategyHandler id="handler" /> + <StrategyHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -36,9 +36,11 @@ */ public class TripTypeHandler extends InputContentHandler<TripTypeUI> { - protected void init(final TripTypeUI inputContentUI) { - super.init(inputContentUI); + protected TripTypeHandler(TripTypeUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.setButtonTitle(t("isisfish.input.continueVesselTypes")); inputContentUI.setNextPath(n("isisfish.input.tree.vesseltypes")); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.TripType id='bean' javaBean='null'/> - <TripTypeHandler id="handler" /> + <TripTypeHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.TripType' @@ -41,7 +41,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -60,9 +60,11 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(EntityVariableHandler.class); - protected void init(final EntityVariableUI inputContentUI) { - super.init(inputContentUI); - + protected EntityVariableHandler(EntityVariableUI inputContentUI) { + super(inputContentUI); + } + + protected void afterInit() { inputContentUI.addPropertyChangeListener(EntityVariableUI.PROPERTY_BEAN, new java.beans.PropertyChangeListener() { public void propertyChange(java.beans.PropertyChangeEvent evt) { reloadVariables(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,11 +29,11 @@ <fr.ifremer.isisfish.entities.Variable id="variable" javaBean='null' /> - <EntityVariableHandler id="handler" /> + <EntityVariableHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -42,9 +42,11 @@ protected boolean init; - protected void init(final VesselTypeUI inputContentUI) { - super.init(inputContentUI); + protected VesselTypeHandler(VesselTypeUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.setButtonTitle(t("isisfish.input.continueSetOfVessels")); inputContentUI.setNextPath(n("isisfish.input.tree.setofvessels")); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.VesselType id='bean' javaBean='null'/> - <VesselTypeHandler id="handler" /> + <VesselTypeHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.VesselType' @@ -41,7 +41,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -50,27 +50,29 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(ZoneBasicsHandler.class); - protected void init(final ZoneBasicsUI zoneBasicsUI) { - super.init(zoneBasicsUI); + public ZoneBasicsHandler(ZoneBasicsUI inputContentUI) { + super(inputContentUI); + } - new OpenMapEvents(zoneBasicsUI.zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { + protected void afterInit() { + new OpenMapEvents(inputContentUI.zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { boolean result = false; - if (zoneBasicsUI.getBean() != null) { // impossible de desactiver la carte :( - zoneBasicsUI.getBean().setCell(zoneBasicsUI.zoneMap.getSelectedCells()); + if (inputContentUI.getBean() != null) { // impossible de desactiver la carte :( + inputContentUI.getBean().setCell(inputContentUI.zoneMap.getSelectedCells()); setZoneCells(); } return result; } }; - zoneBasicsUI.addPropertyChangeListener(ZoneBasicsUI.PROPERTY_BEAN, new PropertyChangeListener() { + inputContentUI.addPropertyChangeListener(ZoneBasicsUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { - zoneBasicsUI.fieldZoneName.setText(""); - zoneBasicsUI.fieldZoneComment.setText(""); - zoneBasicsUI.zoneMap.setSelectedCells(); + inputContentUI.fieldZoneName.setText(""); + inputContentUI.fieldZoneComment.setText(""); + inputContentUI.zoneMap.setSelectedCells(); } if (evt.getNewValue() != null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@  <fr.ifremer.isisfish.entities.Zone id='bean' javaBean='null'/> - <ZoneBasicsHandler id="handler" /> + <ZoneBasicsHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Zone' @@ -38,7 +38,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,9 +33,11 @@ */ public class ZoneHandler extends InputContentHandler<ZoneUI> { - protected void init(final ZoneUI inputContentUI) { - super.init(inputContentUI); + protected ZoneHandler(ZoneUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.setButtonTitle(t("isisfish.input.continuePorts")); inputContentUI.setNextPath(n("isisfish.input.tree.ports")); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -26,11 +26,11 @@ <fr.ifremer.isisfish.entities.Zone id='bean' javaBean='null'/> - <ZoneHandler id="handler" /> + <ZoneHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -53,15 +53,16 @@ /** queue ui to manage. */ protected QueueUI queueUI; - + /** - * Queue action. * * @param queueUI queue ui to manage */ - public void init(QueueUI queueUI) { + public QueueHandler(QueueUI queueUI) { this.queueUI = queueUI; - + } + + public void afterInit() { queueUI.queueTable.setDefaultRenderer(JProgressBar.class, new ComponentTableCellRenderer()); queueUI.queueTableDone.setDefaultRenderer(JProgressBar.class, new ComponentTableCellRenderer()); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -23,6 +23,8 @@ #L% --> <Table> + <QueueHandler id="handler" constructorParams="this" /> + <import> fr.ifremer.isisfish.simulator.launcher.SimulationService fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel @@ -30,7 +32,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> @@ -39,7 +41,7 @@ <Boolean id='canClear' javaBean='false'/> <Boolean id='canRestart' javaBean='false'/> - <QueueHandler id="handler" /> + <SimulationServiceTableModel id="newSimulationModel" javaBean='new SimulationServiceTableModel(SimulationService.getService(), true)'/> <SimulationServiceTableModel id="doneSimulationModel" javaBean='new SimulationServiceTableModel(SimulationService.getService(), false)' onTableChanged='handler.updateActions()' />

1 0

r4236 - trunk/src/main/java/fr/ifremer/isisfish/ui/config
by echatellier＠users.forge.codelutin.com May 27, 2015

May 27, 2015

Author: echatellier Date: 2015-05-27 12:59:59 +0000 (Wed, 27 May 2015) New Revision: 4236 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4236 Log: Add usefull log Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java 2015-05-27 12:59:32 UTC (rev 4235) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java 2015-05-27 12:59:59 UTC (rev 4236) @@ -295,6 +295,9 @@ Session session = jsch.getSession(currentSSHUsername, host, port); String proxyCommand = IsisFish.config.getSimulatorSshProxyCommand(); if (StringUtils.isNotBlank(proxyCommand)) { + if (log.isInfoEnabled()) { + log.info("Using proxy command : " + proxyCommand); + } session.setProxy(new ProxyCommand(proxyCommand)); }

1 0