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

r2129 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: sensitivity simulator
by chatellier＠users.labs.libre-entreprise.org April 21, 2009

April 21, 2009

Author: chatellier Date: 2009-04-21 10:18:03 +0000 (Tue, 21 Apr 2009) New Revision: 2129 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Refresh sensitivity export list after old simulation reloading. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-04-21 10:02:06 UTC (rev 2128) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-04-21 10:18:03 UTC (rev 2129) @@ -264,7 +264,10 @@ clearExportsButton.setEnabled(false); } - protected void setExportListModel() { + /** + * Set model (refresh export Jlist). + */ + public void setExportListModel() { java.util.List<SensitivityExport> exports = getSimulAction().getSensitivityExportList(); DefaultListModel model = new DefaultListModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-04-21 10:02:06 UTC (rev 2128) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-04-21 10:18:03 UTC (rev 2129) @@ -16,46 +16,25 @@ * 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. - *##%*/ - -/** - * ParamsUI. - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ - --> + *##%*/ --> + <Table> -  <Boolean id='sensitivity' javaBean='false'/> <script><![CDATA[ -import static org.codelutin.i18n.I18n._; import fr.ifremer.isisfish.ui.Common; -import fr.ifremer.isisfish.datastore.RuleStorage; -import fr.ifremer.isisfish.ui.WelcomeUI; import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.WelcomeTabUI; -import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; import fr.ifremer.isisfish.entities.Strategy; import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.rule.Rule; -import org.codelutin.math.matrix.gui.JAXXMatrixEditor; import javax.swing.table.DefaultTableModel; import java.text.ParseException; import java.awt.event.ItemEvent; import javax.swing.table.TableModel; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -import javax.swing.table.TableColumn; import fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor; -import static javax.swing.JOptionPane.showMessageDialog; import javax.swing.text.JTextComponent; import org.dom4j.DocumentHelper; import org.dom4j.Element; @@ -67,8 +46,11 @@ import fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipTableColumnRenderer; import fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipComboBoxRenderer; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; + +// instances variables déclaration SimulationServiceListener simulationListener; +// end constructor code simulationListener = new SimulationServiceListener() { @Override public void simulationStart(SimulationService simService, SimulationJob job) { @@ -84,14 +66,14 @@ } } -public ParamsUI(SimulAction action){ +public ParamsUI(SimulAction action) { setContextValue(action); } -public void refresh(){ +public void refresh() { SimulationService.getService().removeSimulationServiceListener(simulationListener); SimulationService.getService().addSimulationServiceListener(simulationListener); - if (getContextValue(SimulAction.class).getSimulationStorage() != null){ + if (getContextValue(SimulAction.class).getSimulationStorage() != null) { fieldSimulParamsName.setText(getContextValue(SimulAction.class).getSimulationStorage().getName()); } fieldSimulParamsDesc.setText(getContextValue(SimulAction.class).getSimulationParameter().getDescription()); @@ -99,12 +81,12 @@ setListSimulParamsPopulationsItems(); setRulesItems(); fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getRegionName()); - if (!isSensitivity()){ - if (getContextValue(SimulAction.class).getSimulationParameter().getUsePreScript()){ + if (!isSensitivity()) { + if (getContextValue(SimulAction.class).getSimulationParameter().getUsePreScript()) { SimulUI simul = getParentContainer(SimulUI.class); simul.enablePreSimul(); } - if (getContextValue(SimulAction.class).getSimulationParameter().getUseAnalysePlan()){ + if (getContextValue(SimulAction.class).getSimulationParameter().getUseAnalysePlan()) { SimulUI simul = getParentContainer(SimulUI.class); simul.enableAnalysePlan(); } @@ -131,7 +113,7 @@ } } } -protected void setFactorRegion(){ +protected void setFactorRegion() { if (isSensitivity()){ try { getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.class).getSimulationParameter().getRegion().getFisheryRegion()); @@ -143,23 +125,24 @@ } } } -protected void setFactor(){ +protected void setFactor() { if (isSensitivity()){ getParentContainer(SensitivityUI.class).getSensitivityTabUI().setFactorModel(); } } -protected void setExportSens(){ - if (isSensitivity()){ +protected void setExportSens() { + if (isSensitivity()) { + getParentContainer(SensitivityUI.class).getSensitivityChooserUI().setExportListModel(); } } -protected void setSensibilities(){ +protected void setSensibilities() { if (isSensitivity()){ } } public void setSimulationParameter(SimulAction simulAction){ getContextValue(SimulAction.class).setSimulationParameter(simulAction.getSimulationParameter()); } -protected void loadOldSimulation(){ +protected void loadOldSimulation() { final String selected = fieldSimulParamsSelect.getSelectedItem().toString(); // le premier item est " " pour ne pas avoir de selection par defaut if (selected != null && !selected.equals(" ")){

1 0

r2128 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/sensitivity resources/i18n
by chatellier＠users.labs.libre-entreprise.org April 21, 2009

April 21, 2009

Author: chatellier Date: 2009-04-21 10:02:06 +0000 (Tue, 21 Apr 2009) New Revision: 2128 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Add option to delete factors with popup menu Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-04-21 09:05:36 UTC (rev 2127) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-04-21 10:02:06 UTC (rev 2128) @@ -1,7 +1,6 @@  + *##%*/ --> <JDialog id="FactorTypeChooser" title='isisfish.factor.title' modal='{true}' layout='{new BorderLayout()}'> <Boolean id='continuePossible' javaBean='true'/> @@ -56,6 +42,7 @@ protected String path = null; protected ContinuousPanelContainer continuousPanel = null; protected Factor factor = null; + addPropertyChangeListener("continuePossible", new PropertyChangeListener(){ @Override Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-04-21 09:05:36 UTC (rev 2127) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-04-21 10:02:06 UTC (rev 2128) @@ -1,7 +1,6 @@  <JPanel id="sensibilityTabUI" layout='{new BorderLayout()}'> @@ -41,32 +28,45 @@ <fr.ifremer.isisfish.entities.FisheryRegionImpl id='region' javaBean='null'/> <script><![CDATA[ - import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.entities.FisheryRegionImpl; -import fr.ifremer.isisfish.ui.Common; import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.input.InputAction; -import fr.ifremer.isisfish.ui.input.InputNavigationTreeSelectionAdapter; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import jaxx.runtime.swing.navigation.NavigationTreeCellRenderer; import jaxx.runtime.swing.navigation.NavigationTreeModel; import fr.ifremer.isisfish.ui.input.InputSaveVerifier; -import org.codelutin.topia.TopiaContext; import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; import jaxx.runtime.swing.navigation.NavigationUtil; import fr.ifremer.isisfish.ui.simulator.SimulAction; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeNode; +import javax.swing.JPopupMenu; import fr.ifremer.isisfish.simulator.sensitivity.Factor; +// end code constructor getVerifier().setSensPanel(this); -factors.addMouseListener(new MouseListener(){ +factors.addMouseListener(new MouseListener() { @Override public void mouseClicked(MouseEvent e) { - factorSelected(); + // clic droit + if (e.getButton() == MouseEvent.BUTTON3) { + JPopupMenu menu = new JPopupMenu(); + JMenuItem menuItemDelete = new JMenuItem(_("isisfish.common.delete")); + menuItemDelete.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + deleteSelectedFactors(); + } + }); + menu.add(menuItemDelete); + menu.show(e.getComponent(), e.getX(), e.getY()); + } + else { + // autre clic + factorSelected(); + } } @Override @@ -86,27 +86,32 @@ } }); -protected InputAction getInputAction(){ + +protected InputAction getInputAction() { return getContextValue(InputAction.class); } -protected SimulAction getSimulAction(){ + +protected SimulAction getSimulAction() { return getContextValue(SimulAction.class); } -protected InputSaveVerifier getVerifier(){ + +protected InputSaveVerifier getVerifier() { return getContextValue(InputSaveVerifier.class); } -protected RegionStorage getRegionStorage(){ + +protected RegionStorage getRegionStorage() { return getContextValue(RegionStorage.class); } -protected void factorSelected(){ + +protected void factorSelected() { DefaultMutableTreeNode node = (DefaultMutableTreeNode)factors.getSelectionValue(); - if (node != null){ + if (node != null) { Object o = node.getUserObject(); - if (Factor.class.isInstance(o)){ + if (Factor.class.isInstance(o)) { Factor f = (Factor)o; FactorWizard wizard = new FactorWizard(this); JComponent c = getSimulAction().getFactorComponent(f); - if (c != null){ + if (c != null) { wizard.initExisting(c, f); wizard.pack(); wizard.setVisible(true); @@ -114,8 +119,8 @@ } } } -public void setTreeModel(){ - if (getRegion() != null){ +public void setTreeModel() { + if (getRegion() != null) { getCardlayoutPrincipal().show(inputPanePrincipal,"normale"); String regionName = getRegion().getName(); setContextValue(getRegion()); @@ -129,27 +134,27 @@ setTreeSelection("$root"); } } -public void repaintNode(String path){ +public void repaintNode(String path) { NavigationTreeModel model = getContextValue(NavigationTreeModel.class); NavigationTreeNode currentNode = model.findNode(path); model.nodeChanged(currentNode); } -public void setTreeSelection(String path){ +public void setTreeSelection(String path) { NavigationTreeNode node = NavigationUtil.findNode(this, null, path); TreePath pathToRoot = new TreePath(getContextValue(NavigationTreeModel.class).getPathToRoot(node)); navigation.setSelectionPath(pathToRoot); navigation.scrollPathToVisible(pathToRoot); } -protected void setInfoText(String s){ +protected void setInfoText(String s) { WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); root.setInfoText(s); } -protected void regionNull(){ +protected void regionNull() { getCardlayoutPrincipal().show(inputPanePrincipal,"none"); DefaultTreeModel model = new DefaultTreeModel(null); navigation.setModel(model); } -public void setFactorModel(){ +public void setFactorModel() { TreeNode root = new DefaultMutableTreeNode(getSimulAction().getFactors()); factors.setRootVisible(true); FactorTreeModel model = new FactorTreeModel(root); @@ -157,6 +162,22 @@ factors.setCellRenderer(new FactorTreeCellRenderer()); getParentContainer(SensitivityUI.class).getSensitivityChooserUI().setFactorCardinalityTableModel(); } + +protected void deleteSelectedFactors() { + DefaultMutableTreeNode node = (DefaultMutableTreeNode)factors.getSelectionValue(); + + if (node != null) { + Object o = node.getUserObject(); + if (o instanceof Factor) { + Factor factor = (Factor)o; + if (log.isDebugEnabled()) { + log.debug("Deleting factor " + factor.getName()); + } + getSimulAction().removeFactor(factor); + setFactorModel(); + } + } +} ]]> </script> <JSplitPane oneTouchExpandable="true" dividerLocation="200" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> @@ -173,14 +194,15 @@ </Table> <JPanel id="factorPanel" name="factorPanel" layout='{new BorderLayout()}'> <JScrollPane constraints='BorderLayout.CENTER'> - <JTree id="factors" rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}'/> + <JTree id="factors" rootVisible="true" selectionRow='0' + model='{new DefaultTreeModel(null)}' /> </JScrollPane> </JPanel> </JSplitPane> </JPanel> <JPanel id='inputPanePrincipal' layout='{getCardlayoutPrincipal()}'> <fr.ifremer.isisfish.ui.input.NoneUI id='noneUI' constraints='"none"'/> - <JPanel id="inputPane" layout='{getCardlayout()}' constraints='"normale"'/> + <JPanel id="inputPane" layout='{getCardlayout()}' constraints='"normale"'/> </JPanel> </JSplitPane> </JPanel> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2009-04-21 09:05:36 UTC (rev 2127) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2009-04-21 10:02:06 UTC (rev 2128) @@ -1,7 +1,6 @@  <JPanel layout='{new BorderLayout()}'> <script><![CDATA[ @@ -43,7 +30,7 @@ import fr.ifremer.isisfish.ui.simulator.ExportUI; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; - public void selTab(int i){ + public void selTab(int i) { sensitivityTabs.setSelectedIndex(i); } ]]> Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-21 09:05:36 UTC (rev 2127) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-21 10:02:06 UTC (rev 2128) @@ -105,6 +105,7 @@ isisfish.common.clear=clear isisfish.common.date=Date isisfish.common.debug=debug +isisfish.common.delete=Delete isisfish.common.ellipsis=ellipsis isisfish.common.emigration=emigration isisfish.common.empty=vide Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-21 09:05:36 UTC (rev 2127) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-21 10:02:06 UTC (rev 2128) @@ -105,6 +105,7 @@ isisfish.common.clear=Effacer isisfish.common.date=Date isisfish.common.debug=Debug +isisfish.common.delete=Supprimer isisfish.common.ellipsis=... isisfish.common.emigration=\u00E9migration isisfish.common.empty=vide

1 0

r2127 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 21, 2009

April 21, 2009

Author: chatellier Date: 2009-04-21 09:05:36 +0000 (Tue, 21 Apr 2009) New Revision: 2127 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx Log: Doc/style improvments Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-04-21 09:04:48 UTC (rev 2126) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-04-21 09:05:36 UTC (rev 2127) @@ -44,16 +44,10 @@ <fr.ifremer.isisfish.entities.Equation id='selectedEquation' javaBean='null'/> <script><![CDATA[ -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.EquationImpl; import java.lang.reflect.Method; -import org.apache.commons.beanutils.MethodUtils; -import org.codelutin.topia.persistence.TopiaEntity; import org.codelutin.topia.TopiaContext; -import fr.ifremer.isisfish.entities.EquationDAO; -import fr.ifremer.isisfish.IsisFishDAOHelper; import jaxx.runtime.swing.Item; protected DocumentListener listener = null; @@ -63,7 +57,7 @@ if (evt.getOldValue() != null || evt.getNewValue() == null) { // remove previous binding on getBean() //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - combo.setModel(new DefaultComboBoxModel()); + formuleComboBox.setModel(new DefaultComboBoxModel()); try { editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); } catch (IOException e) { @@ -80,8 +74,8 @@ } }); start(); -protected void start(){ - if (listener == null){ +protected void start() { + if (listener == null) { listener = new DocumentListener() { @Override @@ -102,7 +96,7 @@ setComboModel(); editor.getCurrentEditor().addDocumentListener(listener); } -protected Equation getEquation(){ +protected Equation getEquation() { Equation result = null; try { if (bean != null && methodGet != null){ @@ -139,7 +133,7 @@ } if (nameEquation != null){ setComboModel(); - setFormule((Formule)combo.getSelectedItem()); + setFormule((Formule)formuleComboBox.getSelectedItem()); setEditorText(); selectedEquation = getEquation(); } @@ -159,7 +153,7 @@ boolean selected = f.equals(selectedEquation); items.add(new Item(f.getName(), f.getName(), f, selected)); } - combo.setItems(items); + formuleComboBox.setItems(items); } } } @@ -169,7 +163,7 @@ setInfoText(_("isisfish.message.saveModel.finished")); } protected void openEditor() { - Formule e = (Formule)combo.getSelectedItem(); + Formule e = (Formule)formuleComboBox.getSelectedItem(); if (e != null) { getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(), clazz, e.getContent(), editor); } @@ -191,6 +185,12 @@ } } } + +protected void formuleChanged() { + Formule selectedFormule = (Formule)formuleComboBox.getSelectedItem(); + setFormule(selectedFormule); + setEditorText(); +} ]]> </script> <Table id='body'> @@ -199,7 +199,7 @@ <JLabel id='lbl' text='{getLblText()}' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="combo" onActionPerformed='setFormule((Formule)combo.getSelectedItem());setEditorText();' enabled='{isActif()}'/> + <JComboBox id="formuleComboBox" onActionPerformed='formuleChanged()' enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-04-21 09:04:48 UTC (rev 2126) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-04-21 09:05:36 UTC (rev 2127) @@ -158,7 +158,7 @@ protected void add() { Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue(); if (getMetierInfo() != null && species != null) { - Formule selectedFormule = (Formule)targetFactor.getCombo().getSelectedItem(); + Formule selectedFormule = (Formule)targetFactor.getFormuleComboBox().getSelectedItem(); getContextValue(InputAction.class).addTargetSpecies( getBean(), (MetierSeasonInfo)getMetierInfo(), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-04-21 09:04:48 UTC (rev 2126) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-04-21 09:05:36 UTC (rev 2127) @@ -1,7 +1,6 @@  - <fr.ifremer.isisfish.ui.input.InputContentUI>  @@ -39,13 +25,12 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> <script><![CDATA[ - import fr.ifremer.isisfish.entities.PopulationSeasonInfo; import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -import fr.ifremer.isisfish.entities.Formule; +// TODO why it's commented addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -58,10 +43,12 @@ } } }); -public void init(PopulationSeasonInfo pi){ + +public void init(PopulationSeasonInfo pi) { setPopInfo((PopulationSeasonInfoImpl)pi); } -public void refresh(){ + +public void refresh() { Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); getVerifier().addCurrentPanel(immigrationEquation, emigrationEquation, migrationEquation); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-04-21 09:04:48 UTC (rev 2126) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-04-21 09:05:36 UTC (rev 2127) @@ -16,23 +16,8 @@ * 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. - *##%*/ - -/* * - * IsisFish.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ - --> - + *##%*/ --> + <fr.ifremer.isisfish.ui.input.InputContentUI>  Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-04-21 09:04:48 UTC (rev 2126) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-04-21 09:05:36 UTC (rev 2127) @@ -47,20 +47,20 @@ } }); -public void refresh(){ +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI); Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); - if (getBean() != null){ + if (getBean() != null) { setFieldPopulationMigrationSeasonChooserModel(); } useEquationChanged(); } -protected void seasonChanged(){ +protected void seasonChanged() { setPopInfo((PopulationSeasonInfoImpl)getPopulationSeasonInfo()); - if (getPopInfo() != null){ + if (getPopInfo() != null) { getVerifier().addCurrentEntity(getPopInfo()); populationMigrationEquationUI.init(getPopInfo()); populationMigrationMigrationUI.init(getPopInfo()); @@ -69,22 +69,22 @@ } useEquationChanged(); } -protected void setFieldPopulationMigrationSeasonChooserModel(){ +protected void setFieldPopulationMigrationSeasonChooserModel() { DefaultComboBoxModel model = new DefaultComboBoxModel(); - if (getBean().getPopulationSeasonInfo() != null){ + if (getBean().getPopulationSeasonInfo() != null) { model.addElement(new GenericCell(" ", null, PopulationSeasonInfo.class)); - for (PopulationSeasonInfo psi : getBean().getPopulationSeasonInfo()){ + for (PopulationSeasonInfo psi : getBean().getPopulationSeasonInfo()) { model.addElement(new GenericCell(psi.getFirstMonth() + " - " + psi.getLastMonth(), psi, PopulationSeasonInfo.class)); } } fieldPopulationMigrationSeasonChooser.setModel(model); } -protected PopulationSeasonInfo getPopulationSeasonInfo(){ +protected PopulationSeasonInfo getPopulationSeasonInfo() { PopulationSeasonInfo result = null; Object selected = fieldPopulationMigrationSeasonChooser.getSelectedItem(); - if (selected != null){ + if (selected != null) { GenericCell cell = (GenericCell)selected; - if (cell.getValue() != null){ + if (cell.getValue() != null) { result = (PopulationSeasonInfo)cell.getValue(); } } @@ -94,10 +94,10 @@ if (getPopInfo() != null) { getPopInfo().setUseEquationMigration(fieldUseEquationMigration.isSelected()); } - if (fieldUseEquationMigration.isSelected()){ + if (fieldUseEquationMigration.isSelected()) { ((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "fieldUseEquation"); } - else{ + else { ((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "fieldUseMatrix"); } } @@ -122,9 +122,15 @@ <JPanel id="hidablePanel" layout='{new CardLayout()}'> <PopulationMigrationEquationUI id='populationMigrationEquationUI' constraints='"fieldUseEquation"' constructorParams='this'/> <JTabbedPane id="fieldUseMatrix" constraints='"fieldUseMatrix"'> - <tab title='{_("isisfish.populationMigrationMigration.title")}'><PopulationMigrationMigrationUI id="populationMigrationMigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"MigrationMatrix"'/></tab> - <tab title='{_("isisfish.populationMigrationImmigration.title")}'><PopulationMigrationImmigrationUI id="populationMigrationImmigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ImmigrationMatrix"'/></tab> - <tab title='{_("isisfish.populationMigrationEmigration.title")}'><PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationMatrix"'/></tab> + <tab title='{_("isisfish.populationMigrationMigration.title")}'> + <PopulationMigrationMigrationUI id="populationMigrationMigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"MigrationMatrix"'/> + </tab> + <tab title='{_("isisfish.populationMigrationImmigration.title")}'> + <PopulationMigrationImmigrationUI id="populationMigrationImmigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ImmigrationMatrix"'/> + </tab> + <tab title='{_("isisfish.populationMigrationEmigration.title")}'> + <PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationMatrix"'/> + </tab> </JTabbedPane> </JPanel> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-04-21 09:04:48 UTC (rev 2126) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-04-21 09:05:36 UTC (rev 2127) @@ -100,7 +100,10 @@ if (selectivity != null) { for (Selectivity s : selectivity) { populations.add(s.getPopulation()); - equations.add(s.getEquation()); + + Equation equation = s.getEquation(); + getVerifier().addCurrentEntity(equation); + equations.add(equation); } } model.addColumn("Population", populations.toArray()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-04-21 09:04:48 UTC (rev 2126) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-04-21 09:05:36 UTC (rev 2127) @@ -1,7 +1,6 @@  <fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-04-21 09:04:48 UTC (rev 2126) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-04-21 09:05:36 UTC (rev 2127) @@ -1,7 +1,6 @@  - -  <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[

3 3

r2126 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 21, 2009

April 21, 2009

Author: chatellier Date: 2009-04-21 09:04:48 +0000 (Tue, 21 Apr 2009) New Revision: 2126 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java Log: Comment previous set null on topiaId Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-04-20 17:19:37 UTC (rev 2125) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-04-21 09:04:48 UTC (rev 2126) @@ -43,7 +43,6 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.topia.TopiaContext; import org.codelutin.topia.TopiaException; -import org.codelutin.topia.framework.TopiaContextImpl; import org.codelutin.topia.persistence.TopiaDAO; import org.codelutin.topia.persistence.TopiaEntity; @@ -306,7 +305,7 @@ // fix : org.hibernate.NonUniqueObjectException: a different object with the // same identifier value was already associated with the session //((TopiaContextImpl)isisContext).getHibernate().evict(t2); - t.setTopiaId(null); + //t.setTopiaId(null); rootUI.repaintNode(currentNode.getContextPath()); rootUI.setTreeSelection(currentNode.getContextPath()); @@ -344,18 +343,17 @@ if (currentEntity != null) { editable = true; isisContext = currentEntity.getTopiaContext(); - currentEntity - .addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("PropertyChanged : " - + evt.getPropertyName() - + " New Value : " + evt.getNewValue()); - } - topiaChanged(); - } - }); + currentEntity.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (log.isDebugEnabled()) { + log.debug("PropertyChanged : " + + evt.getPropertyName() + + " New Value : " + evt.getNewValue()); + } + topiaChanged(); + } + }); TopiaEntity entity = getEntity(currentEntity.getClass()); if (entity != null) { currentEntities.remove(entity);

1 0

r2125 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 20, 2009

April 20, 2009

Author: chatellier Date: 2009-04-20 17:19:37 +0000 (Mon, 20 Apr 2009) New Revision: 2125 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx Log: Make class abstract, add comments... Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-04-20 17:14:44 UTC (rev 2124) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-04-20 17:19:37 UTC (rev 2125) @@ -1,4 +1,4 @@ -<JPanel layout='{new BorderLayout()}'> +<JPanel layout='{new BorderLayout()}' abstract="true">  <Boolean id='actif' javaBean='false'/> @@ -11,6 +11,7 @@  <java.lang.String id='nextPath' javaBean='null'/> +  <jaxx.runtime.swing.BlockingLayerUI id='layerUI' blockIcon='{SwingUtil.createImageIcon("building.png")}' acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' @@ -46,38 +47,47 @@ import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; import jaxx.runtime.JAXXInitialContext; -public void refresh(){} +// TODO comment this empty method !!! +public void refresh() { + +} + public InputAction getAction() { return getContextValue(InputAction.class); } -public InputSaveVerifier getVerifier(){ +public InputSaveVerifier getVerifier() { return getContextValue(InputSaveVerifier.class); } -public FisheryRegion getRegion(){ +public FisheryRegion getRegion() { return getContextValue(FisheryRegion.class); } -public void setInfoText(String msg){ +public void setInfoText(String msg) { WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); if (root != null){ root.setInfoText(msg); } } -protected void goTo(){ +protected void goTo() { getParentContainer(InputUI.class).setTreeSelection(getNextPath()); } -public void setBean(TopiaEntity t){}; +// TODO this method cause a lot of probleme +// must cast TopiaEntity to impl in inherited UIs... +public void setBean(TopiaEntity t) { + +} + public void setLayer(boolean active) { - if (this.get$objectMap() != null){ + if (this.get$objectMap() != null) { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { // Verifie si dans l'entré existe dans le fichier sensitivity.properties Class classBean = (Class)boxed.getClientProperty("bean"); String method = (String)boxed.getClientProperty("method"); boolean isSensitivity = false; - if (classBean != null){ + if (classBean != null) { isSensitivity = UtilsUI.isSensitivity(classBean.getSimpleName().replace("Impl", "") + "." + method); } - if (isSensitivity){ + if (isSensitivity) { jaxx.runtime.swing.BlockingLayerUI2 ui = active ? layerUI2.clone() : null; SwingUtil.getLayer(boxed).setUI(ui); } else { @@ -90,21 +100,19 @@ } } - protected void accept(ActionEvent e) { - JComponent source = (JComponent) e.getSource(); - Class classBean = (Class)source.getClientProperty("bean"); - TopiaEntity bean = getVerifier().getEntity(classBean); - if (bean != null){ - FactorWizard wizard = new FactorWizard(this); - - wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean)); - wizard.pack(); - wizard.setVisible(true); - } +protected void accept(ActionEvent e) { + JComponent source = (JComponent) e.getSource(); + Class classBean = (Class)source.getClientProperty("bean"); + TopiaEntity bean = getVerifier().getEntity(classBean); + if (bean != null) { + FactorWizard wizard = new FactorWizard(this); + wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean)); + wizard.pack(); + wizard.setVisible(true); } +} -]]> - </script> +]]></script> <JPanel id='body' constraints='BorderLayout.CENTER'/> <JButton id='next' text='{getButtonTitle()}' constraints='BorderLayout.SOUTH' visible='{getNextPath() != null}' onActionPerformed='goTo()'/> </JPanel>

1 0

r2124 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 20, 2009

April 20, 2009

Author: chatellier Date: 2009-04-20 17:14:44 +0000 (Mon, 20 Apr 2009) New Revision: 2124 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx Log: Fix effortdescriptionUI (can't edit float value, etc...) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-04-20 09:34:22 UTC (rev 2123) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-04-20 17:14:44 UTC (rev 2124) @@ -1,7 +1,6 @@  <fr.ifremer.isisfish.ui.input.InputContentUI> @@ -38,13 +25,13 @@ <fr.ifremer.isisfish.entities.EffortDescriptionImpl id='effortDescription' javaBean='null'/> <script><![CDATA[ - import fr.ifremer.isisfish.entities.EffortDescription; import fr.ifremer.isisfish.entities.EffortDescriptionImpl; import fr.ifremer.isisfish.entities.SetOfVesselsImpl; import fr.ifremer.isisfish.entities.SetOfVessels; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.types.TimeUnit; + import jaxx.runtime.swing.Item; addPropertyChangeListener("bean", new PropertyChangeListener() { @@ -108,6 +95,11 @@ setEffortDescriptionEffortDescriptionList(); } } +protected void effortDescriptionChanged() { + EffortDescriptionImpl selectedEffort = (EffortDescriptionImpl)fieldEffortDescriptionEffortDescriptionList.getSelectedValue(); + setEffortDescription(selectedEffort); + getVerifier().addCurrentEntity(getEffortDescription()); +} ]]> </script> <Table id='body'> @@ -129,7 +121,7 @@ <row> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="0" onMouseClicked='setEffortDescription((EffortDescriptionImpl)fieldEffortDescriptionEffortDescriptionList.getSelectedValue());getVerifier().addCurrentEntity(getEffortDescription())' enabled='{isActif()}'/> + <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="0" onValueChanged='effortDescriptionChanged()' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -142,7 +134,7 @@ <JLabel text="isisfish.effortDescription.fishingOperation" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}' onKeyReleased='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/> + <JTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}' onFocusLost='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/> </cell> </row> <row> @@ -150,7 +142,7 @@ <JLabel text="isisfish.effortDescription.fishingOperationDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' toolTipText="in hour" onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperationDuration"'/> + <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' toolTipText="in hour" onFocusLost='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperationDuration"'/> </cell> </row> <row> @@ -158,7 +150,7 @@ <JLabel text="isisfish.effortDescription.gearsNumberPerOperation" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{getEffortDescription().getGearsNumberPerOperation()}' onKeyReleased='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/> + <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{getEffortDescription().getGearsNumberPerOperation()}' onFocusLost='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/> </cell> </row> <row> @@ -166,7 +158,7 @@ <JLabel text="isisfish.effortDescription.crewSize" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewSize" text='{getEffortDescription().getCrewSize()}' onKeyReleased='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/> + <JTextField id="fieldEffortDescriptionCrewSize" text='{getEffortDescription().getCrewSize()}' onFocusLost='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/> </cell> </row> <row> @@ -174,7 +166,7 @@ <JLabel text="isisfish.effortDescription.unitCostOfFishing" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{getEffortDescription().getUnitCostOfFishing()}' onKeyReleased='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/> + <JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{getEffortDescription().getUnitCostOfFishing()}' onFocusLost='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/> </cell> </row> <row> @@ -182,7 +174,7 @@ <JLabel text="isisfish.effortDescription.fixedCrewSalary" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{getEffortDescription().getFixedCrewSalary()}' onKeyReleased='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/> + <JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{getEffortDescription().getFixedCrewSalary()}' onFocusLost='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/> </cell> </row> <row> @@ -190,7 +182,7 @@ <JLabel text="isisfish.effortDescription.crewFoodCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewFoodCost" text='{getEffortDescription().getCrewFoodCost()}' onKeyReleased='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/> + <JTextField id="fieldEffortDescriptionCrewFoodCost" text='{getEffortDescription().getCrewFoodCost()}' onFocusLost='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/> </cell> </row> <row> @@ -198,7 +190,7 @@ <JLabel text="isisfish.effortDescription.crewShareRate" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewShareRate" text='{getEffortDescription().getCrewShareRate()}' onKeyReleased='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/> + <JTextField id="fieldEffortDescriptionCrewShareRate" text='{getEffortDescription().getCrewShareRate()}' onFocusLost='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/> </cell> </row> <row> @@ -206,7 +198,7 @@ <JLabel text="isisfish.effortDescription.repairAndMaintenanceGearCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{getEffortDescription().getRepairAndMaintenanceGearCost()}' onKeyReleased='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"RepairAndMaintenanceGearCost"'/> + <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{getEffortDescription().getRepairAndMaintenanceGearCost()}' onFocusLost='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"RepairAndMaintenanceGearCost"'/> </cell> </row> <row> @@ -214,7 +206,7 @@ <JLabel text="isisfish.effortDescription.landingCosts" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionLandingCosts" text='{getEffortDescription().getLandingCosts()}' onKeyReleased='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/> + <JTextField id="fieldEffortDescriptionLandingCosts" text='{getEffortDescription().getLandingCosts()}' onFocusLost='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/> </cell> </row> <row> @@ -222,11 +214,11 @@ <JLabel text="isisfish.effortDescription.otherRunningCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionOtherRunningCost" text='{getEffortDescription().getOtherRunningCost()}' onKeyReleased='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/> + <JTextField id="fieldEffortDescriptionOtherRunningCost" text='{getEffortDescription().getOtherRunningCost()}' onFocusLost='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/> </cell> </row> <row> - <cell columns='2' fill='horizontal' weightx='1.0'> + <cell columns='2' fill='horizontal' weightx='1.0'> <Table> <row> <cell fill='horizontal' weightx='0.3'>

1 0

r2123 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org April 20, 2009

April 20, 2009

Author: chatellier Date: 2009-04-20 09:34:22 +0000 (Mon, 20 Apr 2009) New Revision: 2123 Modified: isis-fish/trunk/pom.xml Log: Update libs (jsch, h2) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-04-20 08:49:22 UTC (rev 2122) +++ isis-fish/trunk/pom.xml 2009-04-20 09:34:22 UTC (rev 2123) @@ -197,7 +197,7 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.38</version> + <version>0.1.41</version> <scope>compile</scope> </dependency> @@ -213,7 +213,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.110</version> + <version>1.1.111</version> <scope>compile</scope> </dependency>

1 0

r2122 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 20, 2009

April 20, 2009

Author: chatellier Date: 2009-04-20 08:49:22 +0000 (Mon, 20 Apr 2009) New Revision: 2122 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx Log: Fix unused import, undocumented commented code... Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-04-20 07:54:12 UTC (rev 2121) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-04-20 08:49:22 UTC (rev 2122) @@ -1,7 +1,6 @@  - - -  + *##%*/ --> <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.GearImpl; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; +// constructor code getVerifier().addCurrentPanel(this); setButtonTitle(_("isisfish.input.continueMetiers")); setNextPath("$root/$metiers"); + +// refresh public void refresh() { - if (isSens()){ + if (isSens()) { gearTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { gearTab.addChangeListener(new InputTabbedPaneListener()); } - getVerifier().addCurrentPanel(selectivityUI ,gearTabUI); + getVerifier().addCurrentPanel(selectivityUI, gearTabUI); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab" name="Gear"> - <tab title='{_("isisfish.gear.title")}'><GearTabUI id="gearTabUI" constructorParams='this'/></tab> + <tab title='{_("isisfish.gear.title")}'><GearTabUI id="gearTabUI" constructorParams='this'/></tab> <tab title='{_("isisfish.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this'/></tab> </JTabbedPane> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-04-20 07:54:12 UTC (rev 2121) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-04-20 08:49:22 UTC (rev 2122) @@ -1,7 +1,6 @@  -/* * - * IsisFish.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ - --> - <fr.ifremer.isisfish.ui.input.InputContentUI>  @@ -45,8 +31,6 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -106,9 +90,10 @@ } return result; } -protected void useEquationChanged(){ - if (getPopInfo() != null) +protected void useEquationChanged() { + if (getPopInfo() != null) { getPopInfo().setUseEquationMigration(fieldUseEquationMigration.isSelected()); + } if (fieldUseEquationMigration.isSelected()){ ((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "fieldUseEquation"); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-04-20 07:54:12 UTC (rev 2121) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-04-20 08:49:22 UTC (rev 2122) @@ -1,7 +1,6 @@  + *##%*/ --> <fr.ifremer.isisfish.ui.input.InputContentUI>  @@ -39,29 +25,17 @@ <Boolean id='selectivityPopulationSelected' javaBean='false'/> - <script> - <![CDATA[ - + <script><![CDATA[ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -import fr.ifremer.isisfish.entities.Gear; -import fr.ifremer.isisfish.entities.GearImpl; import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; import javax.swing.table.DefaultTableModel; import fr.ifremer.isisfish.entities.Selectivity; -import fr.ifremer.isisfish.entities.GearImpl; import fr.ifremer.isisfish.entities.Equation; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.MetierImpl; +// TODO why it's commented ? to remove ? addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -98,8 +72,9 @@ public void mouseExited(MouseEvent e) { } }); -public void refresh(){ - if (getBean() != null){ + +public void refresh() { + if (getBean() != null) { setSelectivityTableModel(); fieldSelectivityPopulation.setModel(getSelectivityPopulationModel()); } @@ -107,16 +82,17 @@ remove.setEnabled(false); } + protected void setSelectivityTableModel() { DefaultTableModel model = new DefaultTableModel() { @Override - public boolean isCellEditable(int row, int column) { - boolean result = false; - if (column > 0) { - result =true; - } - return result; + public boolean isCellEditable(int row, int column) { + boolean result = false; + if (column > 0) { + result =true; } + return result; + } }; Collection<Selectivity> selectivity = getBean().getPopulationSelectivity(); java.util.List<Population> populations = new ArrayList<Population>(); @@ -134,15 +110,18 @@ EquationTableEditor cellEditor = new EquationTableEditor(); selectivityTable.getColumnModel().getColumn(1).setCellEditor(cellEditor); } + protected void add() { getAction().addSelectivity((Population)getPopulation(), selectivityEquation.getEditor().getText(), getBean()); setSelectivityTableModel(); } + protected void remove() { getAction().removeSelectivity(getBean(), (Selectivity) getBean().getPopulationSelectivity((Population) selectivityTable.getValueAt(selectivityTable.getSelectedRow(), 0))); setSelectivityTableModel(); } -protected DefaultComboBoxModel getSelectivityPopulationModel(){ + +protected DefaultComboBoxModel getSelectivityPopulationModel() { java.util.List<Species> species = getRegion().getSpecies(); DefaultComboBoxModel selectivityPopulationModel = new DefaultComboBoxModel(); if (species != null) { @@ -157,13 +136,13 @@ } return selectivityPopulationModel; } -protected void selectivityChanged(){ + +protected void selectivityChanged() { setSelectivityPopulationSelected(fieldSelectivityPopulation.getSelectedItem() != null); setPopulation((PopulationImpl) ((GenericCell) fieldSelectivityPopulation.getSelectedItem()).getValue()); add.setEnabled(isSelectivityPopulationSelected()); } - ]]> - </script> + ]]></script> <Table id='body'> <row> <cell fill='both' weightx='1.0' weighty='1.0'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-04-20 07:54:12 UTC (rev 2121) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-04-20 08:49:22 UTC (rev 2122) @@ -1,7 +1,6 @@  + *##%*/ --> <fr.ifremer.isisfish.ui.input.InputContentUI>  <fr.ifremer.isisfish.entities.GearImpl id='bean' javaBean='null'/> - <script> - <![CDATA[ - -import java.util.logging.Level; -import java.util.logging.Logger; -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.MetierImpl; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationImpl; + <script><![CDATA[ import fr.ifremer.isisfish.entities.Gear; import fr.ifremer.isisfish.entities.GearImpl; -import fr.ifremer.isisfish.entities.Species; +// TODO why it's commented ? to remove ? addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -61,17 +38,17 @@ } } }); + +// refresh public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); setBean(null); Gear gear = (Gear)getVerifier().getEntity(Gear.class); setBean((GearImpl) gear); - getVerifier().addCurrentPanel(editor); } - ]]> - </script> + ]]></script> <Table id='body'> <row> <cell fill='both' weightx='1.0' weighty='1.0'>

1 0

r2121 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org April 20, 2009

April 20, 2009

Author: chatellier Date: 2009-04-20 07:54:12 +0000 (Mon, 20 Apr 2009) New Revision: 2121 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java Log: Do test in "target" directory. Remove created directory after tests 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-04-18 10:25:47 UTC (rev 2120) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-04-20 07:54:12 UTC (rev 2121) @@ -105,7 +105,7 @@ */ @Test public void testCompile() throws IOException, ClassNotFoundException { - File f = File.createTempFile("testCompile", ".java"); + File f = File.createTempFile("testCompile", ".java", TestUtils.getTargetdir()); String filename = FileUtil.basename(f, ".java"); String code = getFirstClassContent(filename); FileUtil.writeString(f, code); @@ -138,12 +138,12 @@ @Test public void testCompileDepend() throws IOException, ClassNotFoundException { - File fA = File.createTempFile("testCompileA", ".java"); + File fA = File.createTempFile("testCompileA", ".java", TestUtils.getTargetdir()); String filenameA = FileUtil.basename(fA, ".java"); String codeA = getFirstClassContent(filenameA); FileUtil.writeString(fA, codeA); - File fB = File.createTempFile("testCompileB", ".java"); + File fB = File.createTempFile("testCompileB", ".java", TestUtils.getTargetdir()); String filenameB = FileUtil.basename(fB, ".java"); String codeB = getSecondClassContent(filenameB, filenameA); FileUtil.writeString(fB, codeB); @@ -177,5 +177,6 @@ fclassB.delete(); fA.delete(); fB.delete(); + FileUtil.deleteRecursively(dest); } }

1 0

r2120 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by bpoussin＠users.labs.libre-entreprise.org April 18, 2009

April 18, 2009

Author: bpoussin Date: 2009-04-18 10:25:47 +0000 (Sat, 18 Apr 2009) New Revision: 2120 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java Log: correction bug de TopiaContext. On utilisait certaine fois le context de simulation alors que le SimulationStorage n'etait pas celui de la simulation. Un test a ete ajoute pour eviter cette erreur 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-04-17 12:26:08 UTC (rev 2119) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2009-04-18 10:25:47 UTC (rev 2120) @@ -84,11 +84,11 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(ResultStorage.class); - + protected SimulationStorage simulation = null; // transient protected HashMap<String, MatrixND> globalMatrix = new HashMap<String, MatrixND>(); transient protected ReferenceMap cacheContext = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - + /** cache to maintains some result. key: String(date + ':' + name), value: matrix * TODO: cache will be more efficient if it keep at min the number of result by year */ transient protected ReferenceMap cache = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); @@ -105,7 +105,7 @@ public ResultStorage(SimulationStorage simulation) { this.simulation = simulation; } - + protected void putInCache(Date date, String name, MatrixND mat, TopiaContext context) { String key = date + ":" + name; putInCache(key, mat, context); @@ -142,8 +142,13 @@ if (availableResult == null) { availableResult = new HashSet<String>(); try { - TopiaContext tx = SimulationContext.get().getDbResult(); - boolean mustClose = false; + TopiaContext tx = null; + boolean mustClose = false; + + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } + if (tx == null) { // not in simulation, create transaction tx = simulation.getStorage().beginTransaction(); @@ -165,7 +170,7 @@ } return availableResult; } - + /** * Verifie si un resultat est disponible pour une date donnée * @param date @@ -186,7 +191,7 @@ String key = date.getDate() + ":" + name; getAvailableResult().add(key); } - + /** * Permet de savoir si lorsque l'on ajoutera ce resultat, il sera * sauvé ou non. @@ -195,7 +200,7 @@ name = name.trim(); if (enabledResult == null) { enabledResult = new HashSet<String>(); - + Collection<String> resultEnabled = simulation.getParameter().getResultEnabled(); enabledResult.addAll(resultEnabled); List<String> exportNames = simulation.getParameter().getExportNames(); @@ -259,7 +264,7 @@ public void addResult(Date date, String name, MatrixND mat) throws IsisFishException{ addResult(false, date, name, mat); } - + public void addResult(boolean force, Date date, String name, Population pop, MatrixND mat) throws IsisFishException{ if (force || isEnabled(name)) { doAddResult(date, name + " " + pop, mat); @@ -271,11 +276,15 @@ doAddResult(date, name, mat); } } - + protected void doAddResult(Date date, String name, MatrixND mat) throws IsisFishException{ try { - TopiaContext tx = SimulationContext.get().getDbResult(); - boolean mustClose = false; + TopiaContext tx = null; + boolean mustClose = false; + + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } if (tx == null) { // not in simulation, create transaction tx = simulation.getStorage().beginTransaction(); @@ -319,8 +328,12 @@ public void addActiveRule(Date date, Rule rule) throws IsisFishException { try { - TopiaContext tx = SimulationContext.get().getDbResult(); - boolean mustClose = false; + TopiaContext tx = null; + boolean mustClose = false; + + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } if (tx == null) { // not in simulation, create transaction tx = simulation.getStorage().beginTransaction(); @@ -338,9 +351,9 @@ } } catch (TopiaException eee) { throw new IsisFishException("Can't add result", eee); - } + } } - + /** * Retourne la liste de tous les résultats. Si le résultat est categorisé * par une population alors le nom de la population est automatiquement @@ -348,19 +361,23 @@ */ @SuppressWarnings("unchecked") public List<String> getResultName(){ - + List<String> result = null; try { - TopiaContext tx = SimulationContext.get().getDbResult(); - boolean mustClose = false; + TopiaContext tx = null; + boolean mustClose = false; + + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } if (tx == null) { // not in simulation, create transaction tx = simulation.getStorage().beginTransaction(); mustClose = true; } ResultDAO resultPS = IsisFishDAOHelper.getResultDAO(tx); - - + + result = (List<String>)resultPS.getContext().find( "Select distinct name from fr.ifremer.isisfish.entities.Result order by name"); if (mustClose) { @@ -393,8 +410,12 @@ MatrixND mat = getInCache(date, name); if (mat == null && isAvailableResult(date, name)) { try { - TopiaContext tx = SimulationContext.get().getDbResult(); - boolean mustClose = false; + TopiaContext tx = null; + boolean mustClose = false; + + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } if (tx == null) { // not in simulation, create transaction tx = simulation.getStorage().beginTransaction(); @@ -413,11 +434,11 @@ if (log.isWarnEnabled()) { log.warn("Can't return matrix '" + name + "' for date " + date, eee); } - } + } } return mat; } - + /** * Retourne la matrice stocke pour un pas de temps * @param date le pas de temps que l'on souhaite @@ -435,12 +456,12 @@ if (result != null) { mat = result.getMatrix(); putInCache(date, name, mat, tx); - } + } } catch (Exception eee) { if (log.isWarnEnabled()) { log.warn("Can't return matrix '" + name + "' for date " + date, eee); } - } + } } return mat; } @@ -462,8 +483,12 @@ public MatrixND getMatrix(String name){ MatrixND resultMat = null; try { - TopiaContext tx = SimulationContext.get().getDbResult(); - boolean mustClose = false; + TopiaContext tx = null; + boolean mustClose = false; + + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } if (tx == null) { // not in simulation, create transaction tx = simulation.getStorage().beginTransaction(); @@ -485,7 +510,7 @@ } return resultMat; } - + /** * Retourne une matrice contenant tous les pas de temps. * @param name le nom des resultats dont on veut une matrice globale. @@ -557,7 +582,7 @@ log.trace("Ajout de la semantics: "+ Arrays.asList(mattmp.getSemantics())); } - + for(int s=0; s<mattmp.getNbDim(); s++){ sem[s+1].addAll(mattmp.getSemantics(s)); } @@ -598,7 +623,7 @@ * @return */ public Date getLastDate() { - int monthNumber = simulation.getParameter().getNumberOfYear() * Month.NUMBER_OF_MONTH; + int monthNumber = simulation.getParameter().getNumberOfYear() * Month.NUMBER_OF_MONTH; Date result = new Date(monthNumber - 1); // -1 because date begin at 0 return result; } @@ -678,4 +703,3 @@ // } } // ResultStorage -

1 0