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

r1600 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 09:26:58 +0000 (Wed, 19 Nov 2008) New Revision: 1600 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java Log: Update pom, remove tools.jar Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-11-19 09:26:14 UTC (rev 1599) +++ isis-fish/trunk/pom.xml 2008-11-19 09:26:58 UTC (rev 1600) @@ -442,12 +442,12 @@ </dependency>  - <dependency> +  </dependencies> @@ -637,6 +637,7 @@ </configuration> <executions> <execution> + <phase>generate-resources</phase> <goals> <goal>parserJava</goal> <goal>gen</goal> @@ -648,9 +649,18 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </execution> + </executions> </plugin> <plugin> @@ -677,20 +687,17 @@ <phase>package</phase> <configuration> <tasks> - <copy - file="${project.basedir}/src/main/resources/jnlp/sun.jnlp" - todir="${project.basedir}/target/resources/jnlp/"> + <copy file="${project.basedir}/src/main/resources/jnlp/sun.jnlp" + todir="${project.basedir}/target/resources/jnlp/"> <filterset> <filter token="mail" value="mail-1.4.jar"/> <filter token="activation" value="activation-1.1.jar"/> </filterset> </copy> - <copy - file="${project.build.directory}/lib/mail-1.4.jar" - todir="${project.basedir}/target/resources/jnlp/"/> - <copy - file="${project.build.directory}/lib/activation-1.1.jar" - todir="${project.basedir}/target/resources/jnlp/"/> + <copy file="${project.build.directory}/lib/mail-1.4.jar" + todir="${project.basedir}/target/resources/jnlp/"/> + <copy file="${project.build.directory}/lib/activation-1.1.jar" + todir="${project.basedir}/target/resources/jnlp/"/> </tasks> </configuration> <goals> @@ -769,8 +776,6 @@ </configuration> </plugin> - - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> @@ -790,7 +795,6 @@ </executions> </plugin> - </plugins> </build> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2008-11-19 09:26:14 UTC (rev 1599) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2008-11-19 09:26:58 UTC (rev 1600) @@ -48,14 +48,13 @@ import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; -import com.sun.tools.javac.api.JavacTool; - import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.JavaSourceStorage; @@ -194,7 +193,9 @@ int result = -1000; try { - JavaCompiler compiler = JavacTool.create(); + //JavaCompiler compiler = JavacTool.create(); + // Use system compiler + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, null); Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromFiles(src);

1 0

r1599 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 09:26:14 +0000 (Wed, 19 Nov 2008) New Revision: 1599 Removed: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/GenerationHibernate.java Log: Test does'nt compile anymore Deleted: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/GenerationHibernate.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/GenerationHibernate.java 2008-11-18 17:40:06 UTC (rev 1598) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/GenerationHibernate.java 2008-11-19 09:26:14 UTC (rev 1599) @@ -1,61 +0,0 @@ -/* *##% - * Copyright (C) 2006 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * GenerationHibernate.java - * - * Created: 5 mars 2006 13:34:03 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - -package fr.ifremer.isisfish; - -import java.io.File; - -import junit.framework.TestCase; - -import org.codelutin.topia.generator.EntityHibernateMappingGenerator; - - -/** - * @author poussin - * - */ - -public class GenerationHibernate extends TestCase { - - - - public void testGen() { - File source = new File("/usr/local/src/PROJET/lutin/isis-fish/target/src-build/objectmodel/isis-fish.objectmodel"); - File dest = new File("/tmp/gentest"); - dest.mkdirs(); - EntityHibernateMappingGenerator gen = new EntityHibernateMappingGenerator(); - System.out.println("source: " + source + " dest: " + dest); - gen.generate(source, dest); - } - -} - -

1 0

r1598 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: chatellier Date: 2008-11-18 17:40:06 +0000 (Tue, 18 Nov 2008) New Revision: 1598 Modified: isis-fish/trunk/pom.xml Log: Use new super pom Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-11-18 17:37:34 UTC (rev 1597) +++ isis-fish/trunk/pom.xml 2008-11-18 17:40:06 UTC (rev 1598) @@ -11,7 +11,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.0</version> + <version>3.1</version> </parent> <groupId>ifremer</groupId>

1 0

r1597 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: chatellier Date: 2008-11-18 17:37:34 +0000 (Tue, 18 Nov 2008) New Revision: 1597 Modified: isis-fish/trunk/pom.xml Log: Remove duplicated lutinutil Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-11-18 17:20:42 UTC (rev 1596) +++ isis-fish/trunk/pom.xml 2008-11-18 17:37:34 UTC (rev 1597) @@ -75,6 +75,12 @@ <artifactId>lutinxml</artifactId> <version>0.7</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>lutinlib</groupId> + <artifactId>lutinutil</artifactId> + </exclusion> + </exclusions> </dependency> <!-- librairie commandline

1 0

r1596 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: chatellier Date: 2008-11-18 17:20:42 +0000 (Tue, 18 Nov 2008) New Revision: 1596 Modified: isis-fish/trunk/pom.xml Log: Remove jdic, update libs, switch to stable release Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-11-18 14:18:22 UTC (rev 1595) +++ isis-fish/trunk/pom.xml 2008-11-18 17:20:42 UTC (rev 1596) @@ -21,12 +21,6 @@ <dependencies> <dependency> - <groupId>jdesktop</groupId> - <artifactId>jdic</artifactId> - <version>20061102</version> - </dependency> - - <dependency> <groupId>org.jdesktop</groupId> <artifactId>beansbinding</artifactId> <version>1.2.1</version> @@ -75,14 +69,14 @@ <version>${lutinwidget.version}</version> <scope>compile</scope> </dependency> -  +  + -->  - <jaxx.version>0.6-SNAPSHOT</jaxx.version> + <jaxx.version>0.6</jaxx.version>  <generator.version>0.61</generator.version>  - <topia.version>2.0.28</topia.version> + <topia.version>2.0.29</topia.version>  <lutinwidget.version>0.10</lutinwidget.version> @@ -615,7 +609,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinmatrix</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> <scope>compile</scope> </dependency> </dependencies> @@ -803,50 +797,4 @@ <url>${maven.scm.url}</url> </scm> -  - <profiles> -  -  -  - </profiles> - </project>

1 0

r1595 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result
by sletellier＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: sletellier Date: 2008-11-18 14:18:22 +0000 (Tue, 18 Nov 2008) New Revision: 1595 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java Log: Debug vol1 Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java 2008-11-18 14:14:40 UTC (rev 1594) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java 2008-11-18 14:18:22 UTC (rev 1595) @@ -1,224 +0,0 @@ -/** - * DataResult - * - * Generated: Thu Jul 27 22:04:41 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * - */ - -package fr.ifremer.isisfish.ui.result; - -import static org.codelutin.i18n.I18nf._; - -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Toolkit; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.HashMap; -import java.util.Vector; - -import javax.swing.AbstractButton; -import javax.swing.ButtonGroup; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTable; -import javax.swing.JViewport; -import javax.swing.ListSelectionModel; -import javax.swing.table.DefaultTableModel; -import javax.swing.table.JTableHeader; - -public abstract class DataResultUI extends JPanel implements DataResultUICallback{ - - protected void init(){ - DataResultUI result = this; - this.setLayout(new BorderLayout()); - Vector childs = getDataResultChilds(); - if(childs.size() >= 1) - result.add((Component)childs.get(0), - BorderLayout.CENTER); - - result.setBounds(0,0,0,0); - } - - public void center(){ - // Center the screen - Toolkit tk = this.getToolkit(); - Dimension d = this.getSize(); - int x = (tk.getScreenSize().width - d.width) / 2; - int y = (tk.getScreenSize().height - d.height) / 2; - this.setLocation(x, y); - } - - protected HashMap<String,ButtonGroup> hashGroup = null; - /** - * Ajoute un bouton a un groupe - * @param b the button - * @param groupName name fo group - */ - protected void group(AbstractButton b, String groupName){ - if(hashGroup == null) - hashGroup = new HashMap<String,ButtonGroup>(); - ButtonGroup bg = hashGroup.get(groupName); - if(bg == null){ - bg = new ButtonGroup(); - hashGroup.put(groupName, bg); - } - bg.add(b); - } - - public Vector getDataResultChilds(){ - Vector<Object> result = new Vector<Object>(); - result.add(getTable2()); - return result; - } - - private JPanel __table2__ = null; - public JPanel getTable2(){ - if(__table2__ == null){ - Vector childs = getTable2Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.NONE; - cs[0] = c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 6; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.NONE; - cs[1] = c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 2; - c.weightx = 1; - c.weighty = 5; - c.gridwidth = 1; - c.gridheight = 4; - c.fill = GridBagConstraints.BOTH; - cs[2] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.dataResult.table2")); - - __table2__ = result; - } - return __table2__; - } - - public Vector getTable2Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getDescriptionLabel()); - result.add(getExportButton()); - result.add(getScrolledwindow2()); - return result; - } - - private JLabel __descriptionLabel__ = null; - public JLabel getDescriptionLabel(){ - if(__descriptionLabel__ == null){ - JLabel result = new JLabel(_("isisfish.simulation.name")); - result.setToolTipText(_("isisfish.dataResult.descriptionLabel")); - - __descriptionLabel__ = result; - } - return __descriptionLabel__; - } - - private JButton __exportButton__ = null; - public JButton getExportButton(){ - if(__exportButton__ == null){ - ImageIcon icon = null; - - JButton result = new JButton(_("isisfish.dataResult.export.csv"), icon); - result.setToolTipText(_("isisfish.dataResult.exportButton")); - result.addMouseListener(new MouseAdapter(){ - public void mouseClicked(MouseEvent e){ - on_exportButton_clicked(); - } - }); - - __exportButton__ = result; - } - return __exportButton__; - } - - private JScrollPane __scrolledwindow2__ = null; - public JScrollPane getScrolledwindow2(){ - if(__scrolledwindow2__ == null){ - Vector childs = getScrolledwindow2Childs(); - Component child = null; - if(childs.size() >= 1) - child = (Component)childs.get(0); - - JScrollPane result; - if(child instanceof JViewport){ - result = new JScrollPane(); - result.setViewport((JViewport)child); - } - else - result = new JScrollPane(child); - result.setToolTipText(_("isisfish.dataResult.scrolledwindow2")); - - __scrolledwindow2__ = result; - } - return __scrolledwindow2__; - } - - public Vector getScrolledwindow2Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getMatriceTable()); - return result; - } - - private JTable __matriceTable__ = null; - public JTable getMatriceTable(){ - if(__matriceTable__ == null){ - Vector head = getMatriceTableHead(); - JTable result = - new JTable(new DefaultTableModel(new Vector(), head)); - result.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - setSignalMatriceTableHeader(result); - result.setToolTipText(_("isisfish.dataResult.matriceTable")); - - __matriceTable__ = result; - } - return __matriceTable__; - } - - public Vector getMatriceTableHead(){ - Vector<String> result = new Vector<String>(); - result.add(_("isisfish.dataResult.label")); - result.add(_("isisfish.dataResult.label")); - result.add(_("isisfish.dataResult.label")); - return result; - } - - public void setSignalMatriceTableHeader(JTable table){ - JTableHeader result = table.getTableHeader(); - } - - - -} Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java 2008-11-18 14:14:40 UTC (rev 1594) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java 2008-11-18 14:18:22 UTC (rev 1595) @@ -1,390 +0,0 @@ -/** - * GraphBean - * - * Generated: Thu Jul 27 22:04:40 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * - */ - -package fr.ifremer.isisfish.ui.result; - -import static org.codelutin.i18n.I18nf._; - -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Toolkit; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.HashMap; -import java.util.Vector; - -import javax.swing.AbstractButton; -import javax.swing.ButtonGroup; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JSplitPane; -import javax.swing.JViewport; - -public abstract class GraphBeanUI extends JPanel implements GraphBeanUICallback{ - - protected void init(){ - GraphBeanUI result = this; - this.setLayout(new BorderLayout()); - Vector childs = getGraphBeanChilds(); - if(childs.size() >= 1) - result.add((Component)childs.get(0), - BorderLayout.CENTER); - - result.setBounds(0,0,0,0); - } - - public void center(){ - // Center the screen - Toolkit tk = this.getToolkit(); - Dimension d = this.getSize(); - int x = (tk.getScreenSize().width - d.width) / 2; - int y = (tk.getScreenSize().height - d.height) / 2; - this.setLocation(x, y); - } - - protected HashMap<String,ButtonGroup> hashGroup = null; - - protected void group(AbstractButton b, String groupName){ - if(hashGroup == null) - hashGroup = new HashMap<String,ButtonGroup>(); - ButtonGroup bg = hashGroup.get(groupName); - if(bg == null){ - bg = new ButtonGroup(); - hashGroup.put(groupName, bg); - } - bg.add(b); - } - - public Vector getGraphBeanChilds(){ - Vector<Object> result = new Vector<Object>(); - result.add(getGraphSplitPane()); - return result; - } - - private JSplitPane __graphSplitPane__ = null; - public JSplitPane getGraphSplitPane(){ - if(__graphSplitPane__ == null){ - Vector childs = getGraphSplitPaneChilds(); - Component child1 = null; - Component child2 = null; - if(childs.size() >= 1) - child1 = (Component)childs.get(0); - if(childs.size() >= 2) - child2 = (Component)childs.get(1); - - JSplitPane result = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, - child1, child2); - result.setOneTouchExpandable(true); - result.setDividerSize(10); - - result.setToolTipText(_("isisfish.graphBean.graphSplitPane")); - - __graphSplitPane__ = result; - } - return __graphSplitPane__; - } - - public Vector getGraphSplitPaneChilds(){ - Vector<Object> result = new Vector<Object>(); - result.add(getTable3()); - result.add(getTable1()); - return result; - } - - private JPanel __table3__ = null; - public JPanel getTable3(){ - if(__table3__ == null){ - Vector childs = getTable3Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 0; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.NONE; - cs[0] = c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 1; - c.weightx = 1; - c.weighty = 3; - c.gridwidth = 2; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[1] = c; - - c = new GridBagConstraints(); - c.gridx = 1; - c.gridy = 0; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.HORIZONTAL; - cs[2] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.graphBean.table3")); - - __table3__ = result; - } - return __table3__; - } - - public Vector getTable3Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getLabel1()); - result.add(getScrolledwindow1()); - result.add(getGraphRendererCombo()); - return result; - } - - private JLabel __label1__ = null; - public JLabel getLabel1(){ - if(__label1__ == null){ - JLabel result = new JLabel(_("isisfish.graphBean.graph.render")); - result.setToolTipText(_("isisfish.graphBean.label")); - - __label1__ = result; - } - return __label1__; - } - - private JScrollPane __scrolledwindow1__ = null; - public JScrollPane getScrolledwindow1(){ - if(__scrolledwindow1__ == null){ - Vector childs = getScrolledwindow1Childs(); - Component child = null; - if(childs.size() >= 1) - child = (Component)childs.get(0); - - JScrollPane result; - if(child instanceof JViewport){ - result = new JScrollPane(); - result.setViewport((JViewport)child); - } - else - result = new JScrollPane(child); - result.setToolTipText(_("isisfish.graphBean.scrolledwindow")); - - __scrolledwindow1__ = result; - } - return __scrolledwindow1__; - } - - public Vector getScrolledwindow1Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getViewport1()); - return result; - } - - private JViewport __viewport1__ = null; - public JViewport getViewport1(){ - if(__viewport1__ == null){ - JViewport result = new JViewport(); - Vector childs = getViewport1Childs(); - for (Object child : childs) result.add((Component) child); - - __viewport1__ = result; - } - return __viewport1__; - } - - public Vector getViewport1Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getTable99()); - return result; - } - - private JPanel __table99__ = null; - public JPanel getTable99(){ - if(__table99__ == null){ - Vector childs = getTable99Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 1; - c.weighty = 1; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[0] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.graphBean.table")); - - __table99__ = result; - } - return __table99__; - } - - public Vector getTable99Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getGraphPanel()); - return result; - } - - private javax.swing.JPanel __graphPanel__ = null; - public javax.swing.JPanel getGraphPanel(){ - if(__graphPanel__ == null){ - javax.swing.JPanel result = new javax.swing.JPanel(); - result.setToolTipText(_("isisfish.graphBean.graphPanel")); - - __graphPanel__ = result; - } - return __graphPanel__; - } - - private JComboBox __graphRendererCombo__ = null; - public JComboBox getGraphRendererCombo(){ - if(__graphRendererCombo__ == null){ - JComboBox result = new JComboBox(); - result.setEditable(true); - result.setToolTipText(_("isisfish.graphBean.graphRendererCombo")); - result.addItemListener(new ItemListener(){ - public void itemStateChanged(ItemEvent e){ - on_graphRendererCombo_selectionChanged(e); - } - }); - - __graphRendererCombo__ = result; - } - return __graphRendererCombo__; - } - - private JPanel __table1__ = null; - public JPanel getTable1(){ - if(__table1__ == null){ - Vector childs = getTable1Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 1; - c.weighty = 1; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[0] = c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 1; - c.weightx = 1; - c.weighty = 1; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.NONE; - cs[1] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.graphBean.table")); - - __table1__ = result; - } - return __table1__; - } - - public Vector getTable1Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getTable2()); - result.add(getAppliquer()); - return result; - } - - private JPanel __table2__ = null; - public JPanel getTable2(){ - if(__table2__ == null){ - Vector childs = getTable2Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 1; - c.weighty = 1; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[0] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.graphBean.table")); - - __table2__ = result; - } - return __table2__; - } - - public Vector getTable2Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getPalettePanel()); - return result; - } - - private javax.swing.JPanel __palettePanel__ = null; - public javax.swing.JPanel getPalettePanel(){ - if(__palettePanel__ == null){ - javax.swing.JPanel result = new javax.swing.JPanel(); - result.setToolTipText(_("isisfish.graphBean.palettePanel")); - - __palettePanel__ = result; - } - return __palettePanel__; - } - - private JButton __appliquer__ = null; - public JButton getAppliquer(){ - if(__appliquer__ == null){ - ImageIcon icon = null; - - JButton result = new JButton(_("isisfish.common.apply"), icon); - result.setToolTipText(_("isisfish.common.apply")); - result.addMouseListener(new MouseAdapter(){ - public void mouseClicked(MouseEvent e){ - on_appliquer_clicked(); - } - }); - - __appliquer__ = result; - } - return __appliquer__; - } - - - -} Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java 2008-11-18 14:14:40 UTC (rev 1594) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java 2008-11-18 14:18:22 UTC (rev 1595) @@ -1,702 +0,0 @@ -/** - * ResultEdit - * - * Generated: Thu Jul 27 22:04:42 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * - */ - -package fr.ifremer.isisfish.ui.result; - -import static org.codelutin.i18n.I18nf._; - -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Toolkit; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.HashMap; -import java.util.Vector; - -import javax.swing.AbstractButton; -import javax.swing.Box; -import javax.swing.ButtonGroup; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.JScrollPane; -import javax.swing.JSeparator; -import javax.swing.JSplitPane; -import javax.swing.JViewport; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - -public abstract class ResultEditUI extends JFrame implements ResultEditUICallback{ - - public ResultEditUI(){ - super(_("isisfish.result.title")); - } - - protected void init(){ - ResultEditUI result = this; - this.getContentPane().setLayout(new BorderLayout()); - Vector childs = getResultatEditChilds(); - if(childs.size() >= 1) - result.getContentPane().add((Component)childs.get(0), - BorderLayout.CENTER); - - this.setJMenuBar(getMenubar2()); - this.pack(); - - } - - public void center(){ - // Center the screen - Toolkit tk = this.getToolkit(); - Dimension d = this.getSize(); - int x = (tk.getScreenSize().width - d.width) / 2; - int y = (tk.getScreenSize().height - d.height) / 2; - this.setLocation(x, y); - } - - protected HashMap<String,ButtonGroup> hashGroup = null; - /** - * Ajoute un bouton a un groupe - * @param b the button - * @param groupName name fo group - */ - protected void group(AbstractButton b, String groupName){ - if(hashGroup == null) - hashGroup = new HashMap<String,ButtonGroup>(); - ButtonGroup bg = hashGroup.get(groupName); - if(bg == null){ - bg = new ButtonGroup(); - hashGroup.put(groupName, bg); - } - bg.add(b); - } - - public Vector getResultatEditChilds(){ - Vector<Object> result = new Vector<Object>(); - result.add(getVbox2()); - return result; - } - - private Box __vbox2__ = null; - public Box getVbox2(){ - if(__vbox2__ == null){ - Vector childs = getVbox2Childs(); - Box result = Box.createVerticalBox(); - for (Object child : childs) result.add((Component) child); - result.setToolTipText(_("isisfish.result.vbox")); - - __vbox2__ = result; - } - return __vbox2__; - } - - public Vector getVbox2Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getTable23()); - return result; - } - - private JMenuBar __menubar2__ = null; - public JMenuBar getMenubar2(){ - if(__menubar2__ == null){ - Vector childs = getMenubar2Childs(); - JMenuBar result = new JMenuBar(); - for (Object child : childs) result.add((JMenuItem) child); - result.setToolTipText(_("isisfish.result.menubar")); - - __menubar2__ = result; - } - return __menubar2__; - } - - public Vector getMenubar2Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getMenuExport()); - return result; - } - - private JMenu __menuExport__ = null; - public JMenu getMenuExport(){ - if(__menuExport__ == null){ - Vector childs = getMenuExport_menuChilds(); - JMenu result = new JMenu(_("isisfish.result.export")); - for (Object child : childs) result.add((Component) child); - result.setToolTipText(_("isisfish.result.menuExport")); - - __menuExport__ = result; - } - return __menuExport__; - } - - public Vector getMenuExport_menuChilds(){ - Vector<Object> result = new Vector<Object>(); - result.add(getMenuitem6()); - return result; - } - - private JSeparator __menuitem6__ = null; - public JSeparator getMenuitem6(){ - if(__menuitem6__ == null){ - JSeparator result = new JSeparator(); - result.setToolTipText(_("isisfish.result.menuitem")); - - __menuitem6__ = result; - } - return __menuitem6__; - } - - private JPanel __table23__ = null; - public JPanel getTable23(){ - if(__table23__ == null){ - Vector childs = getTable23Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 1; - c.weightx = 0; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.HORIZONTAL; - cs[0] = c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 1; - c.weighty = 1; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[1] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); - - __table23__ = result; - } - return __table23__; - } - - public Vector getTable23Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getTable22()); - result.add(getHpaned2()); - return result; - } - - private JPanel __table22__ = null; - public JPanel getTable22(){ - if(__table22__ == null){ - Vector childs = getTable22Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 1; - c.gridy = 0; - c.weightx = 0; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.NONE; - cs[0] = c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.HORIZONTAL; - cs[1] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); - - __table22__ = result; - } - return __table22__; - } - - public Vector getTable22Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getStatusImage()); - result.add(getStatusbar1()); - return result; - } - - private JButton __statusImage__ = null; - public JButton getStatusImage(){ - if(__statusImage__ == null){ - ImageIcon icon = null; - - JButton result = new JButton(_("isisfish.common.blank"), icon); - result.setToolTipText(_("isisfish.result.statusImage")); - - __statusImage__ = result; - } - return __statusImage__; - } - - private JLabel __statusbar1__ = null; - public JLabel getStatusbar1(){ - if(__statusbar1__ == null){ - JLabel result = new JLabel(_("isisfish.result.statusBar")); - result.setToolTipText(_("isisfish.result.statusBar")); - - __statusbar1__ = result; - } - return __statusbar1__; - } - - private JSplitPane __hpaned2__ = null; - public JSplitPane getHpaned2(){ - if(__hpaned2__ == null){ - Vector childs = getHpaned2Childs(); - Component child1 = null; - Component child2 = null; - if(childs.size() >= 1) - child1 = (Component)childs.get(0); - if(childs.size() >= 2) - child2 = (Component)childs.get(1); - - JSplitPane result = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, - child1, child2); - result.setOneTouchExpandable(true); - result.setDividerSize(10); - - result.setToolTipText(_("isisfish.result.hpaned")); - - __hpaned2__ = result; - } - return __hpaned2__; - } - - public Vector getHpaned2Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getTable1()); - result.add(getTable25()); - return result; - } - - private JPanel __table1__ = null; - public JPanel getTable1(){ - if(__table1__ == null){ - Vector childs = getTable1Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 1; - c.weightx = 1; - c.weighty = 1; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[0] = c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.HORIZONTAL; - cs[1] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); - - __table1__ = result; - } - return __table1__; - } - - public Vector getTable1Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getTable7()); - result.add(getResultat()); - return result; - } - - private JPanel __table7__ = null; - public JPanel getTable7(){ - if(__table7__ == null){ - Vector childs = getTable7Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 1; - c.gridy = 0; - c.weightx = 0; - c.weighty = 1; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[0] = c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[1] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); - - __table7__ = result; - } - return __table7__; - } - - public Vector getTable7Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getTable8()); - result.add(getScroll()); - return result; - } - - private JPanel __table8__ = null; - public JPanel getTable8(){ - if(__table8__ == null){ - Vector childs = getTable8Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 0; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.NONE; - cs[0] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); - - __table8__ = result; - } - return __table8__; - } - - public Vector getTable8Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getAjoutRendu()); - return result; - } - - private JButton __ajoutRendu__ = null; - public JButton getAjoutRendu(){ - if(__ajoutRendu__ == null){ - ImageIcon icon = null; - - JButton result = new JButton(_("isisfish.common.add.short"), icon); - result.setToolTipText(_("isisfish.result.add")); - result.addMouseListener(new MouseAdapter(){ - public void mouseClicked(MouseEvent e){ - on_ajoutRendu_clicked(); - } - }); - - __ajoutRendu__ = result; - } - return __ajoutRendu__; - } - - private JScrollPane __scroll__ = null; - public JScrollPane getScroll(){ - if(__scroll__ == null){ - Vector childs = getScrollChilds(); - Component child = null; - if(childs.size() >= 1) - child = (Component)childs.get(0); - - JScrollPane result; - if(child instanceof JViewport){ - result = new JScrollPane(); - result.setViewport((JViewport)child); - } - else - result = new JScrollPane(child); - result.setToolTipText(_("isisfish.result.scroll")); - - __scroll__ = result; - } - return __scroll__; - } - - public Vector getScrollChilds(){ - Vector<Object> result = new Vector<Object>(); - result.add(getInfoPanel()); - return result; - } - - private JPanel __infoPanel__ = null; - public JPanel getInfoPanel(){ - if(__infoPanel__ == null){ - Vector childs = getInfoPanelChilds(); - GridBagConstraints [] cs; - cs = new GridBagConstraints[childs.size()]; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.infoPanel")); - - __infoPanel__ = result; - } - return __infoPanel__; - } - - public Vector getInfoPanelChilds(){ - Vector<Object> result; - result = new Vector<Object>(); - return result; - } - - private JComboBox __resultat__ = null; - public JComboBox getResultat(){ - if(__resultat__ == null){ - JComboBox result = new JComboBox(); - result.setEditable(true); - result.setToolTipText(_("isisfish.result.resultat")); - result.addItemListener(new ItemListener(){ - public void itemStateChanged(ItemEvent e){ - on_resultat_selection_notify_event(e); - } - }); - - __resultat__ = result; - } - return __resultat__; - } - - private JPanel __table25__ = null; - public JPanel getTable25(){ - if(__table25__ == null){ - Vector childs = getTable25Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 1; - c.weighty = 1; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[0] = c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 1; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.HORIZONTAL; - cs[1] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); - - __table25__ = result; - } - return __table25__; - } - - public Vector getTable25Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getViewPanel()); - result.add(getTable26()); - return result; - } - - private javax.swing.JPanel __viewPanel__ = null; - public javax.swing.JPanel getViewPanel(){ - if(__viewPanel__ == null){ - javax.swing.JPanel result = new javax.swing.JPanel(); - result.setToolTipText(_("isisfish.result.viewPanel")); - - __viewPanel__ = result; - } - return __viewPanel__; - } - - private JPanel __table26__ = null; - public JPanel getTable26(){ - if(__table26__ == null){ - Vector childs = getTable26Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.NONE; - cs[0] = c; - - c = new GridBagConstraints(); - c.gridx = 1; - c.gridy = 0; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.NONE; - cs[1] = c; - - c = new GridBagConstraints(); - c.gridx = 2; - c.gridy = 0; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.NONE; - cs[2] = c; - - c = new GridBagConstraints(); - c.gridx = 3; - c.gridy = 0; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.NONE; - cs[3] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); - - __table26__ = result; - } - return __table26__; - } - - public Vector getTable26Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getGraphRadioButton()); - result.add(getMapRadioButton()); - result.add(getDonneeRadioButton()); - result.add(getResumeRadioButton()); - return result; - } - - private JRadioButton __graphRadioButton__ = null; - public JRadioButton getGraphRadioButton(){ - if(__graphRadioButton__ == null){ - JRadioButton result = new JRadioButton(_("isisfish.result.graph"), false); - result.setToolTipText(_("isisfish.result.graphRadioButton")); - result.addChangeListener(new ChangeListener(){ - public void stateChanged(ChangeEvent e){ - on_graphRadioButton_toggled(e); - } - }); - - __graphRadioButton__ = result; - } - return __graphRadioButton__; - } - - private JRadioButton __mapRadioButton__ = null; - public JRadioButton getMapRadioButton(){ - if(__mapRadioButton__ == null){ - JRadioButton result = new JRadioButton(_("isisfish.result.map"), false); - result.setToolTipText(_("isisfish.result.mapRadioButton")); - result.addChangeListener(new ChangeListener(){ - public void stateChanged(ChangeEvent e){ - on_mapRadioButton_toggled(e); - } - }); - - __mapRadioButton__ = result; - } - return __mapRadioButton__; - } - - private JRadioButton __donneeRadioButton__ = null; - public JRadioButton getDonneeRadioButton(){ - if(__donneeRadioButton__ == null){ - JRadioButton result = new JRadioButton(_("isisfish.result.datas"), false); - result.setToolTipText(_("isisfish.result.datasRadioButton")); - result.addChangeListener(new ChangeListener(){ - public void stateChanged(ChangeEvent e){ - on_donneeRadioButton_toggled(e); - } - }); - - __donneeRadioButton__ = result; - } - return __donneeRadioButton__; - } - - private JRadioButton __resumeRadioButton__ = null; - public JRadioButton getResumeRadioButton(){ - if(__resumeRadioButton__ == null){ - JRadioButton result = new JRadioButton(_("isisfish.result.summary"), false); - result.setToolTipText(_("isisfish.result.summaryRadioButton")); - result.addChangeListener(new ChangeListener(){ - public void stateChanged(ChangeEvent e){ - on_resumeRadioButton_toggled(e); - } - }); - - __resumeRadioButton__ = result; - } - return __resumeRadioButton__; - } - - - -} Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java 2008-11-18 14:14:40 UTC (rev 1594) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java 2008-11-18 14:18:22 UTC (rev 1595) @@ -1,184 +0,0 @@ -/** - * ResumePanel - * - * Generated: Thu Jul 27 22:04:44 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * - */ - -package fr.ifremer.isisfish.ui.result; - -import static org.codelutin.i18n.I18nf._; - -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Toolkit; -import java.util.HashMap; -import java.util.Vector; - -import javax.swing.AbstractButton; -import javax.swing.ButtonGroup; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.JViewport; - -public abstract class ResumePanelUI extends JPanel implements ResumePanelUICallback{ - - protected void init(){ - ResumePanelUI result = this; - this.setLayout(new BorderLayout()); - Vector childs = getResumePanelChilds(); - if(childs.size() >= 1) - result.add((Component)childs.get(0), - BorderLayout.CENTER); - - result.setBounds(0,0,0,0); - } - - public void center(){ - // Center the screen - Toolkit tk = this.getToolkit(); - Dimension d = this.getSize(); - int x = (tk.getScreenSize().width - d.width) / 2; - int y = (tk.getScreenSize().height - d.height) / 2; - this.setLocation(x, y); - } - - protected HashMap<String,ButtonGroup> hashGroup = null; - /** - * Ajoute un bouton a un groupe - * @param b the button - * @param groupName name fo group - */ - protected void group(AbstractButton b, String groupName){ - if(hashGroup == null) - hashGroup = new HashMap<String,ButtonGroup>(); - ButtonGroup bg = (ButtonGroup)hashGroup.get(groupName); - if(bg == null){ - bg = new ButtonGroup(); - hashGroup.put(groupName, bg); - } - bg.add(b); - } - - public Vector getResumePanelChilds(){ - Vector<Object> result = new Vector<Object>(); - result.add(getTable1()); - return result; - } - - private JPanel __table1__ = null; - public JPanel getTable1(){ - if(__table1__ == null){ - Vector childs = getTable1Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 1; - c.weighty = 1; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[0] = c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 1; - c.weightx = 2; - c.weighty = 1; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[1] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.resume.table")); - - __table1__ = result; - } - return __table1__; - } - - public Vector getTable1Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getScrolledwindow2()); - result.add(getMatriceInfoGrid()); - return result; - } - - private JScrollPane __scrolledwindow2__ = null; - public JScrollPane getScrolledwindow2(){ - if(__scrolledwindow2__ == null){ - Vector childs = getScrolledwindow2Childs(); - Component child = null; - if(childs.size() >= 1) - child = (Component)childs.get(0); - - JScrollPane result; - if(child instanceof JViewport){ - result = new JScrollPane(); - result.setViewport((JViewport)child); - } - else - result = new JScrollPane(child); - result.setToolTipText(_("isisfish.resume.scrolledwindow")); - - __scrolledwindow2__ = result; - } - return __scrolledwindow2__; - } - - public Vector getScrolledwindow2Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getResumeTextArea()); - return result; - } - - private JTextArea __resumeTextArea__ = null; - public JTextArea getResumeTextArea(){ - if(__resumeTextArea__ == null){ - JTextArea result = new JTextArea(_("isisfish.common.blank")); - result.setEditable(false); - result.setToolTipText(_("isisfish.resume.resumeTextArea")); - - __resumeTextArea__ = result; - } - return __resumeTextArea__; - } - - private JPanel __matriceInfoGrid__ = null; - public JPanel getMatriceInfoGrid(){ - if(__matriceInfoGrid__ == null){ - Vector childs = getMatriceInfoGridChilds(); - GridBagConstraints [] cs; - cs = new GridBagConstraints[childs.size()]; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.resume.matrixInfoGrid")); - - __matriceInfoGrid__ = result; - } - return __matriceInfoGrid__; - } - - public Vector getMatriceInfoGridChilds(){ - Vector result; - result = new Vector(); - return result; - } - - - -} Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java 2008-11-18 14:14:40 UTC (rev 1594) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java 2008-11-18 14:18:22 UTC (rev 1595) @@ -1,187 +0,0 @@ -/** - * SimpleResultatMapBean - * - * Generated: Thu Jul 27 22:04:14 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * - */ - -package fr.ifremer.isisfish.ui.result; - -import static org.codelutin.i18n.I18nf._; - -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Toolkit; -import java.util.HashMap; -import java.util.Vector; - -import javax.swing.AbstractButton; -import javax.swing.ButtonGroup; -import javax.swing.JPanel; - -public abstract class SimpleResultatMapBeanUI extends JPanel implements SimpleResultatMapBeanUICallback{ - - protected void init(){ - SimpleResultatMapBeanUI result = this; - this.setLayout(new BorderLayout()); - Vector childs = getSimpleResultatMapBeanChilds(); - if(childs.size() >= 1) - result.add((Component)childs.get(0), - BorderLayout.CENTER); - - result.setBounds(0,0,0,0); - } - - public void center(){ - // Center the screen - Toolkit tk = this.getToolkit(); - Dimension d = this.getSize(); - int x = (tk.getScreenSize().width - d.width) / 2; - int y = (tk.getScreenSize().height - d.height) / 2; - this.setLocation(x, y); - } - - protected HashMap<String,ButtonGroup> hashGroup = null; - /** - * Ajoute un bouton a un groupe - * @param b the button - * @param groupName name fo group - */ - protected void group(AbstractButton b, String groupName){ - if(hashGroup == null) - hashGroup = new HashMap<String,ButtonGroup>(); - ButtonGroup bg = hashGroup.get(groupName); - if(bg == null){ - bg = new ButtonGroup(); - hashGroup.put(groupName, bg); - } - bg.add(b); - } - - public Vector getSimpleResultatMapBeanChilds(){ - Vector<Object> result = new Vector<Object>(); - result.add(getTable12()); - return result; - } - - private JPanel __table12__ = null; - public JPanel getTable12(){ - if(__table12__ == null){ - Vector childs = getTable12Childs(); - GridBagConstraints [] cs = new GridBagConstraints[childs.size()]; - GridBagConstraints c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 1; - c.weightx = 1; - c.weighty = 1; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[0] = c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 2; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[1] = c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 0; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[2] = c; - - c = new GridBagConstraints(); - c.gridx = 0; - c.gridy = 3; - c.weightx = 1; - c.weighty = 0; - c.gridwidth = 1; - c.gridheight = 1; - c.fill = GridBagConstraints.BOTH; - cs[3] = c; - - JPanel result = new JPanel(new GridBagLayout()); - for(int i=0; i<childs.size(); i++) - result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.simpleResult.table")); - - __table12__ = result; - } - return __table12__; - } - - public Vector getTable12Childs(){ - Vector<Object> result = new Vector<Object>(); - result.add(getIsisMapBean()); - result.add(getInformationDelegator()); - result.add(getIsisMapBeanToolBar()); - result.add(getLegendPanel()); - return result; - } - - private fr.ifremer.isisfish.map.IsisMapBean __resultatMap__ = null; - public fr.ifremer.isisfish.map.IsisMapBean getIsisMapBean(){ - if(__resultatMap__ == null){ - fr.ifremer.isisfish.map.IsisMapBean result = new fr.ifremer.isisfish.map.IsisMapBean(); - result.setToolTipText(_("isisfish.simpleResult.resultatMap")); - - __resultatMap__ = result; - } - return __resultatMap__; - } - - private com.bbn.openmap.InformationDelegator __informationDelegator__ = null; - public com.bbn.openmap.InformationDelegator getInformationDelegator(){ - if(__informationDelegator__ == null){ - com.bbn.openmap.InformationDelegator result; - result = new com.bbn.openmap.InformationDelegator(); - __informationDelegator__ = result; - } - return __informationDelegator__; - } - - private com.bbn.openmap.gui.ToolPanel - __resultatMapToolBar__ = null; - public com.bbn.openmap.gui.ToolPanel - getIsisMapBeanToolBar(){ - if(__resultatMapToolBar__ == null){ - com.bbn.openmap.gui.ToolPanel - result = new com.bbn.openmap.gui.ToolPanel -(); - result.setToolTipText(_("isisfish.simpleResult.resultatMapToolBar")); - - __resultatMapToolBar__ = result; - } - return __resultatMapToolBar__; - } - - private LegendPanel __legendPanel__ = null; - public LegendPanel getLegendPanel(){ - if(__legendPanel__ == null){ - LegendPanel result = new LegendPanel(); - result.setToolTipText(_("isisfish.simpleResult.legendPanel")); - - __legendPanel__ = result; - } - return __legendPanel__; - } - - - -}

1 0

r1594 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console
by sletellier＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: sletellier Date: 2008-11-18 14:14:40 +0000 (Tue, 18 Nov 2008) New Revision: 1594 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java Log: Debug vol1 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2008-11-18 13:43:28 UTC (rev 1593) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2008-11-18 14:14:40 UTC (rev 1594) @@ -65,7 +65,7 @@ public class LogMail extends LogMailUI { - static private final Log log = getLog(LogMail.class); + static private final Log log = org.apache.commons.logging.LogFactory.getLog(LogMail.class); /** the simulation directory */ protected File simulationFile;

1 0

r1593 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: sletellier Date: 2008-11-18 13:43:28 +0000 (Tue, 18 Nov 2008) New Revision: 1593 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx Log: Debug vol1 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2008-11-18 13:43:17 UTC (rev 1592) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2008-11-18 13:43:28 UTC (rev 1593) @@ -54,15 +54,23 @@ fieldStrategyName.setText(strategy.getName()); setSetOfVesselsModel(strategy); fieldStrategyProportionSetOfVessels.setText(strategy.getProportionSetOfVessels() + ""); + setInactivityModel(); fieldUseEquationInactivity.setSelected(strategy.getInactivityEquationUsed()); - setInactivityModel(); fieldStrategyComment.setText(strategy.getComment()); - try { - editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); - } catch (IOException ex) { - Logger.getLogger(StrategyTabUI.class.getName()).log(Level.SEVERE, null, ex); - } } + else{ + fieldStrategyName.setText(""); + fieldStrategySetOfVessels.setModel(new DefaultComboBoxModel()); + fieldStrategyProportionSetOfVessels.setText("0.0"); + fieldStrategyInactivity.setModel(new DefaultComboBoxModel()); + fieldStrategyComment.setText(""); + } + valueChanged(false); + try { + editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); + } catch (IOException ex) { + Logger.getLogger(StrategyTabUI.class.getName()).log(Level.SEVERE, null, ex); + } } protected void setInactivityModel(){ java.util.List<Formule> formules = getContextValue(InputAction.class).getFormules("Inactivity"); @@ -192,7 +200,7 @@ <JPanel/> </cell> <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldUseEquationInactivity" onActionPerformed='useInactivityChanged()'/> + <JCheckBox id="fieldUseEquationInactivity" text="isisfish.strategy.inactivityEquationUsed" onActionPerformed='useInactivityChanged()'/> </cell> </row> <row>

1 0

r1592 - isis-fish/trunk/src/main/resources/i18n
by sletellier＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: sletellier Date: 2008-11-18 13:43:17 +0000 (Tue, 18 Nov 2008) New Revision: 1592 Modified: 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: Debug vol1 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 2008-11-18 13:03:17 UTC (rev 1591) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-11-18 13:43:17 UTC (rev 1592) @@ -1013,6 +1013,7 @@ isisfish.simulation.name=Simulation name isisfish.simulation.title=Simulation Launcher isisfish.simulationQueue.title=Simulation Queue +isisfish.simulator.subprocess.readoutput.error= isisfish.species.age=age isisfish.species.cee=CEE isisfish.species.comments=Comments @@ -1151,6 +1152,7 @@ lutinutil.vcs.state.unversionned=unversionned lutinutil.vcs.state.unversionnedOrMissing=unversionnedOrMissing lutinutil.vcs.state.uptodate=uptodate +msg= no\ properties\ found\ or\ unsafe\ properties\ found\ %1$s=no properties found or unsafe properties found %1$s not\ started= region\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= @@ -1158,6 +1160,7 @@ repository\ protocol\ change\ from\ %s\ to\ %s= repository\ user\ change\ from\ %s\ to\ %s= simulate\ %s\ with\ file\ %s= +strategyMonthInfo.getNumberOfTrips().toString()= the\ property\ %1$s\ is\ mandatory\ but\ missed.=the property %1$s is mandatory but missed. to\ use\ ssh\ authentication\ mode,\ you\ must\ have\ a\ username.\ %1$s.=to use ssh authentication mode, you must have a username. %1$s. to\ use\ ssh\ authentication\ mode,\ you\ must\ have\ an\ existing\ private\ key\ %1$s\ \:\ %2$s.=to use ssh authentication mode, you must have an existing private key %1$s \: %2$s. 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 2008-11-18 13:03:17 UTC (rev 1591) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-11-18 13:43:17 UTC (rev 1592) @@ -1013,6 +1013,7 @@ isisfish.simulation.name=Nom de la simulation isisfish.simulation.title=Lanceur de simulations isisfish.simulationQueue.title=Queue des simulations +isisfish.simulator.subprocess.readoutput.error= isisfish.species.age=age isisfish.species.cee=CEE isisfish.species.comments=Commentaires @@ -1151,6 +1152,7 @@ lutinutil.vcs.state.unversionned=fichier non versionn\u00E9 lutinutil.vcs.state.unversionnedOrMissing=fichier non versionn\u00E9 ou non pr\u00E9sent localement lutinutil.vcs.state.uptodate=fichier \u00E0 jour +msg= no\ properties\ found\ or\ unsafe\ properties\ found\ %1$s=no properties found or unsafe properties found %1$s not\ started= region\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= @@ -1158,6 +1160,7 @@ repository\ protocol\ change\ from\ %s\ to\ %s= repository\ user\ change\ from\ %s\ to\ %s= simulate\ %s\ with\ file\ %s= +strategyMonthInfo.getNumberOfTrips().toString()= the\ property\ %1$s\ is\ mandatory\ but\ missed.=the property %1$s is mandatory but missed. to\ use\ ssh\ authentication\ mode,\ you\ must\ have\ a\ username.\ %1$s.=to use ssh authentication mode, you must have a username. %1$s. to\ use\ ssh\ authentication\ mode,\ you\ must\ have\ an\ existing\ private\ key\ %1$s\ \:\ %2$s.=to use ssh authentication mode, you must have an existing private key %1$s \: %2$s.

1 0

r1591 - isis-fish/trunk/src/main/xmi
by sletellier＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: sletellier Date: 2008-11-18 13:03:17 +0000 (Tue, 18 Nov 2008) New Revision: 1591 Modified: isis-fish/trunk/src/main/xmi/isis-fish.zargo Log: Model update Modified: isis-fish/trunk/src/main/xmi/isis-fish.zargo =================================================================== (Binary files differ)

1 0