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

r3581 - trunk
by echatellier＠users.forge.codelutin.com 04 Jan '12

04 Jan '12

Author: echatellier Date: 2012-01-04 15:19:04 +0100 (Wed, 04 Jan 2012) New Revision: 3581 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3581 Log: Use nuiton-matrix snapshot Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 11:08:02 UTC (rev 3580) +++ trunk/pom.xml 2012-01-04 14:19:04 UTC (rev 3581) @@ -62,14 +62,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> <scope>compile</scope> <exclusions> <exclusion> @@ -396,13 +396,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - <version>1.0.12</version> - <scope>runtime</scope> - </dependency> </dependencies>

1 0

r3580 - trunk
by echatellier＠users.forge.codelutin.com 04 Jan '12

04 Jan '12

Author: echatellier Date: 2012-01-04 12:08:02 +0100 (Wed, 04 Jan 2012) New Revision: 3580 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3580 Log: Update h2, nuiton-utils, topia Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-20 10:58:54 UTC (rev 3579) +++ trunk/pom.xml 2012-01-04 11:08:02 UTC (rev 3580) @@ -278,7 +278,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.162</version> + <version>1.3.163</version> <scope>compile</scope> </dependency> @@ -531,9 +531,9 @@  <jaxxVersion>2.4.2</jaxxVersion> <eugeneVersion>2.4.1</eugeneVersion> - <topiaVersion>2.6.3</topiaVersion> + <topiaVersion>2.6.4</topiaVersion> <hibernateVersion>3.6.8.Final</hibernateVersion> - <nuitonUtilsVersion>2.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.1</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <aspectwerkzVersion>2.0</aspectwerkzVersion>

1 0

r3579 - trunk
by echatellier＠users.forge.codelutin.com 20 Dec '11

20 Dec '11

Author: echatellier Date: 2011-12-20 11:58:54 +0100 (Tue, 20 Dec 2011) New Revision: 3579 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3579 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-20 10:58:52 UTC (rev 3578) +++ trunk/pom.xml 2011-12-20 10:58:54 UTC (rev 3579) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.1</version> + <version>4.0.0.2-SNAPSHOT</version>  <dependencies> @@ -724,9 +724,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.1</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.1</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.1</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> <repositories>

1 0

r3578 - in tags: . isis-fish-4.0.0.1
by echatellier＠users.forge.codelutin.com 20 Dec '11

20 Dec '11

Author: echatellier Date: 2011-12-20 11:58:52 +0100 (Tue, 20 Dec 2011) New Revision: 3578 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3578 Log: [maven-release-plugin] copy for tag isis-fish-4.0.0.1 Added: tags/isis-fish-4.0.0.1/ Property changes on: tags/isis-fish-4.0.0.1 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo +

1 0

r3577 - trunk
by echatellier＠users.forge.codelutin.com 20 Dec '11

20 Dec '11

Author: echatellier Date: 2011-12-20 11:58:48 +0100 (Tue, 20 Dec 2011) New Revision: 3577 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3577 Log: [maven-release-plugin] prepare release isis-fish-4.0.0.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-20 10:26:17 UTC (rev 3576) +++ trunk/pom.xml 2011-12-20 10:58:48 UTC (rev 3577) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.1-SNAPSHOT</version> + <version>4.0.0.1</version>  <dependencies> @@ -724,9 +724,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.1</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.1</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.1</url> </scm> <repositories>

1 0

r3576 - trunk
by echatellier＠users.forge.codelutin.com 20 Dec '11

20 Dec '11

Author: echatellier Date: 2011-12-20 11:26:17 +0100 (Tue, 20 Dec 2011) New Revision: 3576 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3576 Log: #571 : Bug rendu en aire sur les graphiques Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-20 10:09:45 UTC (rev 3575) +++ trunk/pom.xml 2011-12-20 10:26:17 UTC (rev 3576) @@ -396,6 +396,13 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <version>1.0.12</version> + <scope>runtime</scope> + </dependency> </dependencies>

1 0

r3575 - trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by echatellier＠users.forge.codelutin.com 20 Dec '11

20 Dec '11

Author: echatellier Date: 2011-12-20 11:09:45 +0100 (Tue, 20 Dec 2011) New Revision: 3575 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3575 Log: #572 : Effectifs initiaux discrets non remplissables Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-12-19 16:04:02 UTC (rev 3574) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-12-20 10:09:45 UTC (rev 3575) @@ -502,13 +502,11 @@ int nbTab = Integer.parseInt(discreteNumber); factorWizardUI.discretComponents.clear(); factorWizardUI.getTabPane().removeAll(); - for (int i = 0; i < nbTab ; i++) { + for (int i = 1; i <= nbTab ; i++) { JComponent c = getNewDiscreteComponent(factorWizardUI); - System.out.println(c); factorWizardUI.discretComponents.add(c); - JScrollPane js = new JScrollPane(c); - String tabName = _("isisfish.sensitivity.discretevaluelabel", (i+1)); - factorWizardUI.getTabPane().addTab(tabName, js); + String tabName = _("isisfish.sensitivity.discretevaluelabel", i); + factorWizardUI.getTabPane().addTab(tabName, c); } factorWizardUI.pack(); } @@ -920,6 +918,9 @@ * Get copy of component with original entity value as default value. * Used to add new tab to a new or existing factor. * + * Le composant retourné est inclut dans un jscrollpane (sauf pour les + * matrices qui contient deja un jscrollpane) + * * @param factorWizardUI factorWizardUI * @return component copy */ @@ -982,7 +983,8 @@ MatrixContinuousPanelUI currentPanel = (MatrixContinuousPanelUI)factorWizardUI.continuousPanel; // on copie une des matrices du composant MatrixND matrix = currentPanel.getReferenceValuePanel().getMatrix().copy(); - result = new MatrixPanelEditor(matrix, false); + result = new MatrixPanelEditor(); // bug in 2.2.x with matrix in constructor + ((MatrixPanelEditor)result).setMatrix(matrix); } else if (factorPath.startsWith("parameters.rule.")) { Pattern pattern = Pattern.compile("^parameters\\.rule\\.\\d+\\.parameter\\.\\w+\\.(.+)$"); Matcher matcher = pattern.matcher(factorPath); @@ -1014,6 +1016,11 @@ log.debug("Component for path " + factorPath + " is " + result); } + // hack : si on met 2 fois un jscrollpane, rien ne s'affiche + if (!(result instanceof MatrixPanelEditor)) { + result = new JScrollPane(result); + } + return result; }

1 0

r3574 - branches/isis-fish-3.3.0.x
by echatellier＠users.forge.codelutin.com 19 Dec '11

19 Dec '11

Author: echatellier Date: 2011-12-19 17:04:02 +0100 (Mon, 19 Dec 2011) New Revision: 3574 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3574 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/isis-fish-3.3.0.x/pom.xml Modified: branches/isis-fish-3.3.0.x/pom.xml =================================================================== --- branches/isis-fish-3.3.0.x/pom.xml 2011-12-19 16:04:00 UTC (rev 3573) +++ branches/isis-fish-3.3.0.x/pom.xml 2011-12-19 16:04:02 UTC (rev 3574) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.9</version> + <version>3.3.0.10-SNAPSHOT</version>  <dependencies> @@ -694,9 +694,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-3.3.0.9</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-3.3.0.9</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-3.3.0.9</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/branches/isis-fish-3.3…</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/branches/isis-fish-3.3…</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/branches/isis-fish-3.3.0.x</url> </scm> <repositories>

1 0

r3573 - in tags: . isis-fish-3.3.0.9
by echatellier＠users.forge.codelutin.com 19 Dec '11

19 Dec '11

Author: echatellier Date: 2011-12-19 17:04:00 +0100 (Mon, 19 Dec 2011) New Revision: 3573 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3573 Log: [maven-release-plugin] copy for tag isis-fish-3.3.0.9 Added: tags/isis-fish-3.3.0.9/ Property changes on: tags/isis-fish-3.3.0.9 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo +

1 0

r3572 - branches/isis-fish-3.3.0.x
by echatellier＠users.forge.codelutin.com 19 Dec '11

19 Dec '11

Author: echatellier Date: 2011-12-19 17:03:57 +0100 (Mon, 19 Dec 2011) New Revision: 3572 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3572 Log: [maven-release-plugin] prepare release isis-fish-3.3.0.9 Modified: branches/isis-fish-3.3.0.x/pom.xml Modified: branches/isis-fish-3.3.0.x/pom.xml =================================================================== --- branches/isis-fish-3.3.0.x/pom.xml 2011-12-19 16:01:38 UTC (rev 3571) +++ branches/isis-fish-3.3.0.x/pom.xml 2011-12-19 16:03:57 UTC (rev 3572) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.9-SNAPSHOT</version> + <version>3.3.0.9</version>  <dependencies> @@ -694,9 +694,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/branches/isis-fish-3.3…</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/branches/isis-fish-3.3…</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/branches/isis-fish-3.3.0.x</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-3.3.0.9</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-3.3.0.9</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-3.3.0.9</url> </scm> <repositories>

1 0