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

r2368 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 12 Jun '09

12 Jun '09

Author: chatellier Date: 2009-06-12 08:51:59 +0000 (Fri, 12 Jun 2009) New Revision: 2368 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx Log: Add hack for parent container. (InputUI and SensitivityUI) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-06-12 08:49:37 UTC (rev 2367) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-06-12 08:51:59 UTC (rev 2368) @@ -28,6 +28,7 @@ import com.bbn.openmap.gui.OMToolSet; import com.bbn.openmap.event.SelectMouseMode; import fr.ifremer.isisfish.map.CellSelectionLayer; +import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; protected OMToolSet toolSet = new OMToolSet(); protected OpenMapEvents mapListener = null; @@ -106,13 +107,21 @@ return; } - // FIXME this can't work on sensitivity - getParentContainer(InputUI.class).setTreeSelection("$root/$cells/"+c.getTopiaId()); + // FIXME il ne faut pas appeler le parent + // on ne sais jamais de quel type est le parent + InputUI inputUI = getParentContainer(InputUI.class); + if (inputUI != null) { + inputUI.setTreeSelection("$root/$cells/" + c.getTopiaId()); + } + else { + SensitivityTabUI sensitivityTabUI = getParentContainer(SensitivityTabUI.class); + sensitivityTabUI.setTreeSelection("$root/$cells/"+c.getTopiaId()); + } } } ]]></script> - <JPanel id='body' layout='{new BorderLayout()}'> - <JSplitPane id="CellTab" name="Cells" constraints='BorderLayout.CENTER' + <JPanel layout='{new BorderLayout()}'> + <JSplitPane constraints='BorderLayout.CENTER' oneTouchExpandable="true" dividerLocation="200" orientation="horizontal"> <Table> <row>

1 0

r2367 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: rule simulator
by chatellier＠users.labs.libre-entreprise.org 12 Jun '09

12 Jun '09

Author: chatellier Date: 2009-06-12 08:49:37 +0000 (Fri, 12 Jun 2009) New Revision: 2367 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java Log: Load rules parameters in current simulation context. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java 2009-06-10 15:24:47 UTC (rev 2366) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java 2009-06-12 08:49:37 UTC (rev 2367) @@ -25,9 +25,9 @@ import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codelutin.topia.TopiaContext; import org.codelutin.topia.persistence.TopiaEntity; -import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.util.ConverterUtil; @@ -57,14 +57,14 @@ * @param ruleIndex l'index de la regle * @param rule la regle dont les parametres doivent etre lu depuis les * proprietes - * @param region le topia context dont on a besoin + * @param context le topia context dont on a besoin * @param props les proprietes contenant les parametre de la regle */ - public static void populateRule(int ruleIndex, RegionStorage region, Rule rule, Properties props) { - ConvertUtilsBean beanUtils = ConverterUtil.getConverter(region.getStorage()); + public static void populateRule(int ruleIndex, TopiaContext context, Rule rule, Properties props) { + ConvertUtilsBean beanUtils = ConverterUtil.getConverter(context); String ruleName = RuleStorage.getName(rule); String paramTag = "rule." + ruleIndex + ".parameter."; - + for (Map.Entry<String, Class> entry : RuleStorage.getParameterNames(rule).entrySet()) { String propName = entry.getKey(); Class type = entry.getValue(); @@ -85,7 +85,4 @@ } } } - } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-06-10 15:24:47 UTC (rev 2366) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-06-12 08:49:37 UTC (rev 2367) @@ -362,8 +362,19 @@ } try { - TopiaContext tx = getRegion().getStorage().beginTransaction(); + // On verifie tout d'abord que l'on ai pas dans une simulation + // si on y es, on utilise le context static non null du thread local + // Resoud les lazy exceptions des parametres des regles + boolean mustClose = false; + TopiaContext tx = SimulationContext.get().getDB(); + + if (tx == null) { + // not in simulation, create transaction + tx = getRegion().getStorage().beginTransaction(); + mustClose = true; + } + // strategies try { StrategyDAO strategyDAO = IsisFishDAOHelper.getStrategyDAO(tx); String[] strategyList = props.getProperty("strategies", "") @@ -386,6 +397,7 @@ } } + // populations try { PopulationDAO populationDAO = IsisFishDAOHelper .getPopulationDAO(tx); @@ -418,30 +430,37 @@ } } + // rules + String[] ruleList = props.getProperty("rules", "").split(","); + int ruleIndex = 0; + for (String name : ruleList) { + if (name != null && !"".equals(name)) { + try { + Rule rule = RuleStorage.getRule(name).getNewRuleInstance(); + RuleHelper.populateRule(ruleIndex++, tx, rule, props); + getRules().add(rule); + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't find rule: " + name, eee); + } + } + } + } + tx.commitTransaction(); - tx.closeContext(); + + // si la transaction a été ouverte (pas dans une simulation) + // on la referme + if (mustClose) { + tx.closeContext(); + } } catch (TopiaException eee1) { if (log.isWarnEnabled()) { log.warn("Can't get TopiaContext", eee1); } } - String[] ruleList = props.getProperty("rules", "").split(","); - int ruleIndex = 0; - for (String name : ruleList) { - if (name != null && !"".equals(name)) { - try { - Rule rule = RuleStorage.getRule(name).getNewRuleInstance(); - RuleHelper.populateRule(ruleIndex++, getRegion(), rule, props); - getRules().add(rule); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't find rule: " + name, eee); - } - } - } - } - + // analyse plan String[] planList = props.getProperty("plans", "").split(","); int planIndex = 0; for (String name : planList) { @@ -458,6 +477,7 @@ } } + // exports String[] exportList = props.getProperty("exports", "").split(","); int exportIndex = 0; for (String name : exportList) {

1 0

r2366 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: . queue simulator
by chatellier＠users.labs.libre-entreprise.org 10 Jun '09

10 Jun '09

Author: chatellier Date: 2009-06-10 15:24:47 +0000 (Wed, 10 Jun 2009) New Revision: 2366 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTableCellRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Move and refactor queue UI. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-06-10 15:24:16 UTC (rev 2365) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-06-10 15:24:47 UTC (rev 2366) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ --> -<JPanel id='welcomePanelUI' layout='{new BorderLayout()}'> +<JPanel layout='{new BorderLayout()}'> <script><![CDATA[ import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.ui.result.ResultAction; @@ -30,11 +30,11 @@ // chatellier already done in SimulAction constructor //simulUI.getContextValue(SimulAction.class).init(); - queueUI.setContextValue(simulUI.getContextValue(SimulAction.class)); + //queueUI.setContextValue(simulUI.getContextValue(SimulAction.class)); public void selTab(int i){ simulTabs.setSelectedIndex(i); } - public void refresh(){ + public void refresh() { simulUI.refresh(); sensitivityUI.refresh(); } @@ -57,7 +57,7 @@ <fr.ifremer.isisfish.ui.script.ScriptUI/> </tab> <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/Queue.gif"))}'> - <fr.ifremer.isisfish.ui.simulator.QueueUI id="queueUI"/> + <fr.ifremer.isisfish.ui.queue.QueueUI /> </tab> </JTabbedPane> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-06-10 15:24:16 UTC (rev 2365) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-06-10 15:24:47 UTC (rev 2366) @@ -33,7 +33,7 @@ import fr.ifremer.isisfish.ui.result.ResultView; import fr.ifremer.isisfish.ui.script.ScriptUI; import fr.ifremer.isisfish.ui.simulator.SimulUI; - import fr.ifremer.isisfish.ui.simulator.QueueUI; + import fr.ifremer.isisfish.ui.queue.QueueUI; import fr.ifremer.isisfish.ui.simulator.launcher.SSHLauncherConfigUI; import fr.ifremer.isisfish.ui.vcs.VCSConfigUI; import org.codelutin.widget.AboutFrame; @@ -132,11 +132,11 @@ <JMenuItem text="isisfish.welcome.menu.close" onActionPerformed='close()'/> </JMenu> <JMenu text="isisfish.welcome.menu.frame"> - <JMenuItem text="isisfish.welcome.menu.simulation" onActionPerformed='openFrame(new SimulUI(new SimulAction()), _("isisfish.simulation.title"))'/> + <JMenuItem text="isisfish.welcome.menu.simulation" onActionPerformed='openFrame(new SimulUI(new JAXXInitialContext().add(new SimulAction()).add(regionMonitor).add(this)), _("isisfish.simulation.title"))'/> <JMenuItem text="isisfish.welcome.menu.result" onActionPerformed='openFrame(new ResultView(), _("isisfish.result.title"))'/> - <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(new JAXXInitialContext().add(verifier).add(new InputAction()).add(new InputSaveVerifier()).add(this)), _("isisfish.input.title"))'/> + <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(new JAXXInitialContext().add(verifier).add(regionMonitor).add(new InputAction()).add(new InputSaveVerifier()).add(this)), _("isisfish.input.title"))'/> <JMenuItem text="isisfish.welcome.menu.script" onActionPerformed='openFrame(new ScriptUI(), _("isisfish.script.title"))'/> - <JMenuItem text="isisfish.sensitivity.title" onActionPerformed='openFrame(new SensitivityUI(new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier()).add(new SimulAction()).add(this)), _("isisfish.sensitivity.title"))'/> + <JMenuItem text="isisfish.sensitivity.title" onActionPerformed='openFrame(new SensitivityUI(new JAXXInitialContext().add(regionMonitor).add(new InputAction()).add(new InputSaveVerifier()).add(new SimulAction()).add(this)), _("isisfish.sensitivity.title"))'/> <JSeparator/> <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new QueueUI(), _("isisfish.queue.title"))'/> </JMenu> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTableCellRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTableCellRenderer.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTableCellRenderer.java 2009-06-10 15:24:47 UTC (rev 2366) @@ -0,0 +1,47 @@ +/* *##% + * Copyright (C) 2009 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.queue; + +import java.awt.Component; + +import javax.swing.JTable; +import javax.swing.table.TableCellRenderer; + +/** + * Renderer to display component in table. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 10 juin 2009 $ + * By : $Author: chatellier $ + */ +public class ComponentTableCellRenderer implements TableCellRenderer { + + /** + * Value is already a component, resend it without modification. + */ + @Override + public Component getTableCellRendererComponent(JTable table, + Object value, boolean isSelected, boolean hasFocus, + int row, int column) { + + return (Component)value; + } +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java 2009-06-10 15:24:47 UTC (rev 2366) @@ -0,0 +1,139 @@ +/* *##% + * Copyright (C) 2009 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.queue; + +import static org.codelutin.i18n.I18n._; +import jaxx.runtime.swing.ErrorDialogUI; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.log.UserLog; + +import fr.ifremer.isisfish.logging.SimulationLoggerUtil; +import fr.ifremer.isisfish.simulator.launcher.SimulationJob; +import fr.ifremer.isisfish.simulator.launcher.SimulationService; + +/** + * Common action for all queue ui. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 10 juin 2009 $ + * By : $Author: chatellier $ + */ +public class QueueAction { + + /** Log. */ + private static Log log = LogFactory.getLog(QueueAction.class); + + /** queue ui to manage. */ + protected QueueUI queueUI; + + /** + * Queue action. + * + * @param queueUI queue ui to manage + */ + public QueueAction(QueueUI queueUI) { + this.queueUI = queueUI; + } + + /** + * Update ui buttons. + */ + public void updateActions() { + queueUI.setCanStop(!queueUI.getSelectionModelQueueTable().isSelectionEmpty()); + queueUI.setCanShowLog(!queueUI.getSelectionModelQueueTableDone().isSelectionEmpty()); + // TODO value have to change on non valueChanged event + queueUI.setCanClear(queueUI.getQueueTableDone().getModel().getRowCount()>0); + queueUI.setCanRestart(!queueUI.getSelectionModelQueueTableDone().isSelectionEmpty()); + } + + /** + * Stop simulation associated with table selected rows. + */ + protected void stopSimulation() { + int[] selectedRows = queueUI.getQueueTable().getSelectedRows(); + SimulationJob[] jobsToStop = new SimulationJob[selectedRows.length]; + int index = 0; + + // to do in two pass, because each stopped simulation + // change selected rows + for (int selectedRow : selectedRows) { + jobsToStop[index++] = queueUI.getNewSimulationModel().getJob(selectedRow); + } + for (SimulationJob jobToStop : jobsToStop) { + jobToStop.stop(); + if (log.isInfoEnabled()) { + log.info(_("User stop simulation %s", jobToStop.getItem().getControl() + .getId())); + } + } + } + + /** + * Restart simulation. + */ + protected void restartSimulation() { + int[] selectedRows = queueUI.getQueueTableDone().getSelectedRows(); + SimulationJob[] jobsToRestart = new SimulationJob[selectedRows.length]; + int index = 0; + + // to do in two pass, because each simulation + // change selected rows + for (int selectedRow : selectedRows) { + jobsToRestart[index++] = queueUI.getDoneSimulationModel().getJob(selectedRow); + } + for (SimulationJob jobToRestart : jobsToRestart) { + + jobToRestart.restart(); + jobToRestart.getItem().getControl().setText(_("isisfish.simulation.restarting")); + if (log.isInfoEnabled()) { + log.info(_("User restart simulation %s", jobToRestart.getItem().getControl() + .getId())); + } + } + } + + /** + * View log of selected done jobs. + */ + protected void viewLog() { + if (queueUI.getQueueTableDone().getSelectedRow() >= 0) { + SimulationJob selectedJob = queueUI.getDoneSimulationModel().getJob(queueUI.getQueueTableDone().getSelectedRow()); + + String id = selectedJob.getItem().getControl().getId(); + try { + SimulationLoggerUtil.showSimulationLogConsole(id); + } catch (Exception eee) { + UserLog.error(_("Can't open log for %s", id), eee); + ErrorDialogUI.showError(eee); + } + } + } + + /** + * Remove all done jobs. + */ + protected void clearDoneJobs() { + SimulationService ss = SimulationService.getService(); + ss.clearJobDone(); + } +} Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx (from rev 2296, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2009-06-10 15:24:47 UTC (rev 2366) @@ -0,0 +1,80 @@ + +<Table> +<script><![CDATA[ + import fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel; + import fr.ifremer.isisfish.simulator.launcher.SimulationService; + import javax.swing.JProgressBar; + import javax.swing.ListSelectionModel; + + queueTable.setDefaultRenderer(JProgressBar.class, new ComponentTableCellRenderer()); + queueTableDone.setDefaultRenderer(JProgressBar.class, new ComponentTableCellRenderer()); + ]]> + </script> + + <Boolean id='canStop' javaBean='false'/> + <Boolean id='canShowLog' javaBean='false'/> + <Boolean id='canClear' javaBean='false'/> + <Boolean id='canRestart' javaBean='false'/> + + <QueueAction id="queueAction" javaBean='new QueueAction(this)'/> + <SimulationServiceTableModel id="newSimulationModel" javaBean='new SimulationServiceTableModel(SimulationService.getService(), true)'/> + <SimulationServiceTableModel id="doneSimulationModel" javaBean='new SimulationServiceTableModel(SimulationService.getService(), false)'/> + + <DefaultListSelectionModel id="selectionModelQueueTable" onValueChanged='queueAction.updateActions()'/> + <DefaultListSelectionModel id="selectionModelQueueTableDone" onValueChanged='queueAction.updateActions()'/> + + <row> + <cell columns="5" fill="both" weightx="1.0" weighty="0.5"> + <JScrollPane> + <JTable id="queueTable" model='{newSimulationModel}' + selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" + selectionModel="{selectionModelQueueTable}" /> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="5" fill="both" weightx="1.0" weighty="0.5"> + <JScrollPane> + <JTable id="queueTableDone" model='{doneSimulationModel}' + selectionMode="{ListSelectionModel.SINGLE_SELECTION}" + selectionModel="{selectionModelQueueTableDone}" /> + </JScrollPane> + </cell> + </row> + <row> + <cell fill="horizontal" weightx="0.3"> + <JToggleButton id="autoLaunchButton" text="isisfish.queue.simulationLaunch"/> + </cell> + <cell fill="horizontal" weightx="0.3"> + <JButton id="stopSimuButton" text="isisfish.queue.stopSimulation" onActionPerformed='queueAction.stopSimulation()' enabled='{isCanStop()}' /> + </cell> + <cell fill="horizontal" weightx="0.3"> + <JButton id="restartSimulationButton" text="isisfish.queue.restartSimulation" onActionPerformed='queueAction.restartSimulation()' enabled='{isCanRestart()}' /> + </cell> + <cell fill="horizontal" weightx="0.3"> + <JButton id="showLogButton" text="isisfish.queue.showLog" onActionPerformed='queueAction.viewLog()' enabled='{isCanShowLog()}' /> + </cell> + <cell fill="horizontal" weightx="0.3"> + <JButton id="clearDoneJobsButton" text="isisfish.queue.clearDone" onActionPerformed='queueAction.clearDoneJobs()' enabled='{isCanClear()}' /> + </cell> + </row> +</Table> \ No newline at end of file Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2009-06-10 15:24:16 UTC (rev 2365) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2009-06-10 15:24:47 UTC (rev 2366) @@ -1,153 +0,0 @@ - - -<Table> -<script><![CDATA[ - import fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel; - import fr.ifremer.isisfish.simulator.launcher.SimulationService; - import fr.ifremer.isisfish.simulator.launcher.SimulationJob; - import javax.swing.JProgressBar; - import javax.swing.ListSelectionModel; - import javax.swing.table.TableCellRenderer; - - // TODO this code is magic - // lucky executed BEFORE ui - initContext(); - - public void initContext() { - SimulationService ss = SimulationService.getService(); - setContextValue(new SimulationServiceTableModel(ss, true), "new"); - setContextValue(new SimulationServiceTableModel(ss, false), "done"); - queueTable.setDefaultRenderer(JProgressBar.class, new JProgressBarTableCellRenderer()); - queueTableDone.setDefaultRenderer(JProgressBar.class, new JProgressBarTableCellRenderer()); - } - - public QueueUI(SimulAction action) { - setContextValue(action); - } - - public class JProgressBarTableCellRenderer implements TableCellRenderer { - public Component getTableCellRendererComponent(JTable table, - Object value, boolean isSelected, boolean hasFocus, - int row, int column) { - return (JProgressBar) value; - } - } - - /** - * Stop simulation associated with table selected rows. - */ - protected void stopSimulation() { - SimulAction simulAction = getContextValue(SimulAction.class); - - int[] selectedRows = queueTable.getSelectedRows(); - SimulationJob[] jobsToStop = new SimulationJob[selectedRows.length]; - int index = 0; - - // to do in two pass, because each stopped simulation - // change selected rows - for (int selectedRow : selectedRows) { - jobsToStop[index++] = getContextValue(SimulationServiceTableModel.class, "new").getJob(selectedRow); - } - for (SimulationJob jobToStop : jobsToStop) { - simulAction.stopSimulation(jobToStop); - } - } - - protected void restartSimulation() { - SimulAction simulAction = getContextValue(SimulAction.class); - - int[] selectedRows = queueTableDone.getSelectedRows(); - SimulationJob[] jobsToRestart = new SimulationJob[selectedRows.length]; - int index = 0; - - // to do in two pass, because each simulation - // change selected rows - for (int selectedRow : selectedRows) { - jobsToRestart[index++] = getContextValue(SimulationServiceTableModel.class, "done").getJob(selectedRow); - } - for (SimulationJob jobToRestart : jobsToRestart) { - simulAction.restartSimulation(jobToRestart); - } - } - - protected void viewLog() { - if (queueTableDone.getSelectedRow() >= 0) { - getContextValue(SimulAction.class).viewLog(getContextValue(SimulationServiceTableModel.class, "done").getJob(queueTableDone.getSelectedRow())); - } - } - - protected void clearDoneJobs() { - getContextValue(SimulAction.class).clearDoneJobs(); - } - - protected void updateActions() { - setCanStop(!selectionModelQueueTab.isSelectionEmpty()); - setCanShowLog(!selectionModelQueueTabDone.isSelectionEmpty()); - // TODO value have to change on non valueChanged event - setCanClear(queueTableDone.getModel().getRowCount()>0); - setCanRestart(!selectionModelQueueTabDone.isSelectionEmpty()); - } - ]]> - </script> - - <Boolean id='canStop' javaBean='false'/> - <Boolean id='canShowLog' javaBean='false'/> - <Boolean id='canClear' javaBean='false'/> - <Boolean id='canRestart' javaBean='false'/> - - <DefaultListSelectionModel id="selectionModelQueueTab" onValueChanged='updateActions()'/> - <DefaultListSelectionModel id="selectionModelQueueTabDone" onValueChanged='updateActions()'/> - - <row> - <cell columns="5" fill="both" weightx="1.0" weighty="0.5"> - <JScrollPane> - <JTable id="queueTable" model='{getContextValue(SimulationServiceTableModel.class, "new")}' selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - selectionModel="{selectionModelQueueTab}"/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns="5" fill="both" weightx="1.0" weighty="0.5"> - <JScrollPane> - <JTable id="queueTableDone" model='{getContextValue(SimulationServiceTableModel.class, "done")}' selectionMode="{ListSelectionModel.SINGLE_SELECTION}" - selectionModel="{selectionModelQueueTabDone}" /> - </JScrollPane> - </cell> - </row> - <row> - <cell fill="horizontal" weightx="0.3"> - <JToggleButton id="autoLaunchButton" text="isisfish.queue.simulationLaunch"/> - </cell> - <cell fill="horizontal" weightx="0.3"> - <JButton id="stopSimuButton" text="isisfish.queue.stopSimulation" onActionPerformed='stopSimulation()' enabled='{isCanStop()}' /> - </cell> - <cell fill="horizontal" weightx="0.3"> - <JButton id="restartSimulationButton" text="isisfish.queue.restartSimulation" onActionPerformed='restartSimulation()' enabled='{isCanRestart()}' /> - </cell> - <cell fill="horizontal" weightx="0.3"> - <JButton id="showLogButton" text="isisfish.queue.showLog" onActionPerformed='viewLog()' enabled='{isCanShowLog()}' /> - </cell> - <cell fill="horizontal" weightx="0.3"> - <JButton id="clearDoneJobsButton" text="isisfish.queue.clearDone" onActionPerformed='clearDoneJobs()' enabled='{isCanClear()}' /> - </cell> - </row> -</Table> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-06-10 15:24:16 UTC (rev 2365) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-06-10 15:24:47 UTC (rev 2366) @@ -32,16 +32,16 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.SortedMap; import java.util.TreeMap; -import java.util.Map.Entry; import javax.swing.JComponent; +import jaxx.runtime.swing.ErrorDialogUI; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.log.UserLog; @@ -63,13 +63,11 @@ import fr.ifremer.isisfish.entities.Strategy; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.export.SensitivityExport; -import fr.ifremer.isisfish.logging.SimulationLoggerUtil; import fr.ifremer.isisfish.mexico.MexicoHelper; import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.simulator.AnalysePlan; import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.SimulationProperties; -import fr.ifremer.isisfish.simulator.launcher.SimulationJob; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; @@ -82,7 +80,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; -import jaxx.runtime.swing.ErrorDialogUI; /** * SimulAction. @@ -105,9 +102,7 @@ protected SimulationParameter param = null; protected RegionStorage regionStorage = null; protected SimulationStorage simulStorage = null; - protected RuleStorage ruleStorage = null; protected List<String> analysePlan = null; - protected List<Rule> rules = new ArrayList<Rule>(); protected Map<SensitivityExport, String> sensitivityExports = new HashMap<SensitivityExport, String>(); protected List<String> oldSimulNames = null; @@ -259,58 +254,24 @@ return result; } - public void stopSimulation(SimulationJob job) { - job.stop(); - if (log.isInfoEnabled()) { - log.info(_("User stop simulation %s", job.getItem().getControl() - .getId())); - } - } - /** - * Restart job. - * - * @param job job to restart - */ - public void restartSimulation(SimulationJob job) { - job.restart(); - job.getItem().getControl().setText(_("isisfish.simulation.restarting")); - if (log.isInfoEnabled()) { - log.info(_("User restart simulation %s", job.getItem().getControl() - .getId())); - } - } - - protected void viewLog(SimulationJob job) { - String id = job.getItem().getControl().getId(); - try { - SimulationLoggerUtil.showSimulationLogConsole(id); - } catch (Exception eee) { - UserLog.error(_("Can't open log for %s", id), eee); - showMsgBox(eee); - } - } - - protected void clearDoneJobs() { - SimulationService ss = SimulationService.getService(); - ss.clearJobDone(); - } - - /** * Change region in simulation launcher * - * @param regionName SimulationParameter/description + * @param regionName region name */ public void regionChange(String regionName) { try { regionStorage = RegionStorage.getRegion(regionName); - init(); // reinitialise param pour le vider + + // chatellier, on ne peut pas le reinitialiser, on + // perd toutes les info apres un rechergement d'une anciennes simulation + //init(); // reinitialise param pour le vider param.setRegionName(regionName); -// poussin 20090519 quel est l'interet de faire ca ? et encore plus maintenant qu'on reinitialise -// for (Rule r : param.getRules()) { -// rules.put(r, RuleStorage.getName(r)); -// } + // poussin 20090519 quel est l'interet de faire ca ? et encore plus maintenant qu'on reinitialise + // for (Rule r : param.getRules()) { + // rules.put(r, RuleStorage.getName(r)); + // } } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Can't change region", e); @@ -390,13 +351,16 @@ } /** - * Add new rule by name. + * Add new rule. * - * @param name rule name + * Get a new instance of ruleItem, and add it to rule list. + * + * @param ruleItem rule to get copy */ - public void addRules(String name) { - ruleStorage = RuleStorage.getRule(name); + public void addNewRule(Rule ruleItem) { + String ruleName = RuleStorage.getName(ruleItem); try { + RuleStorage ruleStorage = RuleStorage.getRule(ruleName); Rule ruleTmp = ruleStorage.getNewRuleInstance(); param.addRule(ruleTmp); } catch (IsisFishException e) { @@ -418,20 +382,29 @@ } /** - * Return rules name without .java extention. + * Retourne une liste d'instance de toutes les regles disponible. * - * @return rule names list + * Instancié (utile pour les modeles). + * + * @return instance rule list */ - public List<String> getAvailableRuleNames() { - List<String> result = new ArrayList<String>(); - for (String r : RuleStorage.getRuleNames()) { - // Remove .java extention - // TODO find a better way to to that - // for example RuleStorage.getRuleName(String) - result.add(r.substring(0, r.length() - 5)); + public List<Rule> getAvailableRules() { + List<Rule> result = new ArrayList<Rule>(); + for (String ruleName : RuleStorage.getRuleNames()) { + try { + // remove last .java + String shortRuleName = ruleName.substring(0, ruleName.length() - 5); + Rule rule = RuleStorage.getRule(shortRuleName).getNewRuleInstance(); + result.add(rule); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't get rule instance", e); + } + } } return result; } + // Strategies public List<Strategy> getStrategies() {

1 0

r2365 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator: . rule
by chatellier＠users.labs.libre-entreprise.org 10 Jun '09

10 Jun '09

Author: chatellier Date: 2009-06-10 15:24:16 +0000 (Wed, 10 Jun 2009) New Revision: 2365 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/rule/RuleComboBoxModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/rule/RuleListCellRenderer.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Refactor rules combo and list models 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-06-10 15:23:24 UTC (rev 2364) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-06-10 15:24:16 UTC (rev 2365) @@ -1,7 +1,6 @@  - + *##%*/ +--> <Table>  <Boolean id='sensitivity' javaBean='false'/> @@ -30,24 +29,15 @@ import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; import fr.ifremer.isisfish.entities.Strategy; import fr.ifremer.isisfish.entities.Population; -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 fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor; -import fr.ifremer.isisfish.ui.widget.editor.ParameterTableCellEditor; -import javax.swing.text.JTextComponent; -import org.dom4j.DocumentHelper; -import org.dom4j.Element; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulationJob; import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; import fr.ifremer.isisfish.entities.FisheryRegionImpl; import fr.ifremer.isisfish.datastore.StorageException; -import fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipTableColumnRenderer; -import fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipComboBoxRenderer; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; +import fr.ifremer.isisfish.ui.simulator.rule.RuleComboBoxModel; +import fr.ifremer.isisfish.ui.simulator.rule.RuleListCellRenderer; import fr.ifremer.isisfish.ui.simulator.rule.RuleListModel; import fr.ifremer.isisfish.ui.simulator.rule.RuleParametersTableModel; import fr.ifremer.isisfish.ui.simulator.rule.RuleParametersTableCellEditor; @@ -99,26 +89,28 @@ setListSimulParamsPopulationsItems(); setRulesListModel(); } -protected void regionChange(ItemEvent e) { - if (e.getStateChange() == ItemEvent.SELECTED) { - // le premier item est " " pour ne pas avoir de selection par defaut - final String selected = fieldSimulParamsRegion.getSelectedItem().toString(); - if (log.isDebugEnabled()) { - log.debug(" selected " + selected); - } - if(selected != null && !selected.trim().isEmpty()) { - getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.loading.region")); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - simulAction.regionChange(selected); - refresh(); - setFactorRegion(); - getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.region.loaded")); - } - }); - } + +/** + * Called on user region selection change. + */ +protected void regionChange() { + // le premier item est " " pour ne pas avoir de selection par defaut + final String selected = fieldSimulParamsRegion.getSelectedItem().toString(); + if (log.isDebugEnabled()) { + log.debug(" selected " + selected); } + if(selected != null && !selected.trim().isEmpty()) { + getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.loading.region")); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + simulAction.regionChange(selected); + refresh(); + setFactorRegion(); + getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.region.loaded")); + } + }); + } } protected void setPreScript() { if (!isSensitivity()){ @@ -140,7 +132,7 @@ } } protected void setFactor() { - if (isSensitivity()){ + if (isSensitivity()) { getParentContainer(SensitivityUI.class).getSensitivityTabUI().setFactorModel(); } } @@ -160,9 +152,9 @@ 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(" ")){ + if (selected != null && !selected.equals(" ")) { getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.loading.old.simulation")); - SwingUtilities.invokeLater(new Runnable() { + SwingUtilities.invokeLater(new Runnable() { @Override public void run() { simulAction.loadOldSimulation(selected); @@ -180,14 +172,20 @@ }); } } -protected void simul() { +protected void launchSimulation() { if (!isSensitivity()) { simulAction.launchSimulation(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem()); } else{ simulAction.launchSimulationWhithSensibility(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem()); } - getParentContainer(WelcomeTabUI.class).selTab(5); + + // dans le cas d'une fenetre independante, il n'y a pas de ParentContainer + WelcomeTabUI parent = getParentContainer(WelcomeTabUI.class); + if (parent != null) { + // 5 = queue simulation tab + parent.selTab(5); + } } protected void enablePreSimul() { simulAction.getSimulationParameter().setUsePreScript(fieldUseSimulPreScripts.isSelected()); @@ -259,7 +257,7 @@ } } protected void populationSelected(){ - if (listSimulParamsPopulations.getSelectedIndex() != -1){ + if (listSimulParamsPopulations.getSelectedIndex() != -1) { simulAction.setPopulations(listSimulParamsPopulations.getSelectedValues()); simulParamsNumbers.setMatrix(simulAction.getSimulationParameter().getNumberOf((Population) listSimulParamsPopulations.getSelectedValue())); } @@ -271,12 +269,25 @@ simulAction.getSimulationParameter().setDescription(fieldSimulParamsDesc.getText()); } +/*protected ComboBoxModel getParamsMesuresSelectModel() { + java.util.List<Rule> availableRules = simulAction.getAvailableRules(); + RuleComboBoxModel model = new RuleComboBoxModel(availableRules); + + // TODO change place (but must be same rule list) + fieldSimulParamsMesuresSelect.setRenderer(model); + + return model; +}*/ + protected void setRulesListModel() { - RuleListModel model = new RuleListModel(simulAction.getRules()); - listSimulParamsMesuresList.setModel(model); - listSimulParamsMesuresList.setCellRenderer(model); + if (log.isDebugEnabled()) { + log.debug("Set simulation rules model"); + } + RuleListModel model = new RuleListModel(simulAction.getRules()); + listSimulParamsMesuresList.setModel(model); + listSimulParamsMesuresList.setCellRenderer(model); - onRuleSelectionChange(); + onRuleSelectionChange(); } /** * Called when selection change on rule list. @@ -308,8 +319,8 @@ } } protected void addRules() { - String selectedRuleName = fieldSimulParamsMesuresSelect.getSelectedItem().toString(); - simulAction.addRules(selectedRuleName); + Rule selectedRule = (Rule)fieldSimulParamsMesuresSelect.getSelectedItem(); + simulAction.addNewRule(selectedRule); setRulesListModel(); } protected void removeRules() { @@ -345,7 +356,7 @@ protected ComboBoxModel getSimulParamsSelectModel(boolean force) { java.util.List<String> items = simulAction.getFilteredOldSimulatorNames(force); DefaultComboBoxModel result = new DefaultComboBoxModel(); - if (items != null){ + if (items != null) { for (String s : items){ result.addElement(s); } @@ -353,13 +364,6 @@ return result; } -protected ComboBoxModel getParamsMesuresSelectModel() { - java.util.List<String> rulesNames = simulAction.getAvailableRuleNames(); - DefaultComboBoxModel model = new DefaultComboBoxModel(rulesNames.toArray()); - fieldSimulParamsMesuresSelect.setRenderer(new SimpleToolTipComboBoxRenderer(ToolTipListModelFactory.createRuleDescriptionsModel(rulesNames))); - return model; -} - protected void resetFilter(){ simulAction.resetOldSimulatorNames(); } @@ -394,7 +398,7 @@ </row> <row> <cell columns="2" fill="horizontal" weightx="1.0"> - <JComboBox id="fieldSimulParamsSelect" model='{getSimulParamsSelectModel()}' onActionPerformed='loadOldSimulation()'/> + <JComboBox id="fieldSimulParamsSelect" model='{getSimulParamsSelectModel()}' onActionPerformed='loadOldSimulation()'/> </cell> <cell> <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter" onActionPerformed='selectFilter()'/> @@ -429,7 +433,7 @@ <JLabel text="isisfish.common.region"/> </cell> <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldSimulParamsRegion" model='{new DefaultComboBoxModel(Common.getRegionItem())}' selectedItem='{getContextValue(SimulAction.class).getSimulationParameter().getRegionName()}' onItemStateChanged='regionChange(event)'/> + <JComboBox id="fieldSimulParamsRegion" model='{new DefaultComboBoxModel(Common.getRegionItem())}' selectedItem='{getContextValue(SimulAction.class).getSimulationParameter().getRegionName()}' onActionPerformed='regionChange()'/> </cell> </row> </Table> @@ -515,13 +519,13 @@ </row> <row> <cell fill="horizontal"> - <JComboBox id="fieldSimulParamsMesuresSelect" model='{getParamsMesuresSelectModel()}'/> + <JComboBox id="fieldSimulParamsMesuresSelect" model='{new RuleComboBoxModel(simulAction.getAvailableRules())}' renderer='{new RuleListCellRenderer()}'/> </cell> </row> <row> <cell fill="both" weightx="1.0" weighty="1.0"> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="listSimulParamsMesuresList" selectionMode="0" model='{new DefaultComboBoxModel(simulAction.getRules().toArray())}' onMouseClicked='onRuleSelectionChange()'/> + <JList id="listSimulParamsMesuresList" selectionMode="0" onMouseClicked='onRuleSelectionChange()'/> </JScrollPane> </cell> </row> @@ -606,7 +610,7 @@ <JComboBox id="comboSelLauncher" model='{new DefaultComboBoxModel(simulAction.getSimulationLauncher().toArray())}'/> </cell> <cell fill="horizontal" weightx="0.4"> - <JButton id="buttonSimulParamsSimulate" text="isisfish.common.simulate" onActionPerformed='simul()'/> + <JButton id="buttonSimulParamsSimulate" text="isisfish.common.simulate" onActionPerformed='launchSimulation()'/> </cell> <cell fill="horizontal" weightx="0.2"> <JButton id="saveSimul" text="isisfish.simulation.menu.save" onActionPerformed='saveSimulation()'/> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/rule/RuleComboBoxModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/rule/RuleComboBoxModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/rule/RuleComboBoxModel.java 2009-06-10 15:24:16 UTC (rev 2365) @@ -0,0 +1,123 @@ +/* *##% + * Copyright (C) 2009 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.simulator.rule; + +import java.util.List; + +import javax.swing.AbstractListModel; +import javax.swing.ComboBoxModel; + +import fr.ifremer.isisfish.rule.Rule; + +/** + * Model pour la liste des regles des parametres d'une simulation. + * + * @author chatellier + * @version $Revision: 2350 $ + * + * Last update : $Date: 2009-06-09 13:52:58 +0200 (mar. 09 juin 2009) $ + * By : $Author: chatellier $ + */ +public class RuleComboBoxModel extends AbstractListModel implements ComboBoxModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = -4070846632975105788L; + + protected List<Rule> rules; + + protected Object selectedItem; + + /** + * Empty constructor. + */ + public RuleComboBoxModel() { + this(null); + } + + /** + * Constructor with rule list. + * + * @param rules rules + */ + public RuleComboBoxModel(List<Rule> rules) { + super(); + setRules(rules); + } + + /** + * Get rules list. + * + * @return the rules + */ + public List<Rule> getRules() { + return rules; + } + + /** + * Set rules list. + * + * @param rules the rules to set + */ + public void setRules(List<Rule> rules) { + this.rules = rules; + + // default first selected + if (!rules.isEmpty()) { + selectedItem = rules.get(0); + } + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return rules.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (rules != null) { + size = rules.size(); + } + + return size; + } + + /* + * @see javax.swing.ComboBoxModel#getSelectedItem() + */ + @Override + public Object getSelectedItem() { + return selectedItem; + } + + /* + * @see javax.swing.ComboBoxModel#setSelectedItem(java.lang.Object) + */ + @Override + public void setSelectedItem(Object anItem) { + this.selectedItem = anItem; + } +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/rule/RuleListCellRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/rule/RuleListCellRenderer.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/rule/RuleListCellRenderer.java 2009-06-10 15:24:16 UTC (rev 2365) @@ -0,0 +1,76 @@ +/* *##% + * Copyright (C) 2009 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.simulator.rule; + +import java.awt.Component; + +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.ListCellRenderer; + +import fr.ifremer.isisfish.datastore.RuleStorage; +import fr.ifremer.isisfish.rule.Rule; + +/** + * Rendu des données d'une liste graphique de regles + * + * @author chatellier + * @version $Revision: 2350 $ + * + * Last update : $Date: 2009-06-09 13:52:58 +0200 (mar. 09 juin 2009) $ + * By : $Author: chatellier $ + */ +public class RuleListCellRenderer extends JLabel implements ListCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = -948394724922547715L; + + /* + * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) + */ + @Override + public Component getListCellRendererComponent(JList list, Object value, + int index, boolean isSelected, boolean cellHasFocus) { + + if (value != null) { + Rule rule = (Rule)value; + String ruleName = RuleStorage.getName(rule); + setText(ruleName); + + try { + setToolTipText(rule.getDescription()); + } catch (Exception e) { + // can't get exception + } + + if(isSelected) { + setBackground(list.getSelectionBackground()); + setForeground(list.getSelectionForeground()); + setOpaque(true); // background won't work + } + else { + setBackground(list.getBackground()); + setForeground(list.getForeground()); + setOpaque(false); // background won't work + } + } + + return this; + } +}

1 0

r2364 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: . simulator
by chatellier＠users.labs.libre-entreprise.org 10 Jun '09

10 Jun '09

Author: chatellier Date: 2009-06-10 15:23:24 +0000 (Wed, 10 Jun 2009) New Revision: 2364 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx Log: Fix comments and others minor bugfix Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java 2009-06-10 15:20:46 UTC (rev 2363) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java 2009-06-10 15:23:24 UTC (rev 2364) @@ -1,6 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 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/ui/simulator/ExportUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2009-06-10 15:20:46 UTC (rev 2363) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2009-06-10 15:23:24 UTC (rev 2364) @@ -1,7 +1,6 @@  - <Table> <script><![CDATA[ import jaxx.runtime.swing.Item; import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipComboBoxRenderer; + refresh(); + public ExportUI (SimulAction action){ - setContextValue(action); } - public void refresh(){ + + public void refresh() { fieldSimulExportFolder.setText(getContextValue(SimulAction.class).getSimulationParameter().getExportDirectory()); setListSimulExportChooseModel(); } - protected void setListSimulExportChooseModel(){ + + protected void setListSimulExportChooseModel() { java.util.List<String> values = getContextValue(SimulAction.class).getExportNames(); java.util.List<String> selectedValue = getContextValue(SimulAction.class).getSimulationParameter().getExportNames(); java.util.List<Item> items = new ArrayList<Item>(); - for (String s : values){ + for (String s : values) { boolean selected = false; - for (String sv : selectedValue){ + for (String sv : selectedValue) { selected = (sv.equals(s) || selected); } items.add(new Item(s, s, s, selected)); @@ -59,21 +48,24 @@ listSimulExportChoose.setItems(items); listSimulExportChoose.setCellRenderer(new SimpleToolTipComboBoxRenderer(ToolTipListModelFactory.createExportClassDocsModel(values))); } + protected void exportChanged(){ - if (listSimulExportChoose.getSelectedIndex() > -1){ + if (listSimulExportChoose.getSelectedIndex() > -1) { Object[] values = listSimulExportChoose.getSelectedValues(); java.util.List<String> exportNames = new LinkedList<String>(); - for (Object o : values){ + for (Object o : values) { exportNames.add((String) o); } getContextValue(SimulAction.class).getSimulationParameter().setExportNames(exportNames); } } + protected void saveExport(){ getContextValue(SimulAction.class).saveExport(); setInfoText(_("isisfish.export.saved")); } - protected void setInfoText(String txt){ + + protected void setInfoText(String txt) { WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); root.setInfoText(txt); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx 2009-06-10 15:20:46 UTC (rev 2363) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx 2009-06-10 15:23:24 UTC (rev 2364) @@ -16,20 +16,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ - -/** - * PreScriptUI. - * - * 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 $ - */ --> -<JPanel id="simulPreScripts" layout='{new BorderLayout()}'> +<JPanel layout='{new BorderLayout()}'> <script><![CDATA[ public PreScriptsUI(SimulAction action) { setContextValue(action); @@ -47,8 +35,7 @@ SimulUI simul = getParentContainer(SimulUI.class); simul.selTab(0); } - ]]> - </script> + ]]></script> <JScrollPane constraints='BorderLayout.CENTER'> <JTextArea id="fieldSimulPreScript" onFocusLost='save()'/> </JScrollPane> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2009-06-10 15:20:46 UTC (rev 2363) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2009-06-10 15:23:24 UTC (rev 2364) @@ -1,7 +1,6 @@  -<JPanel id="ResultChoice" name="isisfish.resultChoice.title" layout='{new BorderLayout()}'> +<JPanel layout='{new BorderLayout()}'> <script><![CDATA[ import fr.ifremer.isisfish.ui.WelcomePanelUI; import jaxx.runtime.swing.Item; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2009-06-10 15:20:46 UTC (rev 2363) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2009-06-10 15:23:24 UTC (rev 2364) @@ -1,7 +1,6 @@  - <Table> <script><![CDATA[ import javax.swing.DefaultComboBoxModel; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-06-10 15:20:46 UTC (rev 2363) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-06-10 15:23:24 UTC (rev 2364) @@ -1,7 +1,6 @@  -<JPanel size='{new Dimension(800,600)}' id="simul" layout='{new BorderLayout()}'> +<JPanel layout='{new BorderLayout()}'> <script><![CDATA[ import org.dom4j.DocumentHelper; import org.dom4j.Element;

1 0

r2363 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 10 Jun '09

10 Jun '09

Author: chatellier Date: 2009-06-10 15:20:46 +0000 (Wed, 10 Jun 2009) New Revision: 2363 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx Log: Fix jaxx format, add comments Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2009-06-10 15:19:06 UTC (rev 2362) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2009-06-10 15:20:46 UTC (rev 2363) @@ -1,7 +1,6 @@  - <Table> <Boolean id='ajout' javaBean='false'/> - <Boolean id='remove' javaBean='false'/> - <Boolean id='changed' javaBean='false'/> - <script> - <![CDATA[ + + <script><![CDATA[ import javax.swing.table.DefaultTableModel; import java.util.Map.Entry; - tableTagValue.addMouseListener(new MouseListener() { - + tableTagValue.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { - } - - @Override - public void mousePressed(MouseEvent e) { - } - - @Override public void mouseReleased(MouseEvent e) { setRemove(tableTagValue.getSelectedRow() != -1); } - - @Override - public void mouseEntered(MouseEvent e) { - } - - @Override - public void mouseExited(MouseEvent e) { - } }); + refresh(); public void refresh(){ @@ -99,8 +67,10 @@ } protected void setTableTagValue(){ Map<String, String> tagValue = getContextValue(SimulAction.class).getSimulationParameter().getTagValue(); - if (tagValue!=null){ - String columnName[] = {"Tag", "Value"}; + + // TODO make a table model for it + String columnName[] = {"isisfish.common.tag", "isisfish.common.value"}; + if (tagValue != null) { DefaultTableModel model = new DefaultTableModel(columnName, tagValue.size()){ @Override public boolean isCellEditable(int row, int column) { @@ -119,7 +89,6 @@ tableTagValue.setModel(model); } else { - String columnName[] = {"Tag", "Value"}; DefaultTableModel model = new DefaultTableModel(columnName, 0); } } @@ -130,7 +99,7 @@ ]]> </script> <row> - <cell fill="horizontal" weightx="0.16"> + <cell fill="horizontal" weightx="0.16"> <Table> <row> <cell> @@ -142,7 +111,7 @@ </row> </Table> </cell> - <cell columns="5" fill="horizontal" weightx="0.84"> + <cell columns="5" fill="horizontal" weightx="0.84"> <JComboBox id="fieldSimulAdvParamsSimulatorSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulatorNames().toArray())}' onActionPerformed='setSimulName()'/> </cell> </row> @@ -150,131 +119,131 @@ <cell fill="horizontal" weightx="0.2"> <JPanel/> </cell> - <cell columns="2" fill="horizontal" weightx="0.3"> + <cell columns="2" fill="horizontal" weightx="0.3"> <JCheckBox id="fieldSimulationStatistique" text="isisfish.advancedParams.simulationStatistique" selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseStatistic()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseStatistic(fieldSimulationStatistique.isSelected());valueChanged(true);'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="0.2"> <JPanel/> </cell> - <cell columns="2" fill="horizontal" weightx="0.3"> + <cell columns="2" fill="horizontal" weightx="0.3"> <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache" selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseOptimization()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseOptimization(fieldSimulationCache.isSelected());valueChanged(true);'/> </cell> </row> <row> - <cell columns="2" fill="horizontal" weightx="0.2"> + <cell columns="2" fill="horizontal" weightx="0.2"> <JLabel text="isisfish.advancedParams.simulLevelLogger"/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulErrorLevel()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("error");valueChanged(true);'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulWarnLevel()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("warn");valueChanged(true);'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulInfoLevel()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("info");valueChanged(true);'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulDebugLevel()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("debug");valueChanged(true);'/> </cell> </row> <row> - <cell columns="2" fill="horizontal" weightx="0.2"> + <cell columns="2" fill="horizontal" weightx="0.2"> <JLabel text="isisfish.advancedParams.scriptLevelLogger"/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptErrorLevel()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("error");valueChanged(true);'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptWarnLevel()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("warn");valueChanged(true);'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptInfoLevel()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("info");valueChanged(true);'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptDebugLevel()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("debug");valueChanged(true);'/> </cell> </row> <row> - <cell columns="2" fill="horizontal" weightx="0.2"> + <cell columns="2" fill="horizontal" weightx="0.2"> <JLabel text="isisfish.advancedParams.libLevelLogger"/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsLibLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibErrorLevel()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("error");valueChanged(true);'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibWarnLevel()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("warn");valueChanged(true);'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibErrorLevel()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("info");valueChanged(true);'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsLibLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibDebugLevel()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("debug");valueChanged(true);'/> </cell> </row> <row> - <cell columns="6" fill="horizontal" weightx="1.0"> + <cell columns="6" fill="horizontal" weightx="1.0"> <JLabel text="isisfish.advancedParams.freeParameters" horizontalAlignment="0"/> </cell> </row> <row> - <cell fill="horizontal" weightx="0.25"> + <cell fill="horizontal" weightx="0.25"> <JLabel text="isisfish.common.tag"/> </cell> - <cell columns="2" fill="horizontal" weightx="0.25"> + <cell columns="2" fill="horizontal" weightx="0.25"> <JTextField id="fieldTag" onKeyTyped="setAjout(true)"/> </cell> <cell fill="horizontal" weightx="0.25"> <JLabel text="isisfish.common.value"/> </cell> - <cell columns="2" fill="horizontal" weightx="0.25"> + <cell columns="2" fill="horizontal" weightx="0.25"> <JTextField id="fieldValue" onKeyTyped="setAjout(true)"/> </cell> </row> <row> - <cell columns="6" fill="horizontal" weightx="1.0"> + <cell columns="6" fill="horizontal" weightx="1.0"> <JButton id='add' text="isisfish.common.add" enabled="{isAjout()}" onActionPerformed='addTagValue()'/> </cell> </row> <row> - <cell columns="6" fill="both" weightx="1.0" weighty="1.0"> + <cell columns="6" fill="both" weightx="1.0" weighty="1.0"> <JScrollPane> <JTable id="tableTagValue"/> </JScrollPane> </cell> </row> <row> - <cell columns="6" fill="horizontal" weightx="1.0"> + <cell columns="6" fill="horizontal" weightx="1.0"> <JButton text="isisfish.common.remove" enabled="{isRemove()}" onActionPerformed='removeTagValue()'/> </cell> </row> <row> - <cell columns="6" fill="horizontal" weightx="1.0"> + <cell columns="6" fill="horizontal" weightx="1.0"> <JButton id='save' text="isisfish.common.saveNextSimulation" enabled="{isChanged()}" onActionPerformed='saveTagValue()'/> </cell> </row>

1 0

r2362 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/script resources/i18n
by chatellier＠users.labs.libre-entreprise.org 10 Jun '09

10 Jun '09

Author: chatellier Date: 2009-06-10 15:19:06 +0000 (Wed, 10 Jun 2009) New Revision: 2362 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.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: Fix various things on script ui 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-06-10 15:16:58 UTC (rev 2361) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-06-10 15:19:06 UTC (rev 2362) @@ -18,8 +18,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ --> - -<JPanel id="script" layout='{new BorderLayout()}'> +<JPanel layout='{new BorderLayout()}'> <script><![CDATA[ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; @@ -169,8 +168,8 @@ if (scriptType.equals("EquationModel")){ equationModelType = (String)JOptionPane.showInputDialog( this, - "Select the equation model's category", - "Equation model", + _("isisfish.message.new.formule.category"), + _("isisfish.message.new.formule.title"), JOptionPane.PLAIN_MESSAGE, null, values.toArray(), @@ -182,7 +181,7 @@ if (fileName != null){ getContextValue(ScriptAction.class).newScript(equationModelTypePath + fileName, scriptType); setTreeModel(); - setInfoText(_("isisfish.message.creation.done", script.getName())); + setInfoText(_("isisfish.message.creation.done", fileName)); DefaultMutableTreeNode element = null; element = findNode((DefaultMutableTreeNode) tree.getModel().getRoot(), scriptType); if (!equationModelTypePath.equals("")){ @@ -246,10 +245,6 @@ protected void diffScript(){ setInfoText(getContextValue(ScriptAction.class).diffScript(editor.getText())); } - protected void editorHelp(){ - } - protected void javaHelp(){ - } ]]> </script> @@ -291,11 +286,6 @@ <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" accelerator="accCheckSyntax" onActionPerformed="checkScript()"/> <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" accelerator="accEvaluate" onActionPerformed="evaluateScript()"/> </JMenu> - - <JMenu text="isisfish.script.menu.txtHelp"> - <JMenuItem id="miEditorHelp" text="isisfish.script.menu.txtEditorHelp" accelerator="accEditorHelp" onActionPerformed="editorHelp()"/> - <JMenuItem id="miJavaHelp" text="isisfish.script.menu.txtJavaHelp" accelerator="accJavaHelp" onActionPerformed="javaHelp()"/> - </JMenu> </JMenuBar> <!-- 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-06-10 15:16:58 UTC (rev 2361) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-10 15:19:06 UTC (rev 2362) @@ -111,7 +111,6 @@ isisfish.common.delete=Delete isisfish.common.ellipsis=ellipsis isisfish.common.emigration=emigration -isisfish.common.empty=vide isisfish.common.equation=Equation isisfish.common.error=error isisfish.common.finish=finish @@ -602,6 +601,8 @@ isisfish.message.loading.region=Loading region ... isisfish.message.name.imported.region=Enter name for imported region isisfish.message.new.filename=Enter the name of the new file. (use only chars and _ and start with uppercase) +isisfish.message.new.formule.category=Select the equation model's category +isisfish.message.new.formule.title=New equation model isisfish.message.new.region.name=Enter new region name isisfish.message.old.simulation.loaded=Old simulation loaded isisfish.message.page.modified=This page has been modified, do you want to save it ? @@ -863,11 +864,8 @@ isisfish.script.menu.new=New isisfish.script.menu.paste=Paste isisfish.script.menu.save=Save -isisfish.script.menu.txtEditorHelp=Online help isisfish.script.menu.txtExport=Export -isisfish.script.menu.txtHelp=Help isisfish.script.menu.txtImport=Import -isisfish.script.menu.txtJavaHelp=Java help isisfish.script.menu.txtNewAnalysePlan=New analyse plan isisfish.script.menu.txtNewEquationModel=New Equation model isisfish.script.menu.txtNewExport=New Export 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-06-10 15:16:58 UTC (rev 2361) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-10 15:19:06 UTC (rev 2362) @@ -111,7 +111,6 @@ isisfish.common.delete=Supprimer isisfish.common.ellipsis=... isisfish.common.emigration=\u00E9migration -isisfish.common.empty=vide isisfish.common.equation=Equation isisfish.common.error=Erreur isisfish.common.finish=Terminer @@ -601,7 +600,9 @@ isisfish.message.loading.old.simulation=Chargement d'une ancienne simulation ... isisfish.message.loading.region=Chargement de la r\u00E9gion isisfish.message.name.imported.region=Entrez le nom de la r\u00E9gion \u00E0 importer -isisfish.message.new.filename=Entrer le nom du nouveau du fichier.\n\t (utiliser uniquemment des caract\u00E8res et _ en commencant avec une majuscule) +isisfish.message.new.filename=Entrez le nom du nouveau du fichier.\n\t (utiliser uniquemment des caract\u00E8res et _ en commencant avec une majuscule) +isisfish.message.new.formule.category=Choisissez le cat\u00E9gorie de la formule +isisfish.message.new.formule.title=Nouvelle formule isisfish.message.new.region.name=Entrer le nom de la nouvell r\u00E9gion isisfish.message.old.simulation.loaded=Ancienne simulation charg\u00E9e isisfish.message.page.modified=Cette page a \u00E9t\u00E9 modifi\u00E9, voulez-vous la sauvegarder ? @@ -863,11 +864,8 @@ isisfish.script.menu.new=Nouveau isisfish.script.menu.paste=Coller isisfish.script.menu.save=Sauver -isisfish.script.menu.txtEditorHelp=Aide en ligne... isisfish.script.menu.txtExport=Exporter -isisfish.script.menu.txtHelp=Aide isisfish.script.menu.txtImport=Importer -isisfish.script.menu.txtJavaHelp=Aide Java... isisfish.script.menu.txtNewAnalysePlan=Nouveau plan d'analyse isisfish.script.menu.txtNewEquationModel=Nouvelle formule isisfish.script.menu.txtNewExport=Nouveau script d'export

1 0

r2361 - isis-fish/trunk/src/main/resources/templates/script
by chatellier＠users.labs.libre-entreprise.org 10 Jun '09

10 Jun '09

Author: chatellier Date: 2009-06-10 15:16:58 +0000 (Wed, 10 Jun 2009) New Revision: 2361 Modified: isis-fish/trunk/src/main/resources/templates/script/equation.ftl Log: Remove huge header for formule Modified: isis-fish/trunk/src/main/resources/templates/script/equation.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/equation.ftl 2009-06-10 09:44:34 UTC (rev 2360) +++ isis-fish/trunk/src/main/resources/templates/script/equation.ftl 2009-06-10 15:16:58 UTC (rev 2361) @@ -1,12 +1,2 @@ -/** - * ${name}. - * - * Created: ${date?date?string.long} - * - * @author ${author} <${email}> - * @version $Revision: 1545 $ - * Last update: $Date : ${date?date?string.long} $ - * by : $Author: ${author} $ - */ +// ${name} // put your code here -

1 0

r2360 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org 10 Jun '09

10 Jun '09

Author: chatellier Date: 2009-06-10 09:44:34 +0000 (Wed, 10 Jun 2009) New Revision: 2360 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx Log: Comment SimulAction init (). Already done in constructor. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-06-10 09:23:34 UTC (rev 2359) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-06-10 09:44:34 UTC (rev 2360) @@ -26,7 +26,10 @@ import fr.ifremer.isisfish.ui.input.InputSaveVerifier; protected RegionMonitor regionMonitor = getContextValue(RegionMonitor.class); - simulUI.getContextValue(SimulAction.class).init(); + + // chatellier already done in SimulAction constructor + //simulUI.getContextValue(SimulAction.class).init(); + queueUI.setContextValue(simulUI.getContextValue(SimulAction.class)); public void selTab(int i){ simulTabs.setSelectedIndex(i);

1 0

r2359 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 10 Jun '09

10 Jun '09

Author: chatellier Date: 2009-06-10 09:23:34 +0000 (Wed, 10 Jun 2009) New Revision: 2359 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx Log: Change event set to onKeyReleased 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-06-09 17:50:12 UTC (rev 2358) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-06-10 09:23:34 UTC (rev 2359) @@ -177,8 +177,8 @@ bean='{getEffortDescription()}' property='fishingOperation' enabled='{isActif()}' decorator='boxed' useSign='true' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/--> - <JTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}' - onFocusLost='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' + <JFormattedTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}' + onKeyReleased='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/> </cell> </row> @@ -189,7 +189,7 @@ <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' - toolTipText="in hour" onFocusLost='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' + toolTipText="in hour" onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperationDuration"'/> </cell> </row> @@ -203,7 +203,7 @@ enabled='{isActif()}' decorator='boxed' useSign='true' _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/--> <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{getEffortDescription().getGearsNumberPerOperation()}' - onFocusLost='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' + onKeyReleased='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/> </cell> </row> @@ -217,7 +217,7 @@ enabled='{isActif()}' decorator='boxed' useSign='true' _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/--> <JTextField id="fieldEffortDescriptionCrewSize" text='{getEffortDescription().getCrewSize()}' - onFocusLost='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' + onKeyReleased='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/> </cell> </row> @@ -231,7 +231,7 @@ enabled='{isActif()}' decorator='boxed' useSign='true' _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/--> <JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{getEffortDescription().getUnitCostOfFishing()}' - onFocusLost='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' + onKeyReleased='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/> </cell> </row> @@ -245,7 +245,7 @@ enabled='{isActif()}' decorator='boxed' useSign='true' _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/--> <JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{getEffortDescription().getFixedCrewSalary()}' - onFocusLost='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' + onKeyReleased='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/> </cell> </row> @@ -259,7 +259,7 @@ enabled='{isActif()}' decorator='boxed' useSign='true' _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/--> <JTextField id="fieldEffortDescriptionCrewFoodCost" text='{getEffortDescription().getCrewFoodCost()}' - onFocusLost='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' + onKeyReleased='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/> </cell> </row> @@ -273,7 +273,7 @@ enabled='{isActif()}' decorator='boxed' useSign='true' _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/--> <JTextField id="fieldEffortDescriptionCrewShareRate" text='{getEffortDescription().getCrewShareRate()}' - onFocusLost='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' + onKeyReleased='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/> </cell> </row> @@ -287,7 +287,7 @@ enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"RepairAndMaintenanceGearCost"' useSign='true'/--> <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{getEffortDescription().getRepairAndMaintenanceGearCost()}' - onFocusLost='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' + onKeyReleased='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"RepairAndMaintenanceGearCost"'/> </cell> </row> @@ -301,7 +301,7 @@ enabled='{isActif()}' decorator='boxed' useSign='true' _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/--> <JTextField id="fieldEffortDescriptionLandingCosts" text='{getEffortDescription().getLandingCosts()}' - onFocusLost='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' + onKeyReleased='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/> </cell> </row> @@ -315,7 +315,7 @@ enabled='{isActif()}' decorator='boxed' useSign='true' _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/--> <JTextField id="fieldEffortDescriptionOtherRunningCost" text='{getEffortDescription().getOtherRunningCost()}' - onFocusLost='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' + onKeyReleased='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/> </cell> </row>

1 0