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

r3299 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 29 Apr '11

29 Apr '11

Author: chatellier Date: 2011-04-29 13:05:47 +0000 (Fri, 29 Apr 2011) New Revision: 3299 Log: Suppression des PCL des entites (dans un cas, c'est incoh?\195?\169rent : population des especes) 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-29 13:02:44 UTC (rev 3298) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-04-29 13:05:47 UTC (rev 3299) @@ -84,6 +84,19 @@ /** Map entity key to {@link TopiaEntity}. */ protected HashMap<String, TopiaEntityContextable> currentEntities = new HashMap<String, TopiaEntityContextable>(); + /** Intance unique de PCL pour pouvoir être ajouter et supprimé au bon moment. */ + protected PropertyChangeListener entityPCL = new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (log.isDebugEnabled()) { + log.debug("PropertyChanged : " + + evt.getPropertyName() + + " New Value : " + evt.getNewValue()); + } + topiaChanged(); + } + }; + public InputContentUI<?> getInputContentUI() { return inputContentUI; } @@ -185,7 +198,7 @@ } /** - * Create new {@link type} entity. + * Create new {@code type} entity. * * @param type */ @@ -319,6 +332,8 @@ return response; } + + /** * Add entity to check for modification. * @@ -335,26 +350,7 @@ public void addCurrentEntity(TopiaEntityContextable currentEntity, String key) { if (currentEntity != null) { editable = true; - currentEntity - .addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("PropertyChanged : " - + evt.getPropertyName() - + " New Value : " + evt.getNewValue()); - } - topiaChanged(); - } - }); - // chatellier 20090602 , pas sur du code suivant - // plutot ne rien faire, si une autre entite de la meme - // clé est ajoutée, elle sera ecrasée - //TopiaEntity entity = getEntity(currentEntity.getClass()); - //if (entity != null) { - // currentEntities.remove(entity); - //} - + currentEntity.addPropertyChangeListener(entityPCL); this.currentEntities.put(key, currentEntity); } } @@ -381,6 +377,13 @@ * Reset state. */ public void reset() { + // il faut absolument supprimer les property change listener + // sinon, lors de la selection d'une espece, à la creation + // d'une population, le PCL est declanché, et l'abre + // croit qu'il y a eu une modification et il boucle + for (TopiaEntity entity : currentEntities.values()) { + entity.removePropertyChangeListener(entityPCL); + } currentEntities.clear(); noModif(); }

1 0

r3298 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org 29 Apr '11

29 Apr '11

Author: chatellier Date: 2011-04-29 13:02:44 +0000 (Fri, 29 Apr 2011) New Revision: 3298 Log: Corrige un probleme de suppression de population Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-04-29 09:21:11 UTC (rev 3297) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-04-29 13:02:44 UTC (rev 3298) @@ -70,10 +70,10 @@ /** serialVersionUID */ private static final long serialVersionUID = 1L; - /* + /** * Overwrite delete. * @throws TopiaException - * + */ @Override public void delete() throws TopiaException { // chatellier 20090317 fix hibernate exception @@ -82,7 +82,7 @@ this.getSpecies().getPopulation().remove(this); super.delete(); - }*/ + } /* * @see fr.ifremer.isisfish.entities.PopulationAbstract#toString()

1 0

r3297 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui: input input/tree sensitivity
by chatellier＠users.labs.libre-entreprise.org 29 Apr '11

29 Apr '11

Author: chatellier Date: 2011-04-29 09:21:11 +0000 (Fri, 29 Apr 2011) New Revision: 3297 Log: Fix NPE 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/tree/FisheryTreeRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.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-29 09:19:23 UTC (rev 3296) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-04-29 09:21:11 UTC (rev 3297) @@ -161,8 +161,6 @@ FisheryDataProvider dataProvider = new FisheryDataProvider(fisheryRegion); fisheryTreeHelper.setDataProvider(dataProvider); TreeModel fisheryTreeModel = fisheryTreeHelper.createTreeModel(fisheryRegion); - // fix strange region switch error - //inputUI.getFisheryRegionTree().setCellRenderer(null); inputUI.getFisheryRegionTree().setModel(fisheryTreeModel); inputUI.getFisheryRegionTree().setCellRenderer(new FisheryTreeRenderer(dataProvider)); inputUI.getFisheryRegionTree().setSelectionModel(new FisheryTreeSelectionModel(inputUI)); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2011-04-29 09:19:23 UTC (rev 3296) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2011-04-29 09:21:11 UTC (rev 3297) @@ -86,43 +86,49 @@ TopiaContext topiaContext = ((FisheryRegionImpl)fisheryRegion).getTopiaContext(); try { TopiaEntity entity = topiaContext.findByTopiaId(node.getId()); - - if (FisheryRegion.class.isAssignableFrom(entity.getClass())) { - stringValue = ((FisheryRegion)entity).getName(); + + // il arrive que ca bug + // lorsqu'un renderer essaye de rendre quelque chose qui n'existe plus + // cela arrive notement sur le changement de region + // lorsqu'une est deja chargée + if (entity != null) { + if (FisheryRegion.class.isAssignableFrom(entity.getClass())) { + stringValue = ((FisheryRegion)entity).getName(); + } + else if (Cell.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Cell)entity).getName(); + } + else if (Gear.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Gear)entity).getName(); + } + else if (Metier.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Metier)entity).getName(); + } + else if (Population.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Population)entity).getName(); + } + else if (Port.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Port)entity).getName(); + } + else if (SetOfVessels.class.isAssignableFrom(entity.getClass())) { + stringValue = ((SetOfVessels)entity).getName(); + } + else if (Species.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Species)entity).getName(); + } + else if (Strategy.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Strategy)entity).getName(); + } + else if (TripType.class.isAssignableFrom(entity.getClass())) { + stringValue = ((TripType)entity).getName(); + } + else if (VesselType.class.isAssignableFrom(entity.getClass())) { + stringValue = ((VesselType)entity).getName(); + } + else if (Zone.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Zone)entity).getName(); + } } - else if (Cell.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Cell)entity).getName(); - } - else if (Gear.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Gear)entity).getName(); - } - else if (Metier.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Metier)entity).getName(); - } - else if (Population.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Population)entity).getName(); - } - else if (Port.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Port)entity).getName(); - } - else if (SetOfVessels.class.isAssignableFrom(entity.getClass())) { - stringValue = ((SetOfVessels)entity).getName(); - } - else if (Species.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Species)entity).getName(); - } - else if (Strategy.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Strategy)entity).getName(); - } - else if (TripType.class.isAssignableFrom(entity.getClass())) { - stringValue = ((TripType)entity).getName(); - } - else if (VesselType.class.isAssignableFrom(entity.getClass())) { - stringValue = ((VesselType)entity).getName(); - } - else if (Zone.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Zone)entity).getName(); - } } catch (TopiaException eee) { throw new IsisFishRuntimeException("Can't get entity for id " + node.getId(), eee); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-04-29 09:19:23 UTC (rev 3296) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-04-29 09:21:11 UTC (rev 3297) @@ -114,8 +114,6 @@ FisheryDataProvider dataProvider = new FisheryDataProvider(fisheryRegion); treeHelper.setDataProvider(dataProvider); TreeModel model = treeHelper.createTreeModel(fisheryRegion); - // fix strange region switch error - sensitivityTabUI.getFisheryRegionTree().setCellRenderer(null); sensitivityTabUI.getFisheryRegionTree().setModel(model); sensitivityTabUI.getFisheryRegionTree().setCellRenderer(new FisheryTreeRenderer(dataProvider)); treeHelper.setUI(sensitivityTabUI.getFisheryRegionTree(), true, false, null);

1 0

r3296 - in isis-fish/branches/3.3.1: . src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 29 Apr '11

29 Apr '11

Author: chatellier Date: 2011-04-29 09:19:23 +0000 (Fri, 29 Apr 2011) New Revision: 3296 Log: Update to nuiton utils 2.2 Modified: isis-fish/branches/3.3.1/pom.xml isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-04-29 09:19:09 UTC (rev 3295) +++ isis-fish/branches/3.3.1/pom.xml 2011-04-29 09:19:23 UTC (rev 3296) @@ -496,7 +496,7 @@ <jaxxVersion>2.4.2-SNAPSHOT</jaxxVersion> <eugeneVersion>2.3.3</eugeneVersion> <topiaVersion>2.5.3</topiaVersion> - <nuitonUtilsVersion>2.1.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.2-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.3.2</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.2-SNAPSHOT</nuitonWidgetsVersion> <jrstPluginVersion>1.2</jrstPluginVersion> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-04-29 09:19:09 UTC (rev 3295) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-04-29 09:19:23 UTC (rev 3296) @@ -869,7 +869,7 @@ * @throws org.nuiton.util.ArgumentsParserException */ @Override - public void parse(String... args) throws ArgumentsParserException { + public ApplicationConfig parse(String... args) throws ArgumentsParserException { super.parse(args); // dans la version precedente (3.1) seul le fichier user existe, il est // donc le seul a devoir etre modifie @@ -942,6 +942,8 @@ if (log.isDebugEnabled()) { printConfig(); } + + return this; } //////////////////////////////////////////////////

1 0

r3295 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input: . model
by chatellier＠users.labs.libre-entreprise.org 29 Apr '11

29 Apr '11

Author: chatellier Date: 2011-04-29 09:19:09 +0000 (Fri, 29 Apr 2011) New Revision: 3295 Log: Fix port and zone edition Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java 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/ZoneUI.jaxx 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-28 08:28:23 UTC (rev 3294) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-04-29 09:19:09 UTC (rev 3295) @@ -38,6 +38,7 @@ com.bbn.openmap.event.SelectMouseMode java.beans.PropertyChangeEvent java.beans.PropertyChangeListener + java.awt.event.MouseEvent </import> <BeanValidator id='validator' @@ -65,12 +66,12 @@ for (Cell c : portMap.getSelectedCells()) { if (getBean().getCell() != null) { if (!getBean().getCell().getTopiaId().equals(c.getTopiaId())){ - getBean().setCell(c); + portCell.setSelectedValue(c); return true; } } else { - getBean().setCell(c); + portCell.setSelectedValue(c); return true; } } @@ -89,7 +90,7 @@ fieldPortComment.setText(""); } if (evt.getNewValue() != null) { - fillList(); + fillCellList(); } } }); @@ -106,7 +107,7 @@ refreshRegionInMap(portMap); }*/ -protected void fillList() { +protected void fillCellList() { if (getBean() != null) { portChanged = false; portCell.fillList(getFisheryRegion().getCell(), getBean().getCell()); @@ -143,7 +144,8 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane id="spPortCell"> - <JAXXList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" onMouseClicked='portChanged()' enabled='{isActive()}' decorator='boxed' /> + <JAXXList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" + onValueChanged='portChanged()' enabled='{isActive()}' decorator='boxed' /> </JScrollPane> </cell> </row> @@ -193,7 +195,8 @@ constraints='BorderLayout.NORTH' decorator='boxed' enabled='{getBean() != null}' /> <fr.ifremer.isisfish.map.IsisMapBean id='portMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.SINGLE_SELECTION}" - decorator='boxed' enabled='{getBean() != null}' fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean().getCell()}' /> + decorator='boxed' enabled='{getBean() != null}' fisheryRegion='{getFisheryRegion()}' + selectedCells='{getBean() == null ? null : bean.getCell()}' /> </JPanel> </JSplitPane> </JPanel> 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-28 08:28:23 UTC (rev 3294) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-04-29 09:19:09 UTC (rev 3295) @@ -34,13 +34,13 @@ fr.ifremer.isisfish.entities.Zone fr.ifremer.isisfish.map.CellSelectionLayer fr.ifremer.isisfish.map.CopyMapToClipboardListener + fr.ifremer.isisfish.ui.input.model.TopiaEntityListModel com.bbn.openmap.event.SelectMouseMode com.bbn.openmap.gui.Tool com.bbn.openmap.gui.OMToolSet java.beans.PropertyChangeEvent java.beans.PropertyChangeListener java.awt.event.MouseEvent - javax.swing.DefaultListModel java.util.ArrayList </import> @@ -69,10 +69,7 @@ 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; - } + setZoneCells(); } return result; } @@ -83,36 +80,25 @@ if (evt.getNewValue() == null) { fieldZoneName.setText(""); fieldZoneComment.setText(""); - zoneMap.setSelectedCells((Cell)null); + zoneMap.setSelectedCells(); } if (evt.getNewValue() != null) { setZoneCells(); - zoneMap.setSelectedCells(getBean().getCell()); } } }); } -/*public void refresh() { - Zone zone = getSaveVerifier().getEntity(Zone.class); - - // add null before, for second to be considered as a changed event - // otherwize, setBean has no effect - setBean(null); - setBean(zone); - - // reload region in map - refreshRegionInMap(zoneMap); -}*/ - -protected void setZoneCells(){ - if (getBean() != null){ - DefaultListModel model = new DefaultListModel(); - for (Cell c : getFisheryRegion().getCell()) - model.addElement(c); +protected void setZoneCells() { + if (getBean() != null) { + List<Cell> cells = getFisheryRegion().getCell(); + TopiaEntityListModel model = new TopiaEntityListModel(cells); zoneCells.setModel(model); - if (getBean().getCell() != null){ - zoneCells.setSelectedValues(getBean().getCell().toArray()); + if (getBean().getCell() != null) { + for (Cell selectedCell : getBean().getCell()) { + int index = cells.indexOf(selectedCell); + zoneCells.addSelectionInterval(index, index); + } } } } @@ -129,11 +115,6 @@ getBean().setCell(cells); } } - else { - if (log.isDebugEnabled()) { - log.debug("Duplicated event skipped"); - } - } } ]]> </script> @@ -161,9 +142,8 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane id="spZoneCells"> -  - <JAXXList id="zoneCells" enabled='{isActive()}' selectedValues='{getBean().getCell() == null ? null : getBean().getCell().toArray()}' - onValueChanged='zoneCellsChange(event)' decorator='boxed'/> + <JList id="zoneCells" enabled='{isActive()}' + onValueChanged='zoneCellsChange(event)' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -219,8 +199,9 @@ <fr.ifremer.isisfish.map.IsisMapBean id='zoneMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}" - fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean().getCell()}' + fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean()==null?null:bean.getCell()}' decorator='boxed' constraints='BorderLayout.CENTER'/> +  </JPanel> </JSplitPane> </JPanel> Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java 2011-04-29 09:19:09 UTC (rev 3295) @@ -0,0 +1,91 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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 + * published by the Free Software Foundation, either version 2 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.ui.input.model; + +import java.util.List; + +import javax.swing.DefaultListModel; + +import org.nuiton.topia.persistence.TopiaEntity; + +/** + * Model pour la liste des {@link TopiaEntity}. + * + * Pas de selection par defaut. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class TopiaEntityListModel extends DefaultListModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6171850179969290032L; + + /** Zones list */ + protected List<? extends TopiaEntity> entities; + + /** + * Constructor with entities list. + * + * @param entities entities list + */ + public TopiaEntityListModel(List<? extends TopiaEntity> entities) { + this.entities = entities; + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return entities.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (entities != null) { + size = entities.size(); + } + return size; + } + + /** + * Return elements in model. + * + * @return elements in model + */ + public List<? extends TopiaEntity> getElements() { + return entities; + } +} Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3294 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 28 Apr '11

28 Apr '11

Author: chatellier Date: 2011-04-28 08:28:23 +0000 (Thu, 28 Apr 2011) New Revision: 3294 Log: Remove unused imports 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/InputContentUI.jaxx 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/MetierSeasonInfoZoneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.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/PopulationEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.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/StrategyTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 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-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -36,8 +36,6 @@ java.beans.PropertyChangeEvent; java.beans.PropertyChangeListener; javax.swing.DefaultListModel - javax.swing.JTabbedPane - javax.swing.JTable </import> <BeanValidator id='validator' Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -65,7 +65,6 @@ javax.swing.event.ChangeListener fr.ifremer.isisfish.entities.FisheryRegion fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils - fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener fr.ifremer.isisfish.ui.WelcomePanelUI org.nuiton.topia.persistence.TopiaEntityContextable 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-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-04-28 08:28:23 UTC (rev 3294) @@ -162,7 +162,7 @@ fisheryTreeHelper.setDataProvider(dataProvider); TreeModel fisheryTreeModel = fisheryTreeHelper.createTreeModel(fisheryRegion); // fix strange region switch error - inputUI.getFisheryRegionTree().setCellRenderer(null); + //inputUI.getFisheryRegionTree().setCellRenderer(null); inputUI.getFisheryRegionTree().setModel(fisheryTreeModel); inputUI.getFisheryRegionTree().setCellRenderer(new FisheryTreeRenderer(dataProvider)); inputUI.getFisheryRegionTree().setSelectionModel(new FisheryTreeSelectionModel(inputUI)); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -32,7 +32,6 @@ <import> fr.ifremer.isisfish.entities.Metier; fr.ifremer.isisfish.entities.MetierSeasonInfo; - fr.ifremer.isisfish.entities.Season; fr.ifremer.isisfish.entities.Zone; fr.ifremer.isisfish.types.Month; fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -29,8 +29,6 @@ <import> static org.nuiton.i18n.I18n._ static org.nuiton.i18n.I18n.n_ - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; </import> <script><![CDATA[ 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-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -28,8 +28,6 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Equation; - fr.ifremer.isisfish.entities.Formule; fr.ifremer.isisfish.entities.Species; fr.ifremer.isisfish.entities.PopulationGroup; fr.ifremer.isisfish.entities.Population; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -28,7 +28,6 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Formule; fr.ifremer.isisfish.entities.Population; </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -29,7 +29,6 @@ <import> static org.nuiton.i18n.I18n.n_ - fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; </import> <script><![CDATA[ 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-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -29,9 +29,7 @@ <import> fr.ifremer.isisfish.entities.Port - fr.ifremer.isisfish.entities.Equation fr.ifremer.isisfish.entities.VesselType - fr.ifremer.isisfish.entities.Formule fr.ifremer.isisfish.entities.SetOfVessels fr.ifremer.isisfish.ui.input.model.PortComboModel fr.ifremer.isisfish.ui.input.model.VesselTypeComboModel 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-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -28,12 +28,8 @@ <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Equation fr.ifremer.isisfish.entities.Strategy - fr.ifremer.isisfish.entities.Formule fr.ifremer.isisfish.entities.SetOfVessels - org.nuiton.topia.persistence.TopiaEntity - fr.ifremer.isisfish.ui.WelcomePanelUI java.beans.PropertyChangeEvent java.beans.PropertyChangeListener fr.ifremer.isisfish.ui.input.model.SetOfVesselsComboModel Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -30,7 +30,6 @@ fr.ifremer.isisfish.entities.Population fr.ifremer.isisfish.entities.PopulationGroup fr.ifremer.isisfish.entities.PopulationGroupDAO - fr.ifremer.isisfish.entities.PopulationDAO java.awt.CardLayout javax.swing.JFrame </import>

1 0

r3293 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 28 Apr '11

28 Apr '11

Author: chatellier Date: 2011-04-28 08:28:07 +0000 (Thu, 28 Apr 2011) New Revision: 3293 Log: Remove deprecated stuff Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.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-26 15:52:55 UTC (rev 3292) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) @@ -67,7 +67,7 @@ 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); + fieldCell.setSelectedItem(c); result = true; } }

1 0

r3292 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 26 Apr '11

26 Apr '11

Author: chatellier Date: 2011-04-26 15:52:55 +0000 (Tue, 26 Apr 2011) New Revision: 3292 Log: Add some validation check when creating need factors Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-04-26 15:52:05 UTC (rev 3291) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-04-26 15:52:55 UTC (rev 3292) @@ -49,7 +49,36 @@ @Override public boolean isFactorValid() { - return true; + boolean valid = false; + + try { + if (continueSelected) { + if (percentageTypeFactor) { + Double coefficient = Double.parseDouble(coefficientField.getText().trim()); + Double referenceValue = Double.parseDouble(referenceValueField.getText().trim()); + String operator = (String)operatorField.getSelectedItem(); + valid = coefficient != null && + referenceValue != null && + operator != null; + } + else { + Double minValue = Double.parseDouble(continueMin.getText().trim()); + Double maxValue = Double.parseDouble(continueMax.getText().trim()); + valid = minValue != null && + maxValue != null; + } + } + else { + valid = true; + } + } + catch (NumberFormatException eee) { + if (log.isWarnEnabled()) { + log.warn("Double parse error", eee); + } + } + + return valid; } ]]></script> <JPanel id="content"> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-04-26 15:52:05 UTC (rev 3291) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-04-26 15:52:55 UTC (rev 3292) @@ -29,7 +29,14 @@ <script><![CDATA[ @Override public boolean isFactorValid() { - return true; + boolean valid = false; + + Double coefficient = Double.parseDouble(coef.getText().trim()); + String selectedOperator = (String)operator.getSelectedItem(); + valid = coefficient != null && + selectedOperator != null; + + return valid; } ]]></script> <JPanel id='content'>

1 0

r3291 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 26 Apr '11

26 Apr '11

Author: chatellier Date: 2011-04-26 15:52:05 +0000 (Tue, 26 Apr 2011) New Revision: 3291 Log: Fix region switch Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-04-26 15:51:37 UTC (rev 3290) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-04-26 15:52:05 UTC (rev 3291) @@ -114,6 +114,8 @@ FisheryDataProvider dataProvider = new FisheryDataProvider(fisheryRegion); treeHelper.setDataProvider(dataProvider); TreeModel model = treeHelper.createTreeModel(fisheryRegion); + // fix strange region switch error + sensitivityTabUI.getFisheryRegionTree().setCellRenderer(null); sensitivityTabUI.getFisheryRegionTree().setModel(model); sensitivityTabUI.getFisheryRegionTree().setCellRenderer(new FisheryTreeRenderer(dataProvider)); treeHelper.setUI(sensitivityTabUI.getFisheryRegionTree(), true, false, null);

1 0

r3290 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 26 Apr '11

26 Apr '11

Author: chatellier Date: 2011-04-26 15:51:37 +0000 (Tue, 26 Apr 2011) New Revision: 3290 Log: Remove ask to save unsave when saving fishery -_- 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/InputSaveVerifier.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-26 15:51:04 UTC (rev 3289) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-04-26 15:51:37 UTC (rev 3290) @@ -126,6 +126,12 @@ protected void save() { setInfoText(_("isisfish.message.checking.cell")); + + // this make save done by verifier instead of saveFisheryRegion + // and refresh tree is not working + getSaveVerifier().reset(); + + // save generating cells getInputAction().saveFisheryRegion(getBean()); // reload tree @@ -133,7 +139,6 @@ inputUI.getHandler().reloadFisheryTree(inputUI); setInfoText(_("isisfish.message.save.finished")); - refresh(); } ]]></script> <JPanel id="body"> 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-26 15:51:04 UTC (rev 3289) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-04-26 15:51:37 UTC (rev 3290) @@ -382,6 +382,7 @@ */ public void reset() { currentEntities.clear(); + noModif(); } /*public void removeAllEntity() {

1 0