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

r3189 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity: . domain
by chatellier＠users.labs.libre-entreprise.org March 22, 2011

March 22, 2011

Author: chatellier Date: 2011-03-22 14:40:09 +0000 (Tue, 22 Mar 2011) New Revision: 3189 Log: Fix javadoc and move FactorGroup to parent package Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java Removed: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/group/ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2011-03-22 14:39:17 UTC (rev 3188) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2011-03-22 14:40:09 UTC (rev 3189) @@ -68,7 +68,7 @@ /** * Add factor. * - * @param e factor to add + * @param f factor to add * @return {@code true} if factor has been added * @see java.util.List#add(java.lang.Object) */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-03-22 14:39:17 UTC (rev 3188) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-03-22 14:40:09 UTC (rev 3189) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Ifremer, CodeLutin + * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -34,9 +34,6 @@ /** * Facteur de variation des parametres de simulation. * - * @param <E> type des valeurs gérées par le facteur - * @param <F> type des labels - * * La classe doit être {@link Serializable} avec ses valeurs pour permettre * l'export XML. * Copied: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java (from rev 3148, isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/group/FactorGroup.java) =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2011-03-22 14:40:09 UTC (rev 3189) @@ -0,0 +1,269 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + * %% + * 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, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.simulator.sensitivity; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; + +/** + * Factor group. Used for group screening. + * + * A factor mixed can accept both discrete and continuous factors (used + * for convenience : factor tree root). + * + * A factor group without factors is untyped. + * + * @author chatellier + * @version $Revision$ + * + * @since 3.3.1.0 + * + * Last update : $Date$ + * By : $Author$ + */ +public class FactorGroup extends Factor { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1893573810633639712L; + + /** Factors collection. */ + protected List<Factor> factors; + + protected static class FactorComparator implements Comparator<Factor> { + @Override + public int compare(Factor o1, Factor o2) { + int result = 1; + + if (o1 instanceof FactorGroup) { + if (o2 instanceof FactorGroup) { + result = o1.getName().compareTo(o2.getName()); + } + else { + result = -1; + } + } + else { // factor + if (o2 instanceof Factor) { + result = o1.getName().compareTo(o2.getName()); + } + } + return result; + } + }; + + /** + * Mixed factor composition. + * + * Default to false; + * + * To enable both {@link DiscreteDomain} and {@link ContinuousDomain} in current group. + * Currently used in UI to use it as tree root and drag'n'drop. + */ + protected boolean mixed; + + /** + * Init factor group. + * + * @param name group name + * @param mixed mixed property + */ + public FactorGroup(String name, boolean mixed) { + super(name); + this.mixed = mixed; + factors = new ArrayList<Factor>(); + } + + /** + * Init factor group. + * + * @param name group name + */ + public FactorGroup(String name) { + this(name, false); + } + + /** + * Add all checked factors. + * + * @param allFactors factors to add + */ + public void addAllFactors(List<Factor> allFactors) { + for (Factor factor : allFactors) { + // check all factors to add are from same types + checkFactor(allFactors, factor); + // add factors to add are from same type as current + checkFactor(factors, factor); + } + + factors.addAll(allFactors); + + // sort : factor group, by name, and factor by name + Collections.sort(factors, new FactorComparator()); + } + + /** + * Check factor type and add it into factor collection. + * + * @param factor + */ + public void addFactor(Factor factor) { + // if mixed enabled, don't check + if (!mixed) { + checkFactor(factors, factor); + } + + factors.add(factor); + + // sort : factor group, by name, and factor by name + Collections.sort(factors, new FactorComparator()); + } + + /** + * Check factor type with other factor collection types. + * + * @param factorsList factors list to check + * @param factor factor to check + * @throws IllegalArgumentException if factor doesn't match other factor type + */ + protected void checkFactor(List<Factor> factorsList, Factor factor) { + // basiquement, il doit être du même type que le + // premier element + if (factor.getDomain() == null) { + throw new IllegalArgumentException("Factor domain is null"); + } + + // on va dire, que si c'est le premier, il est du meme + // type que lui meme + if (!factorsList.isEmpty()) { + Factor first = factorsList.get(0); + + // les deux sont discret ou continue + if ((first.getDomain() instanceof DiscreteDomain && !(factor.getDomain() instanceof DiscreteDomain)) || + (first.getDomain() instanceof ContinuousDomain && !(factor.getDomain() instanceof ContinuousDomain))) { + throw new IllegalArgumentException( + "Factor type is not in same type as other factor in group"); + } + } + } + + /** + * Remove factors collection. + * + * @param allFactors factors to remove + */ + public void removeAll(Collection<Factor> allFactors) { + factors.removeAll(allFactors); + } + + /** + * Get groups factors. + * + * @return unmodifiable factors list + */ + public List<Factor> getFactors() { + return Collections.unmodifiableList(factors); + } + + /** + * Convenient method to access specific factor. + * + * @param index index + * @return factor at index + */ + public Factor get(int index) { + return factors.get(index); + } + + /** + * Get factor list size. + * + * @return factor list size + */ + public int size() { + return factors.size(); + } + + /** + * Returns the index of the first occurrence of the specified element in this + * group. + * @param o element to search for + * @return the index of the first occurrence of the specified element in this + * group, or -1 if this list does not contain the element + */ + public int indexOf(Object o) { + return factors.indexOf(o); + } + + /** + * Return {@code true} if factor group is mixed. + * + * @return {@code true} if factor group is mixed + */ + public boolean isMixed() { + return mixed; + } + + /** + * Return {@code true} if factor group has at least one factor + * and this factor is discrete. + * + * @return {@code true} if factor group is discrete + */ + public boolean isDiscrete() { + boolean result = false; + if (!factors.isEmpty()) { + Domain domain = factors.get(0).getDomain(); + result = domain instanceof DiscreteDomain; + } + return result; + } + + /** + * Return {@code true} if factor group has at least one factor + * and this factor is continuous. + * + * @return {@code true} if factor group is continuous + */ + public boolean isContinuous() { + boolean result = false; + if (!factors.isEmpty()) { + Domain domain = factors.get(0).getDomain(); + result = domain instanceof ContinuousDomain; + } + return result; + } + + @Override + public String toString() { + return "FactorGroup(" + name + ")"; + } +} Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java 2011-03-22 14:39:17 UTC (rev 3188) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java 2011-03-22 14:40:09 UTC (rev 3189) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2010 Ifremer, Code Lutin, Chatellier Eric - * - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + * %% + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator.sensitivity.domain;

1 0

r3188 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org March 22, 2011

March 22, 2011

Author: chatellier Date: 2011-03-22 14:39:17 +0000 (Tue, 22 Mar 2011) New Revision: 3188 Log: Fix i18n parsing Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2011-03-22 14:39:01 UTC (rev 3187) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2011-03-22 14:39:17 UTC (rev 3188) @@ -77,8 +77,7 @@ double result = ((Number) val).doubleValue(); return result; } else { - throw new IsisFishRuntimeException(_( - "isisfish.error.equation.return.number", eq)); + throw new IsisFishRuntimeException(_("isisfish.error.equation.return.number", eq)); } } else if (Language.JAVA.equals(getLanguage()) || getJavaInterface() != null) { @@ -90,18 +89,15 @@ double result = ((Number) val).doubleValue(); return result; } else { - throw new IsisFishRuntimeException(_( - "isisfish.error.equation.return.number", eq)); + throw new IsisFishRuntimeException(_("isisfish.error.equation.return.number", eq)); } } else { // TODO other language support - throw new IsisFishRuntimeException(_( - "isisfish.error.unsupported.equation.langage", + throw new IsisFishRuntimeException(_("isisfish.error.unsupported.equation.langage", getLanguage(), eq)); } } catch (Exception eee) { - throw new IsisFishRuntimeException(_( - "isisfish.error.evaluate.equation", eq), eee); + throw new IsisFishRuntimeException(_("isisfish.error.evaluate.equation", eq), eee); } }

1 0

r3187 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org March 22, 2011

March 22, 2011

Author: chatellier Date: 2011-03-22 14:39:01 +0000 (Tue, 22 Mar 2011) New Revision: 3187 Log: Fix message body Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-03-18 13:35:19 UTC (rev 3186) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-03-22 14:39:01 UTC (rev 3187) @@ -135,7 +135,7 @@ // remove isis build directory FileUtil.deleteRecursively(IsisFish.config.getCompileDirectory()); - ErrorHelper.showErrorDialog(null, _("isisfish.error.linkageerror.title"), cause); + ErrorHelper.showErrorDialog(null, _("isisfish.error.linkageerror.message"), cause); } else { if (log.isErrorEnabled()) {

1 0

r3186 - isis-fish/branches/3.3.1/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org March 18, 2011

March 18, 2011

Author: chatellier Date: 2011-03-18 13:35:19 +0000 (Fri, 18 Mar 2011) New Revision: 3186 Log: Fix fuel cost i18n Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-03-18 11:43:17 UTC (rev 3185) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-03-18 13:35:19 UTC (rev 3186) @@ -198,6 +198,7 @@ isisfish.config.main.userName.description=User name isisfish.config.ssh.key.file=SSH key isisfish.config.ssh.key.file.description=Private SSH key path +isisfish.config.title=Preferences isisfish.config.vcs.hostName.description= isisfish.config.vcs.localDatabasePath.description= isisfish.config.vcs.noPassPhrase.description= @@ -1070,7 +1071,7 @@ isisfish.versionStorage.removed=Removed isisfish.vesselType.activityRange=Activity range isisfish.vesselType.comments=Comments -isisfish.vesselType.fuelCost=Fuel cost of travel +isisfish.vesselType.fuelCost=Travel fuel cost isisfish.vesselType.length=Length isisfish.vesselType.maxDuration=Maximum trip duration isisfish.vesselType.miniCrew=Minimum crew size Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-03-18 11:43:17 UTC (rev 3185) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-03-18 13:35:19 UTC (rev 3186) @@ -198,6 +198,7 @@ isisfish.config.main.userName.description=le nom - pr\u00E9nom de l'utilisateur isisfish.config.ssh.key.file=Cl\u00E9 SSH isisfish.config.ssh.key.file.description=Emplacement de la cl\u00E9 priv\u00E9e SSH +isisfish.config.title=Pr\u00E9f\u00E9rences isisfish.config.vcs.hostName.description=le nom du serveur vcs \u00E0 utiliser isisfish.config.vcs.localDatabasePath.description= isisfish.config.vcs.noPassPhrase.description=pour indiquer si la clef priv\u00E9e ssh2 utilis\u00E9e pour communiquer avec le serveur vcs est prot\u00E9g\u00E9 par une passe-phrase @@ -1070,7 +1071,7 @@ isisfish.versionStorage.removed=Supprim\u00E9 isisfish.vesselType.activityRange=Intervalle d'activit\u00E9 isisfish.vesselType.comments=Commentaires -isisfish.vesselType.fuelCost=Co\u00FBt d'un trajet en fuel +isisfish.vesselType.fuelCost=Co\u00FBt fuel en route isisfish.vesselType.length=Longueur isisfish.vesselType.maxDuration=Dur\u00E9e maximale du trajet isisfish.vesselType.miniCrew=Taille minimale d'\u00E9quipage

1 0

r3185 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org March 18, 2011

March 18, 2011

Author: tchemit Date: 2011-03-18 11:43:17 +0000 (Fri, 18 Mar 2011) New Revision: 3185 Log: use mavenpom 2.5.2 Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2011-03-18 11:42:37 UTC (rev 3184) +++ isis-fish/trunk/pom.xml 2011-03-18 11:43:17 UTC (rev 3185) @@ -735,7 +735,6 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor>

1 0

r3184 - isis-fish/branches/3.3.1
by tchemit＠users.labs.libre-entreprise.org March 18, 2011

March 18, 2011

Author: tchemit Date: 2011-03-18 11:42:37 +0000 (Fri, 18 Mar 2011) New Revision: 3184 Log: use mavenpom 2.5.2 Modified: isis-fish/branches/3.3.1/pom.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-03-18 11:30:44 UTC (rev 3183) +++ isis-fish/branches/3.3.1/pom.xml 2011-03-18 11:42:37 UTC (rev 3184) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.5.1</version> + <version>2.5.2</version> </parent> <groupId>fr.ifremer</groupId> @@ -712,7 +712,6 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor>

1 0

r3183 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org March 18, 2011

March 18, 2011

Author: chatellier Date: 2011-03-18 11:30:44 +0000 (Fri, 18 Mar 2011) New Revision: 3183 Log: Fix configuration dialog Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-03-18 09:48:02 UTC (rev 3182) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-03-18 11:30:44 UTC (rev 3183) @@ -242,8 +242,8 @@ modelBuilder.addOption(IsisConfig.Option.SMTP_SERVER); modelBuilder.addOption(IsisConfig.Option.USER_MAIL); - ConfigUI configUI = modelBuilder.buildUI(welcomeUI, _("coser.config.category.path")); - JDialog dialogUI = new JDialog(welcomeUI, _("coser.ui.config.title")); + ConfigUI configUI = modelBuilder.buildUI(welcomeUI, _("isisfish.config.category.main")); + JDialog dialogUI = new JDialog(welcomeUI, _("isisfish.ui.config.title")); dialogUI.add(configUI); dialogUI.pack(); dialogUI.setLocationRelativeTo(welcomeUI);

1 0

March 18, 2011

Author: chatellier Date: 2011-03-18 09:48:02 +0000 (Fri, 18 Mar 2011) New Revision: 3182 Log: Update to jaxx 2.4.1 Modified: isis-fish/branches/3.3.1/pom.xml isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/pom.xml 2011-03-18 09:48:02 UTC (rev 3182) @@ -105,7 +105,7 @@ <dependency> <groupId>org.swinglabs</groupId> <artifactId>jxlayer</artifactId> - <version>3.0.3</version> + <version>3.0.4</version> <scope>compile</scope> </dependency> @@ -488,7 +488,7 @@ <license.licenseName>gpl_v2</license.licenseName>  - <jaxxVersion>2.3</jaxxVersion> + <jaxxVersion>2.4.1-SNAPSHOT</jaxxVersion> <eugeneVersion>2.3.2</eugeneVersion> <topiaVersion>2.5.3-SNAPSHOT</topiaVersion> <nuitonUtilsVersion>2.0</nuitonUtilsVersion> @@ -626,7 +626,7 @@ <configuration> <src>${basedir}/src/main/java</src> <addSourcesToClassPath>true</addSourcesToClassPath> - <addProjectClassPath>true</addProjectClassPath> + <addProjectClassPath>true</addProjectClassPath> </configuration> </execution> </executions> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-03-18 09:48:02 UTC (rev 3182) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.entities; -import org.nuiton.topia.TopiaException; - import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.StorageException; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2011-03-18 09:48:02 UTC (rev 3182) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.entities; -import org.nuiton.topia.TopiaException; - import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.StorageException; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -18,13 +18,17 @@ *##%*/ --> <JPanel layout='{new BorderLayout()}' abstract="true"> + <import> + fr.ifremer.isisfish.ui.simulator.SimulAction; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + javax.swing.JFileChooser + java.io.File + </import> <fr.ifremer.isisfish.datastore.RegionStorage id="regionStorage" javaBean="null" /> <script><![CDATA[ - import fr.ifremer.isisfish.ui.simulator.SimulAction; - import java.beans.PropertyChangeEvent; - import java.beans.PropertyChangeListener; protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_REGION_STORAGE, new PropertyChangeListener() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -29,17 +29,17 @@ return getContextValue(WelcomeSaveVerifier.class); } - public void setContent(Component c) { + public void setContent(java.awt.Component c) { this.add(c, BorderLayout.CENTER); } - public void close(JFrame f) { + public void close(javax.swing.JFrame f) { if (getVerifier().allIsSaved()) { exit(f); } } - protected void exit(JFrame f) { + protected void exit(javax.swing.JFrame f) { f.dispose(); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,13 +23,16 @@ #L% --> <JPanel layout='{new BorderLayout()}'> + <import> + fr.ifremer.isisfish.ui.simulator.SimulAction; + fr.ifremer.isisfish.ui.result.ResultAction; + jaxx.runtime.context.JAXXInitialContext; + fr.ifremer.isisfish.ui.input.InputAction; + fr.ifremer.isisfish.ui.input.InputSaveVerifier; + javax.swing.ImageIcon + </import> + <script><![CDATA[ - import fr.ifremer.isisfish.ui.simulator.SimulAction; - import fr.ifremer.isisfish.ui.result.ResultAction; - import jaxx.runtime.context.JAXXInitialContext; - import fr.ifremer.isisfish.ui.input.InputAction; - import fr.ifremer.isisfish.ui.input.InputSaveVerifier; - /** Change tab selection. */ public void setQueueTabSelection() { simulTabs.setSelectedIndex(5); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,7 +23,7 @@ #L% --> <JDialog resizable="false" title="isisfish.simulator.ssh.configuration.title" - layout="{new BoxLayout(this.getContentPane(), BoxLayout.PAGE_AXIS)}"> + layout="{new javax.swing.BoxLayout(this.getContentPane(), javax.swing.BoxLayout.PAGE_AXIS)}"> <SSHLauncherConfigAction id="action" javaBean="new SSHLauncherConfigAction(this)" /> <Boolean id="connected" javaBean="false" /> @@ -187,7 +187,7 @@ <row fill='horizontal'> <cell columns="2" fill='horizontal'> <JLabel id='messageLabel' text=' ' font-weight='bold' opaque='true' horizontalAlignment='center' - minimumSize='{new Dimension(0, 25)}' preferredSize='{new Dimension(0, 25)}' border='{BorderFactory.createEtchedBorder(EtchedBorder.LOWERED)}' /> + minimumSize='{new java.awt.Dimension(0, 25)}' preferredSize='{new java.awt.Dimension(0, 25)}' border='{BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED)}' /> </cell> </row> <row fill='horizontal'> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -26,19 +26,22 @@  <fr.ifremer.isisfish.entities.Cell id='bean' javaBean='null'/> - + + <import> + java.awt.event.MouseEvent; + fr.ifremer.isisfish.entities.Cell; + com.bbn.openmap.gui.Tool; + com.bbn.openmap.gui.OMToolSet; + com.bbn.openmap.event.SelectMouseMode; + fr.ifremer.isisfish.map.CellSelectionLayer; + fr.ifremer.isisfish.map.CopyMapToClipboardListener; + fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + javax.swing.DefaultComboBoxModel; + </import> + <script><![CDATA[ -import java.awt.event.MouseEvent; -import fr.ifremer.isisfish.entities.Cell; -import com.bbn.openmap.gui.Tool; -import com.bbn.openmap.gui.OMToolSet; -import com.bbn.openmap.event.SelectMouseMode; -import fr.ifremer.isisfish.map.CellSelectionLayer; -import fr.ifremer.isisfish.map.CopyMapToClipboardListener; -import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - protected OMToolSet toolSet = new OMToolSet(); boolean cellChanged = true; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -28,16 +28,19 @@ <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> <fr.ifremer.isisfish.entities.EffortDescription id='effortDescription' javaBean='null'/> + <import> + java.util.ArrayList; + fr.ifremer.isisfish.entities.EffortDescription; + fr.ifremer.isisfish.entities.SetOfVessels; + fr.ifremer.isisfish.types.TimeUnit; + fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListModel; + fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListRenderer; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import java.util.ArrayList; -import fr.ifremer.isisfish.entities.EffortDescription; -import fr.ifremer.isisfish.entities.SetOfVessels; -import fr.ifremer.isisfish.types.TimeUnit; -import fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListModel; -import fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListRenderer; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,18 +27,20 @@  <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> + <import> + java.util.ArrayList; + fr.ifremer.isisfish.entities.EffortDescription; + fr.ifremer.isisfish.entities.SetOfVessels; + fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.ui.input.setofvessels.MetierListModel; + fr.ifremer.isisfish.ui.input.setofvessels.MetierListRenderer; + fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListModel; + fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListRenderer; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> + <script><![CDATA[ -import java.util.ArrayList; -import fr.ifremer.isisfish.entities.EffortDescription; -import fr.ifremer.isisfish.entities.SetOfVessels; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.ui.input.setofvessels.MetierListModel; -import fr.ifremer.isisfish.ui.input.setofvessels.MetierListRenderer; -import fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListModel; -import fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListRenderer; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - /** * Get input action from context. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -25,18 +25,22 @@ <JDialog id="EquationEditorPane" modal="true" title="isisfish.equation.editor.title" width="400" height="400" layout="{new BorderLayout()}"> + <import> + fr.ifremer.isisfish.util.CompileHelper; + fr.ifremer.isisfish.util.EvaluatorHelper; + org.nuiton.util.FileUtil; + javax.swing.text.html.HTMLEditorKit; + javax.swing.text.html.HTMLDocument; + javax.swing.event.HyperlinkListener; + javax.swing.text.html.HTMLFrameHyperlinkEvent; + javax.swing.event.HyperlinkEvent; + java.io.PrintWriter; + java.io.StringWriter; + java.awt.Color + java.awt.Desktop + </import> + <script><![CDATA[ -import fr.ifremer.isisfish.util.CompileHelper; -import fr.ifremer.isisfish.util.EvaluatorHelper; -import org.nuiton.util.FileUtil; -import javax.swing.text.html.HTMLEditorKit; -import javax.swing.text.html.HTMLDocument; -import javax.swing.event.HyperlinkListener; -import javax.swing.text.html.HTMLFrameHyperlinkEvent; -import javax.swing.event.HyperlinkEvent; -import java.io.PrintWriter; -import java.io.StringWriter; - boolean ok = false; Class javaInterface = null; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,13 +27,19 @@  <fr.ifremer.isisfish.entities.FisheryRegion id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.FisheryRegion; + fr.ifremer.isisfish.map.CopyMapToClipboardListener; + com.bbn.openmap.gui.Tool; + com.bbn.openmap.gui.OMToolSet; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + javax.swing.DefaultListModel + javax.swing.JTabbedPane + javax.swing.JTable + </import> + <script><![CDATA[ -import fr.ifremer.isisfish.entities.FisheryRegion; -import fr.ifremer.isisfish.map.CopyMapToClipboardListener; -import com.bbn.openmap.gui.Tool; -import com.bbn.openmap.gui.OMToolSet; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; protected OMToolSet toolSet = new OMToolSet(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,11 +27,13 @@  <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Gear; + jaxx.runtime.swing.editor.NumberEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Gear; -import jaxx.runtime.swing.editor.NumberEditor; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -26,9 +26,11 @@ <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> + <import> + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueMetiers")); @@ -70,10 +72,10 @@ ]]></script> <JPanel id="body"> <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab"> - <tab title='{_("isisfish.gear.title")}'> + <tab title='isisfish.gear.title'> <GearTabUI id="gearTabUI" bean="{getBean()}" active="{isActive()}" constructorParams='this' /> </tab> - <tab title='{_("isisfish.selectivity.title")}'> + <tab title='isisfish.selectivity.title'> <SelectivityUI id="selectivityUI" bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> </JTabbedPane> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -54,19 +54,26 @@ <fr.ifremer.isisfish.ui.sensitivity.TableBlockingLayerUI id="tableLayerUI" constructorParams='this' /> + <import> + javax.swing.JComponent; + javax.swing.event.ChangeListener; + fr.ifremer.isisfish.entities.FisheryRegion; + fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils; + fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; + fr.ifremer.isisfish.ui.sensitivity.EditorHelper; + fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; + fr.ifremer.isisfish.ui.WelcomePanelUI; + org.nuiton.topia.persistence.TopiaEntityContextable; + org.nuiton.topia.TopiaContext; + org.apache.commons.lang.StringUtils; + java.awt.Color + javax.swing.AbstractAction + javax.swing.JTable + javax.swing.JTabbedPane + </import> <script><![CDATA[ -import javax.swing.JComponent; -import javax.swing.event.ChangeListener; -import fr.ifremer.isisfish.entities.FisheryRegion; -import fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils; -import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; -import fr.ifremer.isisfish.ui.sensitivity.EditorHelper; -import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; -import fr.ifremer.isisfish.ui.WelcomePanelUI; -import org.nuiton.topia.persistence.TopiaEntityContextable; -import org.nuiton.topia.TopiaContext; -import org.apache.commons.lang.StringUtils; + protected ChangeListener tabbedPaneChangeListener; /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -40,17 +40,22 @@  <fr.ifremer.isisfish.entities.Equation id='selectedEquation' javaBean='null'/> + <import> + java.lang.reflect.Method; + java.io.File; + fr.ifremer.isisfish.entities.Formule; + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.ui.input.formule.FormuleComboModel; + org.apache.commons.lang.StringUtils; + org.nuiton.topia.TopiaContext; + javax.swing.event.DocumentListener; + javax.swing.event.DocumentEvent + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.io.IOException + javax.swing.DefaultComboBoxModel + </import> <script><![CDATA[ -import java.lang.reflect.Method; -import java.io.File; -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.ui.input.formule.FormuleComboModel; -import org.apache.commons.lang.StringUtils; -import org.nuiton.topia.TopiaContext; -import javax.swing.event.DocumentListener; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; protected DocumentListener listener = null; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -31,16 +31,21 @@ <Boolean id='metierSeasonSelected' javaBean='false'/> <Boolean id='targetSpeciesSelected' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.entities.Species; + fr.ifremer.isisfish.entities.TargetSpecies; + fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoTargetSpeciesTableModel; + fr.ifremer.isisfish.ui.input.metier.SpeciesComboModel; + fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.util.ArrayList + java.awt.Dimension + javax.swing.DefaultComboBoxModel + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.TargetSpecies; -import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoTargetSpeciesTableModel; -import fr.ifremer.isisfish.ui.input.metier.SpeciesComboModel; -import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -31,12 +31,15 @@ <Boolean id='metierSeasonInfoSelected' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.entities.MetierSeasonInfo; + fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoComboModel; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + javax.swing.DefaultComboBoxModel + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.MetierSeasonInfo; -import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoComboModel; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -30,18 +30,23 @@ <Boolean id='metierSeasonInfoNotNull' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.entities.MetierSeasonInfo; + fr.ifremer.isisfish.entities.Season; + fr.ifremer.isisfish.entities.Zone; + fr.ifremer.isisfish.types.Month; + fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoComboModel; + fr.ifremer.isisfish.ui.widget.Interval; + fr.ifremer.isisfish.ui.widget.IntervalPanel; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.util.ArrayList + java.awt.Dimension + </import> + <script><![CDATA[ - import fr.ifremer.isisfish.entities.Metier; - import fr.ifremer.isisfish.entities.MetierSeasonInfo; - import fr.ifremer.isisfish.entities.Season; - import fr.ifremer.isisfish.entities.Zone; - import fr.ifremer.isisfish.types.Month; - import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoComboModel; - import fr.ifremer.isisfish.ui.widget.Interval; - import fr.ifremer.isisfish.ui.widget.IntervalPanel; - import java.beans.PropertyChangeEvent; - import java.beans.PropertyChangeListener; - + protected Interval interval = null; protected boolean init = false; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,12 +27,16 @@  <fr.ifremer.isisfish.entities.Metier id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Gear; + fr.ifremer.isisfish.entities.Metier; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.awt.Dimension + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Gear; -import fr.ifremer.isisfish.entities.Metier; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected boolean init = false; protected void $afterCompleteSetup() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -26,10 +26,14 @@ <fr.ifremer.isisfish.entities.Metier id='bean' javaBean='null'/> + <import> + static org.nuiton.i18n.I18n._ + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueTripTypes")); setNextPath("$root/$tripTypes"); @@ -63,13 +67,13 @@ ]]></script> <JPanel id="body"> <JTabbedPane id="metierTab" constraints='BorderLayout.CENTER'> - <tab title='{_("isisfish.metier.title")}'> + <tab title='isisfish.metier.title'> <MetierTabUI id="metierTabUI" bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> - <tab title='{_("isisfish.metierSeasonInfoZone.title")}'> + <tab title='isisfish.metierSeasonInfoZone.title'> <MetierSeasonInfoZoneUI id="metierSeasonInfoUI" bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> - <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'> + <tab title='isisfish.metierSeasonInfoSpecies.title'> <MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> </JTabbedPane> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,18 +27,24 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.entities.Formule; + fr.ifremer.isisfish.entities.Species; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.Population; + javax.swing.table.DefaultTableModel; + org.nuiton.topia.persistence.TopiaEntity; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + javax.swing.JOptionPane + javax.swing.JFrame + java.awt.BorderLayout + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.Population; -import javax.swing.table.DefaultTableModel; -import org.nuiton.topia.persistence.TopiaEntity; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,13 +27,16 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Population; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Population; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import org.nuiton.math.matrix.gui.MatrixPanelListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,11 +27,14 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Formule; + fr.ifremer.isisfish.entities.Population; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.entities.Population; + @Override public void refresh() { Population population = getVerifier().getEntity(Population.class); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -40,15 +40,18 @@ <Boolean id='popGroupNotNull' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.PopulationGroupImpl; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationImpl; + org.nuiton.math.matrix.MatrixND; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.PopulationGroupImpl; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationImpl; -import org.nuiton.math.matrix.MatrixND; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -32,17 +32,20 @@ <Boolean id='zoneDepartSelected' javaBean='false'/> <Boolean id='coefNonVide' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Zone; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Zone; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import org.nuiton.math.matrix.gui.MatrixPanelListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -28,10 +28,13 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Population; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Population; + public void init(PopulationSeasonInfo populationSeasonInfo) { // add null before, for second to be considered as a changed event // otherwize, setBean has no effect Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -32,17 +32,20 @@ <Boolean id='zoneDepartSelected' javaBean='false'/> <Boolean id='coefNonVide' javaBean='false'/> + <import> + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Zone; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + org.nuiton.math.matrix.gui.MatrixPanelListener; + </import> <script><![CDATA[ -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Zone; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import org.nuiton.math.matrix.gui.MatrixPanelListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -33,19 +33,22 @@ <Boolean id='zoneArrivalSelected' javaBean='false'/> <Boolean id='coefNonVide' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Zone; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Zone; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import org.nuiton.math.matrix.gui.MatrixPanelListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -30,15 +30,17 @@ <Boolean id="selectedPopulationSeasonInfo" javaBean='false' /> + <import> + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.ui.input.population.PopulationSeasonInfoComboModel; + fr.ifremer.isisfish.ui.input.population.PopulationSeasonInfoComboRenderer; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.awt.CardLayout + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.ui.input.population.PopulationSeasonInfoComboModel; -import fr.ifremer.isisfish.ui.input.population.PopulationSeasonInfoComboRenderer; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,13 +27,16 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Population; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Population; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import org.nuiton.math.matrix.gui.MatrixPanelListener; + addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -31,14 +31,17 @@ <Boolean id='popSeasonInfoNotNull' javaBean='false'/> <Boolean id='ageGroupType' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.ui.util.ErrorHelper; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEditor; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + org.nuiton.math.matrix.gui.MatrixPanelListener; + javax.swing.JOptionPane + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.ui.util.ErrorHelper; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.gui.MatrixPanelEditor; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import org.nuiton.math.matrix.gui.MatrixPanelListener; protected void populationSeasonLengthMatrixChanged(MatrixPanelEvent event) { if (getPopulationSeasonInfo() != null && matrixPanelPopulationSeasonLengthChange.getMatrix() != null) { @@ -48,17 +51,6 @@ } } -/*addPropertyChangeListener("populationSeasonInfo", new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { - matrixPanelPopulationSeasonLengthChange.setMatrix(null); - } - if (evt.getNewValue() != null) { - matrixPanelPopulationSeasonLengthChange.setMatrix(getPopulationSeasonInfo().getLengthChangeMatrix().copy()); - } - } -});*/ - @Override public void refresh() { // TODO add only once @@ -113,7 +105,7 @@ } MatrixPanelEditor panel = new MatrixPanelEditor(false, 800, 300); panel.setMatrix(lengthChangeMatrix); - JOptionPane.showMessageDialog(null, panel, _("isisfish.populationSeasons.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(this, panel, _("isisfish.populationSeasons.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE); } ]]></script> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -31,17 +31,20 @@ <Boolean id='popSeasonInfoNotNull' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.types.Month; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.ui.widget.Interval; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.types.Month; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.ui.widget.Interval; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import org.nuiton.math.matrix.gui.MatrixPanelListener; + protected Interval seasonInterval; protected boolean init = false; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,9 +27,12 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; + protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueGears")); setNextPath("$root/$gears"); @@ -68,35 +71,35 @@ <JPanel id='body'> <JTabbedPane id="populationTab">  - <tab title='{_("isisfish.populationBasics.title")}'> + <tab title='isisfish.populationBasics.title'> <PopulationBasicsUI id='populationBasicsUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationZones.title")}'> + <tab title='isisfish.populationZones.title'> <PopulationZonesUI id='populationZoneUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationSeasons.title")}'> + <tab title='isisfish.populationSeasons.title'> <PopulationSeasonsUI id='populationSeasonsUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationEquation.title")}'> + <tab title='isisfish.populationEquation.title'> <PopulationEquationUI id='populationEquationUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationRecruitment.title")}'> + <tab title='isisfish.populationRecruitment.title'> <PopulationRecruitmentUI id='populationRecruitementUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationGroup.title")}'> + <tab title='isisfish.populationGroup.title'> <PopulationGroupUI id='populationGroupUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationCapturability.title")}'> + <tab title='isisfish.populationCapturability.title'> <PopulationCapturabilityUI id='populationCapturabilityUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationMigration.title")}'> + <tab title='isisfish.populationMigration.title'> <PopulationMigrationUI id='populationMigrationUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> </JTabbedPane> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,14 +27,19 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Zone; + fr.ifremer.isisfish.ui.input.population.ZoneListModel; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + org.nuiton.math.matrix.gui.MatrixPanelListener; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.util.ArrayList + java.awt.Dimension + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Zone; -import fr.ifremer.isisfish.ui.input.population.ZoneListModel; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import org.nuiton.math.matrix.gui.MatrixPanelListener; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,10 +27,13 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Population; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Population; + @Override public void refresh() { Population population = getVerifier().getEntity(Population.class); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,17 +27,20 @@  <fr.ifremer.isisfish.entities.Port id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Port; + fr.ifremer.isisfish.entities.Cell; + com.bbn.openmap.gui.Tool; + com.bbn.openmap.gui.OMToolSet; + fr.ifremer.isisfish.map.CellSelectionLayer; + fr.ifremer.isisfish.map.CopyMapToClipboardListener; + com.bbn.openmap.event.SelectMouseMode; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Port; -import fr.ifremer.isisfish.entities.Cell; -import com.bbn.openmap.gui.Tool; -import com.bbn.openmap.gui.OMToolSet; -import fr.ifremer.isisfish.map.CellSelectionLayer; -import fr.ifremer.isisfish.map.CopyMapToClipboardListener; -import com.bbn.openmap.event.SelectMouseMode; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected OMToolSet toolSet = new OMToolSet(); boolean portChanged = true; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,12 +27,16 @@  <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> - <script><![CDATA[ -import fr.ifremer.isisfish.types.RangeOfValues; -import fr.ifremer.isisfish.entities.Gear; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + <import> + fr.ifremer.isisfish.types.RangeOfValues; + fr.ifremer.isisfish.entities.Gear; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.util.ArrayList + </import> + <script><![CDATA[ + boolean init = false; protected void $afterCompleteSetup() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -31,18 +31,23 @@ <Boolean id='selectivityPopulationSelected' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.entities.Gear; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.Selectivity; + fr.ifremer.isisfish.entities.Species; + fr.ifremer.isisfish.ui.input.gear.GearPopulationSelectivityModel; + fr.ifremer.isisfish.ui.input.gear.PopulationComboModel; + fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.util.ArrayList + javax.swing.DefaultComboBoxModel + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.Gear; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Selectivity; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.ui.input.gear.GearPopulationSelectivityModel; -import fr.ifremer.isisfish.ui.input.gear.PopulationComboModel; -import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,11 +27,14 @@  <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Gear; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Gear; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,15 +27,17 @@  <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> - <script><![CDATA[ -import fr.ifremer.isisfish.entities.Port; -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.VesselType; -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.entities.SetOfVessels; -import jaxx.runtime.swing.editor.NumberEditor; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + <import> + fr.ifremer.isisfish.entities.Port; + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.entities.VesselType; + fr.ifremer.isisfish.entities.Formule; + fr.ifremer.isisfish.entities.SetOfVessels; + jaxx.runtime.swing.editor.NumberEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> + <script><![CDATA[ boolean init = false; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -56,13 +56,13 @@ ]]></script> <JPanel id="body"> <JTabbedPane id="setOfVesselsTab"> - <tab title='{_("isisfish.setOfVessels.title")}'> + <tab title='isisfish.setOfVessels.title'> <SetOfVesselsBasicsUI id='setOfVesselsBasicsUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> - <tab title='{_("isisfish.effortDescription.title")}'> + <tab title='isisfish.effortDescription.title'> <EffortDescriptionUI id='effortDescriptionUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> - <tab title='{_("isisfish.effortDescription.parametersTitle")}'> + <tab title='isisfish.effortDescription.parametersTitle'> <EffortDescriptionParametersUI id='effortParametersUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> </JTabbedPane> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,12 +27,15 @@  <fr.ifremer.isisfish.entities.Species id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Species; + jaxx.runtime.swing.editor.NumberEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Species; -import jaxx.runtime.swing.editor.NumberEditor; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continuePopulations")); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -26,11 +26,15 @@ <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> + <import> + org.apache.commons.lang.StringUtils; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + static org.nuiton.i18n.I18n._ + </import> <script><![CDATA[ -import org.apache.commons.lang.StringUtils; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -32,16 +32,19 @@ <fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Strategy; + fr.ifremer.isisfish.entities.StrategyMonthInfo; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + jaxx.runtime.swing.editor.NumberEditor; + fr.ifremer.isisfish.entities.TripType; + org.nuiton.math.matrix.gui.MatrixPanelListener; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.StrategyMonthInfo; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import jaxx.runtime.swing.editor.NumberEditor; -import fr.ifremer.isisfish.entities.TripType; -import org.nuiton.math.matrix.gui.MatrixPanelListener; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,14 +27,17 @@  <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.entities.Strategy; + fr.ifremer.isisfish.entities.Formule; + fr.ifremer.isisfish.entities.SetOfVessels; + org.nuiton.topia.persistence.TopiaEntity; + fr.ifremer.isisfish.ui.WelcomePanelUI; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.entities.SetOfVessels; -import org.nuiton.topia.persistence.TopiaEntity; -import fr.ifremer.isisfish.ui.WelcomePanelUI; + @Override public void refresh() { Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,12 +27,15 @@  <fr.ifremer.isisfish.entities.TripType id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.TripType; + fr.ifremer.isisfish.types.TimeUnit; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.TripType; -import fr.ifremer.isisfish.types.TimeUnit; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + setButtonTitle(_("isisfish.input.continueVesselTypes")); setNextPath("$root/$vesselTypes"); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,15 +27,18 @@  <fr.ifremer.isisfish.entities.VesselType id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.VesselType; + fr.ifremer.isisfish.entities.TripType; + fr.ifremer.isisfish.types.TimeUnit; + fr.ifremer.isisfish.ui.input.triptype.TripTypeListModel; + jaxx.runtime.swing.editor.NumberEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.VesselType; -import fr.ifremer.isisfish.entities.TripType; -import fr.ifremer.isisfish.types.TimeUnit; -import fr.ifremer.isisfish.ui.input.triptype.TripTypeListModel; -import jaxx.runtime.swing.editor.NumberEditor; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueSetOfVessels")); setNextPath("$root/$setOfVessels"); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,18 +23,21 @@ #L% --> <JPanel id="wizardGroup" layout='{new BorderLayout()}'> - <script> - <![CDATA[ + <import> + org.nuiton.topia.TopiaContext; + fr.ifremer.isisfish.IsisFishDAOHelper; + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationImpl; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.PopulationGroupDAO; + fr.ifremer.isisfish.entities.PopulationDAO; + java.awt.CardLayout + javax.swing.JFrame + </import> - import org.nuiton.topia.TopiaContext; - import fr.ifremer.isisfish.IsisFishDAOHelper; - import fr.ifremer.isisfish.entities.Equation; - import fr.ifremer.isisfish.entities.Population; - import fr.ifremer.isisfish.entities.PopulationImpl; - import fr.ifremer.isisfish.entities.PopulationGroup; - import fr.ifremer.isisfish.entities.PopulationGroupDAO; - import fr.ifremer.isisfish.entities.PopulationDAO; - + <script><![CDATA[ + protected String current = null; protected boolean ageType = false; protected boolean inputType = false; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,18 +27,24 @@  <fr.ifremer.isisfish.entities.Zone id='bean' javaBean='null'/> + <import> + javax.swing.event.ListSelectionEvent; + fr.ifremer.isisfish.entities.Cell; + fr.ifremer.isisfish.entities.Zone; + fr.ifremer.isisfish.map.CellSelectionLayer; + fr.ifremer.isisfish.map.CopyMapToClipboardListener; + com.bbn.openmap.event.SelectMouseMode; + com.bbn.openmap.gui.Tool; + com.bbn.openmap.gui.OMToolSet; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.awt.event.MouseEvent + javax.swing.DefaultListModel + java.util.ArrayList + </import> <script><![CDATA[ -import javax.swing.event.ListSelectionEvent; -import fr.ifremer.isisfish.entities.Cell; -import fr.ifremer.isisfish.entities.Zone; -import fr.ifremer.isisfish.map.CellSelectionLayer; -import fr.ifremer.isisfish.map.CopyMapToClipboardListener; -import com.bbn.openmap.event.SelectMouseMode; -import com.bbn.openmap.gui.Tool; -import com.bbn.openmap.gui.OMToolSet; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected OMToolSet toolSet = new OMToolSet(); protected void $afterCompleteSetup() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,11 +23,14 @@ #L% --> <Table> + <import> + fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel; + fr.ifremer.isisfish.simulator.launcher.SimulationService; + javax.swing.JProgressBar; + javax.swing.ListSelectionModel; + </import> <script><![CDATA[ - import fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel; - import fr.ifremer.isisfish.simulator.launcher.SimulationService; - import javax.swing.JProgressBar; - import javax.swing.ListSelectionModel; + queueTable.setDefaultRenderer(JProgressBar.class, new ComponentTableCellRenderer()); queueTableDone.setDefaultRenderer(JProgressBar.class, new ComponentTableCellRenderer()); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,6 +23,10 @@ #L% --> <JDialog modal="true" resizable='false' title='isisfish.script.import'> + <import> + java.io.File + java.awt.Color + </import> <style source="ImportDialogUI.css" /> <FileSelectionTableModel id='newFilesTableModel' javaBean='null' /> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -26,6 +26,10 @@ <ScriptAction id="scriptAction" javaBean="new ScriptAction(this)" /> + <import> + javax.swing.SwingWorker + java.awt.Font + </import> <script><![CDATA[ getScriptAction().postInit(); ]]></script> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,10 +23,12 @@ #L% --> <ContinuousPanelContainerUI> - <script><![CDATA[ -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - + <import> + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + javax.swing.JTextField + </import> + <script><![CDATA[ protected JTextField continueMax = null; protected JTextField continueMin = null; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -24,6 +24,24 @@ --> <ContinuousPanelContainerUI> + <import> + javax.swing.table.AbstractTableModel; + javax.swing.table.DefaultTableModel; + fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; + javax.swing.table.TableCellEditor; + javax.swing.table.TableModel; + java.util.regex.Matcher; + java.util.regex.Pattern; + org.apache.commons.lang.StringUtils; + javax.swing.JComboBox + javax.swing.DefaultCellEditor + java.util.EventObject + java.awt.Component + java.util.ArrayList + javax.swing.event.CellEditorListener + java.awt.Dimension + </import> + <String id='text' javaBean='null'/> <org.nuiton.topia.persistence.TopiaEntityContextable id='bean' javaBean='null'/> <String id='beanProperty' javaBean='null'/> @@ -35,15 +53,8 @@ <fr.ifremer.isisfish.entities.Formule id='formule' javaBean='null'/> <script><![CDATA[ -import javax.swing.table.AbstractTableModel; -import javax.swing.table.DefaultTableModel; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableModel; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; + protected String[] columnNames = { _("isisfish.sensitivity.equation.variable.name"), _("isisfish.sensitivity.equation.variable.value"), Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -24,6 +24,22 @@ --> <JDialog title='isisfish.sensitivity.title' modal='{true}' layout='{new BorderLayout()}'> + <import> + org.apache.commons.lang.StringUtils; + org.nuiton.topia.persistence.TopiaEntityContextable; + fr.ifremer.isisfish.ui.simulator.SimulAction; + fr.ifremer.isisfish.ui.input.InputSaveVerifier; + fr.ifremer.isisfish.simulator.sensitivity.Factor; + fr.ifremer.isisfish.simulator.sensitivity.Domain; + fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; + fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; + fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; + jaxx.runtime.JAXXUtil; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.util.SortedMap + javax.swing.JComponent + </import> <Boolean id='continuePossible' javaBean='true'/> <Boolean id='continueSelected' javaBean='false'/> @@ -31,19 +47,8 @@ <Boolean id='existingValue' javaBean='false'/> <script><![CDATA[ -import org.apache.commons.lang.StringUtils; -import org.nuiton.topia.persistence.TopiaEntityContextable; -import fr.ifremer.isisfish.ui.simulator.SimulAction; -import fr.ifremer.isisfish.ui.input.InputSaveVerifier; -import fr.ifremer.isisfish.simulator.sensitivity.Factor; -import fr.ifremer.isisfish.simulator.sensitivity.Domain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import jaxx.runtime.JAXXUtil; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected JComponent cOrigine = null; protected TopiaEntityContextable bean = null; protected java.util.List<JComponent> discretComponents = new ArrayList<JComponent>(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,30 +23,35 @@ #L% --> <Table> + <import> + javax.swing.table.DefaultTableModel; + fr.ifremer.isisfish.ui.simulator.SimulAction; + fr.ifremer.isisfish.simulator.sensitivity.Domain; + fr.ifremer.isisfish.simulator.sensitivity.Factor; + fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; + fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; + fr.ifremer.isisfish.export.SensitivityExport; + + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel; + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer; + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListModel; + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer; + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellEditor; + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellRenderer; + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableModel; + + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboModel; + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboRenderer; + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListModel; + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListRenderer; + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellEditor; + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellRenderer; + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableModel; + java.awt.CardLayout + javax.swing.ComboBoxModel + </import> <script><![CDATA[ - import javax.swing.table.DefaultTableModel; - import fr.ifremer.isisfish.ui.simulator.SimulAction; - import fr.ifremer.isisfish.simulator.sensitivity.Domain; - import fr.ifremer.isisfish.simulator.sensitivity.Factor; - import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; - import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; - import fr.ifremer.isisfish.export.SensitivityExport; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListModel; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellEditor; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellRenderer; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableModel; - - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboModel; - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboRenderer; - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListModel; - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListRenderer; - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellEditor; - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellRenderer; - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableModel; import fr.ifremer.isisfish.ui.sensitivity.model.FactorCardinalityTableModel; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,17 +23,22 @@ #L% --> <Table> + <import> + java.util.ArrayList; + java.io.File; + org.nuiton.util.FileUtil; + fr.ifremer.isisfish.ui.simulator.SimulAction; + fr.ifremer.isisfish.datastore.SimulationStorage; + fr.ifremer.isisfish.simulator.launcher.SimulationService; + fr.ifremer.isisfish.simulator.launcher.SimulationJob; + fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; + fr.ifremer.isisfish.ui.models.simulation.SimulationNamesComboModel; + javax.swing.ComboBoxModel + java.io.IOException + </import> <script><![CDATA[ - import java.util.ArrayList; - import java.io.File; - import org.nuiton.util.FileUtil; - import fr.ifremer.isisfish.ui.simulator.SimulAction; - import fr.ifremer.isisfish.datastore.SimulationStorage; - import fr.ifremer.isisfish.simulator.launcher.SimulationService; - import fr.ifremer.isisfish.simulator.launcher.SimulationJob; - import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; - import fr.ifremer.isisfish.ui.models.simulation.SimulationNamesComboModel; + // declaration sépérée de la variable d'instance (jaxx) SimulationServiceListener simulationListener; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,27 +23,33 @@ #L% --> <fr.ifremer.isisfish.ui.NavigationUI> + <import> + javax.swing.JPopupMenu; + javax.swing.tree.DefaultTreeModel; + javax.swing.tree.TreePath; + javax.swing.tree.DefaultMutableTreeNode; + javax.swing.tree.TreeNode; + fr.ifremer.isisfish.datastore.RegionStorage; + fr.ifremer.isisfish.simulator.sensitivity.Factor; + fr.ifremer.isisfish.ui.WelcomePanelUI; + fr.ifremer.isisfish.ui.input.InputAction; + fr.ifremer.isisfish.ui.input.InputSaveVerifier; + fr.ifremer.isisfish.ui.simulator.SimulAction; + fr.ifremer.isisfish.simulator.sensitivity.group.FactorGroup; + fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeModel; + fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeCellRenderer; + javax.swing.JComponent + java.awt.event.ActionListener + javax.swing.JMenuItem + java.awt.event.ActionEvent + </import> <SensitivityInputHandler id="handler" /> <fr.ifremer.isisfish.entities.FisheryRegion id='fisheryRegion' javaBean='null'/> <script><![CDATA[ -import javax.swing.JPopupMenu; -import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.TreePath; -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.TreeNode; -import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.simulator.sensitivity.Factor; -import fr.ifremer.isisfish.ui.WelcomePanelUI; -import fr.ifremer.isisfish.ui.input.InputAction; -import fr.ifremer.isisfish.ui.input.InputSaveVerifier; -import fr.ifremer.isisfish.ui.simulator.SimulAction; -import fr.ifremer.isisfish.simulator.sensitivity.group.FactorGroup; -import fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeModel; -import fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeCellRenderer; protected void $afterCompleteSetup() { // end code constructor Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -24,10 +24,12 @@ --> <fr.ifremer.isisfish.ui.SimulationUI> + <import> + fr.ifremer.isisfish.ui.input.InputAction; + fr.ifremer.isisfish.ui.input.InputSaveVerifier; + jaxx.runtime.context.JAXXInitialContext; + </import> <script><![CDATA[ - import fr.ifremer.isisfish.ui.input.InputAction; - import fr.ifremer.isisfish.ui.input.InputSaveVerifier; - import jaxx.runtime.context.JAXXInitialContext; /** * Refresh all simulation launch UI. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2011-03-18 09:48:02 UTC (rev 3182) @@ -88,7 +88,7 @@ * @see org.jdesktop.jxlayer.plaf.AbstractLayerUI#processMouseEvent(java.awt.event.MouseEvent, org.jdesktop.jxlayer.JXLayer) */ @Override - protected void processMouseEvent(MouseEvent event, JXLayer</*? extends */JComponent> layer) { + protected void processMouseEvent(MouseEvent event, JXLayer<? extends JComponent> layer) { // scrollbar can be moved if (!(event.getSource() instanceof JScrollBar)) { @@ -150,7 +150,7 @@ * @see org.jdesktop.jxlayer.plaf.AbstractLayerUI#processMouseMotionEvent(java.awt.event.MouseEvent, org.jdesktop.jxlayer.JXLayer) */ @Override - protected void processMouseMotionEvent(MouseEvent e, JXLayer<JComponent> l) { + protected void processMouseMotionEvent(MouseEvent e, JXLayer<? extends JComponent> l) { processMouseEvent(e, l); } } \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,9 +27,17 @@ <Boolean id='remove' javaBean='false'/> <Boolean id='changed' javaBean='false'/> + <import> + javax.swing.table.DefaultTableModel; + java.util.Map.Entry; + javax.swing.event.ListSelectionListener + java.util.Set + java.util.Iterator + javax.swing.DefaultComboBoxModel + javax.swing.event.ListSelectionEvent + </import> <script><![CDATA[ - import javax.swing.table.DefaultTableModel; - import java.util.Map.Entry; + protected void $afterCompleteSetup() { /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,11 +23,15 @@ #L% --> <Table> -<script><![CDATA[ - import fr.ifremer.isisfish.ui.WelcomePanelUI; - import fr.ifremer.isisfish.ui.models.export.ExportNameListModel; - import javax.swing.event.ListSelectionEvent; + <import> + fr.ifremer.isisfish.ui.WelcomePanelUI; + fr.ifremer.isisfish.ui.models.export.ExportNameListModel; + javax.swing.event.ListSelectionEvent; + java.util.LinkedList + </import> + <script><![CDATA[ + protected void $afterCompleteSetup() { refresh(); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -14,40 +14,53 @@  <Boolean id='sensitivity' javaBean='false' /> + <import> + java.util.EventObject; + java.text.ParseException; + fr.ifremer.isisfish.datastore.RegionStorage; + fr.ifremer.isisfish.datastore.StorageChangeEvent; + fr.ifremer.isisfish.datastore.StorageChangeListener; + fr.ifremer.isisfish.datastore.StorageException; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.Strategy; + fr.ifremer.isisfish.entities.FisheryRegion; + fr.ifremer.isisfish.ui.SimulationUI; + fr.ifremer.isisfish.ui.WelcomePanelUI; + fr.ifremer.isisfish.ui.WelcomeTabUI; + fr.ifremer.isisfish.ui.models.common.StringListModel; + fr.ifremer.isisfish.ui.models.rule.RuleComboModel; + fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer; + fr.ifremer.isisfish.ui.models.rule.RuleListModel; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer; + fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; + fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; + fr.ifremer.isisfish.rule.Rule; + fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; + fr.ifremer.isisfish.simulator.launcher.SimulationService; + fr.ifremer.isisfish.simulator.launcher.SimulationJob; + fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; + fr.ifremer.isisfish.simulator.sensitivity.Factor; + org.nuiton.topia.TopiaException; + org.nuiton.topia.TopiaContext; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEditor; + org.apache.commons.lang.ArrayUtils; + javax.swing.SwingUtilities + javax.swing.DefaultComboBoxModel + java.awt.CardLayout + java.awt.Dimension + java.io.IOException + java.awt.BorderLayout + javax.swing.AbstractAction + javax.swing.DefaultListModel + javax.swing.JComponent + javax.swing.ComboBoxModel + </import> <script><![CDATA[ -import java.util.EventObject; -import java.text.ParseException; -import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.datastore.StorageChangeEvent; -import fr.ifremer.isisfish.datastore.StorageChangeListener; -import fr.ifremer.isisfish.datastore.StorageException; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.FisheryRegion; -import fr.ifremer.isisfish.ui.SimulationUI; -import fr.ifremer.isisfish.ui.WelcomePanelUI; -import fr.ifremer.isisfish.ui.WelcomeTabUI; -import fr.ifremer.isisfish.ui.models.common.StringListModel; -import fr.ifremer.isisfish.ui.models.rule.RuleComboModel; -import fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer; -import fr.ifremer.isisfish.ui.models.rule.RuleListModel; -import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel; -import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor; -import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer; -import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; -import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; -import fr.ifremer.isisfish.rule.Rule; -import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; -import fr.ifremer.isisfish.simulator.launcher.SimulationService; -import fr.ifremer.isisfish.simulator.launcher.SimulationJob; -import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; -import fr.ifremer.isisfish.simulator.sensitivity.Factor; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaContext; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.gui.MatrixPanelEditor; -import org.apache.commons.lang.ArrayUtils; + // instances variables déclaration SimulationServiceListener simulationListener; StorageChangeListener regionStorageListener; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,10 +23,13 @@ #L% --> <JPanel layout='{new BorderLayout()}'> + <import> + fr.ifremer.isisfish.ui.WelcomePanelUI; + fr.ifremer.isisfish.ui.models.result.ResultListModel; + javax.swing.event.ListSelectionEvent; + </import> <script><![CDATA[ - import fr.ifremer.isisfish.ui.WelcomePanelUI; - import fr.ifremer.isisfish.ui.models.result.ResultListModel; - import javax.swing.event.ListSelectionEvent; + protected void $afterCompleteSetup() { refresh(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -32,17 +32,20 @@  <fr.ifremer.isisfish.datastore.RegionStorage id="regionStorage" javaBean="null"/> + <import> + fr.ifremer.isisfish.IsisFishException; + fr.ifremer.isisfish.datastore.RuleStorage; + fr.ifremer.isisfish.rule.Rule; + fr.ifremer.isisfish.ui.models.rule.RuleListModel; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer; + fr.ifremer.isisfish.ui.util.ErrorHelper; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ - import fr.ifremer.isisfish.IsisFishException; - import fr.ifremer.isisfish.datastore.RuleStorage; - import fr.ifremer.isisfish.rule.Rule; - import fr.ifremer.isisfish.ui.models.rule.RuleListModel; - import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel; - import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor; - import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer; - import fr.ifremer.isisfish.ui.util.ErrorHelper; - import java.beans.PropertyChangeEvent; - import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { // Manage rule list change Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,21 +23,25 @@ #L% --> <Table> + <import> + javax.swing.table.DefaultTableModel; + fr.ifremer.isisfish.datastore.AnalysePlanStorage; + fr.ifremer.isisfish.datastore.StorageChangeEvent; + fr.ifremer.isisfish.datastore.StorageChangeListener; + fr.ifremer.isisfish.simulator.AnalysePlan; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboModel; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboRenderer; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListModel; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListRenderer; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableModel; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellEditor; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellRenderer; + java.awt.Dimension + </import> <SimulAction id='simulAction' javaBean='getContextValue(SimulAction.class)' /> <script><![CDATA[ - import javax.swing.table.DefaultTableModel; - import fr.ifremer.isisfish.datastore.AnalysePlanStorage; - import fr.ifremer.isisfish.datastore.StorageChangeEvent; - import fr.ifremer.isisfish.datastore.StorageChangeListener; - import fr.ifremer.isisfish.simulator.AnalysePlan; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboModel; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboRenderer; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListModel; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListRenderer; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableModel; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellEditor; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellRenderer; + // to be notified of storage change event StorageChangeListener analyzePlanStorageListener; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,5 +23,5 @@ #L% --> <fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI modal="true"> - <fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterPanelUI id='content' constructorParams='this'/> + <fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterPanelUI id='content' constructorParams='this'/> </fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -30,10 +30,10 @@ java.text.SimpleDateFormat </import> -<script> +<script><![CDATA[ protected static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); - public SimulationFilterPanelUI(fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog) { + public SimulationFilterPanelUI(FilterDialogUI dialog) { super(dialog); } /** @@ -60,8 +60,8 @@ SimulationMeta.simulationStart.name(), SimulationMeta.simulationEnd.name()); } - </script> - <Table> + ]]></script> +<Table> <row fill='horizontal'> <cell> <JLabel labelFor='{simulationName}' @@ -108,12 +108,12 @@ <JLabel labelFor='{simulationStart}' text='isisfish.filter.simulation.simulationStart' toolTipText='isisfish.filter.simulation.tooltip.simulationStart'/> - <org.jdesktop.swingx.JXDatePicker + <JXDatePicker id="simulationStart" onFocusLost="doCheck()"/> <JLabel labelFor='{simulationEnd}' text='isisfish.filter.simulation.simulationEnd' toolTipText='isisfish.filter.simulation.tooltip.simulationEnd'/> - <org.jdesktop.swingx.JXDatePicker + <JXDatePicker id="simulationEnd" onFocusLost="doCheck()"/> </HBox> </cell> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,12 +23,12 @@ #L% --> <JDialog modal="true" title='isisfish.vcs.commit'> + <import> + java.awt.Color + </import> <script><![CDATA[ // FIXME a refaire -// import org.nuiton.vcs.ui.FieldModelUtil.ModuleFile; -// import org.nuiton.vcs.VCSFileState; - // protected ModuleFile<VCSFileState> model; protected Object model; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,13 +23,12 @@ #L% --> <JDialog modal="true" title='isisfish.vcs.updateconfirm'> + <import> + java.awt.Color + </import> <script><![CDATA[ // FIXME a refaire - -// import org.nuiton.vcs.ui.FieldModelUtil.ModuleFile; -// import org.nuiton.vcs.VCSFileState; - // protected ModuleFile<VCSFileState> model; protected Object model; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -26,8 +26,6 @@ <script><![CDATA[ // FIXME a refaire -// import org.nuiton.vcs.VCSState; - // protected org.nuiton.vcs.VCSRepositoryState model; protected Object model; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,16 +23,21 @@ #L% --> <JDialog> + <import> + javax.swing.text.html.HTMLEditorKit; + javax.swing.text.html.HTMLDocument; + javax.swing.event.HyperlinkListener; + javax.swing.text.html.HTMLFrameHyperlinkEvent; + javax.swing.event.HyperlinkEvent; + java.io.PrintWriter; + java.io.StringWriter; + java.net.URL; + javax.swing.JComponent + java.awt.Color + java.awt.Desktop + </import> + <script><![CDATA[ - import javax.swing.text.html.HTMLEditorKit; - import javax.swing.text.html.HTMLDocument; - import javax.swing.event.HyperlinkListener; - import javax.swing.text.html.HTMLFrameHyperlinkEvent; - import javax.swing.event.HyperlinkEvent; - import java.io.PrintWriter; - import java.io.StringWriter; - import java.net.URL; - public boolean cancel; protected boolean invalidFirstName; protected boolean invalidLastName; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,17 +23,22 @@ #L% --> <JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> + <import> + com.jcraft.jsch.JSch; + com.jcraft.jsch.KeyPair; + org.nuiton.util.FileUtil; + java.io.File; + java.io.IOException; + java.util.ArrayList; + java.util.Arrays; + java.util.HashMap; + java.util.Map; + java.awt.Color + javax.swing.JComponent + </import> <script><![CDATA[ - import com.jcraft.jsch.JSch; - import com.jcraft.jsch.KeyPair; - import org.nuiton.util.FileUtil; - import java.io.File; - import java.io.IOException; - import java.util.ArrayList; - import java.util.Arrays; - import java.util.HashMap; - import java.util.Map; + private static VCSGenerateSshKeyUI instance; public static VCSGenerateSshKeyUI getInstance(JDialog parent) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,6 +23,11 @@ #L% --> <JDialog title='isisfish.vcs.ask.passphrase.title' modal='true'> + <import> + java.io.BufferedReader + java.io.InputStreamReader + java.io.IOException + </import> <script><![CDATA[ private boolean cancel; private static VCSPassPhraseUI instance; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -37,15 +37,17 @@ fr.ifremer.isisfish.ui.widget.filter.FilterParamModel fr.ifremer.isisfish.ui.widget.filter.FilterPanelUI java.util.List + java.awt.Desktop + javax.swing.DefaultComboBoxModel </import> - <script> + <script><![CDATA[ /** filter model */ - protected fr.ifremer.isisfish.ui.widget.filter.FilterModel model; + protected FilterModel model; /** use to display filtered result in a comboBox */ protected DefaultComboBoxModel modelResult; - public fr.ifremer.isisfish.ui.widget.filter.FilterParamModel getParamModel(String paramKey) { + public FilterParamModel getParamModel(String paramKey) { return model.getParamModel(paramKey); } @SuppressWarnings({"unchecked"}) @@ -54,12 +56,12 @@ } /** @return list of last filter list obtain */ @SuppressWarnings({"unchecked"}) - protected java.util.List getFilterResult() { + protected List getFilterResult() { // obtain list filtered return model.getFiltered(); } @SuppressWarnings({"unchecked"}) - public java.util.List obtainFilterResult() { + public List obtainFilterResult() { // compact dialog setSize(getMinimumSize()); repaint(); @@ -137,7 +139,7 @@ (HTMLFrameHyperlinkEvent)e); } else { try { - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { Desktop.getDesktop().browse(e.getURL().toURI()); } else { doc.setPage(e.getURL()); @@ -176,7 +178,7 @@ doc.setEditorKit(new HTMLEditorKit()); doc.addHyperlinkListener(createHyperLinkListener()); - </script> + ]]></script> <Table> <row fill='horizontal'> <cell columns='4' weighty="1" fill='both'> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -29,13 +29,15 @@ java.text.SimpleDateFormat fr.ifremer.isisfish.ui.widget.filter.FilterParamModel fr.ifremer.isisfish.ui.util.JaxxUtil + javax.swing.JTextField + javax.swing.JCheckBox </import> -<script> +<script><![CDATA[ protected FilterDialogUI dialog; protected static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); - protected FilterPanelUI(fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog) { + protected FilterPanelUI(FilterDialogUI dialog) { this.dialog = dialog; } @@ -50,7 +52,7 @@ public void doCheck() { if (dialog!=null) dialog.doCheck(); } - @SuppressWarnings({"unchecked"}) + public void doReset() { JaxxUtil.doReset(get$objectMap()); } @@ -76,5 +78,5 @@ d1 = field2.getDate(); paramModel.extractParam(d0==null?null:d0.getTime()+"",d1==null?null:d1.getTime()+""); } - </script> + ]]></script> </JPanel>

1 0

r3181 - isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org March 17, 2011

March 17, 2011

Author: chatellier Date: 2011-03-17 16:33:10 +0000 (Thu, 17 Mar 2011) New Revision: 3181 Log: Import Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2011-03-17 16:32:56 UTC (rev 3180) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2011-03-17 16:33:10 UTC (rev 3181) @@ -29,7 +29,6 @@ import java.io.IOException; import org.apache.commons.io.FileUtils; -import org.h2.engine.Constants; import org.junit.Assert; import org.junit.Test;

1 0

r3180 - isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org March 17, 2011

March 17, 2011

Author: chatellier Date: 2011-03-17 16:32:56 +0000 (Thu, 17 Mar 2011) New Revision: 3180 Log: Remove h2 version test Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2011-03-17 16:32:11 UTC (rev 3179) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2011-03-17 16:32:56 UTC (rev 3180) @@ -64,17 +64,4 @@ Assert.assertTrue("File is not valide for Windows on line " + index, lines[index].endsWith("\r")); } } - - /** - * Test that h2 version is < 1.2.129. - * - * Upgrading from < 1.1.x to 1.2.129 doesn't work - * Since page store has been changed in 1.2.x release, and removed since 1.2.129. - */ - @Test - public void testH2Version() { - Assert.assertEquals(1, Constants.VERSION_MAJOR); - Assert.assertEquals(2, Constants.VERSION_MINOR); - Assert.assertTrue("Using H2 >= 1.2.129 will not work", Constants.BUILD_ID < 129); - } }

1 0