From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:12 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2366 - in
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: . queue	simulator
Date: Wed, 10 Jun 2009 17:24:47 +0200
Message-ID: <20090610152448.03F45461BF7@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0713427034218736074=="

--===============0713427034218736074==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/ComponentTableC=
ellRenderer.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.j=
axx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx	20=
09-06-10 15:24:16 UTC (rev 2365)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx	20=
09-06-10 15:24:47 UTC (rev 2366)
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
  *##%*/
  -->
-<JPanel id=3D'welcomePanelUI' layout=3D'{new BorderLayout()}'>
+<JPanel layout=3D'{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();
        =20
-        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=3D' ' icon=3D'{new ImageIcon(getClass().getResource("/ima=
ges/Queue.gif"))}'>
-            <fr.ifremer.isisfish.ui.simulator.QueueUI id=3D"queueUI"/>
+            <fr.ifremer.isisfish.ui.queue.QueueUI />
         </tab>
     </JTabbedPane>
 </JPanel>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"isisfish.welcome.menu.close" onActionPerforme=
d=3D'close()'/>
         </JMenu>
         <JMenu text=3D"isisfish.welcome.menu.frame">
-            <JMenuItem text=3D"isisfish.welcome.menu.simulation" onActionPer=
formed=3D'openFrame(new SimulUI(new SimulAction()), _("isisfish.simulation.ti=
tle"))'/>
+            <JMenuItem text=3D"isisfish.welcome.menu.simulation" onActionPer=
formed=3D'openFrame(new SimulUI(new JAXXInitialContext().add(new SimulAction(=
)).add(regionMonitor).add(this)), _("isisfish.simulation.title"))'/>
             <JMenuItem text=3D"isisfish.welcome.menu.result" onActionPerform=
ed=3D'openFrame(new ResultView(), _("isisfish.result.title"))'/>
-            <JMenuItem text=3D"isisfish.welcome.menu.input" onActionPerforme=
d=3D'openFrame(new InputUI(new JAXXInitialContext().add(verifier).add(new Inp=
utAction()).add(new InputSaveVerifier()).add(this)), _("isisfish.input.title"=
))'/>
+            <JMenuItem text=3D"isisfish.welcome.menu.input" onActionPerforme=
d=3D'openFrame(new InputUI(new JAXXInitialContext().add(verifier).add(regionM=
onitor).add(new InputAction()).add(new InputSaveVerifier()).add(this)), _("is=
isfish.input.title"))'/>
             <JMenuItem text=3D"isisfish.welcome.menu.script" onActionPerform=
ed=3D'openFrame(new ScriptUI(), _("isisfish.script.title"))'/>
-            <JMenuItem text=3D"isisfish.sensitivity.title" onActionPerformed=
=3D'openFrame(new SensitivityUI(new JAXXInitialContext().add(new InputAction(=
)).add(new InputSaveVerifier()).add(new SimulAction()).add(this)), _("isisfis=
h.sensitivity.title"))'/>
+            <JMenuItem text=3D"isisfish.sensitivity.title" onActionPerformed=
=3D'openFrame(new SensitivityUI(new JAXXInitialContext().add(regionMonitor).a=
dd(new InputAction()).add(new InputSaveVerifier()).add(new SimulAction()).add=
(this)), _("isisfish.sensitivity.title"))'/>
             <JSeparator/>
             <JMenuItem text=3D"isisfish.welcome.menu.queue" onActionPerforme=
d=3D'openFrame(new QueueUI(), _("isisfish.queue.title"))'/>
         </JMenu>

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTa=
bleCellRenderer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTable=
CellRenderer.java	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTable=
CellRenderer.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, US=
A.
+ *##%*/
+
+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 $
+ *=20
+ * Last update : $Date: 10 juin 2009 $
+ * By : $Author: chatellier $
+ */
+public class ComponentTableCellRenderer implements TableCellRenderer {
+   =20
+    /**
+     * 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.ja=
va	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.ja=
va	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, US=
A.
+ *##%*/
+
+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 $
+ *=20
+ * Last update : $Date: 10 juin 2009 $
+ * By : $Author: chatellier $
+ */
+public class QueueAction {
+
+    /** Log. */
+    private static Log log =3D LogFactory.getLog(QueueAction.class);
+   =20
+    /** queue ui to manage. */
+    protected QueueUI queueUI;
+   =20
+    /**
+     * Queue action.
+     *=20
+     * @param queueUI queue ui to manage
+     */
+    public QueueAction(QueueUI queueUI) {
+        this.queueUI =3D queueUI;
+    }
+
+    /**
+     * Update ui buttons.
+     */
+    public void updateActions() {
+        queueUI.setCanStop(!queueUI.getSelectionModelQueueTable().isSelectio=
nEmpty());
+        queueUI.setCanShowLog(!queueUI.getSelectionModelQueueTableDone().isS=
electionEmpty());
+        // TODO value have to change on non valueChanged event
+        queueUI.setCanClear(queueUI.getQueueTableDone().getModel().getRowCou=
nt()>0);
+        queueUI.setCanRestart(!queueUI.getSelectionModelQueueTableDone().isS=
electionEmpty());
+    }
+   =20
+    /**
+     * Stop simulation associated with table selected rows.
+     */
+    protected void stopSimulation() {
+        int[] selectedRows =3D queueUI.getQueueTable().getSelectedRows();
+        SimulationJob[] jobsToStop =3D new SimulationJob[selectedRows.length=
];
+        int index =3D 0;
+       =20
+        // to do in two pass, because each stopped simulation
+        // change selected rows
+        for (int selectedRow : selectedRows) {
+            jobsToStop[index++] =3D queueUI.getNewSimulationModel().getJob(s=
electedRow);
+        }
+        for (SimulationJob jobToStop : jobsToStop) {
+            jobToStop.stop();
+            if (log.isInfoEnabled()) {
+                log.info(_("User stop simulation %s", jobToStop.getItem().ge=
tControl()
+                    .getId()));
+            }
+        }
+    }
+
+    /**
+     * Restart simulation.
+     */
+    protected void restartSimulation() {
+        int[] selectedRows =3D queueUI.getQueueTableDone().getSelectedRows();
+        SimulationJob[] jobsToRestart =3D new SimulationJob[selectedRows.len=
gth];
+        int index =3D 0;
+       =20
+        // to do in two pass, because each simulation
+        // change selected rows
+        for (int selectedRow : selectedRows) {
+            jobsToRestart[index++] =3D queueUI.getDoneSimulationModel().getJ=
ob(selectedRow);
+        }
+        for (SimulationJob jobToRestart : jobsToRestart) {
+           =20
+            jobToRestart.restart();
+            jobToRestart.getItem().getControl().setText(_("isisfish.simulati=
on.restarting"));
+            if (log.isInfoEnabled()) {
+                log.info(_("User restart simulation %s", jobToRestart.getIte=
m().getControl()
+                    .getId()));
+            }
+        }
+    }
+   =20
+    /**
+     * View log of selected done jobs.
+     */
+    protected void viewLog() {
+        if (queueUI.getQueueTableDone().getSelectedRow() >=3D 0) {
+            SimulationJob selectedJob =3D queueUI.getDoneSimulationModel().g=
etJob(queueUI.getQueueTableDone().getSelectedRow());
+           =20
+            String id =3D 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 =3D SimulationService.getService();
+        ss.clearJobDone();
+    }
+}

Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.ja=
xx (from rev 2296, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simul=
ator/QueueUI.jaxx)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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	2=
009-06-10 15:24:47 UTC (rev 2366)
@@ -0,0 +1,80 @@
+<!--
+/* *##%
+ * Copyright (C) 2005 - 2009
+ *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
+ *##%*/
+ -->
+<Table>
+<script><![CDATA[
+    import fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableMode=
l;
+    import fr.ifremer.isisfish.simulator.launcher.SimulationService;
+    import javax.swing.JProgressBar;
+    import javax.swing.ListSelectionModel;
+
+    queueTable.setDefaultRenderer(JProgressBar.class, new ComponentTableCell=
Renderer());
+    queueTableDone.setDefaultRenderer(JProgressBar.class, new ComponentTable=
CellRenderer());
+    ]]>
+ </script>
+
+    <Boolean id=3D'canStop' javaBean=3D'false'/>
+    <Boolean id=3D'canShowLog' javaBean=3D'false'/>
+    <Boolean id=3D'canClear' javaBean=3D'false'/>
+    <Boolean id=3D'canRestart' javaBean=3D'false'/>
+   =20
+    <QueueAction id=3D"queueAction" javaBean=3D'new QueueAction(this)'/>
+    <SimulationServiceTableModel id=3D"newSimulationModel" javaBean=3D'new S=
imulationServiceTableModel(SimulationService.getService(), true)'/>
+    <SimulationServiceTableModel id=3D"doneSimulationModel" javaBean=3D'new =
SimulationServiceTableModel(SimulationService.getService(), false)'/>
+   =20
+    <DefaultListSelectionModel id=3D"selectionModelQueueTable" onValueChange=
d=3D'queueAction.updateActions()'/>
+    <DefaultListSelectionModel id=3D"selectionModelQueueTableDone" onValueCh=
anged=3D'queueAction.updateActions()'/>
+
+    <row>
+        <cell columns=3D"5" fill=3D"both" weightx=3D"1.0" weighty=3D"0.5">
+            <JScrollPane>
+                <JTable id=3D"queueTable" model=3D'{newSimulationModel}'
+                    selectionMode=3D"{ListSelectionModel.MULTIPLE_INTERVAL_S=
ELECTION}"
+                    selectionModel=3D"{selectionModelQueueTable}" />
+            </JScrollPane>
+        </cell>
+    </row>
+    <row>
+        <cell columns=3D"5" fill=3D"both" weightx=3D"1.0" weighty=3D"0.5">
+            <JScrollPane>
+                <JTable id=3D"queueTableDone" model=3D'{doneSimulationModel}'
+                    selectionMode=3D"{ListSelectionModel.SINGLE_SELECTION}"
+                    selectionModel=3D"{selectionModelQueueTableDone}" />
+            </JScrollPane>
+        </cell>
+    </row>
+    <row>
+        <cell fill=3D"horizontal" weightx=3D"0.3">
+            <JToggleButton id=3D"autoLaunchButton" text=3D"isisfish.queue.si=
mulationLaunch"/>
+        </cell>
+        <cell fill=3D"horizontal" weightx=3D"0.3">
+            <JButton id=3D"stopSimuButton" text=3D"isisfish.queue.stopSimula=
tion" onActionPerformed=3D'queueAction.stopSimulation()' enabled=3D'{isCanSto=
p()}' />
+        </cell>
+        <cell fill=3D"horizontal" weightx=3D"0.3">
+            <JButton id=3D"restartSimulationButton" text=3D"isisfish.queue.r=
estartSimulation" onActionPerformed=3D'queueAction.restartSimulation()' enabl=
ed=3D'{isCanRestart()}' />
+        </cell>
+        <cell fill=3D"horizontal" weightx=3D"0.3">
+            <JButton id=3D"showLogButton" text=3D"isisfish.queue.showLog" on=
ActionPerformed=3D'queueAction.viewLog()' enabled=3D'{isCanShowLog()}' />
+        </cell>
+        <cell fill=3D"horizontal" weightx=3D"0.3">
+            <JButton id=3D"clearDoneJobsButton" text=3D"isisfish.queue.clear=
Done" onActionPerformed=3D'queueAction.clearDoneJobs()' enabled=3D'{isCanClea=
r()}' />
+        </cell>
+    </row>
+</Table>
\ No newline at end of file

Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Queue=
UI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.ja=
xx	2009-06-10 15:24:16 UTC (rev 2365)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.ja=
xx	2009-06-10 15:24:47 UTC (rev 2366)
@@ -1,153 +0,0 @@
-<!--
-/* *##%
- * Copyright (C) 2005 - 2009
- *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
- *##%*/
- -->
-
-<Table>
-<script><![CDATA[
-    import fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableMode=
l;
-    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();
-   =20
-    public void initContext() {
-        SimulationService ss =3D SimulationService.getService();
-        setContextValue(new SimulationServiceTableModel(ss, true), "new");
-        setContextValue(new SimulationServiceTableModel(ss, false), "done");
-        queueTable.setDefaultRenderer(JProgressBar.class, new JProgressBarTa=
bleCellRenderer());
-        queueTableDone.setDefaultRenderer(JProgressBar.class, new JProgressB=
arTableCellRenderer());
-    }
-   =20
-    public QueueUI(SimulAction action) {
-        setContextValue(action);
-    }
-   =20
-    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 =3D getContextValue(SimulAction.class);
-       =20
-        int[] selectedRows =3D queueTable.getSelectedRows();
-        SimulationJob[] jobsToStop =3D new SimulationJob[selectedRows.length=
];
-        int index =3D 0;
-       =20
-        // to do in two pass, because each stopped simulation
-        // change selected rows
-        for (int selectedRow : selectedRows) {
-            jobsToStop[index++] =3D getContextValue(SimulationServiceTableMo=
del.class, "new").getJob(selectedRow);
-        }
-        for (SimulationJob jobToStop : jobsToStop) {
-            simulAction.stopSimulation(jobToStop);
-        }
-    }
-
-    protected void restartSimulation() {
-        SimulAction simulAction =3D getContextValue(SimulAction.class);
-       =20
-        int[] selectedRows =3D queueTableDone.getSelectedRows();
-        SimulationJob[] jobsToRestart =3D new SimulationJob[selectedRows.len=
gth];
-        int index =3D 0;
-       =20
-        // to do in two pass, because each simulation
-        // change selected rows
-        for (int selectedRow : selectedRows) {
-            jobsToRestart[index++] =3D getContextValue(SimulationServiceTabl=
eModel.class, "done").getJob(selectedRow);
-        }
-        for (SimulationJob jobToRestart : jobsToRestart) {
-            simulAction.restartSimulation(jobToRestart);
-        }
-    }
-   =20
-    protected void viewLog() {
-        if (queueTableDone.getSelectedRow() >=3D 0) {
-            getContextValue(SimulAction.class).viewLog(getContextValue(Simul=
ationServiceTableModel.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=3D'canStop' javaBean=3D'false'/>
-    <Boolean id=3D'canShowLog' javaBean=3D'false'/>
-    <Boolean id=3D'canClear' javaBean=3D'false'/>
-    <Boolean id=3D'canRestart' javaBean=3D'false'/>
-
-    <DefaultListSelectionModel id=3D"selectionModelQueueTab" onValueChanged=
=3D'updateActions()'/>
-    <DefaultListSelectionModel id=3D"selectionModelQueueTabDone" onValueChan=
ged=3D'updateActions()'/>
-
-    <row>
-        <cell columns=3D"5" fill=3D"both" weightx=3D"1.0" weighty=3D"0.5">
-            <JScrollPane>
-                <JTable id=3D"queueTable" model=3D'{getContextValue(Simulati=
onServiceTableModel.class, "new")}' selectionMode=3D"{ListSelectionModel.MULT=
IPLE_INTERVAL_SELECTION}"
-                        selectionModel=3D"{selectionModelQueueTab}"/>
-            </JScrollPane>
-        </cell>
-    </row>
-    <row>
-        <cell columns=3D"5" fill=3D"both" weightx=3D"1.0" weighty=3D"0.5">
-            <JScrollPane>
-                <JTable id=3D"queueTableDone" model=3D'{getContextValue(Simu=
lationServiceTableModel.class, "done")}' selectionMode=3D"{ListSelectionModel=
.SINGLE_SELECTION}"
-                selectionModel=3D"{selectionModelQueueTabDone}" />
-            </JScrollPane>
-        </cell>
-    </row>
-    <row>
-        <cell fill=3D"horizontal" weightx=3D"0.3">
-            <JToggleButton id=3D"autoLaunchButton" text=3D"isisfish.queue.si=
mulationLaunch"/>
-        </cell>
-        <cell fill=3D"horizontal" weightx=3D"0.3">
-            <JButton id=3D"stopSimuButton" text=3D"isisfish.queue.stopSimula=
tion" onActionPerformed=3D'stopSimulation()' enabled=3D'{isCanStop()}' />
-        </cell>
-        <cell fill=3D"horizontal" weightx=3D"0.3">
-            <JButton id=3D"restartSimulationButton" text=3D"isisfish.queue.r=
estartSimulation" onActionPerformed=3D'restartSimulation()' enabled=3D'{isCan=
Restart()}' />
-        </cell>
-        <cell fill=3D"horizontal" weightx=3D"0.3">
-            <JButton id=3D"showLogButton" text=3D"isisfish.queue.showLog" on=
ActionPerformed=3D'viewLog()' enabled=3D'{isCanShowLog()}' />
-        </cell>
-        <cell fill=3D"horizontal" weightx=3D"0.3">
-            <JButton id=3D"clearDoneJobsButton" text=3D"isisfish.queue.clear=
Done" onActionPerformed=3D'clearDoneJobs()' enabled=3D'{isCanClear()}' />
-        </cell>
-    </row>
-</Table>
\ No newline at end of file

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Simu=
lAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulActio=
n.java	2009-06-10 15:24:16 UTC (rev 2365)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulActio=
n.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;
=20
 import javax.swing.JComponent;
=20
+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.MatrixContinuousDoma=
in;
 import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil;
 import fr.ifremer.isisfish.ui.widget.filter.FilterModel;
-import jaxx.runtime.swing.ErrorDialogUI;
=20
 /**
  * SimulAction.
@@ -105,9 +102,7 @@
     protected SimulationParameter param =3D null;
     protected RegionStorage regionStorage =3D null;
     protected SimulationStorage simulStorage =3D null;
-    protected RuleStorage ruleStorage =3D null;
     protected List<String> analysePlan =3D null;
-    protected List<Rule> rules =3D new ArrayList<Rule>();
     protected Map<SensitivityExport, String> sensitivityExports =3D new Hash=
Map<SensitivityExport, String>();
    =20
     protected List<String> oldSimulNames =3D null;
@@ -259,58 +254,24 @@
         return result;
     }
=20
-    public void stopSimulation(SimulationJob job) {
-        job.stop();
-        if (log.isInfoEnabled()) {
-            log.info(_("User stop simulation %s", job.getItem().getControl()
-                .getId()));
-        }
-    }
-   =20
     /**
-     * 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().getContro=
l()
-                .getId()));
-        }
-    }
-
-    protected void viewLog(SimulationJob job) {
-        String id =3D 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 =3D SimulationService.getService();
-        ss.clearJobDone();
-    }
-
-    /**
      * Change region in simulation launcher
      *
-      * @param regionName SimulationParameter/description
+     * @param regionName region name
      */
     public void regionChange(String regionName) {
         try {
             regionStorage =3D RegionStorage.getRegion(regionName);
-            init(); // reinitialise param pour le vider
+           =20
+            // chatellier, on ne peut pas le reinitialiser, on
+            // perd toutes les info apres un rechergement d'une anciennes si=
mulation
+            //init(); // reinitialise param pour le vider
             param.setRegionName(regionName);
=20
-// poussin 20090519 quel est l'interet de faire ca ? et encore plus maintena=
nt 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 p=
lus 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 @@
     }
    =20
     /**
-     * Add new rule by name.
+     * Add new rule.
      *=20
-     * @param name rule name
+     * Get a new instance of ruleItem, and add it to rule list.
+     *=20
+     * @param ruleItem rule to get copy
      */
-    public void addRules(String name) {
-        ruleStorage =3D RuleStorage.getRule(name);
+    public void addNewRule(Rule ruleItem) {
+        String ruleName =3D RuleStorage.getName(ruleItem);
         try {
+            RuleStorage ruleStorage =3D RuleStorage.getRule(ruleName);
             Rule ruleTmp =3D ruleStorage.getNewRuleInstance();
             param.addRule(ruleTmp);
         } catch (IsisFishException e) {
@@ -418,20 +382,29 @@
     }
=20
     /**
-     * Return rules name without .java extention.
+     * Retourne une liste d'instance de toutes les regles disponible.
      *=20
-     * @return rule names list
+     * Instanci=C3=A9 (utile pour les modeles).
+     *=20
+     * @return instance rule list
      */
-    public List<String> getAvailableRuleNames() {
-        List<String> result =3D 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 =3D new ArrayList<Rule>();
+        for (String ruleName : RuleStorage.getRuleNames()) {
+            try {
+                // remove last .java
+                String shortRuleName =3D ruleName.substring(0, ruleName.leng=
th() - 5);
+                Rule rule =3D RuleStorage.getRule(shortRuleName).getNewRuleI=
nstance();
+                result.add(rule);
+            } catch (IsisFishException e) {
+                if (log.isErrorEnabled()) {
+                    log.error("Can't get rule instance", e);
+                }
+            }
         }
         return result;
     }
+
     // Strategies
=20
     public List<Strategy> getStrategies() {


--===============0713427034218736074==--