Author: echatellier Date: 2012-08-08 17:17:34 +0200 (Wed, 08 Aug 2012) New Revision: 3713 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3713 Log: fixes #1389 : Add new variable tab for population Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.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/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2012-08-08 15:17:34 UTC (rev 3713) @@ -53,6 +53,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.topia.TopiaException; @@ -230,8 +231,13 @@ config.parse(args); // to work in java webstart - I18n.init(new DefaultI18nInitializer("isis-fish-i18n"), config.getLocale()); - + try { + I18n.init(new DefaultI18nInitializer("isis-fish-i18n"), config.getLocale()); + } catch (Exception ex) { + // dev mode + I18n.init(new ClassPathI18nInitializer(), config.getLocale()); + } + // after init shutdown hook Runtime.getRuntime().addShutdownHook(new IsisQuitHook()); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2012-08-08 15:17:34 UTC (rev 3713) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2012 Ifremer, Code Lutin, 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 @@ -41,12 +41,6 @@ installChangeListener(populationTab); } -/*public void refresh() { - // reverse ordre is no more needed - getSaveVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI, - populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI); -}*/ - @Override public void setLayer(boolean active) { super.setLayer(active); @@ -59,6 +53,7 @@ populationCapturabilityUI.setLayer(active); populationMigrationUI.setLayer(active); populationPriceUI.setLayer(active); + variablesUI.setLayer(active); } @Override @@ -72,6 +67,7 @@ populationCapturabilityUI.resetChangeModel(); populationMigrationUI.resetChangeModel(); populationPriceUI.resetChangeModel(); + variablesUI.resetChangeModel(); } ]]> </script> @@ -113,6 +109,11 @@ <tab title='isisfish.populationPrice.title'> <PopulationPriceUI id='populationPriceUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> + <tab title='isisfish.variables.tabtitle'> + <fr.ifremer.isisfish.ui.input.variable.EntityVariableUI id="variablesUI" + bean="{getBean()}" active="{isActive()}" + sensitivity="{isSensitivity()}" constructorParams='this'/> + </tab> </JTabbedPane> </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI> 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 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2012-08-08 15:17:34 UTC (rev 3713) @@ -30,6 +30,7 @@ import javax.swing.JList; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; @@ -79,6 +80,18 @@ } catch (TopiaException ex) { throw new IsisFishRuntimeException("Can't init view", ex); } + + // try to set entity name in label + try { + String name = BeanUtils.getProperty(view.getBean(), "name"); + view.getVariableEntityName().setText(name); + } catch (Exception ex) { + if (log.isWarnEnabled()) { + log.warn("Can't get entity name", ex); + } + } + } else { + view.getVariableEntityName().setText(""); } model.setEntities(variables); 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 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2012-08-08 15:17:34 UTC (rev 3713) @@ -76,6 +76,16 @@ <Table border='{BorderFactory.createTitledBorder(_("isisfish.variables.variabledetail"))}'> <row> <cell fill="horizontal"> + <JLabel text="isisfish.variables.entityname" + enabled='{isActive() && getVariable() != null}'/> + </cell> + <cell fill="horizontal" weightx='1.0'> + <JLabel id="variableEntityName" + enabled='{isActive() && getVariable() != null}'/> + </cell> + </row> + <row> + <cell fill="horizontal"> <JLabel text="isisfish.variables.variablename" enabled='{isActive() && getVariable() != null}'/> </cell> Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-08-08 15:17:34 UTC (rev 3713) @@ -970,6 +970,7 @@ isisfish.variables.defaultname=VarName isisfish.variables.deletevariable=Delete isisfish.variables.double.value=Real value \: +isisfish.variables.entityname=Object name \: isisfish.variables.matrix.value=Matrix \: isisfish.variables.savevariable=Save isisfish.variables.tabtitle=Variables Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-08-08 15:17:34 UTC (rev 3713) @@ -970,6 +970,7 @@ isisfish.variables.defaultname=VarName isisfish.variables.deletevariable=Supprimer isisfish.variables.double.value=Valeur réelle \: +isisfish.variables.entityname=Nom de l'objet \: isisfish.variables.matrix.value=Matrice isisfish.variables.savevariable=Sauver isisfish.variables.tabtitle=Variables