Author: chatellier Date: 2009-06-03 07:52:53 +0000 (Wed, 03 Jun 2009) New Revision: 2313 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java Log: Refactoring "sens" > "sensitivity" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -29,7 +29,7 @@ // refresh public void refresh() { - if (isSens()) { + if (isSensitivity()) { gearTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { gearTab.addChangeListener(new InputTabbedPaneListener()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -19,28 +19,41 @@ --> <JPanel layout='{new BorderLayout()}' abstract="true"> - <!-- ui state when editing --> + <!-- UI state when editing. If no entity selected, actif = false --> <Boolean id='actif' javaBean='false'/> - <!-- TODO : rename bean to sensitivity ! --> - <Boolean id='sens' javaBean='false'/> + + <!-- True only for sensitivity simulation --> + <Boolean id='sensitivity' javaBean='false'/> <!-- Next button title --> <java.lang.String id='buttonTitle' javaBean='""'/> - <!-- Next button title --> + <!-- Next path --> <java.lang.String id='nextPath' javaBean='null'/> + <jaxx.runtime.swing.BlockingLayerUI id='layerUI' + blockIcon='{SwingUtil.createImageIcon("building.png")}' + acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' + useIcon='true' + blockingColor='{new Color(50,50,50)}' + acceptAction='{new AbstractAction() { + private static final long serialVersionUID = 1L; + @Override + public void actionPerformed(ActionEvent e) { + accept(e); + } + }}' /> <!-- Sensitivity UI bloking layer --> - <jaxx.runtime.swing.BlockingLayerUI2 id='sensitivityLayerUI' - blockIcon='{SwingUtil.createImageIcon("building.png")}' - acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' - acceptAction='{new AbstractAction() { - private static final long serialVersionUID = 1L; - @Override - public void actionPerformed(ActionEvent e) { - accept(e); - } - }}' /> + <jaxx.runtime.swing.BlockingLayerUI2 id='layerUI2' + blockIcon='{SwingUtil.createImageIcon("building.png")}' + acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' + acceptAction='{new AbstractAction() { + private static final long serialVersionUID = 1L; + @Override + public void actionPerformed(ActionEvent e) { + accept(e); + } + }}' /> <script><![CDATA[ import fr.ifremer.isisfish.ui.WelcomePanelUI; @@ -87,18 +100,23 @@ //public void setBean(TopiaEntity t) {} public void setLayer(boolean active) { - if (this.get$objectMap() != null) { + if (this.get$objectMap() != null && active) { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { // Verifie si dans l'entré existe dans le fichier sensitivity.properties Class classBean = (Class)boxed.getClientProperty("bean"); String method = (String)boxed.getClientProperty("method"); - boolean isSensitivity = false; + boolean isSensitivityFactorEnabled = false; if (classBean != null) { - isSensitivity = UtilsUI.isSensitivity(classBean.getSimpleName().replace("Impl", "") + "." + method); + isSensitivityFactorEnabled = UtilsUI.isSensitivityFactorEnabled(classBean.getSimpleName().replace("Impl", "") + "." + method); } - if (isSensitivity) { - jaxx.runtime.swing.BlockingLayerUI2 ui = active ? sensitivityLayerUI.clone() : null; + if (isSensitivityFactorEnabled) { + jaxx.runtime.swing.BlockingLayerUI2 ui = layerUI2.clone(); SwingUtil.getLayer(boxed).setUI(ui); + } else { + jaxx.runtime.swing.BlockingLayerUI ui = layerUI.clone(); + ui.setBlock(true); + ui.setUseIcon(isActif()); + SwingUtil.getLayer(boxed).setUI(ui); } } } @@ -110,14 +128,13 @@ String beanID = (String)source.getClientProperty("beanID"); TopiaEntity bean = null; if (beanID == null){ - bean = getVerifier().getEntity(classBean); + bean = getVerifier().getEntity(classBean); } else{ bean = getVerifier().getEntity(classBean, beanID); } - if (bean != null){ + if (bean != null) { FactorWizardUI wizard = new FactorWizardUI(this); - wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean)); wizard.pack(); wizard.setVisible(true); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-06-03 07:52:53 UTC (rev 2313) @@ -122,7 +122,7 @@ // apply refresh method (should a contract for all this ui with a method refresh...) try { currentUI = (InputContentUI) newUI; - currentUI.setSens(false); + currentUI.setSensitivity(false); InputSaveVerifier verifier = context.getContextValue(InputSaveVerifier.class); verifier.removeAllPanels(); verifier.addCurrentPanel(currentUI); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-06-03 07:52:53 UTC (rev 2313) @@ -28,7 +28,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Method; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -494,7 +493,7 @@ editable = !currentEntities.isEmpty(); this.currentPanels.add(ui); if (rootUI == null) { - ui.setSens(true); + ui.setSensitivity(true); ui.setLayer(true); } ui.refresh(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -44,8 +44,9 @@ getVerifier().addCurrentPanel(this); setButtonTitle(_("isisfish.input.continueTripTypes")); setNextPath("$root/$tripTypes"); + public void refresh() { - if (isSens()){ + if (isSensitivity()){ metierTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { metierTab.addChangeListener(new InputTabbedPaneListener()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -16,18 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ - -/** - * NoneUI. - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ --> <JPanel layout='{new BorderLayout()}'> <JLabel id='none' horizontalAlignment="0" text="isisfish.input.selectRegion" constraints='BorderLayout.CENTER'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -29,8 +29,9 @@ getVerifier().addCurrentPanel(this); setButtonTitle(_("isisfish.input.continueGears")); setNextPath("$root/$gears"); + public void refresh(){ - if (isSens()){ + if (isSensitivity()){ populationTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { populationTab.addChangeListener(new InputTabbedPaneListener()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -26,10 +26,10 @@ setButtonTitle(_("isisfish.input.continueStrategies")); setNextPath("$root/$strategies"); +getVerifier().addCurrentPanel(this); -getVerifier().addCurrentPanel(this); public void refresh() { - if (isSens()){ + if (isSensitivity()){ setOfVesselsTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { setOfVesselsTab.addChangeListener(new InputTabbedPaneListener()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -21,7 +21,7 @@ <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> - <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> + <fr.ifremer.isisfish.entities.StrategyImpl id='bean' javaBean='null'/> <script><![CDATA[ import fr.ifremer.isisfish.entities.Equation; @@ -43,7 +43,7 @@ // add null before, for second to be considered as a changed event // otherwize, setBean has no effect setBean(null); - setBean(strategy); + setBean((StrategyImpl) strategy); if (getBean() != null) { setSetOfVesselsModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -22,11 +22,11 @@ <script><![CDATA[ import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; +// is this add needed ? +getVerifier().addCurrentPanel(this); + public void refresh() { - // is this add needed ? - //getVerifier().addCurrentPanel(this); - - if (isSens()){ + if (isSensitivity()){ strategyTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { strategyTab.addChangeListener(new InputTabbedPaneListener()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-06-03 07:52:53 UTC (rev 2313) @@ -106,7 +106,7 @@ try { currentUI = (InputContentUI) newUI; if (currentUI != null){ - currentUI.setSens(true); + currentUI.setSensitivity(true); context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); currentUI.setLayer(true); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-06-03 07:52:53 UTC (rev 2313) @@ -53,7 +53,7 @@ } if (InputContentUI.class.isInstance(pane.getSelectedComponent())){ ui = (InputContentUI) pane.getSelectedComponent(); - ui.setSens(true); + ui.setSensitivity(true); ui.setLayer(true); ui.refresh(); cacheSelectedIndex = pane.getSelectedIndex(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-06-03 07:52:53 UTC (rev 2313) @@ -53,7 +53,7 @@ * @param sensitivityFactorName name * @return <tt>true</tt> if factor name is sensitivity enabled */ - public static boolean isSensitivity(String sensitivityFactorName) { + public static boolean isSensitivityFactorEnabled(String sensitivityFactorName) { Properties data = loadProperties(); return data.getProperty(sensitivityFactorName) != null;