Author: echatellier Date: 2012-02-29 14:25:04 +0100 (Wed, 29 Feb 2012) New Revision: 3619 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3619 Log: Fix variable ui Modified: branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx branches/4.1/src/main/resources/i18n/isis-fish_en_GB.properties branches/4.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2012-02-28 14:25:17 UTC (rev 3618) +++ branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2012-02-29 13:25:04 UTC (rev 3619) @@ -57,7 +57,7 @@ ]]></script> <JPanel id="body"> <JTabbedPane constraints='BorderLayout.CENTER' id="zoneTab"> - <tab title='isisfish.gear.title'> + <tab title='isisfish.zone.title'> <ZoneBasicsUI id="zoneBasicsUI" bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this' /> </tab> Modified: branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java =================================================================== --- branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2012-02-28 14:25:17 UTC (rev 3618) +++ branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2012-02-29 13:25:04 UTC (rev 3619) @@ -217,19 +217,20 @@ break; } // equation already set by ui component - try { + //try { // save in db - TopiaContext context = view.getTopiaContext(); - VariableDAO dao = IsisFishDAOHelper.getVariableDAO(context); - dao.update(variable); - context.commitTransaction(); + //TopiaContext context = view.getTopiaContext(); + //VariableDAO dao = IsisFishDAOHelper.getVariableDAO(context); + //dao.update(variable); + //context.commitTransaction(); + view.getSaveVerifier().save(); // refresh ui (name change) TopiaEntityListModel model = (TopiaEntityListModel)view.getVariablesList().getModel(); List<Variable> variables = (List<Variable>)model.getElements(); model.setEntities(variables); - } catch (TopiaException ex) { + /*} catch (TopiaException ex) { throw new IsisFishRuntimeException("Can't save variable", ex); - } + }*/ } } Modified: branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx =================================================================== --- branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2012-02-28 14:25:17 UTC (rev 3618) +++ branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2012-02-29 13:25:04 UTC (rev 3619) @@ -38,6 +38,14 @@ varHandler.initView(EntityVariableUI.this); } }); + + addPropertyChangeListener(PROPERTY_VARIABLE, new java.beans.PropertyChangeListener() { + public void propertyChange(java.beans.PropertyChangeEvent evt) { + if (evt.getNewValue() == null) { + matrixPanel.setMatrix(null); + } + } + }); } ]]></script> @@ -51,6 +59,7 @@ <JList id="variablesList" cellRenderer="{new VariableListRenderer()}" model="{new fr.ifremer.isisfish.ui.input.model.TopiaEntityListModel()}" onValueChanged="getVarHandler().showSelectedVariable(this)" + selectionMode="{javax.swing.ListSelectionModel.SINGLE_SELECTION}" enabled='{isActive()}'/> </JScrollPane> </cell> Modified: branches/4.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/4.1/src/main/resources/i18n/isis-fish_en_GB.properties 2012-02-28 14:25:17 UTC (rev 3618) +++ branches/4.1/src/main/resources/i18n/isis-fish_en_GB.properties 2012-02-29 13:25:04 UTC (rev 3619) @@ -1107,6 +1107,7 @@ isisfish.zone.cells=Zone cells isisfish.zone.comments=Comments isisfish.zone.name=Name +isisfish.zone.title=Zone matrixAbundance= matrixCatchPerStrategyMetPerZoneMet= matrixDiscardsPerStrMetPerZonePop= Modified: branches/4.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/4.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-02-28 14:25:17 UTC (rev 3618) +++ branches/4.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-02-29 13:25:04 UTC (rev 3619) @@ -1107,6 +1107,7 @@ isisfish.zone.cells=Cellules de la zone isisfish.zone.comments=Commentaires isisfish.zone.name=Nom +isisfish.zone.title=Zone matrixAbundance= matrixCatchPerStrategyMetPerZoneMet= matrixDiscardsPerStrMetPerZonePop=
participants (1)
-
echatellier@users.forge.codelutin.com