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 @@ <!-- /* *##% - * Copyright (C) 2005 - * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * Copyright (C) 2005 - 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,41 +16,31 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ - -/* * - * IsisFish.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ --> - <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 @@ <!-- /* *##% - * Copyright (C) 2005 - * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * Copyright (C) 2005 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 @@ -17,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. *##%*/ - -/* * - * IsisFish.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ --> -<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 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * Copyright (C) 2005 - 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,20 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ - -/* * - * SensUI.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ --> - <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 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * Copyright (C) 2005 - 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,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. *##%*/ - -/** - * SimulUI.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ --> -<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;