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

r1799 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2009

Feb. 8, 2009

Author: tchemit Date: 2009-02-08 14:06:23 +0000 (Sun, 08 Feb 2009) New Revision: 1799 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java Log: faire fonctionner les simulations en jnlp (il reste un cas qui ne fonctionne pas : en sub process + aspect) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-02-08 14:05:20 UTC (rev 1798) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-02-08 14:06:23 UTC (rev 1799) @@ -212,7 +212,8 @@ IsisFish.config.getCompileDirectory().toURI().toURL() }; //URL [] classpath = new URL[]{directory.toURL()}; - AspectClassLoader loader = new AspectClassLoader(classpath, ClassLoader.getSystemClassLoader()); //new URLClassLoader(classpath); + AspectClassLoader loader = new AspectClassLoader(classpath, IsisFish.class.getClassLoader()); //new URLClassLoader(classpath); + //AspectClassLoader loader = new AspectClassLoader(classpath, ClassLoader.getSystemClassLoader()); //new URLClassLoader(classpath); thread.setContextClassLoader(loader); log.info("Classloader used for simulation: " + loader + " " + Arrays.toString(loader.getURLs())); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2009-02-08 14:05:20 UTC (rev 1798) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2009-02-08 14:06:23 UTC (rev 1799) @@ -27,6 +27,8 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.rmi.RemoteException; +import java.net.URLClassLoader; +import java.net.URL; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -118,6 +120,25 @@ File.separator + "bin" + File.separator + "java"; String classpath = System.getProperty("java.class.path"); + if (classpath==null) { + // could not find the jvm property (jnlp context for example) + // rebuild the classpath as in {@link AspectClassLoader} + String pathSep = File.pathSeparator; + ClassLoader loader = IsisFish.class.getClassLoader(); + if (loader instanceof URLClassLoader) { + URLClassLoader urlLoader = (URLClassLoader) loader; + StringBuilder buffer = new StringBuilder(); + for (URL url : urlLoader.getURLs()) { + buffer.append(pathSep).append(url.getPath()); + } + classpath=buffer.substring(1); + } else { + //FIXME, should do as in {@link AspectClassLoader} + } + } + if (log.isDebugEnabled()) { + log.debug("classpath to use : " + classpath); + } // prepare le process ProcessBuilder processBuilder = new ProcessBuilder( java, "-classpath", classpath,

1 0

r1798 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2009

Feb. 8, 2009

Author: tchemit Date: 2009-02-08 14:05:20 +0000 (Sun, 08 Feb 2009) New Revision: 1798 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java Log: fix javadoc Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java 2009-02-08 14:05:00 UTC (rev 1797) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java 2009-02-08 14:05:20 UTC (rev 1798) @@ -108,9 +108,9 @@ * Returns a set with the new expressions for the advice in the aspect to deploy. * * @param aspectClass s * @param newAspectDef + * @param newAspectDef * @param systemDef * @param deploymentScope - * @param deploymentHandle * @return a set with the new expressions */ private Set getNewExpressionsForAspect(final Class aspectClass,

1 0

r1797 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2009

Feb. 8, 2009

Author: tchemit Date: 2009-02-08 14:05:00 +0000 (Sun, 08 Feb 2009) New Revision: 1797 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: fix bug lors de la sauvegarde des tagValues Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-02-08 14:04:27 UTC (rev 1796) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-02-08 14:05:00 UTC (rev 1797) @@ -459,12 +459,12 @@ } public void setDefaultTagValues(Map<String, String> tagValues) { - StringBuilder sb = new StringBuilder(); + StringBuilder sb = new StringBuilder(" "); for (Map.Entry<String, String> entry : tagValues.entrySet()) { sb.append(SEP).append('"').append(entry.getKey()).append("\":\"").append(entry.getValue()).append('"'); } - String value = sb.toString().substring(1); - setOption(Option.DEFAULT_TAG_VALUE.key, value); + String value = sb.toString().trim(); + setOption(Option.DEFAULT_TAG_VALUE.key, value.isEmpty() ? "" : value.substring(1)); saveForUser(); }

1 0

r1796 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2009

Feb. 8, 2009

Author: tchemit Date: 2009-02-08 14:04:27 +0000 (Sun, 08 Feb 2009) New Revision: 1796 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: desactive le security manager pour faire fonctionner javassist en jnlp Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-02-05 18:55:54 UTC (rev 1795) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-02-08 14:04:27 UTC (rev 1796) @@ -115,7 +115,7 @@ static public void main(String... args) { try { // permet de faire fonctionner la compilation en webstart - //System.setSecurityManager(null); + System.setSecurityManager(null); // initialisation de l'application IsisFish.init(args);

1 0

r1795 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish
by tchemit＠users.labs.libre-entreprise.org Feb. 5, 2009

Feb. 5, 2009

Author: tchemit Date: 2009-02-05 18:55:54 +0000 (Thu, 05 Feb 2009) New Revision: 1795 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: refactoring des versions (merci de ne plus les enlever...) suppression du mode fork pour les tests suppression du securityManager pour webstart (laisse en commentaire pour le moment et voir avec ben si c'est ok pour les autres utilisation d'isis sur caparmor par exemple) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-05 18:10:22 UTC (rev 1794) +++ isis-fish/trunk/pom.xml 2009-02-05 18:55:54 UTC (rev 1795) @@ -149,14 +149,14 @@ <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-client</artifactId> - <version>3.1</version> + <version>${xmlrpc.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-server</artifactId> - <version>3.1</version> + <version>${xmlrpc.version}</version> <scope>compile</scope> </dependency> @@ -178,21 +178,21 @@ <dependency> <groupId>openmap</groupId> <artifactId>openmap</artifactId> - <version>4.6.4</version> + <version>${openmap.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>sshtools</groupId> <artifactId>j2ssh-common</artifactId> - <version>0.2.2</version> + <version>${sshtool.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>sshtools</groupId> <artifactId>j2ssh-core</artifactId> - <version>0.2.2</version> + <version>${sshtool.version}</version> <scope>compile</scope> </dependency> @@ -231,19 +231,19 @@ <dependency> <groupId>aspectwerkz</groupId> <artifactId>aspectwerkz</artifactId> - <version>2.0</version> + <version>${aspectwerkz.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>aspectwerkz</groupId> <artifactId>aspectwerkz-jdk5</artifactId> - <version>2.0</version> + <version>${aspectwerkz.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>aspectwerkz</groupId> <artifactId>aspectwerkz-core</artifactId> - <version>2.0</version> + <version>${aspectwerkz.version}</version> <scope>compile</scope> </dependency> @@ -349,7 +349,11 @@ <lutinutil.version>1.0.3-SNAPSHOT</lutinutil.version> <lutinwidget.version>0.12</lutinwidget.version> <generator.version>0.64-SNAPSHOT</generator.version> + <openmap.version>4.6.4</openmap.version> + <aspectwerkz.version>2.0</aspectwerkz.version> + <sshtool.version>0.2.2</sshtool.version> + <xmlrpc.version>3.1</xmlrpc.version>  <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> @@ -368,16 +372,7 @@ <build> <plugins> -  <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - </configuration> - </plugin> - - <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>${generator.version}</version> @@ -429,7 +424,7 @@ <goal>generate</goal> </goals> <configuration> - <src>${project.basedir}/src/main/java</src> +  <addSourcesToClassPath>true</addSourcesToClassPath> <addProjectClassPath>true</addProjectClassPath> </configuration> @@ -463,7 +458,7 @@ </configuration> <executions> <execution> - <phase>generate-resources</phase> +  <goals> <goal>parserJava</goal> <goal>gen</goal> @@ -506,20 +501,24 @@ </configuration> </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>./lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build>  Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-02-05 18:10:22 UTC (rev 1794) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-02-05 18:55:54 UTC (rev 1795) @@ -114,6 +114,9 @@ static public void main(String... args) { try { + // permet de faire fonctionner la compilation en webstart + //System.setSecurityManager(null); + // initialisation de l'application IsisFish.init(args);

1 0

r1794 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org Feb. 5, 2009

Feb. 5, 2009

Author: tchemit Date: 2009-02-05 18:10:22 +0000 (Thu, 05 Feb 2009) New Revision: 1794 Modified: isis-fish/trunk/pom.xml Log: - webstart fonctionne (suite ?\195?\160 modif dans toopia-service) - les tests aussi sans fork du coup Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-05 13:37:22 UTC (rev 1793) +++ isis-fish/trunk/pom.xml 2009-02-05 18:10:22 UTC (rev 1794) @@ -40,7 +40,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>topia-service</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -341,8 +341,6 @@  <labs.project>isis-fish</labs.project> - <maven.test.forkMode>once</maven.test.forkMode> -  <jaxx.version>1.1-SNAPSHOT</jaxx.version> <generator.version>0.63</generator.version> @@ -362,9 +360,9 @@ <keystorepass>codelutin</keystorepass> <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> -  + <jnlpCodebase>${project.url}</jnlpCodebase>  - <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> +  </properties> <build>

1 0

r1793 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org Feb. 5, 2009

Feb. 5, 2009

Author: sletellier Date: 2009-02-05 13:37:22 +0000 (Thu, 05 Feb 2009) New Revision: 1793 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/PortUI.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/VesselTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Debug inputUI Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-02-04 16:45:44 UTC (rev 1792) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-02-05 13:37:22 UTC (rev 1793) @@ -49,9 +49,17 @@ protected OMToolSet toolSet = new OMToolSet(); protected OpenMapEvents mapListener = null; +boolean cellChanged = true; +cellMap = new fr.ifremer.isisfish.map.IsisMapBean(); setButtonTitle(_("isisfish.input.continueZones")); setNextPath("$root/$zones"); +cellMap.setFisheryRegion(getRegion()); +cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); +cellMap.setActiveMouseMode(new SelectMouseMode()); +toolSet.setupListeners(cellMap); +toolMap.add((Component)toolSet); +setMapListener(); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -74,19 +82,10 @@ getVerifier().setCancelButton(cancel); Cell cell = getVerifier().getEntity(Cell.class); setBean((CellImpl) cell); + cellChanged = false; jaxx.runtime.swing.Utils.fillComboBox(fieldCell,getRegion().getCell(), getBean()); - cellMap.setFisheryRegion(getRegion()); - if (mapListener == null){ - cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); - cellMap.setActiveMouseMode(new SelectMouseMode()); - toolSet.setupListeners(cellMap); - toolMap.add((Component)toolSet); - setMapListener(); - } - - if (getBean() != null){ - cellMap.setSelectedCells(getBean()); - } + cellChanged = true; + cellMap.setSelectedCells(getBean()); } protected void setMapListener(){ if (mapListener == null){ @@ -95,7 +94,10 @@ @Override public boolean onMouseClicked() { for (Cell c : cellMap.getSelectedCells()){ - getParentContainer(InputUI.class).setTreeSelection("$root/$cells/" + c.getTopiaId()); + if (!c.getTopiaId().equals(getBean().getTopiaId())){ + jaxx.runtime.swing.Utils.fillComboBox(fieldCell,getRegion().getCell(), c); + return true; + } } return true; } @@ -104,16 +106,18 @@ } protected void fieldCellChanged() { - Cell c = (Cell)fieldCell.getSelectedItem(); - if (c==null) { - return; + if (cellChanged){ + Cell c = (Cell)fieldCell.getSelectedItem(); + if (c==null) { + return; + } + Cell oldC = getBean(); + if (oldC != null && c.getTopiaId().equals(oldC.getTopiaId())) { + // avoid reentrant code + return; + } + getParentContainer(InputUI.class).setTreeSelection("$root/$cells/"+c.getTopiaId()); } - Cell oldC = getBean(); - if (oldC != null && c.getTopiaId().equals(oldC.getTopiaId())) { - // avoid reentrant code - return; - } - getParentContainer(InputUI.class).setTreeSelection("$root/$cells/"+c.getTopiaId()); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> @@ -180,7 +184,7 @@ </Table> <JPanel id='map' layout='{new BorderLayout()}'> <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH'/> - <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER'/> + <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' constraints='BorderLayout.CENTER'/> </JPanel> </JSplitPane> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-02-04 16:45:44 UTC (rev 1792) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-02-05 13:37:22 UTC (rev 1793) @@ -107,7 +107,16 @@ public boolean onMouseClicked() { for (Cell c : portMap.getSelectedCells()){ if (getBean() != null){ - getBean().setCell(c); + if (getBean().getCell() != null){ + if (getBean().getCell().getTopiaId().equals(c.getTopiaId())){ + getBean().setCell(c); + return true; + } + } + else{ + getBean().setCell(c); + return true; + } } } return true; 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 2009-02-04 16:45:44 UTC (rev 1792) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-02-05 13:37:22 UTC (rev 1793) @@ -130,7 +130,7 @@ </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-02-04 16:45:44 UTC (rev 1792) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-02-05 13:37:22 UTC (rev 1793) @@ -76,7 +76,7 @@ setBean((VesselTypeImpl) vesselType); if (getBean() != null){ tripTypeChanged = false; - vesselTypeTripType.fillList(getRegion().getTripType(), getBean().getTripType() == null ? null : getBean().getTripType()); + vesselTypeTripType.fillList(getRegion().getTripType(), getBean().getTripType() == null ? (Object) null : getBean().getTripType()); tripTypeChanged = true; } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-02-04 16:45:44 UTC (rev 1792) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-02-05 13:37:22 UTC (rev 1793) @@ -51,7 +51,14 @@ protected OMToolSet toolSet = new OMToolSet(); protected MapMouseListener mapListener = null; - +boolean cellChanged = true; +zoneMap = new fr.ifremer.isisfish.map.IsisMapBean(); +zoneMap.setFisheryRegion(getRegion()); +zoneMap.setActiveMouseMode(new SelectMouseMode(false)); +zoneMap.setSelectionMode(CellSelectionLayer.MULT_SELECTION); +toolSet.setupListeners(zoneMap); +toolMap.add((Component)toolSet); +setMapListener(); setButtonTitle(_("isisfish.input.continuePorts")); setNextPath("$root/$ports"); addPropertyChangeListener("bean", new PropertyChangeListener() { @@ -64,7 +71,6 @@ // jaxx.runtime.Util.removeDataBinding($InputContentUI0, "fieldZoneName.text", "fieldZoneComment.text"); fieldZoneName.setText(""); fieldZoneComment.setText(""); - //zoneCells.fillList(getRegion().getCell(), java.util.Collections.EMPTY_LIST); } if (evt.getNewValue() != null) { // add binding on getBean() @@ -80,23 +86,13 @@ getVerifier().setDeleteButton(remove); Zone zone = getVerifier().getEntity(Zone.class); setBean((ZoneImpl) zone); - if (log.isDebugEnabled()) { - log.debug("zone nb cells : "+ ( zone==null ? 0 : zone.getCell().size() ) ); - } setZoneCells(); - zoneMap.setFisheryRegion(getRegion()); - if (mapListener == null){ - zoneMap.setActiveMouseMode(new SelectMouseMode(false)); - zoneMap.setSelectionMode(CellSelectionLayer.MULT_SELECTION); - toolSet.setupListeners(zoneMap); - toolMap.add((Component)toolSet); - setMapListener(); - } - refreshMap(); } protected void setZoneCells(){ if (getBean() != null){ + cellChanged = false; zoneCells.fillList(getRegion().getCell(), getBean().getCell()); + cellChanged = true; } } protected void setMapListener(){ @@ -104,25 +100,22 @@ mapListener = new OpenMapEvents(zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { @Override public boolean onMouseClicked() { - java.util.List<Cell> selectedCell = zoneMap.getSelectedCells(); - getBean().setCell(selectedCell); - setZoneCells(); - return true; + zoneCells.fillList(getRegion().getCell(), zoneMap.getSelectedCells()); + zoneCellsChange(); + return false; } }; zoneMap.addMapMouseListener(mapListener); } } -protected void refreshMap(){ - zoneMap.setSelectedCells(getBean() == null ? java.util.Collections.EMPTY_LIST : getBean().getCell()); -} protected void zoneCellsChange() { - java.util.List<Cell> cells = new ArrayList<Cell>(); - for (Object o : zoneCells.getSelectedValues()){ - cells.add((Cell) o); + if (cellChanged){ + java.util.List<Cell> cells = new ArrayList<Cell>(); + for (Object o : zoneCells.getSelectedValues()){ + cells.add((Cell) o); + } + getBean().setCell(cells); } - getBean().setCell(cells); - refreshMap(); } ]]> </script> @@ -194,7 +187,7 @@ javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH'/> <fr.ifremer.isisfish.map.IsisMapBean id='zoneMap' - javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' + selectedCells='{getBean().getCell()}' constraints='BorderLayout.CENTER'/> </JPanel> </JSplitPane>

1 0

r1792 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org Feb. 4, 2009

Feb. 4, 2009

Author: chatellier Date: 2009-02-04 16:45:44 +0000 (Wed, 04 Feb 2009) New Revision: 1792 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java Log: Fix la construction des zip vide dans le cas de storage pas dans le home d'Isis Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2009-02-04 15:42:57 UTC (rev 1791) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2009-02-04 16:45:44 UTC (rev 1792) @@ -31,24 +31,23 @@ package fr.ifremer.isisfish.datastore; -import fr.ifremer.isisfish.IsisConfig; -import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.vcs.VCS; -import fr.ifremer.isisfish.vcs.VCSException; - import static org.codelutin.i18n.I18n._; -import org.codelutin.util.FileUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.io.File; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.util.FileUtil; import org.codelutin.util.VersionNumber; +import fr.ifremer.isisfish.IsisConfig; +import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.vcs.VCS; +import fr.ifremer.isisfish.vcs.VCSException; + /** * Classe permettant de géré l'interaction avec le cvs * @@ -120,7 +119,22 @@ * @return <code>true</code> si le fichier est versionné */ protected boolean isVersionnableAbleFile(File file) { - return getVCS().isVersionnableAbleFile(file); + + // Dans le cas ou on essaye de savoir si file + // est versionnable dans le storage courant + // mais le VCS est toujours celui d'ISIs en static, + // si le storage est alleur que ce VCS + // cela ne fonctionne pas. + + // FIXME il ne faurdrait pas que le VCS soit + // statique , mais contextuel au this.file + // du storage + + boolean result = true; + if(getVCS().getLocalRepository().equals(this.file)) { + result = getVCS().isVersionnableAbleFile(file); + } + return result; } /**

1 0

r1791 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org Feb. 4, 2009

Feb. 4, 2009

Author: sletellier Date: 2009-02-04 15:42:57 +0000 (Wed, 04 Feb 2009) New Revision: 1791 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Debug multi plan d'analyse Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2009-02-04 15:41:44 UTC (rev 1790) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2009-02-04 15:42:57 UTC (rev 1791) @@ -39,21 +39,28 @@ import fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor; import javax.swing.table.TableColumn; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; + import fr.ifremer.isisfish.simulator.AnalysePlan; + import jaxx.runtime.swing.Item; public SensUI (SimulAction action){ setContextValue(action); } public void refresh(){ - listSimulParamsAnalysePlansList.setModel(new DefaultComboBoxModel(getContextValue(SimulAction.class).getParamAnalysePlans().toArray())); + java.util.List<Item> items = new ArrayList<Item>(); + for (AnalysePlan ap : getContextValue(SimulAction.class).getParamAnalysePlans()){ + items.add(new Item(ap.toString(), fr.ifremer.isisfish.datastore.AnalysePlanStorage.getName(ap), ap, false)); + } + listSimulParamsAnalysePlansList.setItems(items); setSimulParamsAnalysePlans(); } public void addAnalysePlan(){ getContextValue(SimulAction.class).addAnalysePlan(fieldSimulParamsAnalysePlansSelect.getSelectedItem().toString()); + setAnalysePlanButton(); refresh(); } public void removeAnalysePlan(){ - getContextValue(SimulAction.class).removeAnalysePlan(fieldSimulParamsAnalysePlansSelect.getSelectedItem().toString()); + getContextValue(SimulAction.class).removeAnalysePlan((AnalysePlan)listSimulParamsAnalysePlansList.getSelectedValue()); refresh(); } public void clearAnalysePlan(){ @@ -75,7 +82,7 @@ } protected void setSimulParamsAnalysePlans(){ if (listSimulParamsAnalysePlansList.getSelectedIndex() != -1){ - Map<String, Class> values = getContextValue(SimulAction.class).getAnalysePlanParameterName(listSimulParamsAnalysePlansList.getSelectedValue().toString()); + Map<String, Class> values = getContextValue(SimulAction.class).getAnalysePlanParameterName((AnalysePlan)listSimulParamsAnalysePlansList.getSelectedValue()); int row = 0; if (values != null){ DefaultTableModel model = new DefaultTableModel(){ @@ -92,7 +99,7 @@ java.util.List<Object> propertyList = new ArrayList<Object>(); for (Iterator<String> it = values.keySet().iterator(); it.hasNext();) { String name = it.next(); - Object properties = getContextValue(SimulAction.class).getAnalysePlanParameterValue(name, listSimulParamsAnalysePlansList.getSelectedValue().toString()); + Object properties = getContextValue(SimulAction.class).getAnalysePlanParameterValue(name, (AnalysePlan)listSimulParamsAnalysePlansList.getSelectedValue()); GenericCell value = new GenericCell(name, values.get(name), null); valuesList.add(value); propertyList.add(properties); @@ -110,7 +117,7 @@ int row = e.getFirstRow(); TableModel model = (TableModel)e.getSource(); GenericCell data = (GenericCell) model.getValueAt(row, 0); - getContextValue(SimulAction.class).setAnalysePlanParameterValue(data.getName(), listSimulParamsAnalysePlansList.getSelectedValue().toString(), model.getValueAt(row, 1)); + getContextValue(SimulAction.class).setAnalysePlanParameterValue(data.getName(), (AnalysePlan)listSimulParamsAnalysePlansList.getSelectedValue(), model.getValueAt(row, 1)); } }); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-02-04 15:41:44 UTC (rev 1790) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-02-04 15:42:57 UTC (rev 1791) @@ -97,7 +97,6 @@ protected RuleStorage ruleStorage = null; protected List<String> analysePlan = null; protected Map<Rule, String> rules = new HashMap<Rule, String>(); - protected Map<AnalysePlan, String> analysePlans = new HashMap<AnalysePlan, String>(); static private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm"); protected List<String> oldSimulNames = null; protected String simulName = null; @@ -545,55 +544,36 @@ public List<String> getAnalysePlanNames(){ return analysePlan; } - public List<String> getParamAnalysePlans(){ - List<String> result = new LinkedList<String>(); - for (AnalysePlan a : param.getAnalysePlans()){ - result.add(analysePlans.get(a)); - } - return result; + public List<AnalysePlan> getParamAnalysePlans(){ + return param.getAnalysePlans(); } public void addAnalysePlan(String name){ try { AnalysePlan ap = AnalysePlanStorage.getAnalysePlan(name).getNewAnalysePlanInstance(); - analysePlans.put(ap, name); getSimulationParameter().addAnalysePlan(ap); } catch (IsisFishException ex) { Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, null, ex); showMsgBox(ex); } } - public void removeAnalysePlan(String name){ - AnalysePlan ap = getAnalysePlan(name); - analysePlans.remove(ap); + public void removeAnalysePlan(AnalysePlan ap){ getSimulationParameter().removeAnalysePlan(ap); } public void clearAnalysePlan(){ getSimulationParameter().clearPlans(); } - public AnalysePlan getAnalysePlan(String name){ - AnalysePlan r = null; - for (Map.Entry<AnalysePlan, String> entry : analysePlans.entrySet()) { - if (entry.getValue().equals(name)) { - r = entry.getKey(); - } - } - return r; - } - public Map<String, Class> getAnalysePlanParameterName(String analysePlanName) { + public Map<String, Class> getAnalysePlanParameterName(AnalysePlan ap) { Map<String, Class> result = null; - if (analysePlanName != null) { - AnalysePlan a = getAnalysePlan(analysePlanName); - if (a != null){ - result = AnalysePlanStorage.getParameterNames(a); - } + if (ap != null) { + result = AnalysePlanStorage.getParameterNames(ap); } return result; } - public Object getAnalysePlanParameterValue(String paramName, String analysePlanName){ + public Object getAnalysePlanParameterValue(String paramName, AnalysePlan ap){ Object result = null; - if (analysePlanName != null) { + if (ap != null) { try { - result = AnalysePlanStorage.getParameterValue(getAnalysePlan(analysePlanName), paramName); + result = AnalysePlanStorage.getParameterValue(ap, paramName); } catch (IsisFishException ex) { Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, null, ex); showMsgBox(ex); @@ -601,15 +581,16 @@ } return result; } - public void setAnalysePlanParameterValue(String paramName, String analysePlanName, Object o){ - if (analysePlanName != null) { - try { - AnalysePlanStorage.setParameterValue(getAnalysePlan(analysePlanName), paramName, o); - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, null, ex); - showMsgBox(ex); - } + public void setAnalysePlanParameterValue(String paramName, AnalysePlan ap, Object value){ + if (log.isDebugEnabled()){ + log.debug("paramName : " + paramName + " analysePlanName : " + ap + " value : " + value); } + try { + AnalysePlanStorage.setParameterValue(ap, paramName, value); + } catch (IsisFishException ex) { + Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, null, ex); + showMsgBox(ex); + } } /*

1 0

r1790 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by sletellier＠users.labs.libre-entreprise.org Feb. 4, 2009

Feb. 4, 2009

Author: sletellier Date: 2009-02-04 15:41:44 +0000 (Wed, 04 Feb 2009) New Revision: 1790 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx Log: Debug gestion de l'arbre script Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-02-04 15:41:06 UTC (rev 1789) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-02-04 15:41:44 UTC (rev 1790) @@ -246,6 +246,7 @@ protected void deleteScript(boolean b){ int resp = JOptionPane.showConfirmDialog(this,_("isisfish.message.confirm.remove.script" , getContextValue(ScriptAction.class).getCode().getName()), null, JOptionPane.YES_NO_OPTION); + setTreeModel(); setInfoText(getContextValue(ScriptAction.class).deleteScript(resp,b)); } protected void diffScript(){

1 0