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

r3269 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input: . tree
by chatellier＠users.labs.libre-entreprise.org April 18, 2011

April 18, 2011

Author: chatellier Date: 2011-04-18 16:43:02 +0000 (Mon, 18 Apr 2011) New Revision: 3269 Log: Fix population node creation Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-04-18 15:47:36 UTC (rev 3268) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-04-18 16:43:02 UTC (rev 3269) @@ -522,21 +522,8 @@ return null; } - // Population - public Species getSpeciesByTopiaId(TopiaContext context, String topiaId) { - Species result = null; - try { - SpeciesDAO dao = IsisFishDAOHelper.getSpeciesDAO(context); - result = dao.findByTopiaId(topiaId); - } catch (TopiaException e) { - if (log.isErrorEnabled()) { - log.error("Can't get species", e); - } - } - return result; - } - public Population createPopulation(TopiaContext context, Species species) { + Population pop = null; if (log.isTraceEnabled()) { log.trace("createPopulation called"); } @@ -544,25 +531,17 @@ String name = "Population_new"; PopulationDAO dao = IsisFishDAOHelper.getPopulationDAO(context); - Population pop = dao.create(); + pop = dao.create(); pop.setName(name); species.addPopulation(pop); pop.setSpecies(species); species.update(); pop.update(); - // EC-20091112 : commit() twice cause hibernate error: - // Found two representations of same collection: - //context.commitTransaction(); - return pop; - } catch (Exception eee) { - if (log.isErrorEnabled()) { - log.error("Can't create Population", eee); - } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", - "Population"), eee); + } catch (TopiaException eee) { + throw new IsisFishRuntimeException(_("isisfish.error.input.addentity", "Population"), eee); } - return null; + return pop; } public PopulationSeasonInfo createPopulationSeasonInfo(Population pop) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-04-18 15:47:36 UTC (rev 3268) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-04-18 16:43:02 UTC (rev 3269) @@ -55,6 +55,7 @@ import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.util.FileUtil; +import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; @@ -68,6 +69,7 @@ import fr.ifremer.isisfish.entities.Port; import fr.ifremer.isisfish.entities.SetOfVessels; import fr.ifremer.isisfish.entities.Species; +import fr.ifremer.isisfish.entities.SpeciesDAO; import fr.ifremer.isisfish.entities.Strategy; import fr.ifremer.isisfish.entities.TripType; import fr.ifremer.isisfish.entities.VesselType; @@ -670,9 +672,17 @@ selectedNode = selectedNode.getParent(); } + // must use loador to properly load species node FisheryTreeNodeLoador typeNodeLoador = fisheryTreeHelper.getLoadorFor(nodeClass); - // must use loador to properly load species node - FisheryTreeNode newNode = (FisheryTreeNode)typeNodeLoador.createNode(topiaEntity, null); + FisheryTreeNode newNode = null; + if (newNode != null) { + newNode = (FisheryTreeNode)typeNodeLoador.createNode(topiaEntity, null); + } + else { + // FIXME echatellier 20110418 cas non résolu du node "population" + // pour lequel on n'a pas le loador + newNode = new FisheryTreeNode(nodeClass, topiaEntity.getTopiaId(), null, null); + } fisheryTreeHelper.insertNode(selectedNode, newNode); fisheryTreeHelper.selectNode(newNode); } @@ -728,35 +738,12 @@ } if (bean != null) { - - //JComponent editor = source; - - // This is a special case for table source component - // If current entity is displayed by a JTable component - // we need to find a better component than - // can display 'property' on 'bean' - /*if (editor instanceof JTable) { - editor = EditorHelper.getEditorForValue(bean, sensitivityMethod); - }*/ - - //if (editor != null) { - FactorWizardUI factorWizardUI = new FactorWizardUI(inputContentUI); - SensitivityInputHandler handler = factorWizardUI.getHandler(); - handler.initNewFactor(factorWizardUI, bean, sensitivityMethod); - factorWizardUI.pack(); - factorWizardUI.setLocationRelativeTo(inputContentUI); - factorWizardUI.setVisible(true); - - //Object value = EditorHelper.getMethodValue(bean, fieldName); - //boolean continuePossible = EditorHelper.canBeContinue(/*source, */value); - //wizard.initNew(/*source, */bean, continuePossible); - //wizard.pack(); - //wizard.setLocationRelativeTo(inputContentUI); - //wizard.setVisible(true); - /*} - else if (log.isWarnEnabled()) { - log.warn("Can't find editor for " + sensitivityBeanClass.getSimpleName() + "#" + sensitivityMethod); - }*/ + FactorWizardUI factorWizardUI = new FactorWizardUI(inputContentUI); + SensitivityInputHandler handler = factorWizardUI.getHandler(); + handler.initNewFactor(factorWizardUI, bean, sensitivityMethod); + factorWizardUI.pack(); + factorWizardUI.setLocationRelativeTo(inputContentUI); + factorWizardUI.setVisible(true); } else { if (log.isErrorEnabled()) { @@ -764,4 +751,47 @@ } } } + + /** + * Dans le cas d'une creation de population, on doit la creer dans + * une espèce. On doit rechercher celle qui est sélectionnée dans l'arbre. + * + * @param inputUI input ui + * @return selected species + */ + public Species findSpecies(InputUI inputUI) { + // get selected node + FisheryTreeHelper treeHelper = inputUI.getContextValue(FisheryTreeHelper.class); + FisheryTreeNode selectedNode = treeHelper.getSelectedNode(); + if (selectedNode == null) { + throw new IsisFishRuntimeException("Not selected tree node"); + } + + // look for parent node (Species type) + String speciesId = null; + FisheryTreeNode parentNode = selectedNode.getParent(); + if (parentNode.getInternalClass().equals(Species.class)) { + // cas selection du noeud type "Population" + speciesId = parentNode.getId(); + } + else if (parentNode.getParent().getInternalClass().equals(Species.class)) { + // cas où on est deja sur une population + speciesId = parentNode.getParent().getId(); + } + else { + throw new IsisFishRuntimeException("Not selected tree node"); + } + + // look for entities + TopiaContext topiaContext = inputUI.getContextValue(TopiaContext.class); + Species result = null; + try { + SpeciesDAO dao = IsisFishDAOHelper.getSpeciesDAO(topiaContext); + result = dao.findByTopiaId(speciesId); + } catch (TopiaException e) { + throw new IsisFishRuntimeException("Can't find "); + } + + return result; + } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-04-18 16:43:02 UTC (rev 3269) @@ -34,7 +34,6 @@ fr.ifremer.isisfish.entities.PopulationGroup; fr.ifremer.isisfish.entities.Population; javax.swing.table.DefaultTableModel; - org.nuiton.topia.persistence.TopiaEntity; java.beans.PropertyChangeEvent; java.beans.PropertyChangeListener; javax.swing.JOptionPane @@ -102,7 +101,8 @@ wizard.init(this); wizardFrame.add(wizard, BorderLayout.CENTER); wizardFrame.setTitle(_("isisfish.wizardGroupCreation.title")); - wizard.setAgeType(getBean().getSpecies().getAgeGroupType()); + Species species = getBean().getSpecies(); + wizard.setAgeType(species.getAgeGroupType()); if (wizard.isAgeType()) { wizard.setCard("singleGroupAge"); } else { @@ -138,15 +138,12 @@ } protected void create() { - Species species = null; //getAction().getSpeciesByTopiaId(getSaveVerifier().getIsisContext(), getSaveVerifier().getCurrentNode().getParent().getNavigationPath()); - if (species == null){ - species = null; //getAction().getSpeciesByTopiaId(getSaveVerifier().getIsisContext(), getSaveVerifier().getCurrentNode().getParent().getParent().getNavigationPath()); - } - - TopiaEntity topia = getContextValue(InputAction.class).createPopulation(getTopiaContext(), species); - // FIXME echatellier 20110306 use new tree api - //getParentContainer(InputUI.class).setTreeModel(); - //getParentContainer(InputUI.class).setTreeSelection("$root/$species/"+ species.getTopiaId() +"/$populations/"+topia.getTopiaId()); + // find species node + InputUI inputUI = getContextValue(InputUI.class, JAXXUtil.PARENT); + Species species = inputUI.getHandler().findSpecies(inputUI); + // create node and select it + Population population = getContextValue(InputAction.class).createPopulation(getTopiaContext(), species); + inputUI.getHandler().insertTreeNode(inputUI, Population.class, population); setInfoText(_("isisfish.message.creation.finished")); } ]]> @@ -276,7 +273,7 @@ <JButton id='create' decorator='boxed' text="isisfish.common.new" enabled="{!validator.isChanged()}" - onActionPerformed="getSaveVerifier().create(Population.class)"/> + onActionPerformed="create()"/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2011-04-18 15:47:36 UTC (rev 3268) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2011-04-18 16:43:02 UTC (rev 3269) @@ -141,7 +141,7 @@ FisheryTreeNode strategiesChild = new FisheryTreeNode(Strategy.class, n_("isisfish.input.tree.strategies"), null, strategiesNodeLoador); loadorCache.put(Strategy.class, strategiesNodeLoador); - + root.add(cellsChild); root.add(zonesChild); root.add(portsChild);

1 0

r3268 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 18, 2011

April 18, 2011

Author: chatellier Date: 2011-04-18 15:47:36 +0000 (Mon, 18 Apr 2011) New Revision: 3268 Log: Activation du bouton "supprimer" seulement si un bean est charg?\195?\169 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-04-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -171,7 +171,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-04-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -182,7 +182,7 @@ <InputOneEquationUI id='targetFactor' constructorParams='this' active='{isTargetSpeciesSelected()}' text='isisfish.metierSeasonInfoSpecies.targetFactor' - bean='{getBean()}' formuleCategory='TargetFactor' + bean='{getMetierSeasonInfo()}' formuleCategory='TargetFactor' clazz='{fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class}' decorator='boxed' _sensitivityBean='{Metier.class}' _sensitivityMethod='""'/> </cell> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-04-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -158,7 +158,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-04-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -196,7 +196,7 @@ </row> <row> <cell anchor='east'> - <JLabel text="isisfish.populationBasics.maturityGroup" enabled='{isActive()}'/> + <JLabel text="isisfish.populationBasics.maturityGroup" enabled='{getBean() != null}'/> </cell> <cell fill='horizontal' weightx='1.0'> <JAXXComboBox id="fieldPopulationBasicsMatureClass" onActionPerformed='matureClassChanged()' @@ -281,7 +281,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-04-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -203,7 +203,7 @@ <cell fill='horizontal' weightx='1.0'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-04-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -191,7 +191,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-04-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -198,7 +198,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-04-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -147,7 +147,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-04-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -256,7 +256,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row>

1 0

r3267 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 18, 2011

April 18, 2011

Author: chatellier Date: 2011-04-18 15:47:11 +0000 (Mon, 18 Apr 2011) New Revision: 3267 Log: Desactivation d'elements qui n'ont plus d'implementation Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-04-18 15:46:47 UTC (rev 3266) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-04-18 15:47:11 UTC (rev 3267) @@ -115,13 +115,9 @@ setFieldMapfilesModel(getBean()); } -protected void cellFillChanged() { - -} - -protected void cellFile() { +/*protected void cellFile() { getInputAction().loadCellFile(fieldCellFile.getText()); -} +}*/ protected void check() { getContextValue(InputAction.class).checkFisheryRegion(getBean()); @@ -276,7 +272,7 @@ <JLabel text="isisfish.fisheryRegion.selectFile"/> </cell> </row> - <row> +  <row> <cell fill='horizontal' weightx='0.3'> <JButton id='save' decorator='boxed' text="isisfish.common.save" enabled="{validator.isValid() && validator.isChanged()}" - onActionPerformed="save()"/> + onActionPerformed="save();validator.setChanged(false)"/> </cell> <cell fill='horizontal' weightx='0.3'> <JButton id='cancel' decorator='boxed' Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-04-18 15:46:47 UTC (rev 3266) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-04-18 15:47:11 UTC (rev 3267) @@ -877,19 +877,19 @@ } } - /** + /* * Affiche une boite de dialogue demandant a l'utilisateur de rentrer * un nom de fichier, et met ce nom dans la textField. * Passe le saveButton en enabled pour marque que la region a ete modifié * * @param cellFile file of cells - */ + * public void loadCellFile(String cellFile) { if (log.isWarnEnabled()) { log.warn("loadCell called but not implemented"); } // FIXME todo loadCellFile - } + }*/ public void saveFisheryRegion(FisheryRegion fisheryRegion) { if (log.isTraceEnabled()) {

1 0

r3266 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 18, 2011

April 18, 2011

Author: chatellier Date: 2011-04-18 15:46:47 +0000 (Mon, 18 Apr 2011) New Revision: 3266 Log: Correction creation de nouvelles entit?\195?\169s Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-04-18 15:46:07 UTC (rev 3265) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-04-18 15:46:47 UTC (rev 3266) @@ -211,7 +211,7 @@ topiaContext.commitTransaction(); InputUI inputUI = inputContentUI.getContextValue(InputUI.class, JAXXUtil.PARENT); - inputUI.getHandler().insertTreeNode(inputUI, type, topiaEntity.getTopiaId()); + inputUI.getHandler().insertTreeNode(inputUI, type, topiaEntity); //rootUI.setStatusMessage(_("isisfish.message.creation.finished")); } catch (Exception eee) {

1 0

r3265 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 18, 2011

April 18, 2011

Author: chatellier Date: 2011-04-18 15:46:07 +0000 (Mon, 18 Apr 2011) New Revision: 3265 Log: Correction creation de nouvelles entit?\195?\169s Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-04-18 15:44:40 UTC (rev 3264) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-04-18 15:46:07 UTC (rev 3265) @@ -82,6 +82,8 @@ import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeRenderer; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeSelectionModel; +import fr.ifremer.isisfish.ui.input.tree.loadors.FisheryTreeNodeLoador; +import fr.ifremer.isisfish.ui.models.common.StringListModel; import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.SensitivityInputHandler; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; @@ -232,6 +234,10 @@ throw new IsisFishRuntimeException("Can't create region", ex); } inputUI.getFieldNewRegion().setText(""); + + // refresh region list + StringListModel regionsModel = new StringListModel(RegionStorage.getRegionNames()); + inputUI.getFieldCurrentRegion().setModel(regionsModel); // event is fired by setSelectedItem to call #regionChange inputUI.getFieldCurrentRegion().setSelectedItem(name); } @@ -513,12 +519,12 @@ } InputContentUI inputContentUI = getUIInstanceForBeanClass(internalClass, inputUI); + inputContentUI.getSaveVerifier().setInputContentUI(inputContentUI); // mandatory set //inputContentUI.getSaveVerifier().reset(); // before set bean !!! if (topiaEntity != null) { inputContentUI.getSaveVerifier().addCurrentEntity(topiaEntity); - inputContentUI.getSaveVerifier().setInputContentUI(inputContentUI); } inputContentUI.setBean((TopiaEntityContextable)topiaEntity); @@ -651,12 +657,12 @@ * * @param inputUI ui containing tree * @param nodeClass node type to create - * @param topiaId node id to insert + * @param topiaEntity node to insert */ - public void insertTreeNode(InputUI inputUI, Class<?> nodeClass, String topiaId) { + public void insertTreeNode(InputUI inputUI, Class nodeClass, TopiaEntityContextable topiaEntity) { FisheryTreeHelper fisheryTreeHelper = inputUI.getContextValue(FisheryTreeHelper.class); - // on par du principe que pour ne pas compliquer les ui est les lier + // on part du principe que pour ne pas compliquer les ui est les lier // à l'arbre, on ajoute un nouveau noeud en fils de celui selectionné // (ou son parent si la creation à lieu à partir d'un noeud bean) FisheryTreeNode selectedNode = fisheryTreeHelper.getSelectedNode(); @@ -664,7 +670,9 @@ selectedNode = selectedNode.getParent(); } - FisheryTreeNode newNode = new FisheryTreeNode(nodeClass, topiaId, null, null); + FisheryTreeNodeLoador typeNodeLoador = fisheryTreeHelper.getLoadorFor(nodeClass); + // must use loador to properly load species node + FisheryTreeNode newNode = (FisheryTreeNode)typeNodeLoador.createNode(topiaEntity, null); fisheryTreeHelper.insertNode(selectedNode, newNode); fisheryTreeHelper.selectNode(newNode); }

1 0

r3264 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree: . loadors
by chatellier＠users.labs.libre-entreprise.org April 18, 2011

April 18, 2011

Author: chatellier Date: 2011-04-18 15:44:40 +0000 (Mon, 18 Apr 2011) New Revision: 3264 Log: Correction de la creation du noeud "Espece" auquel il manquait les sous noeuds. Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -24,9 +24,15 @@ import static org.nuiton.i18n.I18n.n_; +import java.util.HashMap; +import java.util.Map; + import javax.swing.tree.TreeModel; import jaxx.runtime.swing.nav.tree.NavTreeHelper; + +import org.nuiton.topia.persistence.TopiaEntity; + import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.Gear; @@ -39,6 +45,7 @@ import fr.ifremer.isisfish.entities.VesselType; import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.ui.input.tree.loadors.CellsNodeLoador; +import fr.ifremer.isisfish.ui.input.tree.loadors.FisheryTreeNodeLoador; import fr.ifremer.isisfish.ui.input.tree.loadors.GearsNodeLoador; import fr.ifremer.isisfish.ui.input.tree.loadors.MetiersNodeLoador; import fr.ifremer.isisfish.ui.input.tree.loadors.PortsNodeLoador; @@ -57,6 +64,12 @@ */ public class FisheryTreeHelper extends NavTreeHelper<FisheryTreeNode> { + public Map<Class, FisheryTreeNodeLoador<? extends TopiaEntity>> loadorCache = new HashMap<Class, FisheryTreeNodeLoador<? extends TopiaEntity>>(); + + public <T extends TopiaEntity> FisheryTreeNodeLoador<? extends TopiaEntity> getLoadorFor(Class<T> type) { + return loadorCache.get(type); + } + public TreeModel createTreeModel(FisheryRegion fisheryRegion) { FisheryDataProvider provider = new FisheryDataProvider(fisheryRegion); @@ -66,27 +79,68 @@ FisheryTreeNode root = new FisheryTreeNode(FisheryRegion.class, fisheryRegion.getTopiaId(), null, null); + // declare loador + loadorCache.put(Cell.class, new CellsNodeLoador()); + loadorCache.put(Zone.class, new ZonesNodeLoador()); + loadorCache.put(Port.class, new PortsNodeLoador()); + loadorCache.put(Species.class, new SpeciesNodeLoador()); + loadorCache.put(Gear.class, new GearsNodeLoador()); + loadorCache.put(Metier.class, new MetiersNodeLoador()); + loadorCache.put(TripType.class, new TripTypesNodeLoador()); + loadorCache.put(VesselType.class, new VesselTypesNodeLoador()); + loadorCache.put(SetOfVessels.class, new SetOfVesselsNodeLoador()); + loadorCache.put(Strategy.class, new StrategiesNodeLoador()); + // first level nodes + CellsNodeLoador cellsNodeLoador = new CellsNodeLoador(); FisheryTreeNode cellsChild = new FisheryTreeNode(Cell.class, - n_("isisfish.input.tree.cells"), null, new CellsNodeLoador()); + n_("isisfish.input.tree.cells"), null, cellsNodeLoador); + loadorCache.put(Cell.class, cellsNodeLoador); + + ZonesNodeLoador zonesNodeLoador = new ZonesNodeLoador(); FisheryTreeNode zonesChild = new FisheryTreeNode(Zone.class, - n_("isisfish.input.tree.zones"), null, new ZonesNodeLoador()); + n_("isisfish.input.tree.zones"), null, zonesNodeLoador); + loadorCache.put(Zone.class, zonesNodeLoador); + + PortsNodeLoador portsNodeLoador = new PortsNodeLoador(); FisheryTreeNode portsChild = new FisheryTreeNode(Port.class, - n_("isisfish.input.tree.ports"), null, new PortsNodeLoador()); + n_("isisfish.input.tree.ports"), null, portsNodeLoador); + loadorCache.put(Port.class, portsNodeLoador); + + SpeciesNodeLoador speciesNodeLoador = new SpeciesNodeLoador(); FisheryTreeNode speciesChild = new FisheryTreeNode(Species.class, - n_("isisfish.input.tree.species"), null, new SpeciesNodeLoador()); + n_("isisfish.input.tree.species"), null, speciesNodeLoador); + loadorCache.put(Species.class, speciesNodeLoador); + + GearsNodeLoador gearsNodeLoador = new GearsNodeLoador(); FisheryTreeNode gearsChild = new FisheryTreeNode(Gear.class, - n_("isisfish.input.tree.gears"), null, new GearsNodeLoador()); + n_("isisfish.input.tree.gears"), null, gearsNodeLoador); + loadorCache.put(Gear.class, gearsNodeLoador); + + MetiersNodeLoador metiersNodeLoador = new MetiersNodeLoador(); FisheryTreeNode metiersChild = new FisheryTreeNode(Metier.class, - n_("isisfish.input.tree.metiers"), null, new MetiersNodeLoador()); + n_("isisfish.input.tree.metiers"), null, metiersNodeLoador); + loadorCache.put(Metier.class, metiersNodeLoador); + + TripTypesNodeLoador tripTypesNodeLoador = new TripTypesNodeLoador(); FisheryTreeNode tripTypesChild = new FisheryTreeNode(TripType.class, - n_("isisfish.input.tree.triptypes"), null, new TripTypesNodeLoador()); + n_("isisfish.input.tree.triptypes"), null, tripTypesNodeLoador); + loadorCache.put(TripType.class, tripTypesNodeLoador); + + VesselTypesNodeLoador vesselTypesNodeLoador = new VesselTypesNodeLoador(); FisheryTreeNode vesselTypesChild = new FisheryTreeNode(VesselType.class, - n_("isisfish.input.tree.vesseltypes"), null, new VesselTypesNodeLoador()); + n_("isisfish.input.tree.vesseltypes"), null, vesselTypesNodeLoador); + loadorCache.put(VesselType.class, vesselTypesNodeLoador); + + SetOfVesselsNodeLoador setOfVesselsNodeLoador = new SetOfVesselsNodeLoador(); FisheryTreeNode setOfVesselsChild = new FisheryTreeNode(SetOfVessels.class, - n_("isisfish.input.tree.setofvessels"), null, new SetOfVesselsNodeLoador()); + n_("isisfish.input.tree.setofvessels"), null, setOfVesselsNodeLoador); + loadorCache.put(SetOfVessels.class, setOfVesselsNodeLoador); + + StrategiesNodeLoador strategiesNodeLoador = new StrategiesNodeLoador(); FisheryTreeNode strategiesChild = new FisheryTreeNode(Strategy.class, - n_("isisfish.input.tree.strategies"), null, new StrategiesNodeLoador()); + n_("isisfish.input.tree.strategies"), null, strategiesNodeLoador); + loadorCache.put(Strategy.class, strategiesNodeLoador); root.add(cellsChild); root.add(zonesChild); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class CellsNodeLoador extends NavTreeNodeChildLoador<Cell, Cell, FisheryTreeNode> { +public class CellsNodeLoador extends FisheryTreeNodeLoador<Cell> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -0,0 +1,52 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.ui.input.tree.loadors; + +import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; + +import org.nuiton.topia.persistence.TopiaEntity; + +import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; + +/** + * Common class to all loador. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + * @param <T> + */ +public abstract class FisheryTreeNodeLoador<T extends TopiaEntity> extends NavTreeNodeChildLoador<T, T, FisheryTreeNode> { + + /** serialVersionUID. */ + private static final long serialVersionUID = 7738607604066405224L; + + public FisheryTreeNodeLoador(Class<T> type) { + super(type); + } +} Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.Gear; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class GearsNodeLoador extends NavTreeNodeChildLoador<Gear, Gear, FisheryTreeNode> { +public class GearsNodeLoador extends FisheryTreeNodeLoador<Gear> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class MetiersNodeLoador extends NavTreeNodeChildLoador<Metier, Metier, FisheryTreeNode> { +public class MetiersNodeLoador extends FisheryTreeNodeLoador<Metier> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -23,10 +23,10 @@ package fr.ifremer.isisfish.ui.input.tree.loadors; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.Species; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; @@ -37,7 +37,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class PopulationsNodeLoador extends NavTreeNodeChildLoador<Population, Population, FisheryTreeNode> { +public class PopulationsNodeLoador extends FisheryTreeNodeLoador<Population> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; @@ -51,7 +51,13 @@ @Override public List<Population> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception { - List<Population> populations = new ArrayList<Population>(species.getPopulation()); + List<Population> populations = null; + if (species.getPopulation() != null) { + populations = new ArrayList<Population>(species.getPopulation()); + } + else { + populations = Collections.EMPTY_LIST; + } return populations; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.Port; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class PortsNodeLoador extends NavTreeNodeChildLoador<Port, Port, FisheryTreeNode> { +public class PortsNodeLoador extends FisheryTreeNodeLoador<Port> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.SetOfVessels; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class SetOfVesselsNodeLoador extends NavTreeNodeChildLoador<SetOfVessels, SetOfVessels, FisheryTreeNode> { +public class SetOfVesselsNodeLoador extends FisheryTreeNodeLoador<SetOfVessels> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -27,7 +27,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.Species; @@ -40,7 +39,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class SpeciesNodeLoador extends NavTreeNodeChildLoador<Species, Species, FisheryTreeNode> { +public class SpeciesNodeLoador extends FisheryTreeNodeLoador<Species> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.Strategy; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class StrategiesNodeLoador extends NavTreeNodeChildLoador<Strategy, Strategy, FisheryTreeNode> { +public class StrategiesNodeLoador extends FisheryTreeNodeLoador<Strategy> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.TripType; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class TripTypesNodeLoador extends NavTreeNodeChildLoador<TripType, TripType, FisheryTreeNode> { +public class TripTypesNodeLoador extends FisheryTreeNodeLoador<TripType> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.VesselType; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class VesselTypesNodeLoador extends NavTreeNodeChildLoador<VesselType, VesselType, FisheryTreeNode> { +public class VesselTypesNodeLoador extends FisheryTreeNodeLoador<VesselType> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,9 +25,8 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; -import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.entities.FisheryRegion; +import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class ZonesNodeLoador extends NavTreeNodeChildLoador<Zone, Zone, FisheryTreeNode> { +public class ZonesNodeLoador extends FisheryTreeNodeLoador<Zone> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L;

1 0

r3263 - in isis-fish/branches/3.3.1/src/main: java/fr/ifremer/isisfish/ui/input/check resources/i18n
by chatellier＠users.labs.libre-entreprise.org April 18, 2011

April 18, 2011

Author: chatellier Date: 2011-04-18 15:44:03 +0000 (Mon, 18 Apr 2011) New Revision: 3263 Log: Add check about port Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-04-18 14:31:52 UTC (rev 3262) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-04-18 15:44:03 UTC (rev 3263) @@ -468,7 +468,12 @@ } static public void check(Port port, CheckResult result){ - + if (StringUtils.isBlank(port.getName())) { + result.addWarning(port, _("isisfish.error.empty.name")); + } + if (port.getCell() == null) { + result.addWarning(port, _("isisfish.error.undefined.mesh.sector")); + } } } // CheckSaisie Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-04-18 14:31:52 UTC (rev 3262) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-04-18 15:44:03 UTC (rev 3263) @@ -328,6 +328,7 @@ isisfish.error.not.null.natural.death=Null natural mortality isisfish.error.not.possible.metier=Pas de m\u00E9tier possible isisfish.error.not.support.class=this class does not support +isisfish.error.null.semantics=Null semantics for %s isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0 isisfish.error.out.memory=Out of memory try with more memory (option -mx) isisfish.error.overlap.season=Cette saison chevauche une autre saison Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-04-18 14:31:52 UTC (rev 3262) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-04-18 15:44:03 UTC (rev 3263) @@ -328,6 +328,7 @@ isisfish.error.not.null.natural.death=mortalite naturelle nulle isisfish.error.not.possible.metier=Pas de m\u00E9tier possible isisfish.error.not.support.class=La classe %s ne supporte pas les descritions +isisfish.error.null.semantics=Semantiques nulle pour %s isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0 isisfish.error.out.memory=Out of memory try with more memory (option -mx) isisfish.error.overlap.season=Cette saison chevauche une autre saison

1 0

r3262 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 18, 2011

April 18, 2011

Author: chatellier Date: 2011-04-18 14:31:52 +0000 (Mon, 18 Apr 2011) New Revision: 3262 Log: Fix npe when clicking on map with no bean loaded Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-04-18 14:19:01 UTC (rev 3261) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-04-18 14:31:52 UTC (rev 3262) @@ -64,8 +64,8 @@ // TODO a fixer, le clic droit du menu contextuel // passe aussi par ici et change la selection //if (e.getButton() == MouseEvent.BUTTON1) { - for (Cell c : cellMap.getSelectedCells()) { - if (getBean() != null) { + if (getBean() != null) { // impossible de desactiver la carte :( + for (Cell c : cellMap.getSelectedCells()) { if (!c.getTopiaId().equals(getBean().getTopiaId())) { jaxx.runtime.SwingUtil.fillComboBox(fieldCell,getFisheryRegion().getCell(), c); result = true; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-04-18 14:19:01 UTC (rev 3261) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-04-18 14:31:52 UTC (rev 3262) @@ -61,8 +61,8 @@ new OpenMapEvents(portMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { - for (Cell c : portMap.getSelectedCells()) { - if (getBean() != null) { + if (getBean() != null) { // impossible de desactiver la carte :( + for (Cell c : portMap.getSelectedCells()) { if (getBean().getCell() != null) { if (!getBean().getCell().getTopiaId().equals(c.getTopiaId())){ getBean().setCell(c); @@ -183,7 +183,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-04-18 14:19:01 UTC (rev 3261) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-04-18 14:31:52 UTC (rev 3262) @@ -66,11 +66,15 @@ new OpenMapEvents(zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { - getBean().setCell(zoneMap.getSelectedCells()); - if (getBean().getCell() != null){ - zoneCells.setSelectedValues(getBean().getCell().toArray()); + boolean result = false; + if (getBean() != null) { // impossible de desactiver la carte :( + getBean().setCell(zoneMap.getSelectedCells()); + if (getBean().getCell() != null){ + zoneCells.setSelectedValues(getBean().getCell().toArray()); + result = true; + } } - return true; + return result; } }; @@ -203,7 +207,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row>

1 0

r3261 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check
by chatellier＠users.labs.libre-entreprise.org April 18, 2011

April 18, 2011

Author: chatellier Date: 2011-04-18 14:19:01 +0000 (Mon, 18 Apr 2011) New Revision: 3261 Log: Remove wrong comment Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2011-04-18 14:18:23 UTC (rev 3260) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2011-04-18 14:19:01 UTC (rev 3261) @@ -180,7 +180,8 @@ /** * Permet d'ajouter une info sur un objet. - * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet + * + * @param o l'objet sur lequel le message porte * @param message le message à ajouter */ public void addInfo(Object o, String message) { @@ -194,7 +195,8 @@ /** * Permet d'ajouter un avertissement sur un objet. - * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet + * + * @param o l'objet sur lequel le message porte * @param message le message à ajouter */ public void addWarning(Object o, String message) { @@ -208,7 +210,8 @@ /** * Permet d'ajouter une error sur un objet. - * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet + * + * @param o l'objet sur lequel le message porte * @param message le message à ajouter */ public void addError(Object o, String message) {

1 0

r3260 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check
by chatellier＠users.labs.libre-entreprise.org April 18, 2011

April 18, 2011

Author: chatellier Date: 2011-04-18 14:18:23 +0000 (Mon, 18 Apr 2011) New Revision: 3260 Log: Improve code Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2011-04-18 14:08:16 UTC (rev 3259) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2011-04-18 14:18:23 UTC (rev 3260) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, CodeLutin + * Copyright (C) 2002 - 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 @@ -25,10 +25,13 @@ package fr.ifremer.isisfish.ui.input.check; +import java.util.HashMap; +import java.util.Iterator; import java.util.LinkedHashSet; -import java.util.Iterator; -import java.util.HashMap; import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * Classe permettant de créer le résultat d'une vérification de la bonne saisie des objets. @@ -44,60 +47,62 @@ */ public class CheckResult { // CheckResult - LinkedHashSet order = new LinkedHashSet(); + protected Set<Object> order = new LinkedHashSet<Object>(); - HashMap info = new HashMap(); - HashMap warning = new HashMap(); - HashMap error = new HashMap(); + protected Map<Object, List<String>> info = new HashMap<Object, List<String>>(); + protected Map<Object, List<String>> warning = new HashMap<Object, List<String>>(); + protected Map<Object, List<String>> error = new HashMap<Object, List<String>>(); public StringBuffer getInfo() { StringBuffer result = new StringBuffer(); - for(Iterator i=order.iterator(); i.hasNext();){ + for (Iterator i = order.iterator(); i.hasNext();) { Object o = i.next(); StringBuffer tmp = getInfo(o); - if(tmp.length() != 0){ + if (tmp.length() != 0) { String title = o.toString(); tmp.insert(0, "\n"); - for(int e=0; e<title.length(); e++){ + for (int e = 0; e < title.length(); e++) { tmp.insert(0, "="); } - tmp.insert(0, title+"\n"); + tmp.insert(0, title + "\n"); tmp.append("\n"); result.append(tmp.toString()); } } return result; } + public StringBuffer getWarning() { StringBuffer result = new StringBuffer(); - for(Iterator i=order.iterator(); i.hasNext();){ + for (Iterator i = order.iterator(); i.hasNext();) { Object o = i.next(); StringBuffer tmp = getWarning(o); - if(tmp.length() != 0){ + if (tmp.length() != 0) { String title = o.toString(); tmp.insert(0, "\n"); - for(int e=0; e<title.length(); e++){ + for (int e = 0; e < title.length(); e++) { tmp.insert(0, "="); } - tmp.insert(0, title+"\n"); + tmp.insert(0, title + "\n"); tmp.append("\n"); result.append(tmp.toString()); } } return result; } + public StringBuffer getError() { StringBuffer result = new StringBuffer(); - for(Iterator i=order.iterator(); i.hasNext();){ + for (Iterator i = order.iterator(); i.hasNext();) { Object o = i.next(); StringBuffer tmp = getError(o); - if(tmp.length() != 0){ + if (tmp.length() != 0) { String title = o.toString(); tmp.insert(0, "\n"); - for(int e=0; e<title.length(); e++){ + for (int e = 0; e < title.length(); e++) { tmp.insert(0, "="); } - tmp.insert(0, title+"\n"); + tmp.insert(0, title + "\n"); tmp.append("\n"); result.append(tmp.toString()); } @@ -107,37 +112,39 @@ public StringBuffer getInfo(Object o) { StringBuffer result = new StringBuffer(); - LinkedList list = (LinkedList)info.get(o); - if(list != null && list.size() != 0){ + List list = info.get(o); + if (list != null && list.size() != 0) { result.append("Info\n"); result.append("----\n"); - for(Iterator i=list.iterator(); i.hasNext();){ + for (Iterator i = list.iterator(); i.hasNext();) { result.append(i.next().toString()); result.append("\n"); } } return result; } + public StringBuffer getWarning(Object o) { StringBuffer result = new StringBuffer(); - LinkedList list = (LinkedList)warning.get(o); - if(list != null && list.size() != 0){ + List list = warning.get(o); + if (list != null && list.size() != 0) { result.append("Problème\n"); result.append("--------\n"); - for(Iterator i=list.iterator(); i.hasNext();){ + for (Iterator i = list.iterator(); i.hasNext();) { result.append(i.next().toString()); result.append("\n"); } } return result; } + public StringBuffer getError(Object o) { StringBuffer result = new StringBuffer(); - LinkedList list = (LinkedList)error.get(o); - if(list != null && list.size() != 0){ + List list = error.get(o); + if (list != null && list.size() != 0) { result.append("Erreur\n"); result.append("------\n"); - for(Iterator i=list.iterator(); i.hasNext();){ + for (Iterator i = list.iterator(); i.hasNext();) { result.append(i.next().toString()); result.append("\n"); } @@ -145,27 +152,27 @@ return result; } - public StringBuffer getAll(Object o){ + public StringBuffer getAll(Object o) { StringBuffer result = new StringBuffer(); result.append(getError(o).toString()); result.append(getWarning(o).toString()); result.append(getInfo(o).toString()); - if (result.length() != 0){ + if (result.length() != 0) { String title = o.toString(); result.insert(0, "\n"); - for(int i=0; i<title.length(); i++){ + for (int i = 0; i < title.length(); i++) { result.insert(0, "="); } - result.insert(0, title+"\n"); + result.insert(0, title + "\n"); } result.append("\n"); return result; } - public StringBuffer getAll(){ + public StringBuffer getAll() { StringBuffer result = new StringBuffer(); - for(Iterator i=order.iterator(); i.hasNext();){ + for (Iterator i = order.iterator(); i.hasNext();) { result.append(getAll(i.next())); } return result; @@ -176,11 +183,11 @@ * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet * @param message le message à ajouter */ - public void addInfo(Object o, String message){ + public void addInfo(Object o, String message) { order.add(o); - LinkedList list = (LinkedList)info.get(o); - if(list == null){ - info.put(o, list = new LinkedList()); + List<String> list = info.get(o); + if (list == null) { + info.put(o, list = new LinkedList<String>()); } list.add(message); } @@ -190,11 +197,11 @@ * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet * @param message le message à ajouter */ - public void addWarning(Object o, String message){ + public void addWarning(Object o, String message) { order.add(o); - LinkedList list = (LinkedList)warning.get(o); - if(list == null){ - warning.put(o, list = new LinkedList()); + List<String> list = warning.get(o); + if (list == null) { + warning.put(o, list = new LinkedList<String>()); } list.add(message); } @@ -204,14 +211,13 @@ * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet * @param message le message à ajouter */ - public void addError(Object o, String message){ + public void addError(Object o, String message) { order.add(o); - LinkedList list = (LinkedList)error.get(o); - if(list == null){ - error.put(o, list = new LinkedList()); + List<String> list = error.get(o); + if (list == null) { + error.put(o, list = new LinkedList<String>()); } list.add(message); } } // CheckResult - Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2011-04-18 14:08:16 UTC (rev 3259) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2011-04-18 14:18:23 UTC (rev 3260) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, CodeLutin + * Copyright (C) 2002 - 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 @@ -74,4 +74,3 @@ } } // CheckResultFrame -

1 0