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

r2462 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 02 Jul '09

02 Jul '09

Author: chatellier Date: 2009-07-02 16:36:23 +0000 (Thu, 02 Jul 2009) New Revision: 2462 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx Log: Creattino d'un nouveau model a chaque refresh(). L'utilisation du model existant marche pas (avec les selections , etc...) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2009-07-02 16:26:57 UTC (rev 2461) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2009-07-02 16:36:23 UTC (rev 2462) @@ -62,15 +62,13 @@ setBean(null); setBean((SetOfVesselsImpl) setOfVessels); - EffortDescriptionListModel model = (EffortDescriptionListModel)fieldEffortDescriptionEffortDescriptionList.getModel(); + EffortDescriptionListModel model = new EffortDescriptionListModel(); // getBean().getPossibleMetiers() can be null at region creation if (getBean() != null && getBean().getPossibleMetiers() != null) { java.util.List<EffortDescription> effortDescriptions = new ArrayList<EffortDescription>(getBean().getPossibleMetiers()); model.setEffortDescriptions(effortDescriptions); } - else { - model.setEffortDescriptions(null); - } + fieldEffortDescriptionEffortDescriptionList.setModel(model); } @Override @@ -107,7 +105,7 @@ <JScrollPane> <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="{javax.swing.ListSelectionModel.SINGLE_SELECTION}" onValueChanged='effortDescriptionSelectionChanged()' - model='{new EffortDescriptionListModel()}' cellRenderer='{new EffortDescriptionListRenderer()}' + cellRenderer='{new EffortDescriptionListRenderer()}' enabled='{isActif()}' decorator='boxed' /> </JScrollPane> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-07-02 16:26:57 UTC (rev 2461) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-07-02 16:36:23 UTC (rev 2462) @@ -83,14 +83,12 @@ } protected void setEffortDescriptionEffortDescriptionList() { - EffortDescriptionListModel model = (EffortDescriptionListModel)fieldEffortDescriptionEffortDescriptionList.getModel(); + EffortDescriptionListModel model = new EffortDescriptionListModel(); if (getBean() != null && getBean().getPossibleMetiers() != null) { java.util.List<EffortDescription> effortDescriptions = new ArrayList<EffortDescription>(getBean().getPossibleMetiers()); model.setEffortDescriptions(effortDescriptions); } - else { - model.setEffortDescriptions(null); - } + fieldEffortDescriptionEffortDescriptionList.setModel(model); } protected void addEffortDescriptions() { @@ -108,7 +106,6 @@ getInputAction().removeEffortDescription(getBean(), selectedEffortDescription); } setEffortDescriptionEffortDescriptionList(); - fieldEffortDescriptionEffortDescriptionList.clearSelection(); // bug selected index still exists } ]]> </script> @@ -136,7 +133,7 @@ <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - model='{new EffortDescriptionListModel()}' cellRenderer='{new EffortDescriptionListRenderer()}' + cellRenderer='{new EffortDescriptionListRenderer()}' onValueChanged='onFieldEffortDescriptionEffortDescriptionListValueChanged()' enabled='{isActif()}' decorator='boxed' /> </JScrollPane> </cell>

1 0

r2461 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 02 Jul '09

02 Jul '09

Author: tchemit Date: 2009-07-02 16:26:57 +0000 (Thu, 02 Jul 2009) New Revision: 2461 Modified: isis-fish/trunk/changelog.txt Log: update changelog Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-07-02 16:24:47 UTC (rev 2460) +++ isis-fish/trunk/changelog.txt 2009-07-02 16:26:57 UTC (rev 2461) @@ -1,5 +1,5 @@ isis-fish (3.2.0.4-rc2) xxx - + * Fix bug 1900 ( https://labs.libre-entreprise.org/tracker/index.php?func=detail&aid=1900&gr… ) * Fix simulation plan subjob number : start at 0 * Fix bug, database migration asked twice * Fix VCSSVN getRemoteStatus(), not showed added status file

1 0

r2460 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by tchemit＠users.labs.libre-entreprise.org 02 Jul '09

02 Jul '09

Author: tchemit Date: 2009-07-02 16:24:47 +0000 (Thu, 02 Jul 2009) New Revision: 2460 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.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/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: #BUG 1900 : region does not update after loading another region on nodes previously opened... Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-07-02 16:16:41 UTC (rev 2459) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-07-02 16:24:47 UTC (rev 2460) @@ -63,6 +63,9 @@ // otherwize, setBean has no effect setBean(null); setBean((CellImpl) cell); + + // reload region in map + refreshRegionInMap(cellMap); cellChanged = false; jaxx.runtime.SwingUtil.fillComboBox(fieldCell, getRegion().getCell(), getBean()); 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-07-02 16:16:41 UTC (rev 2459) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-07-02 16:24:47 UTC (rev 2460) @@ -106,6 +106,21 @@ getParentContainer(InputUI.class).setTreeSelection(getNextPath()); } +/** + * Mettre a jour la region dans une map si necessaire. + * + * @param map la map a mettre a jour si necessaire + */ +protected void refreshRegionInMap(fr.ifremer.isisfish.map.IsisMapBean map) { + FisheryRegion fisheryRegion = map.getFisheryRegion(); + FisheryRegion regionFromContext = getRegion(); + if (fisheryRegion == null || !fisheryRegion.equals(regionFromContext)) { + log.info("use now " + regionFromContext + " in map " + map); + map.setFisheryRegion(regionFromContext); + } +} + + // TODO this method cause a lot of probleme // must cast TopiaEntity to impl in inherited UIs... // 20090602 chatellier : useless method ? cause a lot of cast problem Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-07-02 16:16:41 UTC (rev 2459) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-07-02 16:24:47 UTC (rev 2460) @@ -36,9 +36,6 @@ boolean portChanged = true; -portMap.setFisheryRegion(getRegion()); -//portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); -//portMap.setActiveMouseMode(new SelectMouseMode()); toolSet.setupListeners(portMap); toolMap.add((Component)toolSet); setMapListener(); @@ -53,8 +50,8 @@ } if (evt.getNewValue() != null) { - } } + } }); @Override @@ -65,7 +62,9 @@ // otherwize, setBean has no effect setBean(null); setBean((PortImpl) port); - + // reload region in map + refreshRegionInMap(portMap); + fillList(); } @@ -129,7 +128,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0' > - <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed' /> + <JTextField id="fieldPortName" text='{SwingUtil.getStringValue(getBean().getName())}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed' /> </cell> </row> <row> @@ -153,7 +152,7 @@ <row> <cell columns='2' fill='both' weighty='0.3' weightx='1.0' > <JScrollPane> - <JTextArea id="fieldPortComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextArea id="fieldPortComment" text='{SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -176,7 +175,7 @@ </Table> <JPanel id='map' layout='{new BorderLayout()}'> <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> - <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed'/> + <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed' fisheryRegion='{getRegion()}'/> </JPanel> </JSplitPane> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-07-02 16:16:41 UTC (rev 2459) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-07-02 16:24:47 UTC (rev 2460) @@ -64,6 +64,9 @@ setBean(null); setBean((ZoneImpl) zone); + // reload region in map + refreshRegionInMap(zoneMap); + if (getBean() != null) { setZoneCells(); zoneMap.setSelectedCells(getBean().getCell());

1 0

r2459 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 02 Jul '09

02 Jul '09

Author: tchemit Date: 2009-07-02 16:16:41 +0000 (Thu, 02 Jul 2009) New Revision: 2459 Modified: isis-fish/trunk/pom.xml Log: use extraImportList instead of extraImport in jaxx plugin Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-07-02 13:48:42 UTC (rev 2458) +++ isis-fish/trunk/pom.xml 2009-07-02 16:16:41 UTC (rev 2459) @@ -450,10 +450,7 @@ <goal>generate</goal> </goals> <configuration> - <extraImports> - <value>jaxx.runtime.SwingUtil</value> - <value>static jaxx.runtime.Util.getStringValue</value> - </extraImports> + <extraImportList>jaxx.runtime.SwingUtil,static jaxx.runtime.Util.getStringValue</extraImportList> <addSourcesToClassPath>true</addSourcesToClassPath> <addProjectClassPath>true</addProjectClassPath> </configuration>

1 0

r2458 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 02 Jul '09

02 Jul '09

Author: chatellier Date: 2009-07-02 13:48:42 +0000 (Thu, 02 Jul 2009) New Revision: 2458 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx Log: Some field are still editable. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-07-02 08:31:00 UTC (rev 2457) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-07-02 13:48:42 UTC (rev 2458) @@ -100,8 +100,8 @@ @Override public void setActionButtons() { - //getVerifier().setSaveButton(save); - //getVerifier().setCancelButton(cancel); + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); } protected void setNaturalDeathRateMatrix() { @@ -194,7 +194,7 @@ _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/--> <JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}' onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' - enabled='false' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/> + enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/> </cell> </row> <row> @@ -236,7 +236,7 @@ </JScrollPane> </cell> </row> -  + </row> </Table> </fr.ifremer.isisfish.ui.input.InputContentUI>

1 0

r2457 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 02 Jul '09

02 Jul '09

Author: chatellier Date: 2009-07-02 08:31:00 +0000 (Thu, 02 Jul 2009) New Revision: 2457 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx Log: Fix NPE Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2009-07-01 17:05:51 UTC (rev 2456) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2009-07-02 08:31:00 UTC (rev 2457) @@ -63,7 +63,8 @@ setBean((SetOfVesselsImpl) setOfVessels); EffortDescriptionListModel model = (EffortDescriptionListModel)fieldEffortDescriptionEffortDescriptionList.getModel(); - if (getBean() != null) { + // getBean().getPossibleMetiers() can be null at region creation + if (getBean() != null && getBean().getPossibleMetiers() != null) { java.util.List<EffortDescription> effortDescriptions = new ArrayList<EffortDescription>(getBean().getPossibleMetiers()); model.setEffortDescriptions(effortDescriptions); }

1 0

r2456 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input resources/i18n
by chatellier＠users.labs.libre-entreprise.org 01 Jul '09

01 Jul '09

Author: chatellier Date: 2009-07-01 17:05:51 +0000 (Wed, 01 Jul 2009) New Revision: 2456 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties Log: Le nom du traget species ne peut pas ?\195?\170tre le nom d'un model, il n'y en a pas au debut. (nom du metier + nom de l'espece + nom de la saison) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-07-01 16:46:19 UTC (rev 2455) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-07-01 17:05:51 UTC (rev 2456) @@ -735,13 +735,17 @@ } public Object addTargetSpecies(Metier metier, MetierSeasonInfo m, - Species species, String targetFactorEquationName, - String targetFactorEquationContent, boolean primaryCatch) { + Species species, String targetFactorEquationContent, boolean primaryCatch) { if (log.isDebugEnabled()) { log.debug("addTargetSpecies called: " + metier + " " + species + " " + primaryCatch + " " + targetFactorEquationContent); } try { + // build targetFactorEquation name + String targetFactorEquationName = metier.getName() + "-" + species.getName() + + "(" + m.getFirstMonth() + "-" + m.getLastMonth() + ")"; + + TargetSpeciesDAO dao = IsisFishDAOHelper.getTargetSpeciesDAO(metier .getTopiaContext()); TargetSpecies targetSpecies = dao.create(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-07-01 16:46:19 UTC (rev 2455) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-07-01 17:05:51 UTC (rev 2456) @@ -108,12 +108,13 @@ protected void add() { Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue(); if (getMetierSeasonInfo() != null && species != null) { - Formule selectedFormule = (Formule)targetFactor.getFormuleComboBox().getSelectedItem(); + // il n'y en a pas a la creaion de la base + //Formule selectedFormule = (Formule)targetFactor.getFormuleComboBox().getSelectedItem(); getContextValue(InputAction.class).addTargetSpecies( getBean(), getMetierSeasonInfo(), (Species)species, - selectedFormule.getName(), + /* selectedFormule.getName(), */ targetFactor.getEditor().getText(), fieldPrimaryCatch.isSelected()); setTableTargetSpeciesModel(); Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-07-01 16:46:19 UTC (rev 2455) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-07-01 17:05:51 UTC (rev 2456) @@ -631,6 +631,7 @@ isisfish.message.script.commit=Enter commit message isisfish.message.setting.cache.aspects=Setting Cache aspects isisfish.message.setting.trace.aspects=Setting Trace aspects +isisfish.message.simulation.after=Result exports isisfish.message.simulation.ended=Simulation ended isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Preparing simulation

1 0

r2455 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 01 Jul '09

01 Jul '09

Author: chatellier Date: 2009-07-01 16:46:19 +0000 (Wed, 01 Jul 2009) New Revision: 2455 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx Log: Fix NPE Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-07-01 16:38:42 UTC (rev 2454) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-07-01 16:46:19 UTC (rev 2455) @@ -86,11 +86,15 @@ protected void setTableTargetSpeciesModel() { if (getMetierSeasonInfo() != null) { java.util.List<TargetSpecies> targetSpecies = new ArrayList<TargetSpecies>(); - // move collection to list - // and add all entity to verifier - for (TargetSpecies oneTargetSpecies : getMetierSeasonInfo().getSpeciesTargetSpecies()) { - getVerifier().addCurrentEntity(oneTargetSpecies); - targetSpecies.add(oneTargetSpecies); + + // SpeciesTargetSpecies can be null durring region creation + if (getMetierSeasonInfo().getSpeciesTargetSpecies() != null) { + // move collection to list + // and add all entity to verifier + for (TargetSpecies oneTargetSpecies : getMetierSeasonInfo().getSpeciesTargetSpecies()) { + getVerifier().addCurrentEntity(oneTargetSpecies); + targetSpecies.add(oneTargetSpecies); + } } // set table model

1 0

r2454 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 01 Jul '09

01 Jul '09

Author: chatellier Date: 2009-07-01 16:38:42 +0000 (Wed, 01 Jul 2009) New Revision: 2454 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx Log: Always set table model (to force data clearing) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-07-01 16:08:08 UTC (rev 2453) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-07-01 16:38:42 UTC (rev 2454) @@ -79,21 +79,25 @@ } protected void setSelectivityTableModel() { + + java.util.List<Selectivity> selectivitiesList = new ArrayList<Selectivity>(); + + // set model even if no selectivity + // to clear data if (getBean().getPopulationSelectivity() != null){ - java.util.List<Selectivity> selectivitiesList = new ArrayList<Selectivity>(); // move collection to list // and add all entity to verifier for (Selectivity oneSelectivity : getBean().getPopulationSelectivity()) { getVerifier().addCurrentEntity(oneSelectivity); selectivitiesList.add(oneSelectivity); } + } - // set table model - GearPopulationSelectivityModel model = new GearPopulationSelectivityModel(selectivitiesList); - selectivityTable.setModel(model); - selectivityTable.setDefaultRenderer(Equation.class, model); - selectivityTable.setDefaultEditor(Equation.class, new EquationTableEditor()); - } + // set table model + GearPopulationSelectivityModel model = new GearPopulationSelectivityModel(selectivitiesList); + selectivityTable.setModel(model); + selectivityTable.setDefaultRenderer(Equation.class, model); + selectivityTable.setDefaultEditor(Equation.class, new EquationTableEditor()); } protected void addSelectivity() {

1 0

r2453 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 01 Jul '09

01 Jul '09

Author: chatellier Date: 2009-07-01 16:08:08 +0000 (Wed, 01 Jul 2009) New Revision: 2453 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx Log: Enabled port modification Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-07-01 16:07:56 UTC (rev 2452) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-07-01 16:08:08 UTC (rev 2453) @@ -93,7 +93,7 @@ for (Cell c : portMap.getSelectedCells()) { if (getBean() != null) { if (getBean().getCell() != null) { - if (getBean().getCell().getTopiaId().equals(c.getTopiaId())){ + if (!getBean().getCell().getTopiaId().equals(c.getTopiaId())){ getBean().setCell(c); return true; }

1 0