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

r2559 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui src/main/java/fr/ifremer/isisfish/ui/input src/main/java/fr/ifremer/isisfish/ui/script
by chatellier＠users.labs.libre-entreprise.org Aug. 31, 2009

Aug. 31, 2009

Author: chatellier Date: 2009-08-31 08:52:33 +0000 (Mon, 31 Aug 2009) New Revision: 2559 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx Log: Reajout de la progression de la status bar pour les op?\195?\169rations longues. (pour l'instant elle a l'air bloqu?\195?\169e par l'ui...) Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-08-28 08:01:15 UTC (rev 2558) +++ isis-fish/trunk/changelog.txt 2009-08-31 08:52:33 UTC (rev 2559) @@ -1,5 +1,6 @@ isis-fish (3.2.0.5) stable; urgency=low + * Restore running status progress bar indeterminate state -- Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2009-08-28 08:01:15 UTC (rev 2558) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2009-08-31 08:52:33 UTC (rev 2559) @@ -18,18 +18,42 @@ *##%*/ --> <Table> + <script><![CDATA[ + + /** + * Change status message and stop progress bar if running. + * + * @param message new message + */ + public void setStatusMessage(String message) { + setStatusMessage(message, false); + } + + /** + * Change status message and progress bar state. + * + * @param message new message + */ + public void setStatusMessage(String message, boolean state) { + // use a basic mode, swap indeterminate state + // can't known real progression here + progressStatus.setIndeterminate(state); + labelStatus.setText(message); + } + + ]]></script> <row> - <cell fill="both" weightx="0.2"> + <cell fill="both" weightx="1"> <JProgressBar id="progressStatus" /> </cell> - <cell fill="both" weightx="0.2"> + <cell fill="both" weightx="5"> <JLabel id="labelStatus" /> </cell> - <cell fill="both" weightx="0.2"> +  + <cell fill="both"> <org.codelutin.widget.StatusBar /> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2009-08-28 08:01:15 UTC (rev 2558) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2009-08-31 08:52:33 UTC (rev 2559) @@ -20,27 +20,52 @@ <JPanel layout='{new BorderLayout()}'> <script> <![CDATA[ - import fr.ifremer.isisfish.IsisFish; - public void setContent(Container c){ + public void setContent(Container c) { this.add(c, BorderLayout.CENTER); } - public void setInfoText(String s){ - statusBar.getLabelStatus().setText(s); + + /** + * @deprecated use setStatusMessage(String) instead + */ + public void setInfoText(String message) { + setStatusMessage(message); } + + /** + * Change status message and stop progress bar if running. + * + * @param message new message + */ + public void setStatusMessage(String message) { + statusBar.setStatusMessage(message); + } + + /** + * Change status message and progress bar state. + * + * @param message new message + * @param running progress bar state + */ + public void setStatusMessage(String message, boolean running) { + statusBar.setStatusMessage(message, running); + } + public void close(JFrame f) { - if (getVerifier().allIsSaved()){ + if (getVerifier().allIsSaved()) { exit(f); } } - protected void exit(JFrame f){ + + protected void exit(JFrame f) { f.dispose(); } - protected WelcomeSaveVerifier getVerifier(){ + + protected WelcomeSaveVerifier getVerifier() { return getContextValue(WelcomeSaveVerifier.class); } ]]> </script> - <JPanel layout='{new BorderLayout()}' constraints="BorderLayout.SOUTH"> - <StatusBarUI id='statusBar' constraints="BorderLayout.CENTER" /> - </JPanel> +  + <StatusBarUI id='statusBar' constraints="BorderLayout.SOUTH" /> +  </JPanel> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-08-28 08:01:15 UTC (rev 2558) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-08-31 08:52:33 UTC (rev 2559) @@ -75,12 +75,14 @@ if (log.isDebugEnabled()) { log.debug("Region change, selected : " + name); } - setInfoText(_("isisfish.message.loading.region", name)); + + // long operation, run status bar + setStatusMessage(_("isisfish.message.loading.region", name), true); SwingUtilities.invokeLater(new Runnable() { public void run() { loadRegion(name); getVerifier().setIsisContext(getContextValue(TopiaContext.class)); - setInfoText(_("isisfish.message.load.finished")); + setStatusMessage(_("isisfish.message.load.finished")); setTreeModel(); } }); @@ -142,22 +144,26 @@ navigation.setSelectionPath(pathToRoot); navigation.scrollPathToVisible(pathToRoot); } -protected void setInfoText(String s) { +protected void setStatusMessage(String s) { WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); - root.setInfoText(s); + root.setStatusMessage(s); } +protected void setStatusMessage(String s, boolean running) { + WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); + root.setStatusMessage(s, running); +} protected void regionChange() { getContextValue(RegionMonitor.class).changeRegion(); } protected void newRegion() { String name = fieldNewRegion.getText(); - setInfoText(_("isisfish.message.creating.region", name)); + setStatusMessage(_("isisfish.message.creating.region", name), true); getContextValue(InputAction.class).newRegion(name); regionChange(); fieldCurrentRegion.setSelectedItem(name); JButtonNewRegion.setEnabled(false); fieldNewRegion.setText(""); - setInfoText(_("isisfish.message.creation.finished")); + setStatusMessage(_("isisfish.message.creation.finished")); } protected void regionNull() { getCardlayoutPrincipal().show(inputPanePrincipal,"none"); @@ -168,45 +174,45 @@ JButtonNewRegion.setEnabled(true); } protected void importRegion() { - setInfoText(_("isisfish.message.import.zip")); + setStatusMessage(_("isisfish.message.import.zip"), true); getContextValue(InputAction.class).importRegion(); regionChange(); - setInfoText(_("isisfish.message.import.finished")); + setStatusMessage(_("isisfish.message.import.finished")); } protected void importRegionAndRename() { - setInfoText(_("isisfish.message.import.zip")); + setStatusMessage(_("isisfish.message.import.zip"), true); getContextValue(InputAction.class).importRegionAndRename(); regionChange(); - setInfoText(_("isisfish.message.import.finished")); + setStatusMessage(_("isisfish.message.import.finished")); } protected void importV2Region() { - setInfoText(_("isisfish.message.import.xml.v2.file") + getContextValue(InputAction.class).importV2Region()); + setStatusMessage(_("isisfish.message.import.xml.v2.file") + getContextValue(InputAction.class).importV2Region(), true); regionChange(); - setInfoText(_("isisfish.message.import.finished")); + setStatusMessage(_("isisfish.message.import.finished")); } protected void importRegionFromSimulation() { - setInfoText(_("isisfish.message.import", getContextValue(InputAction.class).importRegionFromSimulation())); + setStatusMessage(_("isisfish.message.import", getContextValue(InputAction.class).importRegionFromSimulation()), true); regionChange(); - setInfoText(_("isisfish.message.export.done")); + setStatusMessage(_("isisfish.message.export.done")); } protected void exportRegion() { - setInfoText(_("isisfish.message.export.zip", getContextValue(InputAction.class).exportRegion(getRegionStorage()))); - setInfoText(_("isisfish.message.export.done")); + setStatusMessage(_("isisfish.message.export.zip", getContextValue(InputAction.class).exportRegion(getRegionStorage())), true); + setStatusMessage(_("isisfish.message.export.done")); } protected void copyRegion() { - setInfoText(_("isisfish.message.copy.region", getContextValue(InputAction.class).copyRegion(getRegionStorage()))); + setStatusMessage(_("isisfish.message.copy.region", getContextValue(InputAction.class).copyRegion(getRegionStorage())), true); regionChange(); - setInfoText(_("isisfish.message.copy.finished")); + setStatusMessage(_("isisfish.message.copy.finished")); } protected void removeRegion() { - setInfoText(_("isisfish.message.removing.region", getRegionStorage().getName())); - setInfoText(getContextValue(InputAction.class).removeRegion(getRegionStorage(), false)); + setStatusMessage(_("isisfish.message.removing.region", getRegionStorage().getName()), true); + setStatusMessage(getContextValue(InputAction.class).removeRegion(getRegionStorage(), false)); regionChange(); regionNull(); } protected void commitRegionInCVS() { - setInfoText(_("isisfish.message.commiting.region", getRegionStorage().getName())); - setInfoText(getContextValue(InputAction.class).commitRegionInCVS(getRegionStorage())); + setStatusMessage(_("isisfish.message.commiting.region", getRegionStorage().getName()), true); + setStatusMessage(getContextValue(InputAction.class).commitRegionInCVS(getRegionStorage())); } ]]> </script> 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 2009-08-28 08:01:15 UTC (rev 2558) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-08-31 08:52:33 UTC (rev 2559) @@ -114,12 +114,12 @@ node.add(childNode); } } - protected void setEditor(File f){ + protected void setEditor(File f) { editor.open(f); editor.validate(); } - protected DefaultMutableTreeNode findNode(DefaultMutableTreeNode root, String value){ - DefaultMutableTreeNode result= null; + protected DefaultMutableTreeNode findNode(DefaultMutableTreeNode root, String value) { + DefaultMutableTreeNode result = null; for (Enumeration e = root.children(); e.hasMoreElements();){ DefaultMutableTreeNode node = (DefaultMutableTreeNode)e.nextElement(); GenericCell g = (GenericCell)node.getUserObject(); @@ -153,10 +153,14 @@ buttonScriptEval.setEnabled(isJavaScript); miEvaluate.setEnabled(isJavaScript); } - protected void setInfoText(String msg) { + protected void setStatusMessage(String msg) { WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); - root.setInfoText(msg); + root.setStatusMessage(msg); } + protected void setStatusMessage(String msg, boolean running) { + WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); + root.setStatusMessage(msg, running); + } /* * JButton and JMenu Action */ @@ -184,7 +188,7 @@ if (fileName != null){ getContextValue(ScriptAction.class).newScript(equationModelTypePath + fileName, scriptType); setTreeModel(); - setInfoText(_("isisfish.message.creation.done", fileName)); + setStatusMessage(_("isisfish.message.creation.done", fileName)); DefaultMutableTreeNode element = null; element = findNode((DefaultMutableTreeNode) tree.getModel().getRoot(), scriptType); if (!equationModelTypePath.equals("")){ @@ -202,11 +206,11 @@ } protected void saveScript(){ getContextValue(ScriptAction.class).saveScript(editor.getText()); - setInfoText(_("isisfish.message.save.finished")); + setStatusMessage(_("isisfish.message.save.finished")); } protected void importScript() { String importMessage = getContextValue(ScriptAction.class).showImportScriptDialog(); - setInfoText(importMessage); + setStatusMessage(importMessage); } protected void exportScript() { TreePath[] selectedFilesPath = tree.getSelectionPaths(); @@ -215,12 +219,12 @@ protected void commitScript(){ new IsisFishRuntimeException("Not yet implemented"); getContextValue(ScriptAction.class).commitScript(editor.getText()); - setInfoText(_("isisfish.message.commit.finished")); + setStatusMessage(_("isisfish.message.commit.finished")); } protected void updateScript(){ new IsisFishRuntimeException("Not yet implemented"); getContextValue(ScriptAction.class).updateScript(); - setInfoText(_("isisfish.message.update.finished")); + setStatusMessage(_("isisfish.message.update.finished")); } protected void cut(){ } @@ -243,12 +247,12 @@ actionLogArea.setBackground(new Color(255, 210, 210)); } - setInfoText(_("isisfish.message.check.finished")); + setStatusMessage(_("isisfish.message.check.finished")); } protected void evaluateScript(){ actionLogArea.setText(getContextValue(ScriptAction.class).evaluateScript(editor.getText())); actionLogArea.setBackground(null); - setInfoText(_("isisfish.message.evaluation.finished")); + setStatusMessage(_("isisfish.message.evaluation.finished")); } protected void deleteScript(boolean deleteRemote) { // reste in UI even if deleted @@ -256,7 +260,7 @@ int resp = JOptionPane.showConfirmDialog(this,_("isisfish.message.confirm.remove.script", getContextValue(ScriptAction.class).getCode().getName()), null, JOptionPane.YES_NO_OPTION); - setInfoText(getContextValue(ScriptAction.class).deleteScript(resp, deleteRemote)); + setStatusMessage(getContextValue(ScriptAction.class).deleteScript(resp, deleteRemote)); setTreeModel(); } @@ -265,14 +269,14 @@ */ protected void diffScript(){ String diffMessage = getContextValue(ScriptAction.class).diffScript(editor.getText()); - setInfoText(diffMessage); + setStatusMessage(diffMessage); } /** * Generate javadoc and disply output in UI. */ protected void generateScriptJavadoc() { - setInfoText(_("isisfish.script.menu.javadocgenerating", fr.ifremer.isisfish.IsisFish.config.getJavadocDirectory())); + setStatusMessage(_("isisfish.script.menu.javadocgenerating", fr.ifremer.isisfish.IsisFish.config.getJavadocDirectory()), true); SwingUtilities.invokeLater(new Runnable() { public void run() { @@ -290,7 +294,7 @@ // rouge leger actionLogArea.setBackground(new Color(255, 210, 210)); } - setInfoText(_("isisfish.script.menu.javadocgenerated", fr.ifremer.isisfish.IsisFish.config.getJavadocDirectory())); + setStatusMessage(_("isisfish.script.menu.javadocgenerated", fr.ifremer.isisfish.IsisFish.config.getJavadocDirectory())); } }); }

1 0

r2558 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Aug. 28, 2009

Aug. 28, 2009

Author: chatellier Date: 2009-08-28 08:01:15 +0000 (Fri, 28 Aug 2009) New Revision: 2558 Modified: isis-fish/trunk/changelog.txt Log: Update changelog Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-08-27 16:24:57 UTC (rev 2557) +++ isis-fish/trunk/changelog.txt 2009-08-28 08:01:15 UTC (rev 2558) @@ -1,5 +1,16 @@ isis-fish (3.2.0.5) stable; urgency=low + + -- + +isis-fish (3.2.0.5-rc3) stable; urgency=low + + * Fix a beansutils conversion problem for MatrixND + + -- jeu. août 27 15:44:22 CEST 2009 + +isis-fish (3.2.0.5-rc2) stable; urgency=low + * Can copy openmap map to system clipboard * Don't extract database for sensitivity analysis (excepted first) * Add user script javadoc generation @@ -10,7 +21,7 @@ * Improve simulation summary * #1905 : nom des labels pour somme par année - -- + -- jeu. août 27 13:18:52 CEST 2009 isis-fish (3.2.0.5-rc1) stable; urgency=low

1 0

r2557 - isis-fish/trunk/src/main/xmi
by chatellier＠users.labs.libre-entreprise.org Aug. 27, 2009

Aug. 27, 2009

Author: chatellier Date: 2009-08-27 16:24:57 +0000 (Thu, 27 Aug 2009) New Revision: 2557 Modified: isis-fish/trunk/src/main/xmi/isis-fish.properties Log: Ajout du copyright dans les sources g?\195?\169n?\195?\169r?\195?\169es. Modified: isis-fish/trunk/src/main/xmi/isis-fish.properties =================================================================== --- isis-fish/trunk/src/main/xmi/isis-fish.properties 2009-08-27 16:05:07 UTC (rev 2556) +++ isis-fish/trunk/src/main/xmi/isis-fish.properties 2009-08-27 16:24:57 UTC (rev 2557) @@ -1,3 +1,4 @@ +model.tagvalue.copyright=/* Copyright (C) 1999 - 2009 Ifremer - Code Lutin */ model.tagvalue.org.codelutin.math.matrix.MatrixND=fr.ifremer.isisfish.types.hibernate.MatrixType(name,dim,dimNames,semantics,data) model.tagvalue.fr.ifremer.isisfish.types.Month=fr.ifremer.isisfish.types.hibernate.MonthType model.tagvalue.fr.ifremer.isisfish.types.Date=fr.ifremer.isisfish.types.hibernate.DateType

1 0

Aug. 27, 2009

Author: chatellier Date: 2009-08-27 16:05:07 +0000 (Thu, 27 Aug 2009) New Revision: 2556 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFishException.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/Formule.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/Language.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/Export.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Coordinate.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMap.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Motif.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Scale.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/Rule.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Date.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/DateType.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/actions/VCSActionTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogModelMock.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Log: Ajout de "Ifremer" en copyright dans quelques header. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -48,7 +48,6 @@ import fr.ifremer.isisfish.actions.SimulationAction; import fr.ifremer.isisfish.actions.VCSAction; import fr.ifremer.isisfish.simulator.SimulationContext; -import fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SSHSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SubProcessSimulationLauncher; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFishException.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFishException.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFishException.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,7 +1,23 @@ +/* *##% + * Copyright (C) 2005 - 2009 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 + * 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; - - public class IsisFishException extends Exception { /** */ @@ -22,7 +38,4 @@ public IsisFishException(Throwable cause) { super(cause); } - } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% - * Copyright (C) 2006 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2009 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2008 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2008 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2007 + * Copyright (C) 2007 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,18 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * AspectClassLoader.java - * - * Created: 30 mars 07 00:31:22 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.aspect; import java.io.IOException; @@ -54,10 +42,16 @@ import sun.misc.Resource; import sun.misc.URLClassPath; - /** + * AspectClassLoader. + * + * Created: 30 mars 07 00:31:22 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ public class AspectClassLoader extends URLClassLoader { public AspectClassLoader(URL[] urls, ClassLoader parent) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,18 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * Cache.aj - * - * Created: 25 août 06 22:42:47 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.aspect; import java.lang.reflect.Method; @@ -52,10 +40,16 @@ import org.codehaus.aspectwerkz.joinpoint.MethodSignature; /** + * Cache aspect. + * + * Created: 25 août 06 22:42:47 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - @Aspect("perJVM") public class Cache { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,5 @@ - /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -18,18 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * Trace.aj - * - * Created: 25 août 06 22:19:21 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.aspect; import java.lang.reflect.Method; @@ -53,7 +40,13 @@ * cache les appels seront superieur a l'execution car certaine valeur seront * reutilisé dans le cache * + * Created: 25 août 06 22:19:21 + * * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ */ @Aspect("perJVM") public class Trace { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,6 @@ /* - * *##% Copyright (C) 2006 - 2009 Code Lutin, Cédric Pineau, Benjamin Poussin + * *##% Copyright (C) 2006 - 2009 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,6 @@ /* - * *##% Copyright (C) 2006 Code Lutin, Cï¿œdric Pineau, Benjamin Poussin + * *##% Copyright (C) 2006 - 2009 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * 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 @@ -16,18 +17,6 @@ * Place - Suite 330, Boston, MA 02111-1307, USA. ##% */ -/******************************************************************************* - * DataStorage.java - * - * Created: 21 janv. 2006 14:20:51 - * - * @author poussin - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ - package fr.ifremer.isisfish.datastore; import static org.codelutin.i18n.I18n._; @@ -54,10 +43,14 @@ * {@link fr.ifremer.isisfish.datastore.RegionStorage} et * {@link fr.ifremer.isisfish.datastore.SimulationStorage} * + * Created: 21 janv. 2006 14:20:51 + * * @author poussin * + * @version $Revision$ + * + * Last update: $Date$ by : $Author$ */ - public abstract class DataStorage extends VersionStorage { static final public String DATA_BACKUP_FILENAME = "data-backup.sql.gz"; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,4 +1,4 @@ -/* ##% Copyright (C) 2002 - 2009 Code Lutin, Tony Chemit +/* ##% Copyright (C) 2002 - 2009 Ifremer, Code Lutin, Tony Chemit * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,6 +27,7 @@ import java.util.Properties; import org.hibernate.dialect.H2Dialect; + /** * Isis H2 concrete Config implementation. * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,6 @@ /* - * *##% Copyright (C) 2006 - 2009 Code Lutin, Cédric Pineau, Benjamin Poussin + * *##% Copyright (C) 2006 - 2009 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,6 @@ /* - * *##% Copyright (C) 2005 - 2009 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * *##% Copyright (C) 2005 - 2009 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% - * Copyright (C) 2002-2009 Code Lutin, Cédric Pineau, - Benjamin Poussin + * Copyright (C) 2002-2009 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,18 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * ResultStorage.java - * - * Created: 29 sept. 2004 - * - * @author Benjamin Poussin <poussin at codelutin.com> - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ - package fr.ifremer.isisfish.datastore; import static org.codelutin.i18n.I18n._; @@ -69,9 +57,17 @@ import fr.ifremer.isisfish.types.Month; /** -* Cette classe permet de conserver des résultats de simulation. Elle permet -* ensuite de les récupérer. -*/ + * Cette classe permet de conserver des résultats de simulation. Elle permet + * ensuite de les récupérer. + * + * Created: 29 sept. 2004 + * + * @author Benjamin Poussin <poussin at codelutin.com> + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ public class ResultStorage implements SimulationResultListener, SimulationResultGetter{ // ResultStorage /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,6 @@ /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2005 - 2009 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,3 +1,21 @@ +/* *##% + * Copyright (C) 2009 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 + * 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.datastore; import fr.ifremer.isisfish.IsisFishException; @@ -2,7 +20,5 @@ - - public class StorageException extends IsisFishException { - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = -8193638893951824873L; @@ -24,7 +40,4 @@ public StorageException(Throwable cause) { super(cause); } - } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2007 Code Lutin + * Copyright (C) 2007 - 2009 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 @@ -21,13 +21,13 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; + import javax.swing.JOptionPane; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.topia.migration.DatabaseManager; import org.codelutin.topia.migration.callback.MigrationCallbackHandler; -import org.codelutin.topia.migration.callback.MigrationCallbackHandler.MigrationChoice; import org.codelutin.util.VersionNumberUtil; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/Formule.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/Formule.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/Formule.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/Language.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/Language.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/Language.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2008 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2008 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/Export.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/Export.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/Export.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,22 +1,21 @@ /* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* 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. -* ##% */ + * ##% Copyright (C) 2002 2009 + * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * + * 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.logging; /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,22 +1,21 @@ /* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* 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. -* ##% */ + * ##% Copyright (C) 2002 - 2009 + * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * + * 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.logging; import java.util.ArrayList; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,22 +1,21 @@ /* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* 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. -* ##% */ + * ##% Copyright (C) 2002 - 2009 + * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * + * 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.logging; import fr.ifremer.isisfish.IsisConfig; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,22 +1,21 @@ /* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* 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. -* ##% */ + * ##% Copyright (C) 2002 - 2009 + * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * + * 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.logging; /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,22 +1,21 @@ /* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* 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. -* ##% */ + * ##% Copyright (C) 2002 - 2009 + * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * + * 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.logging.console; import org.apache.commons.logging.Log; @@ -46,6 +45,9 @@ */ public class LogConsole extends LogConsoleUI implements ChangeListener { + /** serialVersionUID. */ + private static final long serialVersionUID = 3534645407010584861L; + static private Log log = LogFactory.getLog(LogConsole.class); public static final String EDITOR_SIZE_CHANGED_PROPERTY = "editorSize"; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,22 +1,21 @@ /* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* 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. -* ##% */ + * ##% Copyright (C) 2002 - 2009 + * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * + * 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.logging.console; import fr.ifremer.isisfish.logging.LogLevel; @@ -30,7 +29,6 @@ import fr.ifremer.isisfish.logging.io.MemoryOffsetReader; import org.apache.commons.logging.Log; import static org.apache.commons.logging.LogFactory.getLog; -import org.codelutin.i18n.I18n; import static org.codelutin.i18n.I18n._; import org.codelutin.widget.StatusBar; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,22 +1,21 @@ /* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* 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. -* ##% */ + * ##% Copyright (C) 2002 - 2009 + * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * + * 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.logging.console; import javax.swing.event.ChangeEvent; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,22 +1,21 @@ /* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* 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. -* ##% */ + * ##% Copyright (C) 2002 - 2009 + * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * + * 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.logging.console; import static org.codelutin.i18n.I18n._; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2009 Code Lutin + * Copyright (C) 2002, 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Coordinate.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Coordinate.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Coordinate.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2009 Code Lutin + * Copyright (C) 2002, 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMap.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMap.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMap.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2009 Code Lutin + * Copyright (C) 2002, 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2009 Code Lutin + * Copyright (C) 2002, 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2009 Code Lutin + * Copyright (C) 2002, 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2009 Code Lutin + * Copyright (C) 2002, 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2009 Code Lutin + * Copyright (C) 2002, 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% - * Copyright (C) 2002, 2003, 2004, 2005 Code Lutin, - * Cédric Pineau, Benjamin Poussin + * Copyright (C) 2002 - 2009 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Motif.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Motif.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Motif.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2009 Code Lutin + * Copyright (C) 2002, 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2009 Code Lutin + * Copyright (C) 2002, 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Scale.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Scale.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Scale.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2009 Code Lutin + * Copyright (C) 2002 - 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2009 Code Lutin + * Copyright (C) 2002 - 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.mexico.xml; -import java.io.Serializable; - import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.visitor.DesignPlanVisitor; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.mexico.xml; -import java.io.Serializable; - import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.mexico.xml; -import java.io.Serializable; - import org.apache.commons.beanutils.ConvertUtilsBean; import fr.ifremer.isisfish.simulator.sensitivity.Domain; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,13 +18,8 @@ package fr.ifremer.isisfish.mexico.xml; -import java.io.Serializable; - -import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.Scenario; -import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.ScenarioVisitor; /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,10 +18,6 @@ package fr.ifremer.isisfish.mexico.xml; -import java.io.Serializable; - -import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; -import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.Scenario; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios; import fr.ifremer.isisfish.simulator.sensitivity.visitor.SensitivityScenariosVisitor; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/Rule.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - 2009 - * Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Date.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Date.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Date.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,6 @@ /* - * *##% Copyright (C) 2005 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * *##% Copyright (C) 2005 - 2009 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,25 +1,24 @@ /* - * Created on 7 nov. 2005 by Code Lutin Dev - * - * Copyright (c) 2005 Ifremer - * All rights reserved. - * - * This software is the confidential and proprietary information of - * Ifremer ("Confidential Information"). You shall not - * disclose such Confidential Information and shall use it only in - * accordance with the terms of the license agreement you entered into - * with Ifremer. + * *##% Copyright (C) 2005 - 2009 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * + * 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. ##% */ -/* * - * Month.java - * - * Created: 7 nov. 2005 - * - * @author Code Lutin Dev - * @version $Revision$ - */ + package fr.ifremer.isisfish.types; import static org.codelutin.i18n.I18n._; @@ -28,9 +27,17 @@ import java.util.ArrayList; import java.util.List; +/** + * Month. + * + * Created: 7 nov. 2005 + * + * @author Code Lutin Dev + * @version $Revision$ + */ public class Month implements Cloneable, Serializable, Comparable<Month> { - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = 1L; public final static int MIN_MONTH_NUMBER = 0; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/DateType.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/DateType.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/DateType.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2003 Code Lutin + * Copyright (C) 2002 - 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2003 Code Lutin + * Copyright (C) 2002 - 2009 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2003 Code Lutin + * Copyright (C) 2002 - 2009 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 @@ -45,6 +45,9 @@ public class MonthType extends ImmutableType { + /** serialVersionUID. */ + private static final long serialVersionUID = 6151047526309798890L; + /* (non-Javadoc) * @see org.hibernate.type.NullableType#get(java.sql.ResultSet, java.lang.String) */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2003 Code Lutin + * Copyright (C) 2002 - 2009 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 @@ -28,9 +28,7 @@ * Mise a jour: $Date$ * par : $Author$ */ -/** - * - */ + package fr.ifremer.isisfish.types.hibernate; import java.sql.PreparedStatement; @@ -45,7 +43,7 @@ public class RangeOfValuesType extends ImmutableType { - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = -5295147041590169149L; /* (non-Javadoc) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002, 2003 Code Lutin + * Copyright (C) 2002 - 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/actions/VCSActionTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/actions/VCSActionTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/actions/VCSActionTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% -* Copyright (C) 2002, 2009 Code Lutin, Cédric Pineau, Benjamin Poussin +* Copyright (C) 2002, 2009 Ifremer - Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2008 - 2009 Code Lutin + * Copyright (C) 2008 - 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogModelMock.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogModelMock.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogModelMock.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,3 +1,21 @@ +/* *##% + * Copyright (C) 2007 - 2009 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 + * 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.ui.widget.filter; import java.text.DateFormat; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 CodeLutin + * Copyright (C) 2009 Ifremer, CodeLutin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 CodeLutin + * Copyright (C) 2009 Ifremer, CodeLutin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -20,7 +20,6 @@ import java.io.File; import java.io.IOException; import java.io.PrintWriter; -import java.util.ArrayList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 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 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-08-27 15:21:12 UTC (rev 2555) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-08-27 16:05:07 UTC (rev 2556) @@ -1,5 +1,5 @@ /* *##% IsisFish - * Copyright (C) 2008 - 2009 CodeLutin + * Copyright (C) 2008 - 2009 Ifremer, CodeLutin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as

1 0

r2555 - isis-fish/trunk/src/main/resources/templates/script
by chatellier＠users.labs.libre-entreprise.org Aug. 27, 2009

Aug. 27, 2009

Author: chatellier Date: 2009-08-27 15:21:12 +0000 (Thu, 27 Aug 2009) New Revision: 2555 Modified: isis-fish/trunk/src/main/resources/templates/script/analyseplan.ftl isis-fish/trunk/src/main/resources/templates/script/export.ftl isis-fish/trunk/src/main/resources/templates/script/rule.ftl isis-fish/trunk/src/main/resources/templates/script/script.ftl isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl isis-fish/trunk/src/main/resources/templates/script/simulator.ftl Log: Ajout d'une date sur les copyright Modified: isis-fish/trunk/src/main/resources/templates/script/analyseplan.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/analyseplan.ftl 2009-08-27 14:36:55 UTC (rev 2554) +++ isis-fish/trunk/src/main/resources/templates/script/analyseplan.ftl 2009-08-27 15:21:12 UTC (rev 2555) @@ -1,5 +1,5 @@ /* - * Copyright (C) ${author} + * Copyright (C) ${date?date?string("yyyy")} ${author} * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -63,7 +63,7 @@ // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, }; - @Override + @Override public String[] getNecessaryResult() { return this.necessaryResult; } Modified: isis-fish/trunk/src/main/resources/templates/script/export.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/export.ftl 2009-08-27 14:36:55 UTC (rev 2554) +++ isis-fish/trunk/src/main/resources/templates/script/export.ftl 2009-08-27 15:21:12 UTC (rev 2555) @@ -1,5 +1,5 @@ /* - * Copyright (C) ${author} + * Copyright (C) ${date?date?string("yyyy")} ${author} * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/resources/templates/script/rule.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/rule.ftl 2009-08-27 14:36:55 UTC (rev 2554) +++ isis-fish/trunk/src/main/resources/templates/script/rule.ftl 2009-08-27 15:21:12 UTC (rev 2555) @@ -1,5 +1,5 @@ /* - * Copyright (C) ${author} + * Copyright (C) ${date?date?string("yyyy")} ${author} * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/resources/templates/script/script.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/script.ftl 2009-08-27 14:36:55 UTC (rev 2554) +++ isis-fish/trunk/src/main/resources/templates/script/script.ftl 2009-08-27 15:21:12 UTC (rev 2555) @@ -1,5 +1,5 @@ /* - * Copyright (C) ${author} + * Copyright (C) ${date?date?string("yyyy")} ${author} * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-08-27 14:36:55 UTC (rev 2554) +++ isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-08-27 15:21:12 UTC (rev 2555) @@ -1,5 +1,5 @@ /* - * Copyright (C) ${author} + * Copyright (C) ${date?date?string("yyyy")} ${author} * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/trunk/src/main/resources/templates/script/simulator.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/simulator.ftl 2009-08-27 14:36:55 UTC (rev 2554) +++ isis-fish/trunk/src/main/resources/templates/script/simulator.ftl 2009-08-27 15:21:12 UTC (rev 2555) @@ -1,5 +1,5 @@ /* - * Copyright (C) ${author} + * Copyright (C) ${date?date?string("yyyy")} ${author} * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License

1 0

r2554 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org Aug. 27, 2009

Aug. 27, 2009

Author: chatellier Date: 2009-08-27 14:36:55 +0000 (Thu, 27 Aug 2009) New Revision: 2554 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java Log: Add comment and get an entity only if necessary Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2009-08-27 13:04:10 UTC (rev 2553) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2009-08-27 14:36:55 UTC (rev 2554) @@ -76,14 +76,20 @@ } } + /** + * Evaluate {@link SetOfVesselsAbstract#technicalEfficiencyEquation} with + * {@link Date} and {@link Metier}. + * + * By default return {@code 1} if equation can't be evaluated. + */ @Override public double getTechnicalEfficiency(Date date, Metier metier) { double result = 1; try { - Gear gear = metier.getGear(); Equation eq = getTechnicalEfficiencyEquation(); if (eq != null) { + Gear gear = metier.getGear(); result = eq.evaluate("date", date, "metier", metier, "gear", gear); }

1 0

r2553 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Aug. 27, 2009

Aug. 27, 2009

Author: chatellier Date: 2009-08-27 13:04:10 +0000 (Thu, 27 Aug 2009) New Revision: 2553 Modified: isis-fish/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-08-27 13:04:07 UTC (rev 2552) +++ isis-fish/trunk/pom.xml 2009-08-27 13:04:10 UTC (rev 2553) @@ -13,7 +13,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.5-rc3</version> + <version>3.2.0.5-rc4-SNAPSHOT</version>  <dependencies> @@ -585,9 +585,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/trunk…</url> </scm>

1 0

r2552 - in isis-fish/tags: . isis-fish-3.2.0.5-rc3
by chatellier＠users.labs.libre-entreprise.org Aug. 27, 2009

Aug. 27, 2009

Author: chatellier Date: 2009-08-27 13:04:07 +0000 (Thu, 27 Aug 2009) New Revision: 2552 Added: isis-fish/tags/isis-fish-3.2.0.5-rc3/ isis-fish/tags/isis-fish-3.2.0.5-rc3/pom.xml Removed: isis-fish/tags/isis-fish-3.2.0.5-rc3/pom.xml Log: [maven-release-plugin] copy for tag isis-fish-3.2.0.5-rc3 Deleted: isis-fish/tags/isis-fish-3.2.0.5-rc3/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-08-27 12:12:43 UTC (rev 2550) +++ isis-fish/tags/isis-fish-3.2.0.5-rc3/pom.xml 2009-08-27 13:04:07 UTC (rev 2552) @@ -1,770 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.5</version> - </parent> - - <groupId>ifremer</groupId> - <artifactId>isis-fish</artifactId> - <version>3.2.0.5-rc3-SNAPSHOT</version> - -  - <dependencies> - -  - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia-service</artifactId> - <version>${topia.service.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinmatrix</artifactId> - <version>${lutinmatrix.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinwidget</artifactId> - <version>${lutinwidget.version}</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-runtime-swing</artifactId> - <version>${jaxx.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-runtime-validator</artifactId> - <version>${jaxx.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-runtime-swing-widget</artifactId> - <version>${jaxx.version}</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinj2r</artifactId> - <version>${lutinj2r.version}</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</artifactId> - <version>1.2</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> - <version>2.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>jfreechart</groupId> - <artifactId>jfreechart</artifactId> - <version>0.9.3</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>jcommon</groupId> - <artifactId>jcommon</artifactId> - <version>0.7.0</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-client</artifactId> - <version>${xmlrpc.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-server</artifactId> - <version>${xmlrpc.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>runtime</scope> - </dependency> - -  - <dependency> - <groupId>org.beanshell</groupId> - <artifactId>bsh</artifactId> - <version>2.0b4</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>openmap</groupId> - <artifactId>openmap</artifactId> - <version>${openmap.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.fife</groupId> - <artifactId>rsyntaxtextarea</artifactId> - <version>1.3.4</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - <version>0.1.42</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - <scope>runtime</scope> - </dependency> - -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.1.117</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>aspectwerkz</groupId> - <artifactId>aspectwerkz</artifactId> - <version>${aspectwerkz.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>aspectwerkz</groupId> - <artifactId>aspectwerkz-jdk5</artifactId> - <version>${aspectwerkz.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>aspectwerkz</groupId> - <artifactId>aspectwerkz-core</artifactId> - <version>${aspectwerkz.version}</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>ssj</groupId> - <artifactId>ssj</artifactId> - <version>2.1.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>Blas</artifactId> - <version>20081007</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>colt</artifactId> - <version>20081007</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>interpreter</artifactId> - <version>1.6.8</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>language</artifactId> - <version>1.6.7</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>logger</artifactId> - <version>1.6.4</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>optimization</artifactId> - <version>20081007</version> - <scope>runtime</scope> - </dependency> -  - -  - <dependency> - <groupId>org.tmatesoft</groupId> - <artifactId>svnkit</artifactId> - <version>1.2.3.5521</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.trilead</groupId> - <artifactId>trilead-ssh2</artifactId> - <version>build213-svnkit-1.2</version> - <scope>runtime</scope> - </dependency> -  - - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - <version>2.3.15</version> - </dependency> - - <dependency> - <groupId>net.sourceforge.cpdetector</groupId> - <artifactId>cpdetector</artifactId> - <version>1.0.7</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - <version>1.6.0</version> - </dependency> - </dependencies> - -  -  -  - <name>IsisFish</name> - <description>Simulateur de pecherie complexe.</description> - <inceptionYear>1999</inceptionYear> - - <licenses> - <license> - <name>GPL</name> - <url>http://www.gnu.org/copyleft/gpl.html</url> - <distribution>repo</distribution> - </license> - </licenses> - -  -  -  - <packaging>jar</packaging> - - <properties> -  - <labs.id>8</labs.id> - -  - <labs.project>isis-fish</labs.project> - -  - <jaxx.version>1.5.1</jaxx.version> - <topia.version>2.1.6.1</topia.version> - <topia.service.version>1.0.3</topia.service.version> - <lutinmatrix.version>1.3</lutinmatrix.version> - <lutinutil.version>1.0.6</lutinutil.version> - <i18n.version>0.9</i18n.version> - <lutinwidget.version>0.14.1</lutinwidget.version> - <generator.version>0.64</generator.version> - <lutinj2r.version>0.4</lutinj2r.version> - <jrst.version>0.8.4</jrst.version> - <license-switcher.version>0.6</license-switcher.version> - <openmap.version>4.6.4</openmap.version> - <aspectwerkz.version>2.0</aspectwerkz.version> - <xmlrpc.version>3.1.2</xmlrpc.version> - -  - <maven.test.forkMode>once</maven.test.forkMode> - -  - <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> - -  - <keystorepath>${codelutin.keystorepath}</keystorepath> - <keystorealias>CodeLutin</keystorealias> - <keystorepass>codelutin</keystorepass> - <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> - - <jnlpCodebase>${project.url}</jnlpCodebase> -  - <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> - </properties> - - <build> - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <version>${generator.version}</version> - <executions> - <execution> - <id>Generator</id> - <phase>generate-sources</phase> - <configuration> - <srcDirZuml>${project.basedir}/src/main/xmi</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> - <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> - <extractedPackages>fr.ifremer.isisfish</extractedPackages> -  - <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> - <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <excludeTemplates> - <value>org.codelutin.topia.generator.EntityEnumGenerator</value> - <value>org.codelutin.topia.generator.EntityProviderGenerator</value> - </excludeTemplates> - <destDirGen>${maven.gen.dir}/java</destDirGen> - <defaultPackage>fr.ifremer.isisfish</defaultPackage> - <copyVersionDir>${project.basedir}/src/main/resources/oldmappings/%MODELNAME% - </copyVersionDir> - <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> - <copyOverwrite>true</copyOverwrite> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - <goal>copyVersionFiles</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </plugin> - - <plugin> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - <configuration> - <extraImportList>jaxx.runtime.SwingUtil,static jaxx.runtime.Util.getStringValue</extraImportList> - <addSourcesToClassPath>true</addSourcesToClassPath> - <addProjectClassPath>true</addProjectClassPath> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java/</basedir> - <specificGoal>parserJava</specificGoal> - <includes> - <param>**\/**UI.java</param> - </includes> - </entry> - </entries> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> - <configuration> - <defaultLocale>fr</defaultLocale> - </configuration> - <executions> - <execution> - <phase>pre-site</phase> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-4</version> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>java.io.tmpdir</name> - <value>${project.build.directory}/surefire-workdir</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.6</version> - <configuration> - <links> - <link>http://java.sun.com/javase/6/docs/api/</link> - <link>http://lutinutil.labs.libre-entreprise.org/lutinutil/apidocs/</link> - <link>http://lutinmatrix.labs.libre-entreprise.org/lutinmatrix/apidocs/</link> - <link>http://topia.labs.libre-entreprise.org/topia/topia-persistence/apidocs/</link> - </links> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.1</version> - </plugin> - </plugins> - </reporting> - -  -  -  - <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/trunk…</url> - </scm> - -  - <repositories> - <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> - <configuration> - <licenseName>${license-switcher.licenseName}</licenseName> - </configuration> - <executions> - <execution> - <id>attach-licenses</id> - <goals> -  - <goal>third-party</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> -  - <execution> - <id>JnlpSun</id> - <phase>verify</phase> - <configuration> - <tasks> - <mkdir dir="${jnlp.build.directory}" /> - <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib-javahelp" value="javahelp-2.0.02.jar" /> - <filter token="lib-activation" value="activation-1.1.jar" /> - <filter token="lib-mail" value="mail-1.4.jar" /> - <filter token="url" value="${jnlpCodebase}" /> - </filterset> - </copy> - <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib" value="jxlayer-3.0.1.jar" /> - <filter token="url" value="${jnlpCodebase}" /> - </filterset> - </copy> - - <copy verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false"> - <fileset dir="${project.build.directory}/lib"> - <include name="javahelp-2.0.02.jar" /> - <include name="activation-1.1.jar" /> - <include name="mail-1.4.jar" /> - <include name="jxlayer-3.0.1.jar" /> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - <execution> - <id>JnlpToSite</id> - <phase>pre-site</phase> - <configuration> - <tasks> - <mkdir dir="${maven.site.gen.dir}/resources" /> - <copy todir="${maven.site.gen.dir}/resources" verbose="true" failonerror="false" overwrite="false"> - <fileset dir="${jnlp.build.directory}"> - <include name="**" /> - </fileset> -  - <fileset dir="target"> - <include name="${project.build.finalName}-bin.zip" /> - </fileset> - - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20090204</version> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - <configuration> - <force>false</force> - <dependencies> - <excludes> - <exclude>javax.help:javahelp</exclude> - <exclude>javax.mail:mail</exclude> - <exclude>javax.activation:activation</exclude> - <exclude>org.swinglabs:jxlayer</exclude> - </excludes> - </dependencies> - <libPath>lib</libPath> - <extensions> - <sun>sun.jnlp</sun> - <jxlayer>jxlayer.jnlp</jxlayer> - </extensions> - <jnlp> - <outputFile>isis-fish-v3.jnlp</outputFile> - <mainClass>${maven.jar.main.class}</mainClass> - <allPermissions>true</allPermissions> - <offlineAllowed>true</offlineAllowed> - </jnlp> - - <sign> - <keystore>${keystorepath}</keystore> - <keypass /> - <storepass>${keystorepass}</storepass> - <storetype /> - <alias>${keystorealias}</alias> - <validity /> - <dnameCn /> - <dnameOu /> - <dnameO /> - <dnameL /> - <dnameSt /> - <dnameC /> - <verify>true</verify> - <keystoreConfig> - <delete>false</delete> - <gen>false</gen> - </keystoreConfig> - </sign> - <pack200>false</pack200> - <gzip>true</gzip> - <verbose>false</verbose> - </configuration> - </plugin> - - </plugins> - </build> - </profile> - - </profiles> - -</project> Copied: isis-fish/tags/isis-fish-3.2.0.5-rc3/pom.xml (from rev 2551, isis-fish/trunk/pom.xml) =================================================================== --- isis-fish/tags/isis-fish-3.2.0.5-rc3/pom.xml (rev 0) +++ isis-fish/tags/isis-fish-3.2.0.5-rc3/pom.xml 2009-08-27 13:04:07 UTC (rev 2552) @@ -0,0 +1,770 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>3.5</version> + </parent> + + <groupId>ifremer</groupId> + <artifactId>isis-fish</artifactId> + <version>3.2.0.5-rc3</version> + +  + <dependencies> + +  + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>${lutinutil.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>topia-service</artifactId> + <version>${topia.service.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinmatrix</artifactId> + <version>${lutinmatrix.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinwidget</artifactId> + <version>${lutinwidget.version}</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-runtime-swing</artifactId> + <version>${jaxx.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-runtime-validator</artifactId> + <version>${jaxx.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-runtime-swing-widget</artifactId> + <version>${jaxx.version}</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinj2r</artifactId> + <version>${lutinj2r.version}</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>commons-jxpath</groupId> + <artifactId>commons-jxpath</artifactId> + <version>1.2</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + <version>2.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>jfreechart</groupId> + <artifactId>jfreechart</artifactId> + <version>0.9.3</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>jcommon</groupId> + <artifactId>jcommon</artifactId> + <version>0.7.0</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-client</artifactId> + <version>${xmlrpc.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-server</artifactId> + <version>${xmlrpc.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>org.beanshell</groupId> + <artifactId>bsh</artifactId> + <version>2.0b4</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>openmap</groupId> + <artifactId>openmap</artifactId> + <version>${openmap.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.fife</groupId> + <artifactId>rsyntaxtextarea</artifactId> + <version>1.3.4</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + <version>0.1.42</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.1.117</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>aspectwerkz</groupId> + <artifactId>aspectwerkz</artifactId> + <version>${aspectwerkz.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>aspectwerkz</groupId> + <artifactId>aspectwerkz-jdk5</artifactId> + <version>${aspectwerkz.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>aspectwerkz</groupId> + <artifactId>aspectwerkz-core</artifactId> + <version>${aspectwerkz.version}</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>ssj</groupId> + <artifactId>ssj</artifactId> + <version>2.1.1</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>Blas</artifactId> + <version>20081007</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>colt</artifactId> + <version>20081007</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>interpreter</artifactId> + <version>1.6.8</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>language</artifactId> + <version>1.6.7</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>logger</artifactId> + <version>1.6.4</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>optimization</artifactId> + <version>20081007</version> + <scope>runtime</scope> + </dependency> +  + +  + <dependency> + <groupId>org.tmatesoft</groupId> + <artifactId>svnkit</artifactId> + <version>1.2.3.5521</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.trilead</groupId> + <artifactId>trilead-ssh2</artifactId> + <version>build213-svnkit-1.2</version> + <scope>runtime</scope> + </dependency> +  + + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.15</version> + </dependency> + + <dependency> + <groupId>net.sourceforge.cpdetector</groupId> + <artifactId>cpdetector</artifactId> + <version>1.0.7</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <version>1.6.0</version> + </dependency> + </dependencies> + +  +  +  + <name>IsisFish</name> + <description>Simulateur de pecherie complexe.</description> + <inceptionYear>1999</inceptionYear> + + <licenses> + <license> + <name>GPL</name> + <url>http://www.gnu.org/copyleft/gpl.html</url> + <distribution>repo</distribution> + </license> + </licenses> + +  +  +  + <packaging>jar</packaging> + + <properties> +  + <labs.id>8</labs.id> + +  + <labs.project>isis-fish</labs.project> + +  + <jaxx.version>1.5.1</jaxx.version> + <topia.version>2.1.6.1</topia.version> + <topia.service.version>1.0.3</topia.service.version> + <lutinmatrix.version>1.3</lutinmatrix.version> + <lutinutil.version>1.0.6</lutinutil.version> + <i18n.version>0.9</i18n.version> + <lutinwidget.version>0.14.1</lutinwidget.version> + <generator.version>0.64</generator.version> + <lutinj2r.version>0.4</lutinj2r.version> + <jrst.version>0.8.4</jrst.version> + <license-switcher.version>0.6</license-switcher.version> + <openmap.version>4.6.4</openmap.version> + <aspectwerkz.version>2.0</aspectwerkz.version> + <xmlrpc.version>3.1.2</xmlrpc.version> + +  + <maven.test.forkMode>once</maven.test.forkMode> + +  + <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> + +  + <keystorepath>${codelutin.keystorepath}</keystorepath> + <keystorealias>CodeLutin</keystorealias> + <keystorepass>codelutin</keystorepass> + <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> + + <jnlpCodebase>${project.url}</jnlpCodebase> +  + <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> + </properties> + + <build> + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>${generator.version}</version> + <executions> + <execution> + <id>Generator</id> + <phase>generate-sources</phase> + <configuration> + <srcDirZuml>${project.basedir}/src/main/xmi</srcDirZuml> + <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> + <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> + <extractedPackages>fr.ifremer.isisfish</extractedPackages> +  + <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <excludeTemplates> + <value>org.codelutin.topia.generator.EntityEnumGenerator</value> + <value>org.codelutin.topia.generator.EntityProviderGenerator</value> + </excludeTemplates> + <destDirGen>${maven.gen.dir}/java</destDirGen> + <defaultPackage>fr.ifremer.isisfish</defaultPackage> + <copyVersionDir>${project.basedir}/src/main/resources/oldmappings/%MODELNAME% + </copyVersionDir> + <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> + <copyOverwrite>true</copyOverwrite> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + <goal>copyVersionFiles</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + <configuration> + <extraImportList>jaxx.runtime.SwingUtil,static jaxx.runtime.Util.getStringValue</extraImportList> + <addSourcesToClassPath>true</addSourcesToClassPath> + <addProjectClassPath>true</addProjectClassPath> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + <specificGoal>parserJava</specificGoal> + <includes> + <param>**\/**UI.java</param> + </includes> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <defaultLocale>fr</defaultLocale> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-4</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>java.io.tmpdir</name> + <value>${project.build.directory}/surefire-workdir</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.6</version> + <configuration> + <links> + <link>http://java.sun.com/javase/6/docs/api/</link> + <link>http://lutinutil.labs.libre-entreprise.org/lutinutil/apidocs/</link> + <link>http://lutinmatrix.labs.libre-entreprise.org/lutinmatrix/apidocs/</link> + <link>http://topia.labs.libre-entreprise.org/topia/topia-persistence/apidocs/</link> + </links> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.1</version> + </plugin> + </plugins> + </reporting> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url> + </scm> + +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> +  + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> +  + <execution> + <id>JnlpSun</id> + <phase>verify</phase> + <configuration> + <tasks> + <mkdir dir="${jnlp.build.directory}" /> + <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> + <filterset> + <filter token="lib-javahelp" value="javahelp-2.0.02.jar" /> + <filter token="lib-activation" value="activation-1.1.jar" /> + <filter token="lib-mail" value="mail-1.4.jar" /> + <filter token="url" value="${jnlpCodebase}" /> + </filterset> + </copy> + <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> + <filterset> + <filter token="lib" value="jxlayer-3.0.1.jar" /> + <filter token="url" value="${jnlpCodebase}" /> + </filterset> + </copy> + + <copy verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false"> + <fileset dir="${project.build.directory}/lib"> + <include name="javahelp-2.0.02.jar" /> + <include name="activation-1.1.jar" /> + <include name="mail-1.4.jar" /> + <include name="jxlayer-3.0.1.jar" /> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>JnlpToSite</id> + <phase>pre-site</phase> + <configuration> + <tasks> + <mkdir dir="${maven.site.gen.dir}/resources" /> + <copy todir="${maven.site.gen.dir}/resources" verbose="true" failonerror="false" overwrite="false"> + <fileset dir="${jnlp.build.directory}"> + <include name="**" /> + </fileset> +  + <fileset dir="target"> + <include name="${project.build.finalName}-bin.zip" /> + </fileset> + + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo.webstart</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20090204</version> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + <configuration> + <force>false</force> + <dependencies> + <excludes> + <exclude>javax.help:javahelp</exclude> + <exclude>javax.mail:mail</exclude> + <exclude>javax.activation:activation</exclude> + <exclude>org.swinglabs:jxlayer</exclude> + </excludes> + </dependencies> + <libPath>lib</libPath> + <extensions> + <sun>sun.jnlp</sun> + <jxlayer>jxlayer.jnlp</jxlayer> + </extensions> + <jnlp> + <outputFile>isis-fish-v3.jnlp</outputFile> + <mainClass>${maven.jar.main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> + </jnlp> + + <sign> + <keystore>${keystorepath}</keystore> + <keypass /> + <storepass>${keystorepass}</storepass> + <storetype /> + <alias>${keystorealias}</alias> + <validity /> + <dnameCn /> + <dnameOu /> + <dnameO /> + <dnameL /> + <dnameSt /> + <dnameC /> + <verify>true</verify> + <keystoreConfig> + <delete>false</delete> + <gen>false</gen> + </keystoreConfig> + </sign> + <pack200>false</pack200> + <gzip>true</gzip> + <verbose>false</verbose> + </configuration> + </plugin> + + </plugins> + </build> + </profile> + + </profiles> + +</project>

1 0

r2551 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Aug. 27, 2009

Aug. 27, 2009

Author: chatellier Date: 2009-08-27 13:04:03 +0000 (Thu, 27 Aug 2009) New Revision: 2551 Modified: isis-fish/trunk/pom.xml Log: [maven-release-plugin] prepare release isis-fish-3.2.0.5-rc3 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-08-27 12:12:43 UTC (rev 2550) +++ isis-fish/trunk/pom.xml 2009-08-27 13:04:03 UTC (rev 2551) @@ -13,7 +13,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.5-rc3-SNAPSHOT</version> + <version>3.2.0.5-rc3</version>  <dependencies> @@ -585,9 +585,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/trunk…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url> </scm>

1 0

r2550 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by chatellier＠users.labs.libre-entreprise.org Aug. 27, 2009

Aug. 27, 2009

Author: chatellier Date: 2009-08-27 12:12:43 +0000 (Thu, 27 Aug 2009) New Revision: 2550 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx Log: Always disable export button 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 2009-08-27 12:10:35 UTC (rev 2549) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-08-27 12:12:43 UTC (rev 2550) @@ -135,7 +135,7 @@ boolean isJavaScript = getContextValue(ScriptAction.class).isJavaScript(); buttonScriptExport.setEnabled(tree.getSelectionValue() != null); // TODO refactoring en cours, mais pas fini - miExport.setEnabled(tree.getSelectionValue() != null); + //miExport.setEnabled(tree.getSelectionValue() != null); buttonScriptCommit.setEnabled(fileLoaded); miCommitVCS.setEnabled(fileLoaded); //buttonScriptUpdate.setEnabled(fileLoaded);

1 0