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

r3571 - trunk/src/main/java/fr/ifremer/isisfish/ui/input
by echatellier＠users.forge.codelutin.com Dec. 19, 2011

Dec. 19, 2011

Author: echatellier Date: 2011-12-19 17:01:38 +0100 (Mon, 19 Dec 2011) New Revision: 3571 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3571 Log: Fix species list data Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-12-19 15:37:39 UTC (rev 3570) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-12-19 16:01:38 UTC (rev 3571) @@ -65,6 +65,7 @@ setSeasonModel(); setSpecies(null); setMetierSeasonInfo(null); + setTargetSpeciesModel(); setTableTargetSpeciesModel(); } });

1 0

r3570 - branches/isis-fish-3.3.0.x/src/license
by echatellier＠users.forge.codelutin.com Dec. 19, 2011

Dec. 19, 2011

Author: echatellier Date: 2011-12-19 16:37:39 +0100 (Mon, 19 Dec 2011) New Revision: 3570 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3570 Log: Update third party Modified: branches/isis-fish-3.3.0.x/src/license/THIRD-PARTY.properties Modified: branches/isis-fish-3.3.0.x/src/license/THIRD-PARTY.properties =================================================================== --- branches/isis-fish-3.3.0.x/src/license/THIRD-PARTY.properties 2011-12-19 15:25:28 UTC (rev 3569) +++ branches/isis-fish-3.3.0.x/src/license/THIRD-PARTY.properties 2011-12-19 15:37:39 UTC (rev 3570) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - ANTLR 3 License @@ -10,24 +10,24 @@ # - BBN Technologies # - BSD License # - BSD licence +# - BSD style # - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - GNU General Public License - Version 2 -# - GNU LESSER GENERAL PUBLIC LICENSE # - GNU Lesser General Public Licence -# - GNU Lesser General Public License # - GPL # - ICU License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - JDom license # - JGoodies license # - Java Transaction API (JTA) License # - Jaxen license -# - LGPL # - Lesser General Public License (LGPL v. 2.1) # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - License Agreement for JavaMail(TM) API # - MIT License # - Mozilla Public License 1.1 (MPL 1.1) @@ -43,36 +43,36 @@ # Please fill the missing licenses for dependencies : # # -#Thu Jan 20 17:35:50 CET 2011 -antlr--antlr--2.7.6--jar=BSD License -aspectwerkz--aspectwerkz--2.0--jar=GNU Lesser General Public License -aspectwerkz--aspectwerkz-core--2.0--jar=GNU Lesser General Public License -aspectwerkz--aspectwerkz-jdk5--2.0--jar=GNU Lesser General Public License -com.ibm.icu--icu4j--2.6.1--jar=ICU License -com.sun--tools--1.6.0.16--jar=Sun's Binary Code License -commons-jxpath--commons-jxpath--1.3--jar=The Apache Software License, Version 2.0 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1--jar=BSD License -javassist--javassist--3.8.0.GA--jar=GNU Lesser General Public License -javax.activation--activation--1.1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.help--javahelp--2.0.02--jar=GNU General Public License - Version 2 -javax.mail--mail--1.4.1--jar=License Agreement for JavaMail(TM) API -javax.transaction--jta--1.1--jar=Java Transaction API (JTA) License -jaxen--jaxen--1.1.1--jar=Jaxen license -jdom--jdom--1.0--jar=JDom license -jgoodies--looks--1.2.2--jar=JGoodies license -jrexx--jrexx--1.1.1--jar=Apache Software License -net.java.dev.jna--jna--3.2.2--jar=Lesser General Public License (LGPL v. 2.1) -opensymphony--ognl--2.6.11--jar=The OpenSymphony Software License, Version 1.1 -org.antlr--antlr-runtime--3.1.3--jar=ANTLR 3 License -org.nuiton.thirdparty--JRI--0.8-0--jar=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--REngine--0.6-0--jar=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--Rserve--0.6-0--jar=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--asm--1.5.4-snapshot--jar=ASM License -org.nuiton.thirdparty--asm-attrs--1.5.4-snapshot--jar=ASM License -org.nuiton.thirdparty--asm-util--1.5.4-snapshot--jar=ASM License -org.nuiton.thirdparty--l2fprod-common--0.1--jar=Apache Software License -qdox--qdox--1.4--jar=Apache Software License, Version 2.0 -trove--trove--1.0.2--jar=Lesser General Public License (LGPL) -xalan--xalan--2.6.0--jar=Apache Software License Version 2.0 -xerces--xmlParserAPIs--2.6.2--jar=Apache Software License, Version 1.1 +#Mon Dec 19 16:26:39 CET 2011 +antlr--antlr--2.7.6=BSD License +aspectwerkz--aspectwerkz--2.0=GNU Lesser General Public License +aspectwerkz--aspectwerkz-core--2.0=GNU Lesser General Public License +aspectwerkz--aspectwerkz-jdk5--2.0=GNU Lesser General Public License +com.ibm.icu--icu4j--2.6.1=ICU License +com.sun--tools--1.6.0.16=Sun's Binary Code License +commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.8.0.GA=GNU Lesser General Public License +javax.activation--activation--1.1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.help--javahelp--2.0.02=GNU General Public License - Version 2 +javax.mail--mail--1.4.1=License Agreement for JavaMail(TM) API +javax.transaction--jta--1.1=Java Transaction API (JTA) License +jaxen--jaxen--1.1.1=Jaxen license +jdom--jdom--1.0=JDom license +jgoodies--looks--1.2.2=JGoodies license +jrexx--jrexx--1.1.1=Apache Software License +net.java.dev.jna--jna--3.2.2=Lesser General Public License (LGPL v. 2.1) +opensymphony--ognl--2.6.11=The OpenSymphony Software License, Version 1.1 +org.antlr--antlr-runtime--3.1.3=ANTLR 3 License +org.nuiton.thirdparty--JRI--0.8-0=Lesser General Public License (LGPL v. 2.1) +org.nuiton.thirdparty--REngine--0.6-0=Lesser General Public License (LGPL v. 2.1) +org.nuiton.thirdparty--Rserve--0.6-0=Lesser General Public License (LGPL v. 2.1) +org.nuiton.thirdparty--asm--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--asm-attrs--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--asm-util--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--l2fprod-common--0.1=Apache Software License +qdox--qdox--1.4=Apache Software License, Version 2.0 +trove--trove--1.0.2=Lesser General Public License (LGPL) +xalan--xalan--2.6.0=Apache Software License Version 2.0 +xerces--xmlParserAPIs--2.6.2=Apache Software License, Version 1.1

1 0

r3569 - branches/isis-fish-3.3.0.x
by echatellier＠users.forge.codelutin.com Dec. 19, 2011

Dec. 19, 2011

Author: echatellier Date: 2011-12-19 16:25:28 +0100 (Mon, 19 Dec 2011) New Revision: 3569 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3569 Log: Swicth to redmine 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 15:06:47 UTC (rev 3568) +++ branches/isis-fish-3.3.0.x/pom.xml 2011-12-19 15:25:28 UTC (rev 3569) @@ -5,8 +5,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4labs</artifactId> - <version>2.5.2</version> + <artifactId>mavenpom4redmine</artifactId> + <version>3.0.6</version> </parent> <groupId>fr.ifremer</groupId> @@ -364,7 +364,7 @@ <description>Simulateur de pecherie complexe.</description> <inceptionYear>1999</inceptionYear> - <url>http://isis-fish.labs.libre-entreprise.org/isis-fish</url> + <url>http://maven-site.forge.codelutin.com/isis-fish</url> <organization> <name>CodeLutin</name> @@ -382,10 +382,10 @@ <mailingLists> <mailingList> <name>isis-fish-commits</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-commits</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-commits</unsubscribe> - <post>isis-fish-commits(a)lists.lists.labs.libre-entreprise.org</post> - <archive>http://lists.labs.libre-entreprise.org/pipermail/isis-fish-commits/</archive> + <subscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-commits</subscribe> + <unsubscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-commits</unsubscribe> + <post>isis-fish-commits(a)list.isis-fish.org</post> + <archive>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-commits/</archive> </mailingList> <mailingList> <name>isis-fish-devel</name> @@ -396,21 +396,21 @@ </mailingList> <mailingList> <name>isis-fish-user</name> - <subscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-user</subscribe> - <unsubscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-user</unsubscribe> - <post>isis-fish-user(a)list.isis-fish.org</post> - <archive>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-user/</archive> + <subscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-users</subscribe> + <unsubscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-users</unsubscribe> + <post>isis-fish-users(a)list.isis-fish.org</post> + <archive>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-users/</archive> </mailingList> </mailingLists> <issueManagement> - <system>gforge</system> - <url>http://labs.libre-entreprise.org/tracker/?group_id=8</url> + <system>redmine</system> + <url>http://forge.codelutin.com/projects/isis-fish/issues</url> </issueManagement> <ciManagement> <system>hudson</system> - <url>http://hudson.codelutin.com/hudson</url> + <url>http://jenkins.forge.codelutin.com/jenkins/job/isis-fish</url> </ciManagement> <developers> @@ -475,7 +475,7 @@ <properties>  <projectId>isis-fish</projectId> - <labs.id>8</labs.id> + <platform>forge.codelutin.com</platform> <javadocPluginVersion>2.7</javadocPluginVersion> <siteLocales>fr,en</siteLocales> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> @@ -492,6 +492,8 @@ <aspectwerkzVersion>2.0</aspectwerkzVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> + <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles> +  </properties> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/isis-fish</url> + </site> + </distributionManagement> + <build> <pluginManagement> <plugins> @@ -685,9 +694,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.8</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.8</developerConnection> - <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/tags/isis-fish-3…</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

r3568 - branches/isis-fish-3.3.0.x/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com Dec. 19, 2011

Dec. 19, 2011

Author: echatellier Date: 2011-12-19 16:06:47 +0100 (Mon, 19 Dec 2011) New Revision: 3568 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3568 Log: #609: Les plans de simulations sont reinstanci?\195?\169s durant une simulation Modified: branches/isis-fish-3.3.0.x/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: branches/isis-fish-3.3.0.x/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- branches/isis-fish-3.3.0.x/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-12-19 14:38:07 UTC (rev 3567) +++ branches/isis-fish-3.3.0.x/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-12-19 15:06:47 UTC (rev 3568) @@ -704,6 +704,7 @@ protected SimulationControl control; protected SimulationParameter param; protected int done = 0; + protected List<AnalysePlan> analyzePlan; public PrepareSimulationJob(SimulationService simulationService, SimulationJob job) { @@ -712,11 +713,16 @@ id = job.getItem().getControl().getId(); control = job.getItem().getControl(); param = job.getItem().getParameter(); + // take a copy of simulation paln list + // because they a freed during simulation (soft reference) + // is there is not enought memory available + analyzePlan = param.getAnalysePlans(); + this.planContext = new AnalysePlanContext(control.getId(), param); try { // appel de init sur chaque plan - for (AnalysePlan plan : param.getAnalysePlans()) { + for (AnalysePlan plan : analyzePlan) { plan.init(planContext); } } catch (Exception eee) { @@ -842,7 +848,7 @@ sim.getParameter().setAnalysePlanNumber(planNumber); // appel de tous les plans pour modifier la simulation - for (AnalysePlan plan : param.getAnalysePlans()) { + for (AnalysePlan plan : analyzePlan) { result = result && plan.beforeSimulation(planContext, sim); if (!result) { @@ -917,7 +923,7 @@ // appel de tous les plans pour modifier la simulation // EC20090716 : use param.getAnalysePlans() instances, // not sim.getParameters().getAnalysePlans() not sames !!! - for (AnalysePlan plan : param.getAnalysePlans()) { + for (AnalysePlan plan : analyzePlan) { try { boolean result = plan.afterSimulation(planContext, sim); doNext = doNext && result;

1 0

r3567 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com Dec. 19, 2011

Dec. 19, 2011

Author: echatellier Date: 2011-12-19 15:38:07 +0100 (Mon, 19 Dec 2011) New Revision: 3567 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3567 Log: #609: Les plans de simulations sont reinstanci?\195?\169s durant une simulation Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-12-16 15:47:53 UTC (rev 3566) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-12-19 14:38:07 UTC (rev 3567) @@ -847,6 +847,7 @@ protected SimulationControl control; protected SimulationParameter param; protected int done = 0; + protected List<SimulationPlan> simulationPlan; public PrepareSimulationJob(SimulationService simulationService, SimulationJob job) { @@ -855,11 +856,15 @@ id = job.getItem().getControl().getId(); control = job.getItem().getControl(); param = job.getItem().getParameter(); + // take a copy of simulation paln list + // because they a freed during simulation (soft reference) + // is there is not enought memory available + simulationPlan = param.getSimulationPlans(); this.planContext = new SimulationPlanContext(control.getId(), param); try { // appel de init sur chaque plan - for (SimulationPlan plan : param.getSimulationPlans()) { + for (SimulationPlan plan : simulationPlan) { plan.init(planContext); } } catch (Exception eee) { @@ -985,7 +990,7 @@ sim.getParameter().setSimulationPlanNumber(planNumber); // appel de tous les plans pour modifier la simulation - for (SimulationPlan plan : param.getSimulationPlans()) { + for (SimulationPlan plan : simulationPlan) { result = result && plan.beforeSimulation(planContext, sim); if (!result) { @@ -1060,7 +1065,7 @@ // appel de tous les plans pour modifier la simulation // EC20090716 : use param.getSimulationPlans() instances, // not sim.getParameters().getSimulationPlans() not sames !!! - for (SimulationPlan plan : param.getSimulationPlans()) { + for (SimulationPlan plan : simulationPlan) { try { boolean result = plan.afterSimulation(planContext, sim); doNext = doNext && result;

1 0

r3566 - trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by echatellier＠users.forge.codelutin.com Dec. 16, 2011

Dec. 16, 2011

Author: echatellier Date: 2011-12-16 16:47:53 +0100 (Fri, 16 Dec 2011) New Revision: 3566 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3566 Log: Fix le nom des onglets dans le cas d'un rechargement 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-16 15:43:35 UTC (rev 3565) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-12-16 15:47:53 UTC (rev 3566) @@ -461,7 +461,8 @@ } factorWizardUI.discretComponents.add(c); JScrollPane js = new JScrollPane(c); - factorWizardUI.getTabPane().addTab("Factor " + i, js); + String tabName = _("isisfish.sensitivity.discretevaluelabel", i); + factorWizardUI.getTabPane().addTab(tabName, js); } // init non selected continous panel @@ -486,7 +487,6 @@ throw new IsisFishRuntimeException("Can't get factor path database value", ex); } } - } factorWizardUI.getFactorNameField().setText(factorName); @@ -504,6 +504,7 @@ factorWizardUI.getTabPane().removeAll(); for (int i = 0; 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));

1 0

r3565 - trunk/src/main/java/fr/ifremer/isisfish/ui/widget
by echatellier＠users.forge.codelutin.com Dec. 16, 2011

Dec. 16, 2011

Author: echatellier Date: 2011-12-16 16:43:35 +0100 (Fri, 16 Dec 2011) New Revision: 3565 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3565 Log: Ajout d'un cache pour le modele de filtres des listes sinon les perfs sont d?\195?\169sastreuses. Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-12-10 11:27:50 UTC (rev 3564) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-12-16 15:43:35 UTC (rev 3565) @@ -69,6 +69,13 @@ protected boolean filtering = false; + /* + * Il faut obligatoirement que la liste filtrées soit mise en cache, car + * l'appeler dans le getElementAt() comme c'était fait avant dégrade énormement + * les perfs, un truc de dingue. + */ + protected List<Object> itemCache; + public FilterableComboBox() { actionListeners = new ArrayList<ActionListener>(); buildLayout(); @@ -92,35 +99,39 @@ @Override public int getSize() { - int delegateSize = model.getSize(); - int realSize = 0; - for (int i = 0; i < delegateSize; ++i) { - if (model.getElementAt(i).toString().matches(".*" + filterField.getText() + ".*")) { - realSize++; - } + int size = 0; + if (itemCache != null) { + size = itemCache.size(); + } else { + size = model.getSize(); } - return realSize; + return size; } @Override public Object getElementAt(int index) { + Object element = null; + if (itemCache != null) { + element = itemCache.get(index); + } else { + element = model.getElementAt(index); + } + return element; + } + + public void fireDataChanged() { + filtering = true; + super.fireContentsChanged(this, 0, model.getSize()); + + // filter list int delegateSize = model.getSize(); - int realIndex = -1; + itemCache = new ArrayList<Object>(delegateSize); for (int i = 0; i < delegateSize; ++i) { Object element = model.getElementAt(i); if (element.toString().matches(".*" + filterField.getText() + ".*")) { - realIndex++; + itemCache.add(element); } - if (index == realIndex) { - return element; - } } - return null; - } - - public void fireDataChanged() { - filtering = true; - super.fireContentsChanged(this, 0, model.getSize()); filtering = false; }

1 0

r3564 - trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model
by echatellier＠users.forge.codelutin.com Dec. 10, 2011

Dec. 10, 2011

Author: echatellier Date: 2011-12-10 12:27:50 +0100 (Sat, 10 Dec 2011) New Revision: 3564 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3564 Log: Disable letter in factor icon (now only continous or discrete) Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java 2011-12-10 10:12:43 UTC (rev 3563) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java 2011-12-10 11:27:50 UTC (rev 3564) @@ -65,8 +65,8 @@ public FactorTreeCellRenderer() { iconCache = new HashMap<String, Icon>(); iconCache.put("c", Resource.getIcon("/icons/factors/c.png")); // continuous - iconCache.put("ce", Resource.getIcon("/icons/factors/ce.png")); // continuous equation - iconCache.put("cm", Resource.getIcon("/icons/factors/cm.png")); // continuous matrix + //iconCache.put("ce", Resource.getIcon("/icons/factors/ce.png")); // continuous equation + //iconCache.put("cm", Resource.getIcon("/icons/factors/cm.png")); // continuous matrix iconCache.put("d", Resource.getIcon("/icons/factors/d.png")); // discrete iconCache.put("dg", Resource.getIcon("/icons/factors/dgroup.png")); // group discrete iconCache.put("cg", Resource.getIcon("/icons/factors/cgroup.png")); // group continuous @@ -114,12 +114,12 @@ } // get factor data type - if (domain instanceof EquationContinuousDomain) { + /*if (domain instanceof EquationContinuousDomain) { icon += "e"; } else if (domain instanceof MatrixContinuousDomain) { icon += "m"; - } + }*/ text = factor.getName(); } }

1 0

r3563 - in trunk/src/main/java/fr/ifremer/isisfish: . ui/input ui/input/renderer
by echatellier＠users.forge.codelutin.com Dec. 10, 2011

Dec. 10, 2011

Author: echatellier Date: 2011-12-10 11:12:43 +0100 (Sat, 10 Dec 2011) New Revision: 3563 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3563 Log: #591 : AS - Pas possible d'avoir plusieurs facteurs TargetFactor Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-12-02 19:03:57 UTC (rev 3562) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-12-10 10:12:43 UTC (rev 3563) @@ -119,7 +119,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 0, 0, 0); + protected final static Version version = new Version(4, 0, 0, 1); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version( Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-12-02 19:03:57 UTC (rev 3562) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-12-10 10:12:43 UTC (rev 3563) @@ -73,10 +73,10 @@ <JPanel id="body"> <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab"> <tab title='isisfish.gear.title'> - <GearTabUI id="gearTabUI" bean="{getBean()}" active="{isActive()}" constructorParams='this' /> + <GearTabUI id="gearTabUI" bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this' /> </tab> <tab title='isisfish.selectivity.title'> - <SelectivityUI id="selectivityUI" bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <SelectivityUI id="selectivityUI" bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> </JTabbedPane> </JPanel> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-12-02 19:03:57 UTC (rev 3562) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-12-10 10:12:43 UTC (rev 3563) @@ -44,6 +44,7 @@ java.beans.PropertyChangeEvent; java.beans.PropertyChangeListener; java.util.ArrayList + java.util.List java.awt.Dimension javax.swing.DefaultComboBoxModel </import> @@ -61,16 +62,10 @@ protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { - if (evt.getNewValue() == null) { - DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); - fieldMetierSeasonInfo.setModel(seasonModel); - } - if (evt.getNewValue() != null) { - setSeasonModel(); - setTargetSpeciesModel(); - } + setSeasonModel(); setSpecies(null); setMetierSeasonInfo(null); + setTableTargetSpeciesModel(); } }); } @@ -81,7 +76,11 @@ } protected void setSeasonModel() { - java.util.List<MetierSeasonInfo> metierSeasonInfo = getBean().getMetierSeasonInfo(); + List<MetierSeasonInfo> metierSeasonInfo = null; + + if (getBean() != null) { + metierSeasonInfo = getBean().getMetierSeasonInfo(); + } MetierSeasonInfoComboModel seasonModel = new MetierSeasonInfoComboModel(metierSeasonInfo); fieldMetierSeasonInfo.setModel(seasonModel); } @@ -96,7 +95,7 @@ } protected void setTargetSpeciesModel() { - java.util.List<Species> species = getFisheryRegion().getSpecies(); + List<Species> species = getFisheryRegion().getSpecies(); SpeciesComboModel fieldTargetSpeciesModel = new SpeciesComboModel(species); fieldTargetSpecies.setModel(fieldTargetSpeciesModel); } @@ -108,19 +107,21 @@ protected void setTableTargetSpeciesModel() { List<TargetSpecies> targetSpecies = new ArrayList<TargetSpecies>(); - - // SpeciesTargetSpecies can be null durring region creation - if (getMetierSeasonInfo().getSpeciesTargetSpecies() != null) { - // move collection to list - // and add all entity to verifier - for (TargetSpecies oneTargetSpecies : getMetierSeasonInfo().getSpeciesTargetSpecies()) { - targetSpecies.add(oneTargetSpecies); - getSaveVerifier().addCurrentEntity(oneTargetSpecies); - oneTargetSpecies.addPropertyChangeListener(new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - changeModel.setStayChanged(true); - } - }); + + if (getBean() != null && getMetierSeasonInfo() != null) { + // SpeciesTargetSpecies can be null durring region creation + if (getMetierSeasonInfo().getSpeciesTargetSpecies() != null) { + // move collection to list + // and add all entity to verifier + for (TargetSpecies oneTargetSpecies : getMetierSeasonInfo().getSpeciesTargetSpecies()) { + targetSpecies.add(oneTargetSpecies); + getSaveVerifier().addCurrentEntity(oneTargetSpecies); + oneTargetSpecies.addPropertyChangeListener(new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + changeModel.setStayChanged(true); + } + }); + } } } @@ -170,7 +171,7 @@ <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldMetierSeasonInfo" onItemStateChanged='metierSeasonInfoChanged()' renderer="{new fr.ifremer.isisfish.ui.input.renderer.MetierSeasonInfoComboRenderer()}" - enabled='{isActive() && !changeModel.isChanged()}'/> + enabled='{isActive() && (isSensitivity() || !changeModel.isChanged() ) }'/> </cell> </row> <row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-12-02 19:03:57 UTC (rev 3562) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-12-10 10:12:43 UTC (rev 3563) @@ -238,7 +238,7 @@ <JLabel text="isisfish.metierSeasonInfoZone.selectSeason" enabled='{isActive()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="metierSeasonInfoCombo" onItemStateChanged='seasonChanged()' enabled='{isActive() && !changeModel.isChanged()}' + <JComboBox id="metierSeasonInfoCombo" onItemStateChanged='seasonChanged()' enabled='{isActive() && (isSensitivity() || !changeModel.isChanged() ) }' renderer="{new fr.ifremer.isisfish.ui.input.renderer.MetierSeasonInfoComboRenderer()}" /> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-12-02 19:03:57 UTC (rev 3562) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-12-10 10:12:43 UTC (rev 3563) @@ -41,14 +41,6 @@ installChangeListener(metierTab); } -/*public void refresh() { - - // add tab in reverse order - // metierTabUI at last, for this tab refresh at end, and save/cancel button linked to - // entity change - getSaveVerifier().addCurrentPanel(metierSeasonSpeciesUI, metierSeasonInfoUI, metierTabUI); -}*/ - @Override public void setLayer(boolean active) { super.setLayer(active); @@ -67,13 +59,13 @@ <JPanel id="body"> <JTabbedPane id="metierTab" constraints='BorderLayout.CENTER'> <tab title='isisfish.metier.title'> - <MetierTabUI id="metierTabUI" bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <MetierTabUI id="metierTabUI" bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> <tab title='isisfish.metierSeasonInfoZone.title'> - <MetierSeasonInfoZoneUI id="metierSeasonInfoUI" bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <MetierSeasonInfoZoneUI id="metierSeasonInfoUI" bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> <tab title='isisfish.metierSeasonInfoSpecies.title'> - <MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> </JTabbedPane> </JPanel> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-12-02 19:03:57 UTC (rev 3562) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-12-10 10:12:43 UTC (rev 3563) @@ -264,7 +264,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldPopulationSeasonInfoChooser" - onItemStateChanged='seasonChanged()' enabled='{isActive() && !changeModel.isChanged()}' + onItemStateChanged='seasonChanged()' enabled='{isActive() && (isSensitivity() || !changeModel.isChanged() ) }' renderer="{new fr.ifremer.isisfish.ui.input.renderer.PopulationSeasonInfoComboRenderer()}"/> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-12-02 19:03:57 UTC (rev 3562) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-12-10 10:12:43 UTC (rev 3563) @@ -79,39 +79,39 @@ <JTabbedPane id="populationTab">  <tab title='isisfish.populationBasics.title'> - <PopulationBasicsUI id='populationBasicsUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <PopulationBasicsUI id='populationBasicsUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab>  <tab title='isisfish.populationZones.title'> - <PopulationZonesUI id='populationZoneUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <PopulationZonesUI id='populationZoneUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab>  <tab title='isisfish.populationSeasons.title'> - <PopulationSeasonsUI id='populationSeasonsUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <PopulationSeasonsUI id='populationSeasonsUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab>  <tab title='isisfish.populationEquation.title'> - <PopulationEquationUI id='populationEquationUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <PopulationEquationUI id='populationEquationUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab>  <tab title='isisfish.populationRecruitment.title'> - <PopulationRecruitmentUI id='populationRecruitementUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <PopulationRecruitmentUI id='populationRecruitementUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab>  <tab title='isisfish.populationGroup.title'> - <PopulationGroupUI id='populationGroupUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <PopulationGroupUI id='populationGroupUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab>  <tab title='isisfish.populationCapturability.title'> - <PopulationCapturabilityUI id='populationCapturabilityUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <PopulationCapturabilityUI id='populationCapturabilityUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab>  <tab title='isisfish.populationMigration.title'> - <PopulationMigrationUI id='populationMigrationUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <PopulationMigrationUI id='populationMigrationUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab>  <tab title='isisfish.populationPrice.title'> - <PopulationPriceUI id='populationPriceUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <PopulationPriceUI id='populationPriceUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> </JTabbedPane> </JPanel> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-12-02 19:03:57 UTC (rev 3562) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-12-10 10:12:43 UTC (rev 3563) @@ -62,13 +62,13 @@ <JPanel id="body"> <JTabbedPane id="setOfVesselsTab"> <tab title='isisfish.setOfVessels.title'> - <SetOfVesselsBasicsUI id='setOfVesselsBasicsUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <SetOfVesselsBasicsUI id='setOfVesselsBasicsUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> <tab title='isisfish.effortDescription.title'> - <EffortDescriptionUI id='effortDescriptionUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <EffortDescriptionUI id='effortDescriptionUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> <tab title='isisfish.effortDescription.parametersTitle'> - <EffortDescriptionParametersUI id='effortParametersUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <EffortDescriptionParametersUI id='effortParametersUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> </JTabbedPane> </JPanel> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2011-12-02 19:03:57 UTC (rev 3562) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2011-12-10 10:12:43 UTC (rev 3563) @@ -53,10 +53,10 @@ <JPanel id="body"> <JTabbedPane id="strategyTab"> <tab title='isisfish.strategy.title'> - <StrategyTabUI id='strategyTabUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <StrategyTabUI id='strategyTabUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> <tab title='isisfish.strategyMonthInfo.title'> - <StrategyMonthInfoUI id='strategyMonthInfoUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> + <StrategyMonthInfoUI id='strategyMonthInfoUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> </JTabbedPane> </JPanel> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java 2011-12-02 19:03:57 UTC (rev 3562) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java 2011-12-10 10:12:43 UTC (rev 3563) @@ -71,11 +71,13 @@ index, isSelected, cellHasFocus); TripType tripType = (TripType) value; - if (appendDetails) { - c.setText(tripType.getName() + "(" + tripType.getTripDuration() + ":" - + tripType.getMinTimeBetweenTrip() + ")"); - } else { - c.setText(tripType.getName()); + if (tripType != null) { + if (appendDetails) { + c.setText(tripType.getName() + "(" + tripType.getTripDuration() + ":" + + tripType.getMinTimeBetweenTrip() + ")"); + } else { + c.setText(tripType.getName()); + } } return c;

1 0

r3562 - trunk
by echatellier＠users.forge.codelutin.com Dec. 2, 2011

Dec. 2, 2011

Author: echatellier Date: 2011-12-02 20:03:57 +0100 (Fri, 02 Dec 2011) New Revision: 3562 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3562 Log: Fix release files Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-02 18:31:03 UTC (rev 3561) +++ trunk/pom.xml 2011-12-02 19:03:57 UTC (rev 3562) @@ -531,6 +531,8 @@ <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <aspectwerkzVersion>2.0</aspectwerkzVersion> + <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles> + <!-- jnlp (disabled until retested) <keystorepath>${codelutin.keystorepath}</keystorepath> <keystorealias>CodeLutin</keystorealias>

1 0