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

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