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

r1692 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 15:59:28 +0000 (Thu, 18 Dec 2008) New Revision: 1692 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Debug final ! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2008-12-18 15:29:52 UTC (rev 1691) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2008-12-18 15:59:28 UTC (rev 1692) @@ -56,7 +56,7 @@ import org.codelutin.topia.persistence.TopiaEntity; import org.codelutin.topia.TopiaException; - protected IsisMapBean portMap = new IsisMapBean(); + protected IsisMapBean portMap = null; protected OpenMapToolPanel toolMap = new OpenMapToolPanel(); protected OMToolSet toolSet = new OMToolSet(); protected OpenMapEvents mapListener = null; @@ -93,15 +93,17 @@ } - portMap = new IsisMapBean(); - portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); - portMap.setActiveMouseMode(new SelectMouseMode()); - portMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion()); - toolSet.setupListeners(portMap); - toolMap.add((Component)toolSet); - setMapListener(); - portMapPanel.add(toolMap, BorderLayout.NORTH); - portMapPanel.add(portMap, BorderLayout.CENTER); + if(portMap == null){ + portMap = new IsisMapBean(); + portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); + portMap.setActiveMouseMode(new SelectMouseMode()); + portMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion()); + toolSet.setupListeners(portMap); + toolMap.add((Component)toolSet); + setMapListener(); + portMapPanel.add(toolMap, BorderLayout.NORTH); + portMapPanel.add(portMap, BorderLayout.CENTER); + } refreshMap(); } protected void refreshMap(){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-18 15:29:52 UTC (rev 1691) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-18 15:59:28 UTC (rev 1692) @@ -77,7 +77,7 @@ zoneCells.setModel(zoneCellsModel); java.util.List<Cell> cellsSelected = z.getCell(); if (cellsSelected != null){ - int[] indexs = new int[zoneCellsModel.size()]; + int[] indexs = new int[cellsSelected.size()]; int i = 0; for (Cell c : cellsSelected){ indexs[i] = zoneCellsModel.indexOf(c); @@ -129,6 +129,7 @@ return false; } }; + zoneMap.addMapMouseListener(mapListener); } } protected void refreshMap(){

1 0

r1691 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 15:29:52 +0000 (Thu, 18 Dec 2008) New Revision: 1691 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: UI in 800x600 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-18 14:49:50 UTC (rev 1690) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-18 15:29:52 UTC (rev 1691) @@ -30,7 +30,7 @@ * by : $Author: sletellier $ */ --> -<JFrame id='isisfishFrame' title="isisfish.welcome.title" size='{new Dimension(800,600)}' resizable="true" location='{new Point(0,23)}' layout='{new BorderLayout()}'> +<JFrame id='isisfishFrame' title="isisfish.welcome.title" width='800' height='600' resizable="true" location='{new Point(0,23)}' layout='{new BorderLayout()}'> <script><![CDATA[ import static org.codelutin.i18n.I18n._; import fr.ifremer.isisfish.ui.simulator.SimulAction; @@ -104,7 +104,7 @@ id="menuBar" --> <JMenu text='isisfish.welcome.menu.file'> - <JMenuItem text="isisfish.welcome.menu.synchro" onActionPerformed='updateVCS()'/> + <JMenuItem text="isisfish.welcome.menu.synchro" enabled='false' onActionPerformed='updateVCS()'/> <JSeparator/> <JMenuItem text="isisfish.welcome.menu.close" onActionPerformed='close()'/> </JMenu> @@ -117,8 +117,8 @@ <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new QueueUI(), _("isisfish.queue.title"))'/> <JSeparator/> <JMenu text="isisfish.welcome.menu.configuration"> - <JMenuItem text="isisfish.welcome.menu.configuration" onActionPerformed='config()'/> - <JMenuItem text="isisfish.welcome.menu.vcs.configuration" onActionPerformed='configVCS()'/> + <JMenuItem text="isisfish.welcome.menu.configuration" enabled='false' onActionPerformed='config()'/> + <JMenuItem text="isisfish.welcome.menu.vcs.configuration" enabled='false' onActionPerformed='configVCS()'/> </JMenu> </JMenu> <JMenu text="isisfish.welcome.menu.help">

1 0

r1690 - isis-fish/trunk/src/main/resources
by chatellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: chatellier Date: 2008-12-18 14:49:50 +0000 (Thu, 18 Dec 2008) New Revision: 1690 Modified: isis-fish/trunk/src/main/resources/log4j.properties Log: Back to info log level Modified: isis-fish/trunk/src/main/resources/log4j.properties =================================================================== --- isis-fish/trunk/src/main/resources/log4j.properties 2008-12-18 14:44:56 UTC (rev 1689) +++ isis-fish/trunk/src/main/resources/log4j.properties 2008-12-18 14:49:50 UTC (rev 1690) @@ -6,11 +6,11 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.fr.ifremer.isisfish=DEBUG +log4j.logger.fr.ifremer.isisfish=INFO log4j.logger.org.codelutin=INFO -log4j.logger.analyseplans=DEBUG -log4j.logger.exports=DEBUG -log4j.logger.formules=DEBUG -log4j.logger.rules=DEBUG -log4j.logger.scripts=DEBUG -log4j.logger.simulators=DEBUG +log4j.logger.analyseplans=INFO +log4j.logger.exports=INFO +log4j.logger.formules=INFO +log4j.logger.rules=INFO +log4j.logger.scripts=INFO +log4j.logger.simulators=INFO

1 0

r1689 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 14:44:56 +0000 (Thu, 18 Dec 2008) New Revision: 1689 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx Log: Debug final ! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2008-12-18 14:32:38 UTC (rev 1688) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2008-12-18 14:44:56 UTC (rev 1689) @@ -63,7 +63,7 @@ import org.codelutin.topia.TopiaException; -protected IsisMapBean cellMap = new IsisMapBean(); +protected IsisMapBean cellMap = null; protected OpenMapToolPanel toolMap = new OpenMapToolPanel(); protected OMToolSet toolSet = new OMToolSet(); protected OpenMapEvents mapListener = null; @@ -92,17 +92,18 @@ Cell cell = action.getCell(); setBean((CellImpl) cell); jaxx.runtime.swing.Utils.fillComboBox(fieldCell,action.getFisheryRegion().getCell(), cell); + if (cellMap == null){ + cellMap = new IsisMapBean(); + cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); + cellMap.setActiveMouseMode(new SelectMouseMode()); + cellMap.setFisheryRegion(action.getFisheryRegion()); + toolSet.setupListeners(cellMap); + toolMap.add((Component)toolSet); + setMapListener(); + cellMapPanel.add(toolMap, BorderLayout.NORTH); + cellMapPanel.add(cellMap, BorderLayout.CENTER); + } - cellMap = new IsisMapBean(); - cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); - cellMap.setActiveMouseMode(new SelectMouseMode()); - cellMap.setFisheryRegion(action.getFisheryRegion()); - toolSet.setupListeners(cellMap); - toolMap.add((Component)toolSet); - setMapListener(); - cellMapPanel.add(toolMap, BorderLayout.NORTH); - cellMapPanel.add(cellMap, BorderLayout.CENTER); - if (cell != null){ cellMap.setSelectedCells(cell); }

1 0

r1688 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 14:32:38 +0000 (Thu, 18 Dec 2008) New Revision: 1688 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java Log: Debug final ! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2008-12-18 14:22:08 UTC (rev 1687) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2008-12-18 14:32:38 UTC (rev 1688) @@ -86,7 +86,7 @@ protected MouseDelegator md; protected CellSelectionLayer activeSelectionLayer = null; - protected int selectionMode = CellSelectionLayer.SINGLE_SELECTION; + protected int selectionMode = CellSelectionLayer.MULT_SELECTION; protected static final float SCALE = 9500000f;

1 0

r1687 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 14:22:08 +0000 (Thu, 18 Dec 2008) New Revision: 1687 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Debug final ! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2008-12-18 14:22:08 UTC (rev 1687) @@ -93,11 +93,12 @@ setBean((CellImpl) cell); jaxx.runtime.swing.Utils.fillComboBox(fieldCell,action.getFisheryRegion().getCell(), cell); + cellMap = new IsisMapBean(); + cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); + cellMap.setActiveMouseMode(new SelectMouseMode()); cellMap.setFisheryRegion(action.getFisheryRegion()); toolSet.setupListeners(cellMap); toolMap.add((Component)toolSet); -// cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); -// cellMap.setActiveMouseMode(new SelectMouseMode()); setMapListener(); cellMapPanel.add(toolMap, BorderLayout.NORTH); cellMapPanel.add(cellMap, BorderLayout.CENTER); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2008-12-18 14:22:08 UTC (rev 1687) @@ -45,6 +45,8 @@ import fr.ifremer.isisfish.entities.FisheryRegion; import com.bbn.openmap.gui.OMToolSet; import fr.ifremer.isisfish.map.IsisMapBean; + import fr.ifremer.isisfish.map.CellSelectionLayer; + import com.bbn.openmap.event.SelectMouseMode; import fr.ifremer.isisfish.map.OpenMapToolPanel; import fr.ifremer.isisfish.ui.WelcomePanelUI; @@ -59,6 +61,8 @@ } protected void init(){ cellMap = new IsisMapBean(); + cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); + cellMap.setActiveMouseMode(new SelectMouseMode()); toolSet.setupListeners(cellMap); toolMap.add((Component)toolSet); fisheryRegionMapPanel.add(toolMap, BorderLayout.NORTH); @@ -79,6 +83,9 @@ refreshMap(); } protected void refreshMap(){ +// cellMap = new IsisMapBean(); +// cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); +// cellMap.setActiveMouseMode(new SelectMouseMode()); cellMap.setFisheryRegion(region); cellMap.repaint(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2008-12-18 14:22:08 UTC (rev 1687) @@ -93,6 +93,9 @@ } + portMap = new IsisMapBean(); + portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); + portMap.setActiveMouseMode(new SelectMouseMode()); portMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion()); toolSet.setupListeners(portMap); toolMap.add((Component)toolSet); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-18 14:22:08 UTC (rev 1687) @@ -58,7 +58,7 @@ import java.util.logging.Level; import java.util.logging.Logger; - protected IsisMapBean zoneMap = new IsisMapBean(); + protected IsisMapBean zoneMap = null; protected OpenMapToolPanel toolMap = new OpenMapToolPanel(); protected OMToolSet toolSet = new OMToolSet(); protected MapMouseListener mapListener = null; @@ -101,12 +101,17 @@ fieldZoneName.setText(""); fieldZoneComment.setText(""); } - zoneMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion()); - toolSet.setupListeners(zoneMap); - toolMap.add((Component)toolSet); - setMapListener(); - zoneMapPanel.add(toolMap, BorderLayout.NORTH); - zoneMapPanel.add(zoneMap, BorderLayout.CENTER); + if (zoneMap == null){ + zoneMap = new IsisMapBean(); + zoneMap.setActiveMouseMode(new SelectMouseMode(false)); + zoneMap.setSelectionMode(CellSelectionLayer.MULT_SELECTION); + zoneMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion()); + toolSet.setupListeners(zoneMap); + toolMap.add((Component)toolSet); + setMapListener(); + zoneMapPanel.add(toolMap, BorderLayout.NORTH); + zoneMapPanel.add(zoneMap, BorderLayout.CENTER); + } refreshMap(); } protected void setMapListener(){

1 0

r1686 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 13:47:04 +0000 (Thu, 18 Dec 2008) New Revision: 1686 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx Log: Debug vol5 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2008-12-18 13:37:45 UTC (rev 1685) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) @@ -96,21 +96,26 @@ GenericCell cell = (GenericCell) fieldPopulationGroupPopulationGroup.getSelectedItem(); if (cell.getValue() != null){ jaxx.runtime.Util.assignment(populationGroup = (PopulationGroup)cell.getValue(), "populationGroup", fr.ifremer.isisfish.ui.input.PopulationGroupUI.this); + valueChanged(true); refresh(); } } } protected void reproductionRateChanged(){ populationGroup.setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText())); + valueChanged(true); } protected void groupMinLengthChanged(){ populationGroup.setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText())); + valueChanged(true); } protected void groupMaxLengthChanged(){ populationGroup.setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText())); + valueChanged(true); } protected void groupCommentChanged(){ populationGroup.setComment(fieldPopulationGroupComment.getText()); + valueChanged(true); } protected void save(){ TopiaEntity topia = getContextValue(InputAction.class).save(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2008-12-18 13:37:45 UTC (rev 1685) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) @@ -121,6 +121,7 @@ MatrixND mat = popInfo.getEmigrationMatrix().copy(); mat.setValue(group, departure, 0); + getParentContainer(PopulationMigrationUI.class).valueChanged(true); popInfo.setEmigrationMatrix(mat); }catch(Exception eee){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2008-12-18 13:37:45 UTC (rev 1685) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) @@ -73,6 +73,7 @@ @Override public void matrixChanged(MatrixPanelEvent arg0) { popInfo.setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix()); + getParentContainer(PopulationMigrationUI.class).valueChanged(true); } }); } @@ -116,6 +117,7 @@ MatrixND mat = popInfo.getImmigrationMatrix().copy(); mat.setValue(group, departure, arrival, 0); popInfo.setImmigrationMatrix(mat); + getParentContainer(PopulationMigrationUI.class).valueChanged(true); refresh(); } ]]> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2008-12-18 13:37:45 UTC (rev 1685) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) @@ -74,6 +74,7 @@ @Override public void matrixChanged(MatrixPanelEvent arg0) { popInfo.setMigrationMatrix(populationMigrationMigrationTable.getMatrix()); + getParentContainer(PopulationMigrationUI.class).valueChanged(true); } }); } @@ -127,6 +128,7 @@ MatrixND mat = popInfo.getMigrationMatrix().copy(); mat.setValue(group, departure, arrival, 0); popInfo.setMigrationMatrix(mat); + getParentContainer(PopulationMigrationUI.class).valueChanged(true); refresh(); } ]]> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2008-12-18 13:37:45 UTC (rev 1685) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) @@ -120,6 +120,7 @@ } protected void seasonChooserChanged(){ // populationSeasonInfoSelected = getPopulationSeasonInfo(); + valueChanged(true); refresh(); } protected void useEquationChanged(){ @@ -129,7 +130,7 @@ else{ ((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "fieldUseMatrix"); } - + valueChanged(true); } protected void commentChanged(){ pop.setMigrationComment(fieldPopulationMigrationComment.getText()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2008-12-18 13:37:45 UTC (rev 1685) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) @@ -142,18 +142,20 @@ } ip.setLabelRenderer(Month.MONTH); ip.setModel(interval); - valueChanged(false); + valueChanged(true); } } protected void groupChangedChanged(){ PopulationSeasonInfo selected = getPopulationSeasonInfo(); if (selected != null){ selected.setGroupChange(fieldPopulationSeasonGroupChange.isSelected()); + valueChanged(true); } } protected void commentChanged(){ if (pop != null){ pop.setSeasonsComment(fieldPopulationSeasonComment.getText()); + valueChanged(true); } } protected void create(){ @@ -172,7 +174,7 @@ refresh(); } protected void cancel(){ - TopiaEntity topia = getContextValue(InputAction.class).cancel(); + getContextValue(InputAction.class).cancel(); valueChanged(false); refresh(); setInfoText(_("isisfish.message.cancel.finished"));

1 0

r1685 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: chatellier Date: 2008-12-18 13:37:45 +0000 (Thu, 18 Dec 2008) New Revision: 1685 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Modify about copyright. Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-12-18 13:33:18 UTC (rev 1684) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-12-18 13:37:45 UTC (rev 1685) @@ -62,7 +62,7 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright 2002 - 2008, Code Lutin. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Please, report any bug you can found.<html> +isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright 2002 - 2008, Ifremer - Code Lutin. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Please, report any bug you can found.<html> isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with Isis-Fish. All rights reserved. No guarantees are provided for use of this program. isisfish.about.title=About Isis-Fish... isisfish.advancedParameters.title=advanced Parameters Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-12-18 13:33:18 UTC (rev 1684) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-12-18 13:37:45 UTC (rev 1685) @@ -62,7 +62,7 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright 2002 - 2008, Code Lutin. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Merci de rapporter les bugs.<html> +isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright 2002 - 2008, Ifremer - Code Lutin. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Merci de rapporter les bugs.<html> isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec Isis-Fish. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme. isisfish.about.title=\u00C0 propos de Isis-Fish... isisfish.advancedParameters.title=Param\u00E8tres avanc\u00E9s

1 0

r1684 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 13:33:18 +0000 (Thu, 18 Dec 2008) New Revision: 1684 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx Log: Debug vol5 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2008-12-18 13:33:05 UTC (rev 1683) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2008-12-18 13:33:18 UTC (rev 1684) @@ -129,7 +129,7 @@ root.setInfoText(txt); } public void valueChanged(boolean b){ - changed = b; + getParentContainer(StrategyUI.class).setChanged(b); save.setEnabled(b); cancel.setEnabled(b); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2008-12-18 13:33:05 UTC (rev 1683) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2008-12-18 13:33:18 UTC (rev 1684) @@ -48,6 +48,8 @@ protected StrategyMonthInfo strategyMonthInfo = null; Month month = null; + PropertyChangeListener listener = null; + public StrategyOneMonthInfoUI (InputAction action){ setContextValue(action); @@ -95,16 +97,24 @@ protected void setFieldStrategyMonthInfoProportionModel(){ if (strategyMonthInfo != null){ fieldStrategyMonthInfoProportion.setMatrix(strategyMonthInfo.getProportionMetier()); - strategyMonthInfo.addPropertyChangeListener(new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - strategyMonthInfo.setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); - valueChanged(true); + if (listener == null){ + strategyMonthInfo.addPropertyChangeListener(getListener()); } - }); } } + protected PropertyChangeListener getListener(){ + listener = new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (fieldStrategyMonthInfoProportion.getMatrix() != null){ + strategyMonthInfo.setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); + valueChanged(true); + } + } + }; + return listener; + } protected void tripTypeChanged(){ Object selected = fieldStrategyMonthInfoTripType.getSelectedItem(); if (selected != null){ @@ -116,6 +126,7 @@ protected void minInactivityDayChanged(){ strategyMonthInfo.setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText())); valueChanged(true); + refresh(); } protected void valueChanged(boolean b){ getParentContainer(StrategyMonthInfoUI.class).valueChanged(b); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2008-12-18 13:33:05 UTC (rev 1683) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2008-12-18 13:33:18 UTC (rev 1684) @@ -170,7 +170,7 @@ root.setInfoText(txt); } protected void valueChanged(boolean b){ - changed=b; + getParentContainer(StrategyUI.class).setChanged(b); save.setEnabled(b); cancel.setEnabled(b); }

1 0

r1683 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 13:33:05 +0000 (Thu, 18 Dec 2008) New Revision: 1683 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: About Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-18 12:16:42 UTC (rev 1682) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-18 13:33:05 UTC (rev 1683) @@ -81,18 +81,21 @@ // FIXME a reimplanter } protected void about(){ - AboutFrame about = new AboutFrame(); - about.setTitle(_("isisfish.about.title")); - about.setIconPath("images/strategy.jpg"); - about.setAboutHtmlText(_("isisfish.about.abouthtmltext", IsisConfig.getVersion())); - about.setLicenseText(_("isisfish.about.licensetext")); - about.setBackgroundColor(Color.WHITE); - // center frame - Dimension dim = getToolkit().getScreenSize(); - about.setSize(640, 520); - about.setLocation((dim.width - about.getSize().width) / 2, - (dim.height - about.getSize().height) / 2); - about.setVisible(true); + org.codelutin.widget.AboutFrame about = new org.codelutin.widget.AboutFrame(); +// about.setAboutHtmlText($jaxxObjectDescriptor) +// AboutFrame about = new AboutFrame(); + about.setTitle(_("isisfish.about.title")); + about.setIconPath("images/strategy.jpg"); + about.setAboutHtmlText(_("isisfish.about.abouthtmltext", IsisConfig.getVersion())); + about.setLicenseText(_("isisfish.about.licensetext")); + about.setBackgroundColor(Color.WHITE); + // center frame + Dimension dim = getToolkit().getScreenSize(); + about.setSize(640, 520); + about.setLocation((dim.width - about.getSize().width) / 2, + (dim.height - about.getSize().height) / 2); +// about.pack(); + about.setVisible(true); } ]]> </script>

1 0