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

r2891 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by jcouteau＠users.labs.libre-entreprise.org Jan. 8, 2010

Jan. 8, 2010

Author: jcouteau Date: 2010-01-08 11:29:18 +0000 (Fri, 08 Jan 2010) New Revision: 2891 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java Log: Add method to handle nominal values Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2010-01-08 10:45:28 UTC (rev 2890) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2010-01-08 11:29:18 UTC (rev 2891) @@ -23,6 +23,9 @@ import java.util.Iterator; import java.util.List; +import fr.ifremer.isisfish.util.ConverterUtil; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.j2r.REngine; @@ -33,10 +36,14 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaEntity; public abstract class AbstractSensitivityCalculator implements SensitivityCalculator { + TopiaContext context; + /** to use log facility, just put in your code: log.info("..."); */ private static Log log = LogFactory .getLog(AbstractSensitivityCalculator.class); @@ -61,10 +68,18 @@ String binfValues = ""; String bsup = "Bsup<-c(%s)"; String bsupValues = ""; - String attributes = "attributes(isis.factors)<-list(%s\"nomModel\"=\"isis-fish-externeR\",names=c(\"nomFacteur\",\"Nominal\",\"Continu\",\"Binf\",\"Bsup\"))"; + String attributes = "attributes(isis.factors)<-list(" + + "%s" + + "\"nomModel\"=\"isis-fish-externeR\"," + + "names=c(\"nomFacteur\",\"Nominal\",\"Continu\",\"Binf\",\"Bsup\"))"; String attribute = "attr(isis.factors,\"%s\")<-\"%s\""; String attributesValues = ""; - String isisfactors = "isis.factors<-data.frame(\"nomFacteur\"=nomFacteur,\"Nominal\"=Nominal,\"Continu\"=Continu,\"Binf\"=Binf,\"Bsup\"=Bsup)"; + String isisfactors = "isis.factors<-data.frame(" + + "\"nomFacteur\"=nomFacteur," + + "\"Nominal\"=Nominal," + + "\"Continu\"=Continu," + + "\"Binf\"=Binf," + + "\"Bsup\"=Bsup)"; //Create the vectors List<Factor<?, ?>> factors = plan.getFactors(); @@ -81,19 +96,10 @@ //Factor names factorNames += "\"" + factor.getName() + "\""; - //Nominal values - /*ConvertUtilsBean beanUtils = ConverterUtil.getConverter(null); - String path = factor.getPath(); - String topiaId = path.substring(0,path.lastIndexOf("#")); - String propertyName=path.substring(path.lastIndexOf("#") + 1); - //Object value = beanUtils.convert("${serializedValue}", ${value.class.name}.class); - TopiaEntity entity = db.findByTopiaId(topiaId); - Object value = BeanUtils.getProperty(entity, propertyName);*/ - if (factor.getDomain() instanceof MatrixContinuousDomain) { //Continu values, binf values, bsup values and discrete factors attributes - nominalValues += 1.0; + nominalValues += getNominalValue(factor); //Continu values continuValues += "TRUE"; @@ -126,7 +132,7 @@ } else if (factor.getDomain() instanceof ContinuousDomain) { //Continu values, binf values, bsup values and discrete factors attributes - nominalValues += 0.0; + nominalValues += getNominalValue(factor); //Continu values continuValues += "TRUE"; @@ -141,10 +147,8 @@ .getMaxBound(); } else { + nominalValues += getNominalValue(factor); - //FIXME créer une méthode pour getNominalValue - nominalValues += ""; - //Continu values continuValues += "FALSE"; @@ -220,4 +224,27 @@ } + public void setTopiaContext(TopiaContext context){ + this.context = context; + } + + String getNominalValue(Factor factor){ + ConvertUtilsBean beanUtils = ConverterUtil.getConverter(null); + String path = factor.getPath(); + String topiaId = path.substring(0,path.lastIndexOf("#")); + String propertyName=path.substring(path.lastIndexOf("#") + 1); + Object value = null; + try { + TopiaEntity entity = context.findByTopiaId(topiaId); + value = BeanUtils.getProperty(entity, propertyName); + } catch (Exception ee) { + log.error("An error occurred while trying to get nominal value",ee); + } + if (null!=value){ + return value.toString(); + } else { + return null; + } + } + }

1 0

r2890 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org Jan. 8, 2010

Jan. 8, 2010

Author: chatellier Date: 2010-01-08 10:45:28 +0000 (Fri, 08 Jan 2010) New Revision: 2890 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java Log: Use DOA method in test instead of beanutils (some get method need a non null topia context) Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java 2010-01-08 10:38:34 UTC (rev 2889) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java 2010-01-08 10:45:28 UTC (rev 2890) @@ -25,10 +25,18 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.AbstractIsisFishTest; +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.datastore.IsisH2Config; /** * Test for {@link SensitivityUtils} class. @@ -46,6 +54,19 @@ .getLog(SensitivityUtilsTest.class); /** + * Return a basic valid topia context. + * + * @throws TopiaNotFoundException + */ + protected TopiaContext getTopiaContext() throws TopiaNotFoundException { + Properties config = new Properties(); + IsisH2Config.addMemDatabaseConfig(config, "test"); + IsisH2Config.addHibernateMapping(config); + TopiaContext context = TopiaContextFactory.getContext(config); + return context; + } + + /** * Test (par introspection) que tous les facteurs existent. * * @throws ClassNotFoundException @@ -55,19 +76,30 @@ * @throws SecurityException * @throws InvocationTargetException * @throws IllegalArgumentException + * @throws TopiaException */ @Test public void testFactorExistence() throws InstantiationException, IllegalAccessException, ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, - InvocationTargetException { + InvocationTargetException, TopiaException { Properties factors = SensitivityUtils.getProperties(); + TopiaContext testTC = getTopiaContext(); + TopiaContext context = testTC.beginTransaction(); for (String factorName : factors.stringPropertyNames()) { String className = factorName.substring(0, factorName.indexOf(".")); String propertyName = StringUtils.capitalize(factorName.substring(factorName.indexOf(".") + 1)); - - TopiaEntity entity = (TopiaEntity)Class.forName("fr.ifremer.isisfish.entities." + className + "Impl").newInstance(); + // Simple method + // TopiaEntity entity = (TopiaEntity)Class.forName("fr.ifremer.isisfish.entities." + className + "Impl").newInstance(); + + // Harder method + // but topia context is needed by some getXXX() methods + Method mStatic = IsisFishDAOHelper.class.getMethod("get" + className + "DAO", TopiaContext.class); + TopiaDAO<TopiaEntity> dao = (TopiaDAO<TopiaEntity>) mStatic.invoke(null, new Object[] { context }); + Assert.assertNotNull("No DOA found for factor " + factorName, dao); + TopiaEntity entity = dao.create(); + // call proper property if (log.isDebugEnabled()) { log.debug(" and call get" + propertyName + "() on " + className); @@ -75,5 +107,6 @@ Method m = entity.getClass().getMethod("get" + propertyName); m.invoke(entity, (Object[]) null); } + context.closeContext(); } }

1 0

r2889 - isis-fish/trunk/src/main/resources
by chatellier＠users.labs.libre-entreprise.org Jan. 8, 2010

Jan. 8, 2010

Author: chatellier Date: 2010-01-08 10:38:34 +0000 (Fri, 08 Jan 2010) New Revision: 2889 Modified: isis-fish/trunk/src/main/resources/sensitivity.properties Log: Add new enabled factor : Selectivity.equation Modified: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties 2010-01-08 09:35:44 UTC (rev 2888) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2010-01-08 10:38:34 UTC (rev 2889) @@ -27,6 +27,7 @@ PopulationSeasonInfo.migrationEquation PopulationSeasonInfo.emigrationEquation PopulationSeasonInfo.immigrationEquation +Selectivity.equation SetOfVessels.fixedCosts SetOfVessels.numberOfVessels SetOfVessels.technicalEfficiencyEquation

1 0

r2888 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org Jan. 8, 2010

Jan. 8, 2010

Author: chatellier Date: 2010-01-08 09:35:44 +0000 (Fri, 08 Jan 2010) New Revision: 2888 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java Log: Fix log name. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2010-01-08 09:35:31 UTC (rev 2887) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2010-01-08 09:35:44 UTC (rev 2888) @@ -56,7 +56,6 @@ import fr.ifremer.isisfish.ui.input.InputAction; import fr.ifremer.isisfish.ui.input.InputOneEquationUI; import fr.ifremer.isisfish.ui.input.InputSaveVerifier; -import fr.ifremer.isisfish.ui.input.InputTabbedPaneListener; import fr.ifremer.isisfish.ui.input.MetierSeasonInfoSpeciesEditorUI; import fr.ifremer.isisfish.ui.input.PopulationMigrationEmigrationUI; import fr.ifremer.isisfish.ui.input.PopulationMigrationImmigrationUI;

1 0

r2887 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org Jan. 8, 2010

Jan. 8, 2010

Author: chatellier Date: 2010-01-08 09:35:31 +0000 (Fri, 08 Jan 2010) New Revision: 2887 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java Log: Fix log name. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2010-01-08 09:35:05 UTC (rev 2886) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2010-01-08 09:35:31 UTC (rev 2887) @@ -79,7 +79,7 @@ public class EditorHelper { /** Class logger. */ - private static Log log = LogFactory.getLog(InputTabbedPaneListener.class); + private static Log log = LogFactory.getLog(EditorHelper.class); /** * Get "method" property value for wing component.

1 0

r2886 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org Jan. 8, 2010

Jan. 8, 2010

Author: chatellier Date: 2010-01-08 09:35:05 +0000 (Fri, 08 Jan 2010) New Revision: 2886 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java Log: Fix wrong log + add comments. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2010-01-06 18:34:55 UTC (rev 2885) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2010-01-08 09:35:05 UTC (rev 2886) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,7 +19,6 @@ package fr.ifremer.isisfish.ui.sensitivity; import fr.ifremer.isisfish.ui.input.InputContentUI; -import fr.ifremer.isisfish.ui.input.InputTabbedPaneListener; import javax.swing.JTabbedPane; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -27,13 +26,18 @@ import org.apache.commons.logging.LogFactory; /** - * + * Sensitivity change listener to control tab swapping. + * * @author letellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ */ -public class SensitivityTabbedPaneListener implements ChangeListener{ +public class SensitivityTabbedPaneListener implements ChangeListener { /** Class logger. */ - private static Log log = LogFactory.getLog(InputTabbedPaneListener.class); + private static Log log = LogFactory.getLog(SensitivityTabbedPaneListener.class); protected int cacheSelectedIndex = -1; @@ -72,14 +76,14 @@ } } - /* - * Ask you to save if modification are made - * @param ui selected + /** + * Ask you to save if modification are made. + * + * @param context selected * @return true to change tab */ protected boolean closeUI(InputContentUI context) throws Exception { boolean exit = true; return exit; } - }

1 0

r2885 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: simulator widget/filter
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 18:34:55 +0000 (Wed, 06 Jan 2010) New Revision: 2885 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx Log: Fix simulation filtering. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2010-01-06 16:32:34 UTC (rev 2884) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2010-01-06 18:34:55 UTC (rev 2885) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -337,8 +337,11 @@ protected void selectFilter() { try { - simulAction.setOldSimulatorNames(fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(simulAction.getOldSimulationItem())); - refresh(); + java.util.List<String> simulationsNames = fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(simulAction.getOldSimulationItem()); + // TODO add " " to not triger event (need to be fixed) + simulationsNames.add(0, " "); + simulAction.setOldSimulatorNames(simulationsNames); + fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(false)); } catch (ParseException ex) { if (log.isErrorEnabled()) { log.error("Can't select simulation filter", ex); @@ -367,6 +370,7 @@ protected void resetFilter(){ simulAction.resetOldSimulatorNames(); + fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(false)); } protected void saveName(){ simulAction.setName(fieldSimulParamsName.getText()); @@ -393,12 +397,10 @@ <cell fill="horizontal" weightx="1.0"> <Table> <row> - <cell columns="4" fill="horizontal"> + <cell fill="horizontal"> <JLabel text="isisfish.params.loadOldSimulation"/> </cell> - </row> - <row> - <cell columns="2" fill="horizontal" weightx="1.0"> + <cell fill="horizontal" weightx="1.0"> <JComboBox id="fieldSimulParamsSelect" model='{getSimulParamsSelectModel()}' onActionPerformed='loadOldSimulation()'/> </cell> <cell> @@ -412,6 +414,11 @@ </cell> </row> <row> + <cell fill="horizontal" weightx="1.0" insets="0,3,0,3"> + <JSeparator /> + </cell> + </row> + <row> <cell fill="both" weightx="1.0" weighty="1.0"> <Table> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2010-01-06 16:32:34 UTC (rev 2884) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2010-01-06 18:34:55 UTC (rev 2885) @@ -27,7 +27,6 @@ import java.io.IOException; import java.io.Serializable; import java.lang.reflect.Field; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; @@ -44,7 +43,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; import org.nuiton.topia.TopiaContext; -import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; @@ -66,7 +64,6 @@ import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.simulator.AnalysePlan; import fr.ifremer.isisfish.simulator.SimulationParameter; -import fr.ifremer.isisfish.simulator.SimulationProperties; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; @@ -77,9 +74,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; import fr.ifremer.isisfish.ui.util.ErrorHelper; -import fr.ifremer.isisfish.ui.widget.filter.FilterModel; /** * SimulAction. @@ -472,17 +467,17 @@ */ public List<String> getOldSimulationItem() { - try { + //try { oldSimulNames = new ArrayList<String>(); - FilterModel<SimulationProperties, String> filterModel; + //FilterModel<SimulationProperties, String> filterModel; // keep in context list of old simulation names (for filter process) oldSimulNames.addAll(SimulationStorage.getSimulationNames()); // create filter model - filterModel = SimulationFilterUtil.createFilterModel(oldSimulNames); + //filterModel = SimulationFilterUtil.createFilterModel(oldSimulNames); // to used directly model.getFilteredResult() in xml // we must fill filterModel result with original items - filterModel.selectAll(); + //filterModel.selectAll(); // chatellier : Ajout d'une entrée vide pour forcer la sélection // et que le changement lance un evenement sur la liste @@ -491,7 +486,7 @@ oldSimulNames.add(0, " "); return oldSimulNames; - } catch (ParseException e) { + /*} catch (ParseException e) { if (log.isErrorEnabled()) { log.error("Can't get old simulation item", e); } @@ -502,13 +497,9 @@ } ErrorHelper.showErrorDialog(_("isisfish.error.simulation.listoldsimulation"), e); } - return null; + return null;*/ } - public List<String> getFilteredOldSimulatorNames() { - return getFilteredOldSimulatorNames(false); - } - public List<String> getFilteredOldSimulatorNames(boolean force) { if (oldSimulNames == null || force) { oldSimulNames = getOldSimulationItem(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2010-01-06 16:32:34 UTC (rev 2884) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2010-01-06 18:34:55 UTC (rev 2885) @@ -37,6 +37,8 @@ setSize(getMinimumSize()); repaint(); doReset(); + // TODO pas de composant parent ? + org.nuiton.widget.SwingUtil.center(this); // launch ui and waits for reply setVisible(true); return model.getFilteredResult(); @@ -46,6 +48,8 @@ setSize(getMinimumSize()); repaint(); doReset(); + // TODO pas de composant parent ? + org.nuiton.widget.SwingUtil.center(this); // launch ui and waits for reply setVisible(true); return (String) comboResult.getSelectedItem();

1 0

r2884 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 16:32:34 +0000 (Wed, 06 Jan 2010) New Revision: 2884 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java Log: Use java 6 link Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2010-01-06 16:30:49 UTC (rev 2883) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2010-01-06 16:32:34 UTC (rev 2884) @@ -33,7 +33,7 @@ "<br/>" + " Pour plus de renseignement sur les expressions rationnelles, reportez vous au lien suivant :" + "<ul>" + - "<li><a href='http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html'>Les expression rationnelles en Java</a></li>" + + "<li><a href='http://java.sun.com/javase/6/docs/api/java/util/regex/Pattern.html'>Les expression rationnelles en Java</a></li>" + "</ul>"); doc.setText(sb.toString()); doc.setCaretPosition(0);

1 0

r2883 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 16:30:49 +0000 (Wed, 06 Jan 2010) New Revision: 2883 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java Log: Fix accent Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2010-01-06 16:14:23 UTC (rev 2882) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2010-01-06 16:30:49 UTC (rev 2883) @@ -27,7 +27,7 @@ "<li><b>'.'</b> : un joker, qui repr\u00E9sente un caract\u00E8re unique quelconque.</li>\n" + "<li><b>'^'</b> et<b> '$'</b> : repr\u00E9sentent respectivement un d\u00E9but et une fin de ligne.</li>" + "<li><b>'*'</b> sp\u00E9cifie un nombre quelque conque du caract\u00E8re pr\u00E9c\u00E9dent</li>" + - "<li><b>'+'</b> sp\u00E9cifie un nombre strictement positif d'occurrence sup\u00E9rieur \u00E0 0 du caract\u00E8re pr\u0EE9c\u00E9dent ( x+ = xx*)</li>" + + "<li><b>'+'</b> sp\u00E9cifie un nombre strictement positif d'occurrence sup\u00E9rieur \u00E0 0 du caract\u00E8re pr\u00E9c\u00E9dent ( x+ = xx*)</li>" + "<li><b>'|'</b> sp\u00E9cifie une alternative, par exemple ^(a|b).+ repr\u00E9sente l'ensemble des mots commencant par <code>a</code> ou <code>b</code>.</li>" + "</ul>" + "<br/>" +

1 0

r2882 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 16:14:23 +0000 (Wed, 06 Jan 2010) New Revision: 2882 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Log: Display exception message instead of "error" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-06 16:02:55 UTC (rev 2881) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-06 16:14:23 UTC (rev 2882) @@ -497,7 +497,7 @@ if (log.isDebugEnabled()) { log.debug("saveScript called on " + codeStorage.getName()); } - + try { //String content = scriptUI.getEditor().getText(); //codeStorage.setContent(content); @@ -520,9 +520,11 @@ */ public void commitScript() { + if (log.isDebugEnabled()) { + log.debug("commitScript called for " + codeStorage.getName()); + } + try { - log.debug("commitScript called for " + codeStorage.getName()); - // save script before commit saveScript(); @@ -539,8 +541,8 @@ log.error("Error on script commit", ex); } - // if vcs can write - ErrorHelper.showErrorDialog(_("isisfish.common.error"), ex); + // if vcs can't write + ErrorHelper.showErrorDialog(ex.getMessage(), ex); } }

1 0

r2881 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/ui/script resources/icons
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 16:02:55 +0000 (Wed, 06 Jan 2010) New Revision: 2881 Added: isis-fish/trunk/src/main/resources/icons/cut.png isis-fish/trunk/src/main/resources/icons/database.png isis-fish/trunk/src/main/resources/icons/database_add.png isis-fish/trunk/src/main/resources/icons/database_connect.png isis-fish/trunk/src/main/resources/icons/database_delete.png isis-fish/trunk/src/main/resources/icons/database_edit.png isis-fish/trunk/src/main/resources/icons/database_error.png isis-fish/trunk/src/main/resources/icons/database_gear.png isis-fish/trunk/src/main/resources/icons/database_go.png isis-fish/trunk/src/main/resources/icons/database_key.png isis-fish/trunk/src/main/resources/icons/database_lightning.png isis-fish/trunk/src/main/resources/icons/database_link.png isis-fish/trunk/src/main/resources/icons/database_refresh.png isis-fish/trunk/src/main/resources/icons/database_save.png isis-fish/trunk/src/main/resources/icons/database_table.png isis-fish/trunk/src/main/resources/icons/page_copy.png isis-fish/trunk/src/main/resources/icons/page_paste.png isis-fish/trunk/src/main/resources/icons/page_white_compressed.png isis-fish/trunk/src/main/resources/icons/script.png isis-fish/trunk/src/main/resources/icons/script_add.png isis-fish/trunk/src/main/resources/icons/script_code.png isis-fish/trunk/src/main/resources/icons/script_code_red.png isis-fish/trunk/src/main/resources/icons/script_delete.png isis-fish/trunk/src/main/resources/icons/script_edit.png isis-fish/trunk/src/main/resources/icons/script_error.png isis-fish/trunk/src/main/resources/icons/script_gear.png isis-fish/trunk/src/main/resources/icons/script_go.png isis-fish/trunk/src/main/resources/icons/script_key.png isis-fish/trunk/src/main/resources/icons/script_lightning.png isis-fish/trunk/src/main/resources/icons/script_link.png isis-fish/trunk/src/main/resources/icons/script_palette.png isis-fish/trunk/src/main/resources/icons/script_save.png Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx Log: Add icons into script interface an on main frame Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-06 16:01:36 UTC (rev 2880) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-06 16:02:55 UTC (rev 2881) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -22,16 +22,19 @@ import java.awt.Component; import java.awt.Dimension; +import java.awt.Image; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import javax.imageio.ImageIO; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JScrollPane; @@ -604,6 +607,17 @@ ((WelcomeUI)e.getSource()).close(); } }); + + try { + InputStream imageStream = WelcomeUI.class.getResourceAsStream("/images/simulation.gif"); + Image image = ImageIO.read(imageStream); + welcome.setIconImage(image); + } + catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't set frame icon", ex); + } + } SwingUtil.center(welcome); welcome.setVisible(true); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2010-01-06 16:01:36 UTC (rev 2880) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2010-01-06 16:02:55 UTC (rev 2881) @@ -1,6 +1,6 @@  <JMenuBar id="scriptMenuBar" constraints='BorderLayout.NORTH'> <JMenu id="scriptTxtFile" text="isisfish.script.menu.file"> - <JMenu id="scriptNewMenu" text="isisfish.script.menu.new"> - <JMenuItem id="miNewScript" text="isisfish.script.menu.txtNewScript" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Script)' accelerator="accNewScript"/> - <JMenuItem id="miNewSimulator" text="isisfish.script.menu.txtNewSimulator" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Simulator)' accelerator="accNewSimulator"/> - <JMenuItem id="miNewExport" text="isisfish.script.menu.txtNewExport" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Export)' accelerator="accNewExport"/> - <JMenuItem id="miNewRule" text="isisfish.script.menu.txtNewRule" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Rule)' accelerator="accNewRule"/> - <JMenuItem id="miNewAnalysePlan" text="isisfish.script.menu.txtNewAnalysePlan" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.AnalysePlan)' accelerator="accNewAnalysePlan"/> - <JMenuItem id="miNewSensitivity" text="isisfish.script.menu.txtNewSensitivity" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Sensitivity)' accelerator="accNewSensitivity"/> - <JMenuItem id="miNewSensitivityExport" text="isisfish.script.menu.txtNewSensitivityExport" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.SensitivityExport)' accelerator="accNewSensitivityExport"/> - <JMenuItem id="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.EquationModel)' accelerator="accNewEquationModel"/> + <JMenu id="scriptNewMenu" text="isisfish.script.menu.new" icon="script.png"> + <JMenuItem id="miNewScript" text="isisfish.script.menu.txtNewScript" + onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Script)' icon="script.png" /> + <JMenuItem id="miNewSimulator" text="isisfish.script.menu.txtNewSimulator" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Simulator)' icon="script.png" /> + <JMenuItem id="miNewExport" text="isisfish.script.menu.txtNewExport" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Export)' icon="script.png" /> + <JMenuItem id="miNewRule" text="isisfish.script.menu.txtNewRule" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Rule)' icon="script.png" /> + <JMenuItem id="miNewAnalysePlan" text="isisfish.script.menu.txtNewAnalysePlan" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.AnalysePlan)' icon="script.png" /> + <JMenuItem id="miNewSensitivity" text="isisfish.script.menu.txtNewSensitivity" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Sensitivity)' icon="script.png" /> + <JMenuItem id="miNewSensitivityExport" text="isisfish.script.menu.txtNewSensitivityExport" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.SensitivityExport)' icon="script.png" /> + <JMenuItem id="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.EquationModel)' icon="script.png" /> </JMenu> - <JMenuItem id="miSave" text="isisfish.script.menu.save" onActionPerformed="getScriptAction().saveScript()" accelerator="accSave" enabled='{isSingleFileSelected()}' /> + <JMenuItem id="miSave" text="isisfish.script.menu.save" onActionPerformed="getScriptAction().saveScript()" icon="script_save.png" enabled='{isSingleFileSelected()}' /> <JSeparator/> - <JMenuItem id="miImport" text="isisfish.script.menu.txtImport" enabled="false" onActionPerformed="getScriptAction().importScript()" accelerator="accImport" /> - <JMenuItem id="miExport" text="isisfish.script.menu.txtExport" onActionPerformed="getScriptAction().exportScript()" accelerator="accExport" enabled='{isFileSelected()}' /> + <JMenuItem id="miImport" text="isisfish.script.menu.txtImport" enabled="false" onActionPerformed="getScriptAction().importScript()" icon="page_white_compressed.png" /> + <JMenuItem id="miExport" text="isisfish.script.menu.txtExport" onActionPerformed="getScriptAction().exportScript()" icon="page_white_compressed.png" enabled='{isFileSelected()}' /> <JSeparator/> - <JMenuItem id="miDelete" text="isisfish.script.menu.deleteLocaly" onActionPerformed='getScriptAction().deleteScript(false)' accelerator="accDelete" enabled='{isSingleFileSelected()}' /> + <JMenuItem id="miDelete" text="isisfish.script.menu.deleteLocaly" onActionPerformed='getScriptAction().deleteScript(false)' icon="script_delete.png" enabled='{isSingleFileSelected()}' /> </JMenu> <JMenu id="scriptTxtEdit" text="isisfish.script.menu.edit"> - <JMenuItem id="miCut" text="isisfish.script.menu.cut" onActionPerformed="getScriptAction().cut()" accelerator="accCut" enabled='{isTextSelected()}' /> - <JMenuItem id="miCopy" text="isisfish.script.menu.copy" onActionPerformed="getScriptAction().copy()" accelerator="accCopy" enabled='{isTextSelected()}' /> - <JMenuItem id="miPaste" text="isisfish.script.menu.paste" onActionPerformed="getScriptAction().paste()" accelerator="accPaste" enabled='{isSingleFileSelected()}' /> + <JMenuItem id="miCut" text="isisfish.script.menu.cut" onActionPerformed="getScriptAction().cut()" icon="cut.png" enabled='{isTextSelected()}' /> + <JMenuItem id="miCopy" text="isisfish.script.menu.copy" onActionPerformed="getScriptAction().copy()" icon="page_copy.png" enabled='{isTextSelected()}' /> + <JMenuItem id="miPaste" text="isisfish.script.menu.paste" onActionPerformed="getScriptAction().paste()" icon="page_paste.png" enabled='{isSingleFileSelected()}' /> </JMenu> <JMenu id="scriptTxtVCS" text="isisfish.script.menu.txtVCS"> - <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" accelerator="accCommitVCS" onActionPerformed="getScriptAction().commitScript()" enabled='{isSingleFileSelected()}' /> + <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" icon="database_go.png" onActionPerformed="getScriptAction().commitScript()" enabled='{isSingleFileSelected()}' /> <JMenuItem id="miDiffVCS" text="isisfish.script.menu.diff" accelerator="mnDiffVCS" onActionPerformed="getScriptAction().diffScript()" enabled='{isSingleFileSelected()}' /> - <JMenuItem id="miUpdateVCS" text="isisfish.script.menu.update" accelerator="accUpdateVCS" onActionPerformed="getScriptAction().updateScript()"/> + <JMenuItem id="miUpdateVCS" text="isisfish.script.menu.update" icon="database_refresh.png" onActionPerformed="getScriptAction().updateScript()"/> <JSeparator/> - <JMenuItem id="miDeleteVCS" text="isisfish.script.menu.deleteLocalyServer" onActionPerformed='getScriptAction().deleteScript(true)' accelerator="accDeleteVCS" enabled='{isSingleFileSelected()}'/> + <JMenuItem id="miDeleteVCS" text="isisfish.script.menu.deleteLocalyServer" onActionPerformed='getScriptAction().deleteScript(true)' icon="database_delete.png" enabled='{isSingleFileSelected()}'/> </JMenu> <JMenu id="scriptTxtCode" text="isisfish.script.menu.code"> - <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" accelerator="accCheckSyntax" onActionPerformed="getScriptAction().checkScript()" enabled='{isJavaFileSelected()}' /> - <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" accelerator="accEvaluate" onActionPerformed="getScriptAction().evaluateScript()" enabled='{isJavaFileSelected()}' /> + <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" icon="script_code_red.png" onActionPerformed="getScriptAction().checkScript()" enabled='{isJavaFileSelected()}' /> + <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" icon="script_gear.png" onActionPerformed="getScriptAction().evaluateScript()" enabled='{isJavaFileSelected()}' /> <JSeparator/> <JMenuItem id="miGenerateJavadoc" text="isisfish.script.menu.javadocgenerate" onActionPerformed="getScriptAction().generateScriptJavadoc()"/> <JMenuItem id="miShowJavadoc" text="isisfish.script.menu.javadocshow" onActionPerformed="getScriptAction().showScriptJavadoc()"/> @@ -76,15 +77,15 @@ <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JPanel id="buttonBar" layout='{new GridLayout()}' constraints='BorderLayout.NORTH'> <JComboBox id="scriptTypeChoice" model='{new ScriptTypesComboModel()}'/> - <JButton id="buttonScriptNew" text="isisfish.script.new" toolTipText='isisfish.script.new.tooltip' onActionPerformed='getScriptAction().newScript()' /> - <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().saveScript()' /> - <JButton id="buttonScriptExport" text="isisfish.script.export" toolTipText="isisfish.script.export.tooltip" enabled='false' onActionPerformed='getScriptAction().exportScript()' /> - <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().commitScript()' /> - <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().cut()' /> - <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().copy()' /> - <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().paste()' /> - <JButton id="buttonScriptCheck" text="isisfish.script.check" toolTipText="isisfish.script.check.tooltip" enabled='{isJavaFileSelected()}' onActionPerformed='getScriptAction().checkScript()' /> - <JButton id="buttonScriptEval" text="isisfish.script.evaluate" toolTipText="isisfish.script.evaluate.tooltip" enabled='{isJavaFileSelected()}' onActionPerformed='getScriptAction().evaluateScript()' /> + <JButton id="buttonScriptNew" text="isisfish.script.new" toolTipText='isisfish.script.new.tooltip' onActionPerformed='getScriptAction().newScript()' icon="script.png" /> + <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().saveScript()' icon="script_save.png" /> + <JButton id="buttonScriptExport" text="isisfish.script.export" toolTipText="isisfish.script.export.tooltip" enabled='false' onActionPerformed='getScriptAction().exportScript()' icon="page_white_compressed.png" /> + <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().commitScript()' icon="database_go.png" /> + <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().cut()' icon="cut.png" /> + <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().copy()' icon="page_copy.png" /> + <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().paste()' icon="page_paste.png" /> + <JButton id="buttonScriptCheck" text="isisfish.script.check" toolTipText="isisfish.script.check.tooltip" enabled='{isJavaFileSelected()}' onActionPerformed='getScriptAction().checkScript()' icon="script_code_red.png" /> + <JButton id="buttonScriptEval" text="isisfish.script.evaluate" toolTipText="isisfish.script.evaluate.tooltip" enabled='{isJavaFileSelected()}' onActionPerformed='getScriptAction().evaluateScript()' icon="script_gear.png" /> </JPanel> <JSplitPane oneTouchExpandable="true" dividerLocation="250" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> <JScrollPane> @@ -95,7 +96,7 @@ <JSplitPane oneTouchExpandable="true" resizeWeight="0.75" orientation="VERTICAL"> <org.nuiton.widget.editor.Editor id='editor'/> <JScrollPane> - <JTextArea id="actionLogArea" editable="false" font='{new Font("Monospaced",Font.PLAIN, 12)}' /> + <JTextArea id="actionLogArea" editable="false" font='{new Font("Monospaced", Font.PLAIN, 12)}' /> </JScrollPane> </JSplitPane> </JSplitPane> Added: isis-fish/trunk/src/main/resources/icons/cut.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/cut.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_add.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_connect.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_connect.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_delete.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_edit.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_error.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_gear.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_gear.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_go.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_key.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_lightning.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_link.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_refresh.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_refresh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_save.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_table.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_table.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/page_copy.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/page_copy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/page_paste.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/page_paste.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/page_white_compressed.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/page_white_compressed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_add.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_code.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_code.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_code_red.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_code_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_delete.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_edit.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_error.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_gear.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_gear.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_go.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_key.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_lightning.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_link.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_palette.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_palette.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_save.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r2880 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 16:01:36 +0000 (Wed, 06 Jan 2010) New Revision: 2880 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx Log: Refactor advanced parameters (a border around 'free parameters') Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2010-01-06 11:32:03 UTC (rev 2879) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2010-01-06 16:01:36 UTC (rev 2880) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -26,224 +26,215 @@ import javax.swing.table.DefaultTableModel; import java.util.Map.Entry; - tableTagValue.addMouseListener(new MouseAdapter() { + /** + * Listener to enable/disable remove button. + */ + tableTagValues.getSelectionModel().addListSelectionListener(new ListSelectionListener() { @Override - public void mouseReleased(MouseEvent e) { - setRemove(tableTagValue.getSelectedRow() != -1); + public void valueChanged(ListSelectionEvent e) { + setRemove(tableTagValues.getSelectedRow() != -1); } }); refresh(); - public void refresh(){ - setTableTagValue(); + public void refresh() { + setTableTagValues(); } - public AdvancedParamsUI (SimulAction action){ + public AdvancedParamsUI(SimulAction action) { setContextValue(action); } - protected void addTagValue(){ + + protected void addTagValue() { getContextValue(SimulAction.class).addTagValue(fieldTag.getText(), fieldValue.getText()); - setTableTagValue(); - setRemove(true); + setTableTagValues(); valueChanged(true); } - protected void removeTagValue(){ - getContextValue(SimulAction.class).removeTagValue(tableTagValue.getValueAt(tableTagValue.getSelectedRow(),0).toString()); - setTableTagValue(); + + protected void removeTagValue() { + getContextValue(SimulAction.class).removeTagValue(tableTagValues.getValueAt(tableTagValues.getSelectedRow(),0).toString()); + setTableTagValues(); valueChanged(true); } - protected void saveTagValue(){ - if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1){ + + protected void saveTagValues() { + if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1) { getContextValue(SimulAction.class).saveTagValue(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString()); } valueChanged(false); } - protected void setSimulName(){ - if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1){ + + protected void setSimulatorName() { + if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1) { getContextValue(SimulAction.class).getSimulationParameter().setSimulatorName(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString()); valueChanged(true); } } - protected void setTableTagValue(){ - Map<String, String> tagValue = getContextValue(SimulAction.class).getSimulationParameter().getTagValue(); + + protected void setTableTagValues() { + Map<String, String> tagValues = getContextValue(SimulAction.class).getSimulationParameter().getTagValue(); // TODO make a table model for it String columnName[] = { _("isisfish.common.tag"), _("isisfish.common.value")}; - if (tagValue != null) { - DefaultTableModel model = new DefaultTableModel(columnName, tagValue.size()){ + if (tagValues != null) { + DefaultTableModel model = new DefaultTableModel(columnName, tagValues.size()) { @Override public boolean isCellEditable(int row, int column) { return false; } }; - Set<Entry<String, String>> set = tagValue.entrySet(); + Set<Entry<String, String>> set = tagValues.entrySet(); int row = 0; - for (Iterator<String> it = tagValue.keySet().iterator(); it.hasNext();) { + for (Iterator<String> it = tagValues.keySet().iterator(); it.hasNext();) { String name = it.next(); model.setValueAt(name, row, 0); - model.setValueAt(tagValue.get(name), row, 1); + model.setValueAt(tagValues.get(name), row, 1); row++; } - tableTagValue.setModel(model); + tableTagValues.setModel(model); } - else { - DefaultTableModel model = new DefaultTableModel(columnName, 0); - } } - protected void valueChanged(boolean b){ - save.setEnabled(b); + + protected void valueChanged(boolean b) { setChanged(b); } + ]]> </script> <row> - <cell fill="horizontal" weightx="0.16"> - <Table> - <row> - <cell> - <JLabel text="isisfish.advancedParams.simulatorUse"/> - </cell> - <cell fill="horizontal" weightx="1.0"> - <JPanel/> - </cell> - </row> - </Table> + <cell fill="horizontal" rows="2"> + <JLabel text="isisfish.advancedParams.simulatorUse"/> </cell> - <cell columns="5" fill="horizontal" weightx="0.84"> - <JComboBox id="fieldSimulAdvParamsSimulatorSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulatorNames().toArray())}' onActionPerformed='setSimulName()'/> + <cell columns="4" fill="horizontal"> + <JComboBox id="fieldSimulAdvParamsSimulatorSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulatorNames().toArray())}' onActionPerformed='setSimulatorName()'/> </cell> </row> <row> - <cell fill="horizontal" weightx="0.2"> - <JPanel/> - </cell> - <cell columns="2" fill="horizontal" weightx="0.3"> + <cell columns="2" fill="horizontal"> <JCheckBox id="fieldSimulationStatistique" text="isisfish.advancedParams.simulationStatistique" selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseStatistic()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseStatistic(fieldSimulationStatistique.isSelected());valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseStatistic(fieldSimulationStatistique.isSelected());'/> </cell> - <cell fill="horizontal" weightx="0.2"> - <JPanel/> - </cell> - <cell columns="2" fill="horizontal" weightx="0.3"> + <cell columns="2" fill="horizontal"> <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache" selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseOptimization()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseOptimization(fieldSimulationCache.isSelected());valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseOptimization(fieldSimulationCache.isSelected());'/> </cell> </row> <row> - <cell columns="2" fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="1.0"> <JLabel text="isisfish.advancedParams.simulLevelLogger"/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="1.0"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulErrorLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("error");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("error");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="1.0"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulWarnLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("warn");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("warn");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="1.0"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulInfoLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("info");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("info");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="1.0"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulDebugLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("debug");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("debug");'/> </cell> </row> <row> - <cell columns="2" fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JLabel text="isisfish.advancedParams.scriptLevelLogger"/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptErrorLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("error");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("error");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptWarnLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("warn");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("warn");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptInfoLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("info");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("info");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptDebugLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("debug");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("debug");'/> </cell> </row> <row> - <cell columns="2" fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JLabel text="isisfish.advancedParams.libLevelLogger"/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsLibLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibErrorLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("error");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("error");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibWarnLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("warn");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("warn");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibInfoLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("info");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("info");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsLibLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibDebugLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("debug");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("debug");'/> </cell> </row> <row> - <cell columns="6" fill="horizontal" weightx="1.0"> - <JLabel text="isisfish.advancedParams.freeParameters" horizontalAlignment="0"/> + <cell columns="5" fill="both" weighty="1" weightx="1"> + <Table border='{BorderFactory.createTitledBorder(_("isisfish.advancedParams.freeParameters"))}'> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.common.tag"/> + </cell> + <cell fill="horizontal" weightx="1"> + <JTextField id="fieldTag" onKeyTyped="setAjout(true)"/> + </cell> + <cell fill="horizontal"> + <JLabel text="isisfish.common.value"/> + </cell> + <cell fill="horizontal" weightx="1"> + <JTextField id="fieldValue" onKeyTyped="setAjout(true)"/> + </cell> + </row> + <row> + <cell columns="4" fill="horizontal" weightx="1.0"> + <JButton text="isisfish.common.add" enabled="{isAjout()}" onActionPerformed='addTagValue()'/> + </cell> + </row> + <row> + <cell columns="4" fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="tableTagValues"/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="4" fill="horizontal" weightx="1.0"> + <JButton text="isisfish.common.remove" enabled="{isRemove()}" onActionPerformed='removeTagValue()'/> + </cell> + </row> + <row> + <cell columns="5" fill="horizontal"> + <JButton text="isisfish.common.saveNextSimulation" enabled="{isChanged()}" onActionPerformed='saveTagValues()'/> + </cell> + </row> + </Table> </cell> </row> - <row> - <cell fill="horizontal" weightx="0.25"> - <JLabel text="isisfish.common.tag"/> - </cell> - <cell columns="2" fill="horizontal" weightx="0.25"> - <JTextField id="fieldTag" onKeyTyped="setAjout(true)"/> - </cell> - <cell fill="horizontal" weightx="0.25"> - <JLabel text="isisfish.common.value"/> - </cell> - <cell columns="2" fill="horizontal" weightx="0.25"> - <JTextField id="fieldValue" onKeyTyped="setAjout(true)"/> - </cell> - </row> - <row> - <cell columns="6" fill="horizontal" weightx="1.0"> - <JButton id='add' text="isisfish.common.add" enabled="{isAjout()}" onActionPerformed='addTagValue()'/> - </cell> - </row> - <row> - <cell columns="6" fill="both" weightx="1.0" weighty="1.0"> - <JScrollPane> - <JTable id="tableTagValue"/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns="6" fill="horizontal" weightx="1.0"> - <JButton text="isisfish.common.remove" enabled="{isRemove()}" onActionPerformed='removeTagValue()'/> - </cell> - </row> - <row> - <cell columns="6" fill="horizontal" weightx="1.0"> - <JButton id='save' text="isisfish.common.saveNextSimulation" enabled="{isChanged()}" onActionPerformed='saveTagValue()'/> - </cell> - </row> -</Table> \ No newline at end of file +</Table>

1 0

r2879 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 11:32:03 +0000 (Wed, 06 Jan 2010) New Revision: 2879 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Log: Take care about user cancelation and errors. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-06 11:17:20 UTC (rev 2878) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-06 11:32:03 UTC (rev 2879) @@ -48,6 +48,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; @@ -229,16 +230,19 @@ // if user has not choose "cancel" if (equationModelType != null) { - String fileName = JOptionPane - .showInputDialog(_("isisfish.message.new.filename")); - File scriptFile = newScript(equationModelTypePath + fileName, - scriptType); - ScriptTreeModel model = (ScriptTreeModel) scriptUI.getTree().getModel(); - model.fileAdded(scriptFile); - TreePath treePath = model.getTreePathFor(scriptFile); - scriptUI.getTree().setSelectionPath(treePath); + String fileName = JOptionPane.showInputDialog(_("isisfish.message.new.filename")); + // user cancel + if (!StringUtils.isEmpty(fileName)) { + File scriptFile = newScript(equationModelTypePath + fileName, scriptType); + // creation successful + if (scriptFile != null) { + ScriptTreeModel model = (ScriptTreeModel) scriptUI.getTree().getModel(); + model.fileAdded(scriptFile); + TreePath treePath = model.getTreePathFor(scriptFile); + scriptUI.getTree().setSelectionPath(treePath); + } + } } - } /** @@ -247,7 +251,7 @@ * * @param fileName full filename * @param scriptType le type que l'on souhaite Script, Simulator, ou Export. - * @return created file + * @return created file or {@code null} if any error happen */ protected File newScript(String fileName, ScriptMapping scriptType) { @@ -272,16 +276,16 @@ String message = _("isisfish.error.invalid.file.name", fileName); Exception e = new RuntimeException(message); - returnError(_("isisfish.error.script.create", fileName, e - .getMessage()), e); + returnError(_("isisfish.error.script.create", fileName, e.getMessage()), e); + return null; } // il y a un sous type à traiter if (pos == fileName.length() - 1) { String message = _("isisfish.error.invalid.file.name", fileName); Exception e = new RuntimeException(message); - returnError(_("isisfish.error.script.create", fileName, e - .getMessage()), e); + returnError(_("isisfish.error.script.create", fileName, e.getMessage()), e); + return null; } realFilename = fileName .substring(fileName.lastIndexOf('/') + 1); @@ -293,8 +297,8 @@ if (!realFilename.matches("[A-Z0-9_][a-zA-Z0-9_]*")) { String message = _("isisfish.error.invalid.file.name", fileName); Exception e = new RuntimeException(message); - returnError(_("isisfish.error.script.create", fileName, e - .getMessage()), e); + returnError(_("isisfish.error.script.create", fileName, e.getMessage()), e); + return null; } //TODO do test on category CodeSourceStorage script = null;

1 0

r2878 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 11:17:20 +0000 (Wed, 06 Jan 2010) New Revision: 2878 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Log: Fix no file selection (refresh editor) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-06 10:26:32 UTC (rev 2877) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-06 11:17:20 UTC (rev 2878) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 + * Copyright (C) 2006 - 2010 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -404,13 +404,17 @@ loadScript(selectedFile); scriptUI.getEditor().open(selectedFile); // force refresh + scriptUI.getEditor().repaint(); scriptUI.getEditor().validate(); setButton(); } else { scriptUI.getEditor().close(); + // force refresh + scriptUI.getEditor().repaint(); scriptUI.getEditor().validate(); + setButton(); } }

1 0

r2877 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/mexico/export main/java/fr/ifremer/isisfish/ui/input main/java/fr/ifremer/isisfish/ui/sensitivity main/resources test/java/fr/ifremer/isisfish/mexico/export
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 10:26:32 +0000 (Wed, 06 Jan 2010) New Revision: 2877 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/HorizontalEntityVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/trunk/src/main/resources/sensitivity.properties isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java Log: Uncapitalize factor property names. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/HorizontalEntityVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/HorizontalEntityVisitor.java 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/HorizontalEntityVisitor.java 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009-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 @@ -84,6 +84,8 @@ @Override public void visit(TopiaEntity e, String name, Class<?> type, Object value) { // si c'est une entitÃ© + + // FIXME only hack about Equation is used instead of Topia visitor if (value instanceof TopiaEntity && !(value instanceof Equation)) { TopiaEntity entity = (TopiaEntity) value; toVisitEntities.add(entity); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009-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 @@ -101,8 +101,7 @@ // if there is a "Impl" in entityName, remove it factorClass = factorClass.replaceFirst("Impl", ""); - // FIXME propertyName with capitalize first letter is a bad idea - String factorName = factorClass + "." + StringUtils.capitalize(propertyName); + String factorName = factorClass + "." + propertyName; // test if factor name is enabled // TODO move SensitivityUtils outside of UI Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,6 +1,6 @@  <Boolean id='sensitivity' javaBean='false'/> - +  <java.lang.String id='buttonTitle' javaBean='""'/> @@ -33,7 +33,7 @@  <jaxx.runtime.swing.BlockingLayerUI id='layerUI' - blockingColor='{new Color(50,50,50)}' /> + blockingColor='{new Color(25,25,25)}' />  <jaxx.runtime.swing.BlockingLayerUI2 id='layerUI2' @@ -48,14 +48,15 @@ }}' /> <script><![CDATA[ -import fr.ifremer.isisfish.ui.WelcomePanelUI; +import javax.swing.JComponent; import fr.ifremer.isisfish.entities.FisheryRegion; -import org.nuiton.topia.persistence.TopiaEntity; -import javax.swing.JComponent; 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.TopiaEntity; +import org.apache.commons.lang.StringUtils; protected ChangeListener tabbedPaneChangeListener; @@ -107,28 +108,34 @@ FisheryRegion fisheryRegion = map.getFisheryRegion(); FisheryRegion regionFromContext = getRegion(); if (fisheryRegion == null || !fisheryRegion.equals(regionFromContext)) { - log.info("use now " + regionFromContext + " in map " + map); + if (log.isInfoEnabled()) { + log.info("Use now " + regionFromContext + " in map " + map); + } map.setFisheryRegion(regionFromContext); } } - -// TODO this method cause a lot of probleme -// must cast TopiaEntity to impl in inherited UIs... -// 20090602 chatellier : useless method ? cause a lot of cast problem -//public void setBean(TopiaEntity t) {} - public void setLayer(boolean active) { if (this.get$objectMap() != null && active) { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { // Verifie si dans l'entrÃ© existe dans le fichier sensitivity.properties Class classBean = (Class)boxed.getClientProperty("bean"); String method = (String)boxed.getClientProperty("method"); + + // test if factor is enabled boolean isSensitivityFactorEnabled = false; if (classBean != null) { - String sensitivityFactorName = classBean.getSimpleName().replace("Impl", "") + "." + method; + // classBean is defined in property file without "Impl" + String className = classBean.getSimpleName().replace("Impl", ""); + + // ensure that method name is uncapitalized + method = StringUtils.uncapitalize(method); + + String sensitivityFactorName = className + "." + method; isSensitivityFactorEnabled = SensitivityUtils.isSensitivityFactorEnabled(sensitivityFactorName); } + + // install correct layer depending if factor enable if (isSensitivityFactorEnabled) { jaxx.runtime.swing.BlockingLayerUI2 ui = layerUI2.clone(); SwingUtil.getLayer(boxed).setUI(ui); @@ -148,6 +155,10 @@ * @param e l'event initial interseptÃ© par le layer */ protected void accept(ActionEvent e) { + if (log.isDebugEnabled()) { + log.debug("Event intercepted on " + e); + } + JComponent source = (JComponent) e.getSource(); Class classBean = (Class)source.getClientProperty("bean"); String beanID = (String)source.getClientProperty("beanID"); @@ -178,7 +189,7 @@ for (ChangeListener changeListener : tabbedPane.getChangeListeners()) { tabbedPane.removeChangeListener(changeListener); } - + if (tabbedPaneChangeListener == null) { if (isSensitivity()) { tabbedPaneChangeListener = new SensitivityTabbedPaneListener(); @@ -186,7 +197,7 @@ tabbedPaneChangeListener = new InputTabbedPaneListener(); } } - + tabbedPane.addChangeListener(tabbedPaneChangeListener); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -35,7 +35,6 @@ import jaxx.runtime.JAXXInitialContext; import jaxx.runtime.swing.editor.NumberEditor; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; @@ -784,7 +783,7 @@ } String topiaId = path.substring(0, path.lastIndexOf('#')); - String property = StringUtils.capitalize(path.substring(path.lastIndexOf('#') + 1)); + String property = path.substring(path.lastIndexOf('#') + 1); Class<?> typeClazz = null; try { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -109,7 +109,6 @@ if (log.isDebugEnabled()) { log.debug("Component found is " + component2); } - wizard.initExisting(component2, selectedFactor); wizard.pack(); wizard.setVisible(true); Modified: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,45 +1,44 @@ # this file contains authorized entities factors creation -EffortDescription.CrewFoodCost -EffortDescription.CrewShareRate -EffortDescription.CrewSize -EffortDescription.FishingOperation -EffortDescription.FishingOperationDuration -EffortDescription.FixedCrewSalary -EffortDescription.GearsNumberPerOperation -EffortDescription.LandingCosts -EffortDescription.OtherRunningCost -EffortDescription.RepairAndMaintenanceGearCost -EffortDescription.UnitCostOfFishing -Gear.PossibleValue -Gear.StandardisationFactor -Metier.GearParameterValue -Population.Capturability -PopulationGroup.ReproductionRate -Population.Growth -Population.GrowthReverse -Population.MeanWeight -Population.MonthGapBetweenReproRecrutement -Population.NaturalDeathRate -Population.Price -Population.RecruitmentDistribution -Population.ReproductionEquation -PopulationSeasonInfo.LengthChangeMatrix -PopulationSeasonInfo.MigrationEquation -PopulationSeasonInfo.EmigrationEquation -PopulationSeasonInfo.ImmigrationEquation -SetOfVessels.FixedCosts -SetOfVessels.NumberOfVessels -SetOfVessels.TechnicalEfficiencyEquation -Strategy.InactivityEquation -StrategyMonthInfo.MinInactivityDays -StrategyMonthInfo.ProportionMetier -Strategy.ProportionSetOfVessels -TripType.MinTimeBetweenTrip -TripType.TripDuration -VesselType.ActivityRange -VesselType.Length -VesselType.MaxTripDuration -VesselType.MinCrewSize -VesselType.Speed -VesselType.TripType -VesselType.UnitFuelCostOfTravel \ No newline at end of file +EffortDescription.crewFoodCost +EffortDescription.crewShareRate +EffortDescription.crewSize +EffortDescription.fishingOperation +EffortDescription.fishingOperationDuration +EffortDescription.fixedCrewSalary +EffortDescription.gearsNumberPerOperation +EffortDescription.landingCosts +EffortDescription.otherRunningCost +EffortDescription.repairAndMaintenanceGearCost +EffortDescription.unitCostOfFishing +Gear.possibleValue +Gear.standardisationFactor +Metier.gearParameterValue +Population.capturability +PopulationGroup.reproductionRate +Population.growth +Population.growthReverse +Population.meanWeight +Population.monthGapBetweenReproRecrutement +Population.naturalDeathRate +Population.price +Population.recruitmentDistribution +Population.reproductionEquation +PopulationSeasonInfo.lengthChangeMatrix +PopulationSeasonInfo.migrationEquation +PopulationSeasonInfo.emigrationEquation +PopulationSeasonInfo.immigrationEquation +SetOfVessels.fixedCosts +SetOfVessels.numberOfVessels +SetOfVessels.technicalEfficiencyEquation +Strategy.inactivityEquation +StrategyMonthInfo.minInactivityDays +StrategyMonthInfo.proportionMetier +Strategy.proportionSetOfVessels +TripType.minTimeBetweenTrip +TripType.tripDuration +VesselType.activityRange +VesselType.length +VesselType.maxTripDuration +VesselType.minCrewSize +VesselType.speed +VesselType.unitFuelCostOfTravel \ No newline at end of file Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009-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 @@ -101,14 +101,14 @@ */ @Test public void testAllEntityPresence() throws TopiaException, StorageException, IOException { - // get region to export + // get region to export RegionStorage regionStorage = RegionStorage.getRegion("Golfe de Gascogne"); TopiaContext context = regionStorage.getStorage().beginTransaction(); FisheryRegion fisheryRegion = RegionStorage.getFisheryRegion(context); // export implementation File file = File.createTempFile("xmlexport-", ".xml"); - file.deleteOnExit(); + //file.deleteOnExit(); RegionExportFactorXML xmlFactorExport = new RegionExportFactorXML(file); // explore region (export as xml)

1 0

r2876 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 10:15:51 +0000 (Wed, 06 Jan 2010) New Revision: 2876 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx Log: Do not disable all selectivity UI (some parameters will be factor enable) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2010-01-05 09:58:21 UTC (rev 2875) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2010-01-06 10:15:51 UTC (rev 2876) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -139,10 +139,11 @@ <Table> <row> <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.selectivity.selectPopulation" enabled='{isActif()}'/> + <JLabel text="isisfish.selectivity.selectPopulation" enabled='{isActif()}' decorator='boxed' /> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldSelectivityPopulation" onActionPerformed='selectivityChanged()' enabled='{isActif()}'/> + <JComboBox id="fieldSelectivityPopulation" onActionPerformed='selectivityChanged()' enabled='{isActif()}' + decorator='boxed' /> </cell> </row> <row> @@ -150,7 +151,8 @@ <InputOneEquationUI id='selectivityEquation' constructorParams='this' lblText='{_("isisfish.selectivity.equation")}' bean='{getBean()}' nameEquation='Selectivity' actif='{isSelectivityPopulationSelected()}' - clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}'/> + clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}' + decorator='boxed' /> </cell> </row> </Table> @@ -161,19 +163,21 @@ <Table> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="addSelectivityButton" text="isisfish.common.add" onActionPerformed='addSelectivity()' enabled='{isSelectivityPopulationSelected()}'/> + <JButton id="addSelectivityButton" text="isisfish.common.add" onActionPerformed='addSelectivity()' + enabled='{isSelectivityPopulationSelected()}' decorator='boxed' /> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTable id="selectivityTable" rowHeight='24' enabled='{isActif()}'/> + <JTable id="selectivityTable" rowHeight='24' enabled='{isActif()}' decorator='boxed' /> </JScrollPane> </cell> </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="removeSelectivityButton" text="isisfish.common.remove" onActionPerformed='removeSelectivity()' enabled='false'/> + <JButton id="removeSelectivityButton" text="isisfish.common.remove" onActionPerformed='removeSelectivity()' + enabled='false' decorator='boxed' /> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2010-01-05 09:58:21 UTC (rev 2875) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2010-01-06 10:15:51 UTC (rev 2876) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -51,7 +51,7 @@ <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <SelectivityEditorUI id='editor' constructorParams='this' bean='{getBean()}' - decorator='boxed' _bean='{GearImpl.class}' _method='"PopulationSelectivity"'/> + _bean='{GearImpl.class}' _method='"PopulationSelectivity"'/> </cell> </row> </Table>

1 0

r2875 - in isis-fish/trunk: . src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org Jan. 5, 2010

Jan. 5, 2010

Author: chatellier Date: 2010-01-05 09:58:21 +0000 (Tue, 05 Jan 2010) New Revision: 2875 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/CellImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/GearImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PortImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml Log: Use new deployed beta3 snapshot (eugene/topia). Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/pom.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -432,8 +432,8 @@ <properties>  <jaxx.version>1.7.1</jaxx.version> - <eugene.version>2.0.0-beta-2-SNAPSHOT</eugene.version> - <topia.version>2.3.0-beta-2-SNAPSHOT</topia.version> + <eugene.version>2.0.0-beta-3-SNAPSHOT</eugene.version> + <topia.version>2.3.0-beta-3-SNAPSHOT</topia.version> <nuiton-utils.version>1.1.2</nuiton-utils.version> <nuiton-i18n.version>1.0.1</nuiton-i18n.version> <nuiton-widgets.version>1.0.1-SNAPSHOT</nuiton-widgets.version> @@ -534,17 +534,16 @@ <id>eugene-generation</id> <phase>generate-sources</phase> <configuration> + <inputs>zargo</inputs> <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> - <extractedPackages>fr.ifremer.isisfish</extractedPackages> - <includes>**/*.objectmodel</includes> - <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> - <reader>org.nuiton.eugene.ObjectModelReader</reader> <defaultPackage>fr.ifremer.isisfish</defaultPackage> + <extractedPackages>fr.ifremer.isisfish</extractedPackages> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer + </templates> </configuration> <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> + <goal>smart-generate</goal> </goals> </execution> </executions> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.ActiveRuleImpl" table="activeRule" node="fr.ifremer.isisfish.entities.ActiveRuleImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="activeRuleDate" type="fr.ifremer.isisfish.types.hibernate.DateType" access="field" column="activeRuleDate" node="activeRuleDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="param" type="text" access="field" column="param" node="param"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/CellImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/CellImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/CellImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.CellImpl" table="cell" node="fr.ifremer.isisfish.entities.CellImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="latitude" type="float" access="field" column="latitude" node="latitude"/> <property name="longitude" type="float" access="field" column="longitude" node="longitude"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.EffortDescriptionImpl" table="effortDescription" node="fr.ifremer.isisfish.entities.EffortDescriptionImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="fishingOperation" type="int" access="field" column="fishingOperation" node="fishingOperation"/> <property name="fishingOperationDuration" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="fishingOperationDuration" node="fishingOperationDuration"/> <property name="gearsNumberPerOperation" type="int" access="field" column="gearsNumberPerOperation" node="gearsNumberPerOperation"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.EquationImpl" table="equation" node="fr.ifremer.isisfish.entities.EquationImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="content" type="text" access="field" column="content" node="content"/> <property name="category" type="text" access="field" column="category" node="category"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.FisheryRegionImpl" table="fisheryRegion" node="fr.ifremer.isisfish.entities.FisheryRegionImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="minLongitude" type="float" access="field" column="minLongitude" node="minLongitude"/> <property name="maxLongitude" type="float" access="field" column="maxLongitude" node="maxLongitude"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/GearImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/GearImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/GearImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.GearImpl" table="gear" node="fr.ifremer.isisfish.entities.GearImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="effortUnit" type="text" access="field" column="effortUnit" node="effortUnit"/> <property name="standardisationFactor" type="double" access="field" column="standardisationFactor" node="standardisationFactor"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.MetierImpl" table="metier" node="fr.ifremer.isisfish.entities.MetierImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="gearParameterValue" type="text" access="field" column="gearParameterValue" node="gearParameterValue"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.PopulationGroupImpl" table="populationGroup" node="fr.ifremer.isisfish.entities.PopulationGroupImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="id" type="int" access="field" column="id" node="id"/> <property name="reproductionRate" type="double" access="field" column="reproductionRate" node="reproductionRate"/> <property name="age" type="double" access="field" column="age" node="age"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.PopulationImpl" table="population" node="fr.ifremer.isisfish.entities.PopulationImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="geographicId" type="text" access="field" column="geographicId" node="geographicId"/> <property name="plusGroup" type="boolean" access="field" column="plusGroup" node="plusGroup"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PortImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PortImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PortImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.PortImpl" table="port" node="fr.ifremer.isisfish.entities.PortImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> <many-to-one name="cell" class="fr.ifremer.isisfish.entities.CellImpl" column="cell" node="cell/@topiaId" embed-xml="false"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.ResultImpl" table="result" node="fr.ifremer.isisfish.entities.ResultImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="resultDate" type="fr.ifremer.isisfish.types.hibernate.DateType" access="field" column="resultDate" node="resultDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="matrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.SeasonImpl" table="season" node="fr.ifremer.isisfish.entities.SeasonImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="firstMonth" type="fr.ifremer.isisfish.types.hibernate.MonthType" access="field" column="firstMonth" node="firstMonth"/> <property name="lastMonth" type="fr.ifremer.isisfish.types.hibernate.MonthType" access="field" column="lastMonth" node="lastMonth"/> </class> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.SelectivityImpl" table="selectivity" node="fr.ifremer.isisfish.entities.SelectivityImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <many-to-one name="equation" class="fr.ifremer.isisfish.entities.EquationImpl" column="equation" cascade="delete" node="equation/@topiaId" embed-xml="false"/> <many-to-one name="gear" class="fr.ifremer.isisfish.entities.GearImpl" column="gear" node="gear/@topiaId" embed-xml="false" /> <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false" /> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.SetOfVesselsImpl" table="setOfVessels" node="fr.ifremer.isisfish.entities.SetOfVesselsImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="numberOfVessels" type="int" access="field" column="numberOfVessels" node="numberOfVessels"/> <property name="fixedCosts" type="double" access="field" column="fixedCosts" node="fixedCosts"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.SpeciesImpl" table="species" node="fr.ifremer.isisfish.entities.SpeciesImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="scientificName" type="text" access="field" column="scientificName" node="scientificName"/> <property name="codeRubbin" type="text" access="field" column="codeRubbin" node="codeRubbin"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.StrategyImpl" table="strategy" node="fr.ifremer.isisfish.entities.StrategyImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="proportionSetOfVessels" type="double" access="field" column="proportionSetOfVessels" node="proportionSetOfVessels"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" table="strategyMonthInfo" node="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="month" type="fr.ifremer.isisfish.types.hibernate.MonthType" access="field" column="month" node="month"/> <property name="minInactivityDays" type="double" access="field" column="minInactivityDays" node="minInactivityDays"/> <property name="numberOfTrips" type="double" access="field" column="numberOfTrips" node="numberOfTrips"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.TargetSpeciesImpl" table="targetSpecies" node="fr.ifremer.isisfish.entities.TargetSpeciesImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <many-to-one name="targetFactorEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="targetFactorEquation" cascade="delete" node="targetFactorEquation/@topiaId" embed-xml="false"/> <property name="primaryCatch" type="boolean" access="field" column="primaryCatch" node="primaryCatch"/> <many-to-one name="species" class="fr.ifremer.isisfish.entities.SpeciesImpl" column="species" node="species/@topiaId" embed-xml="false" /> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.TripTypeImpl" table="tripType" node="fr.ifremer.isisfish.entities.TripTypeImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="tripDuration" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="tripDuration" node="tripDuration"/> <property name="minTimeBetweenTrip" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="minTimeBetweenTrip" node="minTimeBetweenTrip"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.VesselTypeImpl" table="vesselType" node="fr.ifremer.isisfish.entities.VesselTypeImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="length" type="int" access="field" column="length" node="length"/> <property name="speed" type="double" access="field" column="speed" node="speed"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml 2010-01-05 08:46:33 UTC (rev 2874) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml 2010-01-05 09:58:21 UTC (rev 2875) @@ -4,7 +4,7 @@ <class name="fr.ifremer.isisfish.entities.ZoneImpl" table="zone" node="fr.ifremer.isisfish.entities.ZoneImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> <bag name="cell" table="cell_zone" lazy="true" node="cell" embed-xml="true">

1 0

r2874 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Jan. 5, 2010

Jan. 5, 2010

Author: chatellier Date: 2010-01-05 08:46:33 +0000 (Tue, 05 Jan 2010) New Revision: 2874 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Regenerated (upper case) Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-05 08:46:08 UTC (rev 2873) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-05 08:46:33 UTC (rev 2874) @@ -162,7 +162,7 @@ isisfish.config.main.localSimulator.description=Nom du simulateur local (processus courant) isisfish.config.main.locale.description=la locale utilisateur isisfish.config.main.monitoringDirectory.description=Dossier contenant les informations permettant de relancer les simulations -isisfish.config.main.performcron.description=D\u00e9marre toutes les t\u00e2ches d\u00e9finies dans le service cron +isisfish.config.main.performcron.description=D\u00E9marre toutes les t\u00E2ches d\u00E9finies dans le service cron isisfish.config.main.performmigration.description=Migre les donn\u00E9es isisfish.config.main.performvcsupdate.description=Met \u00E0 jour le d\u00E9p\u00F4t VCS isisfish.config.main.remoteCaparmor.description=Nom du lanceur de simulation distante

1 0

r2873 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Jan. 5, 2010

Jan. 5, 2010

Author: chatellier Date: 2010-01-05 08:46:08 +0000 (Tue, 05 Jan 2010) New Revision: 2873 Modified: isis-fish/trunk/pom.xml Log: Switch on topia snapshot. Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-01-04 16:12:06 UTC (rev 2872) +++ isis-fish/trunk/pom.xml 2010-01-05 08:46:08 UTC (rev 2873) @@ -133,6 +133,18 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.10</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.10</version> + </dependency> + + <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version> @@ -420,8 +432,8 @@ <properties>  <jaxx.version>1.7.1</jaxx.version> - <eugene.version>2.0.0-beta-1</eugene.version> - <topia.version>2.3.0-beta-1</topia.version> + <eugene.version>2.0.0-beta-2-SNAPSHOT</eugene.version> + <topia.version>2.3.0-beta-2-SNAPSHOT</topia.version> <nuiton-utils.version>1.1.2</nuiton-utils.version> <nuiton-i18n.version>1.0.1</nuiton-i18n.version> <nuiton-widgets.version>1.0.1-SNAPSHOT</nuiton-widgets.version>

1 0

r2872 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org Jan. 4, 2010

Jan. 4, 2010

Author: chatellier Date: 2010-01-04 16:12:06 +0000 (Mon, 04 Jan 2010) New Revision: 2872 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: Remove unused attribute Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 16:11:20 UTC (rev 2871) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 16:12:06 UTC (rev 2872) @@ -99,7 +99,7 @@ static private Log log = LogFactory.getLog(IsisFish.class); static public IsisConfig config = null; - static public int step = 0; // action step + static public VCS vcs = null; /**

1 0

r2871 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org Jan. 4, 2010

Jan. 4, 2010

Author: chatellier Date: 2010-01-04 16:11:20 +0000 (Mon, 04 Jan 2010) New Revision: 2871 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: Remove unused attribute Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 16:07:28 UTC (rev 2870) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 16:11:20 UTC (rev 2871) @@ -98,8 +98,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(IsisFish.class); - static final public String LAST_RELEASE_LAUNCH = "lastReleaseLaunched"; - static public IsisConfig config = null; static public int step = 0; // action step static public VCS vcs = null;

1 0

r2870 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish resources/i18n resources/templates/ssh
by chatellier＠users.labs.libre-entreprise.org Jan. 4, 2010

Jan. 4, 2010

Author: chatellier Date: 2010-01-04 16:07:28 +0000 (Mon, 04 Jan 2010) New Revision: 2870 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl Log: Add option to disable cron launching. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-01-04 15:56:16 UTC (rev 2869) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-01-04 16:07:28 UTC (rev 2870) @@ -564,7 +564,7 @@ boolean result = getOptionAsBoolean(Option.LAUNCH_UI.key); return result; } - + /** * Get perform migration option value. * @@ -574,7 +574,7 @@ boolean result = getOptionAsBoolean(Option.PERFORM_MIGRATION.key); return result; } - + /** * Get perform vcs update option value. * @@ -585,6 +585,16 @@ return result; } + /** + * Get perform cron option value. + * + * @return perform cron option value + */ + public boolean isPerformCron() { + boolean result = getOptionAsBoolean(Option.PERFORM_CRON.key); + return result; + } + public void setSimulatorLauncher(String value) { setOption(Option.SIMULATOR_LAUNCHER.key, value); } @@ -931,6 +941,8 @@ PERFORM_MIGRATION("perform.migration", _("isisfish.config.main.performmigration.description"), "true"), /** Perform vcs update option. */ PERFORM_VCS_UPDATE("perform.vcsupdate", _("isisfish.config.main.performvcsupdate.description"), "true"), + /** Perform cron option. */ + PERFORM_CRON("perform.cron", _("isisfish.config.main.performcron.description"), "true"), /** Database directory. */ DATABASE_DIRECTORY("database.directory", _("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 15:56:16 UTC (rev 2869) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 16:07:28 UTC (rev 2870) @@ -151,9 +151,7 @@ // action after ui launched config.doAction(IsisConfig.STEP_AFTER_UI); - // start cron service - CronService cronService = new CronService(); - cronService.start(); + startCronService(); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Global IsisFish exception", e); @@ -179,6 +177,17 @@ } /** + * Start cron service (if enabled). + */ + protected static void startCronService() { + if (config.isPerformCron()) { + // start cron service + CronService cronService = new CronService(); + cronService.start(); + } + } + + /** * Move user script to nuiton dependants packages. * * Find all files containing "org.codelutin." into "org.nuiton." Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-01-04 15:56:16 UTC (rev 2869) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-01-04 16:07:28 UTC (rev 2870) @@ -162,6 +162,7 @@ isisfish.config.main.localSimulator.description=Local simulator launcher name (same process) isisfish.config.main.locale.description=user locale isisfish.config.main.monitoringDirectory.description=Folder containing all necessary information needed to restart simulation +isisfish.config.main.performcron.description=Perform all task registered in cron service isisfish.config.main.performmigration.description=Perform data migration isisfish.config.main.performvcsupdate.description=Perform vcs update isisfish.config.main.remoteCaparmor.description=Remote simulator launcher name Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-04 15:56:16 UTC (rev 2869) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-04 16:07:28 UTC (rev 2870) @@ -162,6 +162,7 @@ isisfish.config.main.localSimulator.description=Nom du simulateur local (processus courant) isisfish.config.main.locale.description=la locale utilisateur isisfish.config.main.monitoringDirectory.description=Dossier contenant les informations permettant de relancer les simulations +isisfish.config.main.performcron.description=D\u00e9marre toutes les t\u00e2ches d\u00e9finies dans le service cron isisfish.config.main.performmigration.description=Migre les donn\u00E9es isisfish.config.main.performvcsupdate.description=Met \u00E0 jour le d\u00E9p\u00F4t VCS isisfish.config.main.remoteCaparmor.description=Nom du lanceur de simulation distante Modified: isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-01-04 15:56:16 UTC (rev 2869) +++ isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-01-04 16:07:28 UTC (rev 2870) @@ -5,7 +5,7 @@ #source /usr/share/modules/init/csh #module load java/1.6.0 -<#assign commonCommand="/home3/caparmor/poussin/jdk/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false --option perform.vcsupdate false --option perform.migration false" /> +<#assign commonCommand="/home3/caparmor/poussin/jdk/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false --option perform.vcsupdate false --option perform.migration false --option perform.cron false" /> <#if qsubmutiplejob> <#-- localsimulationid is short simulation id version --> <#assign localsimulationid='${simulationid}_$PBS_ARRAY_INDEX' />

1 0

r2869 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain
by chatellier＠users.labs.libre-entreprise.org Jan. 4, 2010

Jan. 4, 2010

Author: chatellier Date: 2010-01-04 15:56:16 +0000 (Mon, 04 Jan 2010) New Revision: 2869 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java Log: Fail to compile now ??? Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2010-01-04 15:49:25 UTC (rev 2868) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2010-01-04 15:56:16 UTC (rev 2869) @@ -131,13 +131,6 @@ } /** - * In continuous domain, just return identifier. - */ - public MatrixND getValueForIdentifier(final Serializable identifier) { - return getValueForIdentifier((Double) identifier); - } - - /** * {@inheritDoc}. * * In continuous domain, just return identifier

1 0

r2868 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: . cron
by chatellier＠users.labs.libre-entreprise.org Jan. 4, 2010

Jan. 4, 2010

Author: chatellier Date: 2010-01-04 15:49:25 +0000 (Mon, 04 Jan 2010) New Revision: 2868 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/package-info.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: Define a cron service. One task implemented : remove old files. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 14:22:06 UTC (rev 2867) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 15:49:25 UTC (rev 2868) @@ -51,6 +51,7 @@ import org.nuiton.util.Version; import org.nuiton.widget.SwingUtil; +import fr.ifremer.isisfish.cron.CronService; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.FormuleStorage; @@ -149,6 +150,10 @@ // action after ui launched config.doAction(IsisConfig.STEP_AFTER_UI); + + // start cron service + CronService cronService = new CronService(); + cronService.start(); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Global IsisFish exception", e); Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java 2010-01-04 15:49:25 UTC (rev 2868) @@ -0,0 +1,99 @@ +/* *##% + * Copyright (C) 2010 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. + * + * 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. + *##%*/ + +package fr.ifremer.isisfish.cron; + +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Main cron service job. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class CronService extends Thread { + + /** Class logger. */ + private static Log log = LogFactory.getLog(CronService.class); + + /** Registered services. */ + protected Collection<Runnable> services; + + /** + * Init cron service with default available services. + */ + public CronService() { + services = new LinkedList<Runnable>(); + registerDefaultServices(); + } + + /** + * Register default services (always executed if service is launched). + */ + private void registerDefaultServices() { + addService(new RemoveOldFileTask()); + } + + /** + * Add a new task for execution. + * + * @param task task to add + */ + protected void addService(Runnable task) { + services.add(task); + } + + /** + * Run all registered services once and stop. + * + * This behavior may change later to run as a real cron service. + */ + public void run() { + + if (log.isInfoEnabled()) { + log.info("Starting " + services.size() + " registered services"); + } + + Iterator<Runnable> itOnTasks = services.iterator(); + + while (itOnTasks.hasNext()) { + Runnable task = itOnTasks.next(); + Thread taskThread = new Thread(task); + try { + taskThread.start(); + taskThread.join(); // run sequential + } + catch (Exception ex) { + if (log.isDebugEnabled()) { + log.debug("Task " + task.getClass().getSimpleName() + " failed to run", ex); + } + } + } + + // free memory + services.clear(); + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java 2010-01-04 15:49:25 UTC (rev 2868) @@ -0,0 +1,83 @@ +/* *##% + * Copyright (C) 2010 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. + * + * 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. + *##%*/ + +package fr.ifremer.isisfish.cron; + +import java.io.File; + +import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import fr.ifremer.isisfish.IsisFish; + +/** + * This cron task is used to remove old isis files. + * + * Currently remove : + * <ul> + * <li>monitored simulations files older than 1 year</li> + * </ul> + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class RemoveOldFileTask implements Runnable { + + /** Class logger. */ + private static Log log = LogFactory.getLog(RemoveOldFileTask.class); + + /* + * @see java.lang.Runnable#run() + */ + @Override + public void run() { + if (log.isDebugEnabled()) { + log.debug("Remove old simulation files task called"); + } + removeMonitoredSimulations(); + } + + /** + * Remove old *.zip files located in monitoring directory. + */ + protected void removeMonitoredSimulations() { + if (log.isDebugEnabled()) { + log.debug("Removing old monitored simulations files"); + } + + File directory = IsisFish.config.getMonitoringDirectory(); + File[] files = directory.listFiles(); + + // supprime les fichier au premier niveau (pour le moment) + // qui sont plus vieux qu'un an + for (File file : files) { + if (file.isFile()) { + if (file.lastModified() + DateUtils.MILLIS_PER_DAY * 365 < System.currentTimeMillis()) { + if (log.isDebugEnabled()) { + log.debug("Removing file " + file); + } + file.delete(); + } + } + } + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/package-info.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/package-info.java 2010-01-04 15:49:25 UTC (rev 2868) @@ -0,0 +1,5 @@ +/** + * Cron service and scripts. + */ +package fr.ifremer.isisfish.cron; + Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/package-info.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2867 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Jan. 4, 2010

Jan. 4, 2010

Author: chatellier Date: 2010-01-04 14:22:06 +0000 (Mon, 04 Jan 2010) New Revision: 2867 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Store only one zip for simulation with common zip file. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-01-04 14:01:31 UTC (rev 2866) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-01-04 14:22:06 UTC (rev 2867) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -285,6 +285,9 @@ String simulationId = job.getId(); SimulationItem simulationItem = job.getItem(); File simulationMonitoringFolder = new File(monitorFolder, simulationId); + if (!simulationMonitoringFolder.exists()) { + simulationMonitoringFolder.mkdirs(); + } File simulationPropertiesFile = new File(simulationMonitoringFolder, PROPERTIES_FILE); if (!simulationPropertiesFile.exists()) { @@ -301,17 +304,34 @@ // zip File zipFile = simulationItem.getSimulationZip(); + try { // original zip must be keeped outside monitoring folder - FileUtils.copyFileToDirectory(zipFile, simulationMonitoringFolder); - simulationProperties.setProperty(PROPERTY_ZIP, zipFile.getName()); + + // for standalone, set it in parent directory + if (simulationItem.isStandaloneSimulationZip()) { + FileUtils.copyFileToDirectory(zipFile, simulationMonitoringFolder); + simulationProperties.setProperty(PROPERTY_ZIP, zipFile.getName()); + } + else { + String shortSimulationId = simulationId.substring(0, simulationId.lastIndexOf('_')); + // zip common to multiples simulations + // saved in monitoring folder at root + File savedZipFile = new File(simulationMonitoringFolder.getParent(), shortSimulationId + ".zip"); + // the first simulation is in charge to save the common zip file + if (simulationItem.getSimulationNumber() == 0) { + FileUtils.copyFile(zipFile, savedZipFile); + } + simulationProperties.setProperty(PROPERTY_ZIP, ".." + File.separator + savedZipFile.getName()); + } + } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can't copy simulation zip", e); } } - // addtionnal infos + // additionnal infos simulationProperties.setProperty(PROPERTY_STANDALONE, String.valueOf(simulationItem.isStandaloneSimulation())); simulationProperties.setProperty(PROPERTY_LASTSIMULATION, String.valueOf(simulationItem.isLastSimulation()));

1 0