Author: chatellier Date: 2011-03-17 15:49:25 +0000 (Thu, 17 Mar 2011) New Revision: 3177 Log: Fix add factor Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -258,6 +258,7 @@ FactorWizardUI wizard = new FactorWizardUI(this); wizard.initNew(editor, bean, EditorHelper.canBeContinue(editor, bean)); wizard.pack(); + wizard.setLocationRelativeTo(this); wizard.setVisible(true); } else if (log.isWarnEnabled()) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -28,6 +28,6 @@ <Boolean id='continueSelected' javaBean='false'/> - <JPanel id='content' constraints='BorderLayout.CENTER'/> + <JPanel id='content' layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'/> </JPanel> \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -24,26 +24,30 @@ --> <ContinuousPanelContainerUI> <script><![CDATA[ +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; protected JTextField continueMax = null; protected JTextField continueMin = null; -addPropertyChangeListener("continuePossible", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - continueMax.setVisible((Boolean)evt.getNewValue()); - continueMin.setVisible((Boolean)evt.getNewValue()); - } -}); +protected void $afterCompleteSetup() { + addPropertyChangeListener("continuePossible", new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + continueMax.setVisible((Boolean)evt.getNewValue()); + continueMin.setVisible((Boolean)evt.getNewValue()); + } + }); + + addPropertyChangeListener("continueSelected", new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + continueMax.setEnabled((Boolean)evt.getNewValue()); + continueMin.setEnabled((Boolean)evt.getNewValue()); + } + }); +} -addPropertyChangeListener("continueSelected", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - continueMax.setEnabled((Boolean)evt.getNewValue()); - continueMin.setEnabled((Boolean)evt.getNewValue()); - } -}); - public void init(JTextField cMin, JTextField cMax) { continueMax = cMax; continueMin = cMin; @@ -63,22 +67,23 @@ public String getMax() { return continueMax.getText(); } - ]]> - </script> - <Table id='content' constraints='BorderLayout.CENTER'> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.firstValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JPanel id='continueMinPanel' layout='{new BorderLayout()}'/> - </cell> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.lastValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JPanel id='continueMaxPanel' layout='{new BorderLayout()}'/> - </cell> - </row> - </Table> + ]]></script> + <JPanel id="content"> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.firstValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JPanel id='continueMinPanel' layout='{new BorderLayout()}'/> + </cell> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.lastValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JPanel id='continueMaxPanel' layout='{new BorderLayout()}'/> + </cell> + </row> + </Table> + </JPanel> </ContinuousPanelContainerUI> \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2011-03-17 15:49:25 UTC (rev 3177) @@ -39,7 +39,8 @@ import javax.swing.JTextField; import javax.swing.text.JTextComponent; -import jaxx.runtime.JAXXInitialContext; +import jaxx.runtime.JAXXContext; +import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.swing.editor.NumberEditor; import org.apache.commons.lang.StringUtils; @@ -51,6 +52,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityContextable; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.Formule; @@ -96,7 +98,7 @@ * @return property value */ public static String getMethod(JComponent component) { - String method = (String)component.getClientProperty("method"); + String method = (String)component.getClientProperty("sensitivityMethod"); return method; } @@ -107,7 +109,7 @@ * @param entity entity * @return component copy */ - public static JComponent getEditor(JComponent component, TopiaEntity entity) { + public static JComponent getEditor(JComponent component, TopiaEntityContextable entity) { JComponent result = null; try { String fieldName = getMethod(component); @@ -175,7 +177,7 @@ //ui.setMethodSet(origine.getMethodSet()); ui.setBeanProperty(origine.getBeanProperty()); ui.setBean(entity); - ui.setActif(true); + ui.setActive(true); ui.refresh(); result = ui; } else if (result instanceof IntervalPanel) { @@ -193,9 +195,9 @@ origine.getRegion()).add( new InputSaveVerifier())); ui.setBean(origine.getBean()); - ui.setActif(true); + ui.setActive(true); ui.refresh(); - ui.setActif(true); + ui.setActive(true); result = ui; } else if (result instanceof MetierSeasonInfoSpeciesEditorUI) { MetierSeasonInfoSpeciesEditorUI origine = (MetierSeasonInfoSpeciesEditorUI) component; @@ -207,7 +209,7 @@ if (origine.getMetierSeasonInfo() != null) { ui.setMetierSeasonInfo(origine.getMetierSeasonInfo()); ui.setMetierSeasonSelected(true); - ui.setActif(true); + ui.setActive(true); } ui.refresh(); result = ui; @@ -215,7 +217,7 @@ PopulationZonesEditorUI origine = (PopulationZonesEditorUI) component; PopulationZonesEditorUI ui = new PopulationZonesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion())); ui.setBean(origine.getBean()); - ui.setActif(true); + ui.setActive(true); ui.refresh(); result = ui; } else if (result instanceof PopulationMigrationMigrationUI) { @@ -224,7 +226,7 @@ new JAXXInitialContext().add(new InputAction())); ui.setBean(origine.getBean()); ui.setPopInfo(origine.getPopInfo()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } else if (result instanceof PopulationMigrationEmigrationUI) { @@ -232,7 +234,7 @@ PopulationMigrationEmigrationUI ui = new PopulationMigrationEmigrationUI(new JAXXInitialContext().add(new InputAction())); ui.setBean(origine.getBean()); ui.setPopInfo(origine.getPopInfo()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } else if (result instanceof PopulationMigrationImmigrationUI) { @@ -240,7 +242,7 @@ PopulationMigrationImmigrationUI ui = new PopulationMigrationImmigrationUI(new JAXXInitialContext().add(new InputAction())); ui.setBean(origine.getBean()); ui.setPopInfo(origine.getPopInfo()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } @@ -263,7 +265,7 @@ * @param entity entity * @return component copy */ - public static ContinuousPanelContainerUI getContinuousPanel(JComponent component, TopiaEntity entity) { + public static ContinuousPanelContainerUI getContinuousPanel(JComponent component, TopiaEntityContextable entity) { ContinuousPanelContainerUI result = null; String fieldName = getMethod(component); DefaultContinuousPanelUI continuousPanel = null; @@ -453,7 +455,7 @@ /// ??? was not set before ui.setBeanProperty(origine.getBeanProperty()); ui.setFormule((Formule) value); - ui.setActif(true); + ui.setActive(true); ui.refresh(); result = ui; } else if (result instanceof IntervalPanel) { @@ -469,9 +471,9 @@ origine.getRegion()).add(new InputSaveVerifier())); ui.setBean(origine.getBean()); ui.getBean().setPopulationSelectivity((Collection<Selectivity>) value); - ui.setActif(true); + ui.setActive(true); ui.refresh(); - ui.setActif(true); + ui.setActive(true); result = ui; } else if (result instanceof MetierSeasonInfoSpeciesEditorUI) { MetierSeasonInfoSpeciesEditorUI origine = (MetierSeasonInfoSpeciesEditorUI) component; @@ -484,7 +486,7 @@ ui.setMetierSeasonInfo(origine.getMetierSeasonInfo()); ui.getMetierSeasonInfo().setSpeciesTargetSpecies((Collection<TargetSpecies>) value); ui.setMetierSeasonSelected(true); - ui.setActif(true); + ui.setActive(true); } ui.refresh(); result = ui; @@ -495,7 +497,7 @@ ui.setBean(origine.getBean()); MatrixND m = (MatrixND) value; ui.getFieldPopulationMappingZoneReproZoneRecru().setMatrix(m == null ? null : m.clone()); - ui.setActif(true); + ui.setActive(true); ui.refresh(); result = ui; } else if (result instanceof PopulationMigrationMigrationUI) { @@ -506,7 +508,7 @@ ui.setPopInfo(origine.getPopInfo()); MatrixND m = (MatrixND) value; ui.getPopInfo().setMigrationMatrix(m == null ? null : m.clone()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } else if (result instanceof PopulationMigrationEmigrationUI) { @@ -517,7 +519,7 @@ ui.setPopInfo(origine.getPopInfo()); MatrixND m = (MatrixND) value; ui.getPopInfo().setEmigrationMatrix(m == null ? null : m.clone()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } else if (result instanceof PopulationMigrationImmigrationUI) { @@ -528,7 +530,7 @@ ui.setPopInfo(origine.getPopInfo()); MatrixND m = (MatrixND) value; ui.getPopInfo().setImmigrationMatrix(m == null ? null : m.clone()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } @@ -650,7 +652,7 @@ */ public static boolean canBeContinue(JComponent component, TopiaEntity entity) { - String fieldName = (String) component.getClientProperty("method"); + String fieldName = (String) component.getClientProperty("sensitivityMethod"); if (component instanceof JTextComponent) { Object o = getMethodValue(entity, fieldName); return canBeContinue(component, o); @@ -887,9 +889,9 @@ InputOneEquationUI equationComponent = new InputOneEquationUI( new JAXXInitialContext().add(new InputAction())); equationComponent.setFormuleCategory(basicEquation.getCategory()); - equationComponent.setBean((TopiaEntity)bean); + equationComponent.setBean((TopiaEntityContextable)bean); equationComponent.setBeanProperty(beanProperty); - equationComponent.putClientProperty("method", beanProperty); + equationComponent.putClientProperty("sensitivityMethod", beanProperty); component = equationComponent; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -25,7 +25,7 @@ <ContinuousPanelContainerUI> <String id='text' javaBean='null'/> - <org.nuiton.topia.persistence.TopiaEntity id='bean' javaBean='null'/> + <org.nuiton.topia.persistence.TopiaEntityContextable id='bean' javaBean='null'/> <String id='beanProperty' javaBean='null'/> <!-- For editor doc purpose --> <Class id='clazz' javaBean='null'/> @@ -243,30 +243,32 @@ } } ]]></script> - <Table id='content' constraints='BorderLayout.CENTER'> - <row> - <cell fill='both' columns='2' weightx='1' weighty='0.5'> - <JScrollPane preferredSize="{new Dimension(200, 150)}"> - <JTable id='params' visible='{isContinuePossible()}' model='{getTableModel()}' + <JPanel id='content'> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell fill='both' columns='2' weightx='1' weighty='1'> + <JScrollPane preferredSize="{new Dimension(200, 150)}"> + <JTable id='params' visible='{isContinuePossible()}' model='{getTableModel()}' enabled='{isContinueSelected()}' /> - </JScrollPane> - </cell> - </row> - <row> - <cell fill='horizontal' weightx='0.5'> - <JButton id='add' text='isisfish.common.add' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='add()'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JButton id='remove' text='isisfish.common.remove' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='remove()'/> - </cell> - </row> - <row> - <cell fill='both' columns='2' weightx='1' weighty='0.5'> - <fr.ifremer.isisfish.ui.input.InputOneEquationUI id='editor' formule='{getFormule()}' text='{getText()}' - constructorParams='this' bean='{getBean()}' clazz='{getClazz()}' beanProperty='{getBeanProperty()}' actif='{isContinueSelected()}' - formuleCategory='{getFormuleCategory()}' selectedEquation='{getSelectedEquation()}' - visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - </row> - </Table> -</ContinuousPanelContainerUI> \ No newline at end of file + </JScrollPane> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1'> + <JButton id='add' text='isisfish.common.add' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='add()'/> + </cell> + <cell fill='horizontal' weightx='1'> + <JButton id='remove' text='isisfish.common.remove' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='remove()'/> + </cell> + </row> + <row> + <cell fill='both' columns='2' weightx='1' weighty='1'> + <fr.ifremer.isisfish.ui.input.InputOneEquationUI id='editor' formule='{getFormule()}' text='{getText()}' + constructorParams='this' bean='{getBean()}' clazz='{getClazz()}' beanProperty='{getBeanProperty()}' active='{isContinueSelected()}' + formuleCategory='{getFormuleCategory()}' selectedEquation='{getSelectedEquation()}' + visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + </row> + </Table> + </JPanel> +</ContinuousPanelContainerUI> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2010 Ifremer, CodeLutin + Copyright (C) 2009 - 2011 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 @@ -28,13 +28,11 @@ <Boolean id='continueSelected' javaBean='false'/> - <Boolean id='saveEnabled' javaBean='false'/> - <Boolean id='existingValue' javaBean='false'/> <script><![CDATA[ import org.apache.commons.lang.StringUtils; -import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityContextable; import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.ui.input.InputSaveVerifier; import fr.ifremer.isisfish.simulator.sensitivity.Factor; @@ -42,33 +40,38 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; +import jaxx.runtime.JAXXUtil; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; protected JComponent cOrigine = null; -protected TopiaEntity bean = null; +protected TopiaEntityContextable bean = null; protected java.util.List<JComponent> discretComponents = new ArrayList<JComponent>(); protected String path = null; protected ContinuousPanelContainerUI continuousPanel = null; protected Factor factor = null; -addPropertyChangeListener("continuePossible", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (continuousPanel != null) { - continuousPanel.setContinuePossible((Boolean)evt.getNewValue()); +protected void $afterCompleteSetup() { + addPropertyChangeListener(PROPERTY_CONTINUE_POSSIBLE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (continuousPanel != null) { + continuousPanel.setContinuePossible((Boolean)evt.getNewValue()); + } } - } -}); - -addPropertyChangeListener("continueSelected", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (continuousPanel != null) { - continuousPanel.setContinueSelected((Boolean)evt.getNewValue()); + }); + + addPropertyChangeListener(PROPERTY_CONTINUE_SELECTED, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (continuousPanel != null) { + continuousPanel.setContinueSelected((Boolean)evt.getNewValue()); + } } - } -}); + }); +} -public void initNew(JComponent c, TopiaEntity be, Boolean b) { +public void initNew(JComponent c, TopiaEntityContextable be, Boolean b) { this.bean = be; this.cOrigine = c; @@ -106,7 +109,6 @@ continuousPanel.setContinueSelected(selected); } setContinueSelected(EditorHelper.isContinue(cOrigine)); - setSaveEnabled(!factorName.getText().equals("")); } public void initExisting(JComponent cOrigine, Factor f) { @@ -173,7 +175,6 @@ this.pack(); } - setSaveEnabled(!factorName.getText().equals("")); } protected void init() { continuousPanelContainer.add(continuousPanel, BorderLayout.CENTER); @@ -206,12 +207,12 @@ } else { getSensitivityAction().saveDiscret(cOrigine, factorName.getText(), comment.getText(), path, discretComponents, getSimulAction(), isExistingValue()); } - getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); + getContextValue(SensitivityTabUI.class, JAXXUtil.PARENT).setFactorModel(); exit(); } protected void remove() { getSimulAction().removeFactor(factor); - getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); + getContextValue(SensitivityTabUI.class, JAXXUtil.PARENT).setFactorModel(); exit(); } protected void exit() { @@ -224,38 +225,41 @@ <cell columns='1' fill='horizontal'> <JLabel text='isisfish.sensitivity.name'/> </cell> - <cell columns='3' fill='horizontal' weightx='1'> - <JTextField id='factorName' onKeyReleased='setSaveEnabled(!factorName.getText().equals(""))'/> + <cell columns='3' fill='horizontal'> + <JTextField id='factorName'/> </cell> </row> <row> - <cell columns='4' fill='horizontal' weightx='1'> - <JRadioButton id='continueRadio' text='isisfish.sensitivity.continue' buttonGroup='factorType' visible='{isContinuePossible()}' selected='{false}' onActionPerformed='setContinueSelected(continueRadio.isSelected())'/> + <cell columns='4' fill='horizontal'> + <JRadioButton id='continueRadio' text='isisfish.sensitivity.continue' + buttonGroup='factorType' visible='{isContinuePossible()}' selected='{false}' onActionPerformed='setContinueSelected(continueRadio.isSelected())'/> </cell> </row> <row> - <cell columns='4' fill='both' weightx='1' weighty='0.5'> + <cell columns='4' fill='both' weightx='1' weighty='2'> <JPanel id='continuousPanelContainer' layout='{new BorderLayout()}'/> </cell> </row> <row> - <cell columns='4' fill='horizontal' weightx='1'> - <JRadioButton id='discret' text='isisfish.sensitivity.discret' selected='{true}' buttonGroup='factorType' onActionPerformed='setContinueSelected(continueRadio.isSelected())'/> + <cell columns='4' fill='horizontal'> + <JRadioButton id='discret' text='isisfish.sensitivity.discret' + selected='{true}' buttonGroup='factorType' + onActionPerformed='setContinueSelected(continueRadio.isSelected())'/> </cell> </row> <row> <cell fill='horizontal'> <JLabel text='isisfish.sensitivity.selectDiscretNumber' enabled='{!isContinueSelected()}'/> </cell> - <cell fill='horizontal' weightx='0.5'> + <cell fill='horizontal'> <JTextField id='discretNumber' enabled='{!isContinueSelected()}'/> </cell> - <cell columns='2' fill='horizontal' weightx='0.5'> + <cell columns='2' fill='horizontal'> <JButton text='isisfish.sensitivity.validDiscretNumber' enabled='{!isContinueSelected()}' onActionPerformed='addTabs(discretNumber.getText())'/> </cell> </row> <row> - <cell columns='4' fill='both' weightx='1' weighty='0.3'> + <cell columns='4' fill='both' weightx='1' weighty='2'> <JTabbedPane id='tabPane' visible='{!isContinueSelected()}' enabled='{!isContinueSelected()}'/> </cell> </row> @@ -265,21 +269,21 @@ </cell> </row> <row> - <cell columns='4' fill='both' weightx='1' weighty='0.3'> + <cell columns='4' fill='both' weighty='1'> <JScrollPane> <JTextArea id='comment'/> </JScrollPane> </cell> </row> <row> - <cell fill='horizontal' weightx='0.25'> + <cell fill='horizontal'> <JButton id='cancel' text='isisfish.common.cancel' onActionPerformed='exit()'/> </cell> - <cell fill='horizontal' weightx='0.25'> + <cell fill='horizontal'> <JButton id='remove' text='isisfish.common.remove' visible='{isExistingValue()}' onActionPerformed='remove()'/> </cell> - <cell columns='2' fill='horizontal' weightx='0.5'> - <JButton id='save' text='isisfish.common.save' enabled='{isSaveEnabled()}' onActionPerformed='save()'/> + <cell columns='2' fill='horizontal'> + <JButton id='save' text='isisfish.common.save' enabled='{!getFactorName().getText().isEmpty()}' onActionPerformed='save()'/> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -26,37 +26,39 @@ <org.nuiton.math.matrix.MatrixND id='matrix' javaBean='null'/> - <Table id='content' constraints='BorderLayout.CENTER'> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='both' weightx='1' weighty='1'> - <org.nuiton.math.matrix.gui.MatrixPanelEditor id='componentPanel' dimensionEdit='{false}' - matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' - enabled='{isContinueSelected()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.coefficient' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='both' columns='2' weightx='1' weighty='1'> - <JTextField id='coef' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='1' columns='3'> - <JComboBox id='operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'> - <item id='plus' value="+"/> - <item id='moins' value="-"/> - <item id='mult' value="*"/> - <item id='div' value="/"/> - </JComboBox> - </cell> - </row> - </Table> + <JPanel id='content'> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='both' weightx='1' weighty='1'> + <org.nuiton.math.matrix.gui.MatrixPanelEditor id='componentPanel' dimensionEdit='{false}' + matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' + enabled='{isContinueSelected()}'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.coefficient' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='both' columns='2' weightx='1' weighty='1'> + <JTextField id='coef' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='1' columns='3'> + <JAXXComboBox id='operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'> + <item id='plus' value="+"/> + <item id='moins' value="-"/> + <item id='mult' value="*"/> + <item id='div' value="/"/> + </JAXXComboBox> + </cell> + </row> + </Table> + </JPanel> </ContinuousPanelContainerUI> \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -37,26 +37,28 @@ // declaration sépérée de la variable d'instance (jaxx) SimulationServiceListener simulationListener; - // permet de rafaichir la liste les simulations - // des qu'une simulation se termine - simulationListener = new SimulationServiceListener() { - @Override - public void simulationStart(SimulationService simService, SimulationJob job) { - } - - @Override - public void simulationStop(SimulationService simService, SimulationJob job) { - if (log.isDebugEnabled()) { - log.debug("Refresh second pass UI simulations list"); + protected void $afterCompleteSetup() { + // permet de rafaichir la liste les simulations + // des qu'une simulation se termine + simulationListener = new SimulationServiceListener() { + @Override + public void simulationStart(SimulationService simService, SimulationJob job) { } - fieldSensitivitySimulationSelect.setModel(getSensitivitySimulationModel()); - } - - @Override - public void clearJobDone(SimulationService simService) { - } + + @Override + public void simulationStop(SimulationService simService, SimulationJob job) { + if (log.isDebugEnabled()) { + log.debug("Refresh second pass UI simulations list"); + } + fieldSensitivitySimulationSelect.setModel(getSensitivitySimulationModel()); + } + + @Override + public void clearJobDone(SimulationService simService) { + } + }; + SimulationService.getService().addSimulationServiceListener(simulationListener); } - SimulationService.getService().addSimulationServiceListener(simulationListener); /** * Model de contenu de la liste des nom de simulations @@ -129,7 +131,7 @@ <row> <cell columns="3" fill="both" weightx="1.0" weighty="1.0"> <JScrollPane> - <JTextArea id='textAreaSensitivitySecondpassResult' text='' editable="false" /> + <JTextArea id='textAreaSensitivitySecondpassResult' editable="false" /> </JScrollPane> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -47,7 +47,7 @@ protected void $afterCompleteSetup() { // end code constructor - getVerifier().setSensPanel(this); + //getVerifier().setSensPanel(this); } protected InputAction getInputAction() {