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

r2969 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui src/main/java/fr/ifremer/isisfish/ui/result src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 02 Feb '10

02 Feb '10

Author: chatellier Date: 2010-02-02 10:04:26 +0000 (Tue, 02 Feb 2010) New Revision: 2969 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Remove all filtering functionalities (too long). Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/changelog.txt 2010-02-02 10:04:26 UTC (rev 2969) @@ -1,5 +1,7 @@ isis-fish (3.3.0.0-rc2) stable; urgency=low + * Disable all list filtering functionalities (don't work anymore with a lot of simulations) + -- jeu. janv. 28 18:51:17 CET 2010 isis-fish (3.3.0.0-rc1) stable; urgency=low Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java 2010-02-02 10:04:26 UTC (rev 2969) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 Ifremer, Code Lutin + * Copyright (C) 2006 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.ui; -import java.io.IOException; -import java.text.ParseException; import java.util.ArrayList; import java.util.List; @@ -28,9 +26,6 @@ import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.simulator.SimulationProperties; -import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; -import fr.ifremer.isisfish.ui.widget.filter.FilterModel; /** * Welcome.java @@ -74,17 +69,21 @@ */ public static Object[] getOldSimulationItem() { - try { + //try { List<String> oldSimul = new ArrayList<String>(); - FilterModel<SimulationProperties, String> filterModel; + //FilterModel<SimulationProperties, String> filterModel; // keep in context list of old simulation names (for filter process) oldSimul.addAll(SimulationStorage.getSimulationNames()); + + // TODO filering disabled since it's read all simulation + // TODO can take more than 20m with a lot of simulations... + // create filter model - filterModel = SimulationFilterUtil.createFilterModel(oldSimul); + //filterModel = SimulationFilterUtil.createFilterModel(oldSimul); // to used directly model.getFilteredResult() in xml // we must fill filterModel result with original items - filterModel.selectAll(); + //filterModel.selectAll(); Object[] result = oldSimul.toArray(); // FIXME chatellier : Ajout d'une entrée vide pour forcer la sélection @@ -92,7 +91,7 @@ oldSimul.add(0, " "); return result; - } catch (ParseException ex) { + /*} catch (ParseException ex) { if (log.isErrorEnabled()) { log.error("Can't get old simulations", ex); } @@ -101,7 +100,7 @@ log.error("Can't get old simulations", ex); } } - return null; + return null;*/ } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2010-02-02 10:04:26 UTC (rev 2969) @@ -39,6 +39,9 @@ private FilterModel<SimulationProperties, String> filterModel; private DefaultComboBoxModel model; + /* + * FIXME this code reload ALL simulation (too long) + */ SimulationServiceListener listener = new SimulationServiceListener() { @Override @@ -78,11 +81,15 @@ private void initSimulation() throws IOException, ParseException { // keep in context list of old simulation names (for filter process) java.util.List<String> value = SimulationStorage.getSimulationNames(); + + // TODO filering disabled since it's read all simulation + // TODO can take more than 20m with a lot of simulations... + // create filter model - filterModel = SimulationFilterUtil.createFilterModel(value); + //filterModel = SimulationFilterUtil.createFilterModel(value); // to used directly model.getFilteredResult() in xml // we must fill filterModel result with original items - filterModel.selectAll(); + //filterModel.selectAll(); getSimulation().setEditable(false); model = new DefaultComboBoxModel(value.toArray()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2010-02-02 10:04:26 UTC (rev 2969) @@ -358,6 +358,9 @@ JButton result = new JButton(_("isisfish.filter"), icon); + // TODO disabled, filtering is too long + result.setEnabled(false); + result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_filterSimulationLogButton_clicked(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2010-02-02 10:04:26 UTC (rev 2969) @@ -404,7 +404,7 @@ <JComboBox id="fieldSimulParamsSelect" model='{getSimulParamsSelectModel()}' onActionPerformed='loadOldSimulation()'/> </cell> <cell> - <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter" onActionPerformed='selectFilter()'/> + <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter" onActionPerformed='selectFilter()' enabled="false"/> </cell> <cell> <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter" onActionPerformed='resetFilter()'/>

1 0

r2968 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 02 Feb '10

02 Feb '10

Author: chatellier Date: 2010-02-02 10:03:53 +0000 (Tue, 02 Feb 2010) New Revision: 2968 Modified: isis-fish/trunk/pom.xml Log: Restore integrations tests Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-02-01 14:45:26 UTC (rev 2967) +++ isis-fish/trunk/pom.xml 2010-02-02 10:03:53 UTC (rev 2968) @@ -504,7 +504,7 @@ <java.io.tmpdir>${project.build.directory}/surefire-workdir</java.io.tmpdir> </systemPropertyVariables> </configuration> -  + </executions> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId>

1 0

r2967 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org 01 Feb '10

01 Feb '10

Author: chatellier Date: 2010-02-01 14:45:26 +0000 (Mon, 01 Feb 2010) New Revision: 2967 Modified: isis-fish/branches/3.3.1/pom.xml Log: Update h2 Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2010-01-28 17:53:17 UTC (rev 2966) +++ isis-fish/branches/3.3.1/pom.xml 2010-02-01 14:45:26 UTC (rev 2967) @@ -218,7 +218,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.127</version> + <version>1.2.128</version> <scope>compile</scope> </dependency>

1 0

r2966 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 28 Jan '10

28 Jan '10

Author: chatellier Date: 2010-01-28 17:53:17 +0000 (Thu, 28 Jan 2010) New Revision: 2966 Modified: isis-fish/trunk/changelog.txt Log: Update changelog Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-01-28 16:31:43 UTC (rev 2965) +++ isis-fish/trunk/changelog.txt 2010-01-28 17:53:17 UTC (rev 2966) @@ -1,5 +1,9 @@ -isis-fish (3.3.0.0) stable; urgency=low +isis-fish (3.3.0.0-rc2) stable; urgency=low + -- jeu. janv. 28 18:51:17 CET 2010 + +isis-fish (3.3.0.0-rc1) stable; urgency=low + * Enable to add factors from tables (target factor equation, selectivity equation) * Restore simulation control auto save features (usefull for remote simulation monitoring) * Make all data storage isolated on simulation directory during a simulation @@ -32,7 +36,7 @@ * Add ".shp" extension to database map files list (database migration) * Move codelutin librairies to nuiton.org (database migration) - -- mar. oct. 13 09:48:15 CEST 2009 + -- jeu. janv. 28 18:51:17 CET 2010 isis-fish (3.2.0.10) stable; urgency=high

1 0

r2965 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 28 Jan '10

28 Jan '10

Author: chatellier Date: 2010-01-28 16:31:43 +0000 (Thu, 28 Jan 2010) New Revision: 2965 Modified: isis-fish/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-01-28 16:31:41 UTC (rev 2964) +++ isis-fish/trunk/pom.xml 2010-01-28 16:31:43 UTC (rev 2965) @@ -10,7 +10,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.0-rc1</version> + <version>3.3.0.0-rc2-SNAPSHOT</version>  <dependencies> @@ -683,9 +683,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.…</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.…</developerConnection> - <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/tags/isis-fish-3…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> + <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/trunk/?root=isis…</url> </scm> <repositories>

1 0

r2964 - isis-fish/tags
by chatellier＠users.labs.libre-entreprise.org 28 Jan '10

28 Jan '10

Author: chatellier Date: 2010-01-28 16:31:41 +0000 (Thu, 28 Jan 2010) New Revision: 2964 Added: isis-fish/tags/isis-fish-3.3.0.0-rc1/ Log: [maven-scm] copy for tag isis-fish-3.3.0.0-rc1

1 0

r2963 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 28 Jan '10

28 Jan '10

Author: chatellier Date: 2010-01-28 16:31:37 +0000 (Thu, 28 Jan 2010) New Revision: 2963 Modified: isis-fish/trunk/pom.xml Log: [maven-release-plugin] prepare release isis-fish-3.3.0.0-rc1 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-01-28 16:20:19 UTC (rev 2962) +++ isis-fish/trunk/pom.xml 2010-01-28 16:31:37 UTC (rev 2963) @@ -1,5 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,7 +10,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.0-rc1-SNAPSHOT</version> + <version>3.3.0.0-rc1</version>  <dependencies> @@ -684,9 +683,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> - <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/trunk/?root=isis…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.…</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.…</developerConnection> + <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/tags/isis-fish-3…</url> </scm> <repositories>

1 0

r2962 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 28 Jan '10

28 Jan '10

Author: chatellier Date: 2010-01-28 16:20:19 +0000 (Thu, 28 Jan 2010) New Revision: 2962 Modified: isis-fish/trunk/pom.xml Log: Disable integration test Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-01-28 16:20:00 UTC (rev 2961) +++ isis-fish/trunk/pom.xml 2010-01-28 16:20:19 UTC (rev 2962) @@ -505,7 +505,7 @@ <java.io.tmpdir>${project.build.directory}/surefire-workdir</java.io.tmpdir> </systemPropertyVariables> </configuration> - <executions> +  </plugin> <plugin> <artifactId>maven-site-plugin</artifactId>

1 0

r2961 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 28 Jan '10

28 Jan '10

Author: chatellier Date: 2010-01-28 16:20:00 +0000 (Thu, 28 Jan 2010) New Revision: 2961 Modified: isis-fish/trunk/LICENSE.txt Log: Replace gplv2 by another gplv2 ? Modified: isis-fish/trunk/LICENSE.txt =================================================================== --- isis-fish/trunk/LICENSE.txt 2010-01-28 11:43:29 UTC (rev 2960) +++ isis-fish/trunk/LICENSE.txt 2010-01-28 16:20:00 UTC (rev 2961) @@ -1,8 +1,8 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -15,7 +15,7 @@ General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -278,3 +278,62 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License.

1 0

r2960 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 28 Jan '10

28 Jan '10

Author: chatellier Date: 2010-01-28 11:43:29 +0000 (Thu, 28 Jan 2010) New Revision: 2960 Modified: isis-fish/trunk/pom.xml Log: Update surefire config Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-01-28 11:03:01 UTC (rev 2959) +++ isis-fish/trunk/pom.xml 2010-01-28 11:43:29 UTC (rev 2960) @@ -501,12 +501,9 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <systemProperties> - <property> - <name>java.io.tmpdir</name> - <value>${project.build.directory}/surefire-workdir</value> - </property> - </systemProperties> + <systemPropertyVariables> + <java.io.tmpdir>${project.build.directory}/surefire-workdir</java.io.tmpdir> + </systemPropertyVariables> </configuration> <executions> <execution>

1 0