r2788 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/result resources/i18n
Author: chatellier Date: 2009-12-02 09:41:41 +0000 (Wed, 02 Dec 2009) New Revision: 2788 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUIJAXX.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUIJAXX.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUIJAXX.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUIJAXX.jaxx Modified: 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/InfoItemDateUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.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/ResultViewUI.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 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: Remove all tooltips displayed by default an all components. Modified: 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 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -120,7 +120,6 @@ 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; } @@ -139,7 +138,6 @@ public JLabel getDescriptionLabel(){ if(__descriptionLabel__ == null){ JLabel result = new JLabel(_("isisfish.simulation.name")); - result.setToolTipText(_("isisfish.dataResult.descriptionLabel")); __descriptionLabel__ = result; } @@ -152,7 +150,6 @@ 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(); @@ -179,7 +176,6 @@ } else result = new JScrollPane(child); - result.setToolTipText(_("isisfish.dataResult.scrolledwindow2")); __scrolledwindow2__ = result; } @@ -200,7 +196,6 @@ new JTable(new DefaultTableModel(new Vector(), head)); result.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); setSignalMatriceTableHeader(result); - result.setToolTipText(_("isisfish.dataResult.matriceTable")); __matriceTable__ = result; } Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUIJAXX.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUIJAXX.jaxx 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUIJAXX.jaxx 2009-12-02 09:41:41 UTC (rev 2788) @@ -1,57 +0,0 @@ -<!-- -/* *##% - * Copyright (C) 2005 - * 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, USA. - *##%*/ - -/* * - * DataResult.jaxx - * - * 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[ - public DataResultUIJAXX (ResultAction action){ - - setContextValue(action); - } - ]]> - </script> - <row> - <cell fill='horizontal' weightx='1.0'> - <JLabel id='descriptionLabel' text="isisfish.simulation.name"/> - </cell> - </row> - <row> - <cell fill='both' weightx='1.0' weighty='1.0'> - <JTable id="matriceTable"/> - </cell> - </row> - <row> - <cell fill='horizontal' weightx='1.0'> - <JButton id="exportButton" text="isisfish.dataResult.export.csv"/> - </cell> - </row> -</Table> Modified: 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 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -92,8 +92,6 @@ result.setOneTouchExpandable(true); result.setDividerSize(10); - result.setToolTipText(_("isisfish.graphBean.graphSplitPane")); - __graphSplitPane__ = result; } return __graphSplitPane__; @@ -146,7 +144,6 @@ 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; } @@ -165,7 +162,6 @@ public JLabel getLabel1(){ if(__label1__ == null){ JLabel result = new JLabel(_("isisfish.graphBean.graph.render")); - result.setToolTipText(_("isisfish.graphBean.label")); __label1__ = result; } @@ -187,7 +183,6 @@ } else result = new JScrollPane(child); - result.setToolTipText(_("isisfish.graphBean.scrolledwindow")); __scrolledwindow1__ = result; } @@ -238,7 +233,6 @@ 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; } @@ -255,7 +249,6 @@ public javax.swing.JPanel getGraphPanel(){ if(__graphPanel__ == null){ javax.swing.JPanel result = new javax.swing.JPanel(); - result.setToolTipText(_("isisfish.graphBean.graphPanel")); __graphPanel__ = result; } @@ -267,7 +260,6 @@ 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); @@ -309,7 +301,6 @@ 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; } @@ -343,7 +334,6 @@ 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; } @@ -360,7 +350,6 @@ public javax.swing.JPanel getPalettePanel(){ if(__palettePanel__ == null){ javax.swing.JPanel result = new javax.swing.JPanel(); - result.setToolTipText(_("isisfish.graphBean.palettePanel")); __palettePanel__ = result; } @@ -373,7 +362,6 @@ 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(); Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx 2009-12-02 09:41:41 UTC (rev 2788) @@ -1,149 +0,0 @@ -<!-- -/* *##% - * Copyright (C) 2005 - * 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, USA. - *##%*/ - -/* * - * DataResult.jaxx - * - * 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 org.jfree.chart.*; - import org.jfree.chart.PolarChartPanel; - - protected GraphBeanModel model; - protected JFreeChart chart; - protected PolarChartPanel graphPalette; - protected ChartPanel chartPanel; - - init(); - public GraphBeanUIJAXX (ResultAction action){ - - setContextValue(action); - } - protected void init(){ - model = new GraphBeanModel(); - JFreeChart chart = new JFreeChart(model.getTitle(), - JFreeChart.DEFAULT_TITLE_FONT, - model.getCategoryPlot(), - true); - graphPalette = new PolarChartPanel(chart); - jpanel1.add(graphPalette); - chartPanel = new ChartPanel(chart,true,true,true,true,true); - jpanel2.add(chartPanel); - model.addGraphListener(new GraphListener() { - - @Override - public void graphChanged(GraphEvent e) { - - } - public void on_graphRendererCombo_selectionChanged(ItemEvent e){ - if (e.getStateChange() == ItemEvent.SELECTED){ - //compile pas model.setRenderer((CategoryItemRenderer)graphRenderer.getSelectedItem()); - } - } - - }); - } - protected DefaultComboBoxModel loadGraphRendererCombo(){ - DefaultComboBoxModel model = new DefaultComboBoxModel(); - //model.addElement(new VerticalBarRenderer()); - //model.addElement(new VerticalBarRenderer3D()); - //model.addElement(new StackedVerticalBarRenderer()); - //model.addElement(new VerticalIntervalBarRenderer()); - //model.addElement(new VerticalStatisticalBarRenderer()); - //model.addElement(new HorizontalBarRenderer()); - //model.addElement(new HorizontalBarRenderer3D()); - //model.addElement(new StackedHorizontalBarRenderer()); - //model.addElement(new HorizontalIntervalBarRenderer()); - //model.addElement(new HorizontalShapeRenderer()); - //model.addElement(new AreaCategoryItemRenderer()); - //model.addElement(new LineAndShapeRenderer()); - //model.addElement(new MinMaxCategoryRenderer()); - //model.setSelectedItem(null); - return model; - } - - protected void displayGraph(){ - - //compile pas jaxx.runtime.SwingUtil.assignment(chart = new JFreeChart(model.getTitle(), JFreeChart.DEFAULT_TITLE_FONT, model.getCategoryPlot(), true), "chart", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this); - - //compile pas jaxx.runtime.SwingUtil.assignment(chartPanel = new ChartPanel(chart,true,true,true,true,true), "chartPanel", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this); - //compile pas jaxx.runtime.SwingUtil.assignment(graphPalette = new ChartPropertyEditPanel(chart), "graphPalette", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this); - - //getGraphSplitPane().setDividerLocation(1.0); - - graphPalette.removeAll(); - palettePanel.removeAll(); - graphPalette.add(chartPanel); - palettePanel.add(graphPalette); - graphPalette.invalidate(); - palettePanel.invalidate(); - graphPalette.validate(); - palettePanel.validate(); - graphPalette.repaint(); - palettePanel.repaint(); - } - protected void graphRenderChanged(){ - //compile pas model.setRenderer((CategoryItemRenderer)graphRenderer.getSelectedItem()); - displayGraph(); - } - public void appliquer(){ - //compile pas graphPalette.updateChartProperties(chart); - } - ]]> - </script> - <row> - <cell fill='horizontal' weightx='0.5'> - <JLabel id='label' text='isisfish.graphBean.graph.render'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JComboBox id='graphRenderer' model='{loadGraphRendererCombo()}' renderer='{new GraphComboRenderer()}' onActionPerformed='graphRenderChanged()'/> - </cell> - </row> - <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <JPanel id='jpanel1' layout='{new BorderLayout()}'/> - </cell> - </row> - <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <JPanel id='jpanel2' layout='{new BorderLayout()}'/> - </cell> - </row> - <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <JPanel id='palettePanel' layout='{new BorderLayout()}'/> - </cell> - </row> - <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <JButton id='appliquer' text="isisfish.common.apply" onActionPerformed='appliquer()'/> - </cell> - </row> -</Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -107,7 +107,6 @@ 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.infoItem.table")); __table31__ = result; } @@ -161,7 +160,6 @@ 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.infoItem.table")); __table32__ = result; } @@ -180,7 +178,6 @@ public JLabel getLabel(){ if(__label__ == null){ JLabel result = new JLabel(_("isisfish.infoItem.label")); - result.setToolTipText(_("isisfish.infoItem.label")); __label__ = result; } @@ -224,7 +221,6 @@ } else result = new JScrollPane(child); - result.setToolTipText(_("isisfish.infoItem.scrolledwindow")); __scrolledwindow2__ = result; } @@ -242,7 +238,6 @@ if(__list__ == null){ JList result = new JList(new DefaultListModel()); result.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - result.setToolTipText(_("isisfish.infoItem.list")); __list__ = result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -106,7 +106,6 @@ 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.infoItem..table")); __table29__ = result; } @@ -150,7 +149,6 @@ 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.infoItem.table")); __table30__ = result; } @@ -168,7 +166,6 @@ public JLabel getLabel(){ if(__label__ == null){ JLabel result = new JLabel(_("isisfish.infoItem.label")); - result.setToolTipText(_("isisfish.infoItem.label")); __label__ = result; } @@ -201,7 +198,6 @@ } else result = new JScrollPane(child); - result.setToolTipText(_("isisfish.infoItem.scrolledwindow")); __scrolledwindow1__ = result; } @@ -219,7 +215,6 @@ if(__list__ == null){ JList result = new JList(new DefaultListModel()); result.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - result.setToolTipText(_("isisfish.infoItem.list")); __list__ = result; } Modified: 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 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -102,7 +102,6 @@ Vector childs = getVbox2Childs(); Box result = Box.createVerticalBox(); for (Object child : childs) result.add((Component) child); - result.setToolTipText(_("isisfish.result.vbox")); __vbox2__ = result; } @@ -121,7 +120,6 @@ Vector childs = getMenubar2Childs(); JMenuBar result = new JMenuBar(); for (Object child : childs) result.add((JMenuItem) child); - result.setToolTipText(_("isisfish.result.menubar")); __menubar2__ = result; } @@ -140,7 +138,6 @@ 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; } @@ -157,7 +154,6 @@ public JSeparator getMenuitem6(){ if(__menuitem6__ == null){ JSeparator result = new JSeparator(); - result.setToolTipText(_("isisfish.result.menuitem")); __menuitem6__ = result; } @@ -194,7 +190,6 @@ 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; } @@ -238,7 +233,6 @@ 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; } @@ -258,7 +252,6 @@ ImageIcon icon = null; JButton result = new JButton(_("isisfish.common.blank"), icon); - result.setToolTipText(_("isisfish.result.statusImage")); __statusImage__ = result; } @@ -269,7 +262,6 @@ public JLabel getStatusbar1(){ if(__statusbar1__ == null){ JLabel result = new JLabel(_("isisfish.result.statusBar")); - result.setToolTipText(_("isisfish.result.statusBar")); __statusbar1__ = result; } @@ -291,8 +283,6 @@ child1, child2); result.setOneTouchExpandable(true); result.setDividerSize(10); - - result.setToolTipText(_("isisfish.result.hpaned")); __hpaned2__ = result; } @@ -336,7 +326,6 @@ 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; } @@ -380,7 +369,6 @@ 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; } @@ -414,7 +402,6 @@ 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; } @@ -460,7 +447,6 @@ } else result = new JScrollPane(child); - result.setToolTipText(_("isisfish.result.scroll")); __scroll__ = result; } @@ -483,7 +469,6 @@ 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; } @@ -501,7 +486,6 @@ 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); @@ -543,7 +527,6 @@ 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; } @@ -561,7 +544,6 @@ public javax.swing.JPanel getViewPanel(){ if(__viewPanel__ == null){ javax.swing.JPanel result = new javax.swing.JPanel(); - result.setToolTipText(_("isisfish.result.viewPanel")); __viewPanel__ = result; } @@ -618,7 +600,6 @@ 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; } @@ -638,7 +619,6 @@ 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); @@ -654,7 +634,6 @@ 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); @@ -670,7 +649,6 @@ 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); @@ -686,7 +664,6 @@ 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); Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUIJAXX.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUIJAXX.jaxx 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUIJAXX.jaxx 2009-12-02 09:41:41 UTC (rev 2788) @@ -1,205 +0,0 @@ -<!-- -/* *##% - * Copyright (C) 2005 - * 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, 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 $ - */ - --> -<JInternalFrame title='{getFrameName()}' size='{new Dimension(800,600)}' resizable="true" location='{new Point(0,23)}' layout='{new BorderLayout()}'> - <script> - <![CDATA[ - public ResultEditUIJAXX (ResultAction action){ - - setContextValue(action); - } - protected String getFrameName(){ - return getContextValue(ResultAction.class).getSimulationStorage().getName(); - } - protected void resultatChanged(){ - } - protected void changePanel(String s) { - ((CardLayout) content.getLayout()).show(content, s); - } - ]]> - </script> - <JSplitPane constraints='BorderLayout.CENTER' orientation="HORIZONTAL"> - <JPanel layout='{new BorderLayout()}'> - <JComboBox id='resultat' constraints='BorderLayout.NORTH' onActionPerformed='resultatChanged()'/> -<!-- - 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); - } - }); ---> - <JTree constraints='BorderLayout.CENTER'> - - </JTree> - </JPanel> - <JPanel layout='{new BorderLayout()}'> - <JPanel id='content' layout='{new CardLayout()}' constraints='BorderLayout.CENTER'> - <DataResultUIJAXX id='dataResult' constraints='new String("dataResult")' constructorParams='getContextValue(ResultAction.class)'/> -<!-- -DataResult -SimpleResultatMapBean -GraphBean -ResumePanel ---> - <SimpleResultatMapBeanUIJAXX id='simpleResultatMapBean' constraints='new String("simpleResultatMapBean")' constructorParams='getContextValue(ResultAction.class)'/> - <GraphBeanUIJAXX id='graphBean' constraints='new String("graphBean")' constructorParams='getContextValue(ResultAction.class)'/> - <ResumePanelUIJAXX id='resumeBean' constraints='new String("resumeBean")' constructorParams='getContextValue(ResultAction.class)'/> - </JPanel> - <Table constraints='BorderLayout.SOUTH'> - <row> - <cell fill='horizontal' weightx='0.2'> - <JRadioButton id='graphRadioButton' text='isisfish.result.graph' buttonGroup='radioGroup' onActionPerformed='changePanel("graphBean")'/> - </cell> - <cell fill='horizontal' weightx='0.2'> - <JRadioButton id='mapRadioButton' text='isisfish.result.map' buttonGroup='radioGroup' onActionPerformed='changePanel("simpleResultatMapBean")'/> - </cell> - <cell fill='horizontal' weightx='0.2'> - <JRadioButton id='donneeRadioButton' text='isisfish.result.datas' buttonGroup='radioGroup' onActionPerformed='changePanel("dataResult")'/> - </cell> - <cell fill='horizontal' weightx='0.2'> - <JRadioButton id='resumeRadioButton' text='isisfish.result.summary' buttonGroup='radioGroup' onActionPerformed='changePanel("resumeBean")'/> - </cell> -<!-- - - - - <item value='{progressBarDemo}'/> - </JTree> - </JScrollPane> - - <java.awt.CardLayout id='cardLayout'/> - - <JPanel id='preview' layout='{cardLayout}'> - - - - - 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__; - } - ---> - </row> - </Table> - </JPanel> - </JSplitPane> - <JPanel constraints='BorderLayout.SOUTH' layout='{new BorderLayout()}'> - <JLabel id='statusbar' constraints='BorderLayout.WEST'/> -<!-- -public JLabel getStatusbar1(){ - if(__statusbar1__ == null){ - JLabel result = new JLabel(_("isisfish.result.statusBar")); - result.setToolTipText(_("isisfish.result.statusBar")); - - __statusbar1__ = result; - } ---> - - <JPanel constraints='BorderLayout.CENTER'/> - <JButton id='ajoutRendu' constraints='BorderLayout.EAST' text='isisfish.common.add.short'/> -<!-- - - 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(); - } - }); ---> - </JPanel> -</JInternalFrame> \ No newline at end of file Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2009-12-02 09:41:41 UTC (rev 2788) @@ -1,130 +0,0 @@ -<!-- -/* *##% - * Copyright (C) 2005 - * 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, 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 layout='{new BorderLayout()}'> - <script> - <![CDATA[ - import fr.ifremer.isisfish.ui.Common; - public ResultUI (ResultAction action){ - - setContextValue(action); - } - protected void open(){ - String name = (String)selSimulation.getSelectedItem(); - if (name != null){ - getContextValue(ResultAction.class).open(name); -// ResultEdit resEdit = new ResultEdit(getContextValue(ResultAction.class).getSimulationStorage()); -// JInternalFrame intFrame = -// new JInternalFrame(resEdit.getSimulation().getName(), -// true, //resizable -// true, //closable -// true, //maximizable -// true);//iconifiable -// intFrame.setContentPane(resEdit.getRootPane()); -// intFrame.setVisible(true); - // intFrame.pack(); -// intFrame.setSize(new Dimension(800,700)); - desktopPane.add(new ResultEdit(getContextValue(ResultAction.class).getSimulationStorage())); -// try{ -// intFrame.setSelected(true); -// } catch (PropertyVetoException eee) { -// log.warn("Error dans l internalFrame ", eee); -// } - } - } - ]]> - </script> - <Table constraints='BorderLayout.NORTH'> - <row> - <cell fill="horizontal" weightx="0.2"> - <JLabel text='isisfish.result.choose.simulation' toolTipText='isisfish.result.label'/> - </cell> - <cell fill="horizontal"> - <JComboBox id='selSimulation' editable='true' toolTipText='isisfish.result.simulation' model='{new DefaultComboBoxModel(Common.getOldSimulationItem())}'/> -<!-- - - addItemListener(new ItemListener(){ - public void itemStateChanged(ItemEvent e){ - on_simulation_selection_notify_event(e); - } - } ---> - - </cell> - <cell fill="horizontal" weightx="0.2"> - <JButton id='filterSimulationButton' text='isisfish.filter' toolTipText='isisfish.filter.simulation'/> -<!-- - onActionPerformed='filter()' - result.addMouseListener(new MouseAdapter(){ - public void mouseClicked(MouseEvent e){ - on_filterSimulationLogButton_clicked(); - } - }); ---> - </cell> - <cell fill="horizontal" weightx="0.2"> - <JButton id='openWindowButton' text='isisfish.result.new.window' toolTipText='isisfish.result.openWindowButton' onActionPerformed='open()'/> -<!-- - - result.addMouseListener(new MouseAdapter(){ - public void mouseClicked(MouseEvent e){ - on_openWindowButton_clicked(); - } - }); ---> - </cell> - <cell fill="horizontal" weightx="0.2"> - <JButton id="supprimerSimulationButton" text='isisfish.result.remove.simulation' toolTipText='isisfish.result.removeSimulationButton'/> -<!-- - onActionPerformed='open()' - result.addMouseListener(new MouseAdapter(){ - public void mouseClicked(MouseEvent e){ - on_supprimerSimulationButton_clicked(); - } - }); ---> - </cell> - <cell fill="horizontal" weightx="0.2"> - <JButton id='voirSimulationLogButton' text='isisfish.result.show.simulation.log' toolTipText='isisfish.result.tooltip.show.simulation.log'/> -<!-- - result.addMouseListener(new MouseAdapter(){ - public void mouseClicked(MouseEvent e){ - on_voirSimulationLogButton_clicked(); - } - }); ---> - - </cell> - </row> - </Table> - <JDesktopPane id='desktopPane' constraints='BorderLayout.CENTER'/> -</JPanel> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -19,8 +19,6 @@ import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.util.HashMap; import java.util.Vector; @@ -91,7 +89,6 @@ for (Object child : childs) { result.add((Component) child); } - result.setToolTipText(_("isisfish.result.vbox")); __vbox1__ = result; } @@ -112,7 +109,6 @@ for (Object child : childs) { result.add((JMenuItem) child); } - result.setToolTipText(_("isisfish.result.menubar")); __menubar1__ = result; } @@ -133,7 +129,6 @@ for (Object child : childs) { result.add((Component) child); } - result.setToolTipText(_("isisfish.result.menuitem")); __menuitem1__ = result; } @@ -153,7 +148,6 @@ JMenuItem result = new JMenuItem(_("isisfish.result.quit"), icon); - result.setToolTipText(_("isisfish.result.menuitem")); result.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e){ on_Resultat_destroy_event(); @@ -246,7 +240,6 @@ for(int i=0; i<childs.size(); i++) { result.add(childs.get(i), cs[i]); } - result.setToolTipText(_("isisfish.result.table")); __table33__ = result; } @@ -269,7 +262,6 @@ public JLabel getLabel9(){ if(__label9__ == null){ JLabel result = new JLabel(_("isisfish.result.choose.simulation")); - result.setToolTipText(_("isisfish.result.label")); __label9__ = result; } @@ -284,7 +276,6 @@ javax.swing.JDesktopPane result = new javax.swing.JDesktopPane (); - result.setToolTipText(_("isisfish.result.desktopPane")); __desktopPane__ = result; } @@ -296,7 +287,6 @@ if(__simulation__ == null){ JComboBox result = new JComboBox(); result.setEditable(true); - result.setToolTipText(_("isisfish.result.simulation")); result.addItemListener(new ItemListener(){ public void itemStateChanged(ItemEvent e){ on_simulation_selection_notify_event(e); @@ -314,7 +304,6 @@ ImageIcon icon = null; JButton result = new JButton(_("isisfish.result.new.window"), icon); - result.setToolTipText(_("isisfish.result.openWindowButton")); result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_openWindowButton_clicked(); @@ -332,7 +321,6 @@ ImageIcon icon = null; JButton result = new JButton(_("isisfish.result.remove.simulation"), icon); - result.setToolTipText(_("isisfish.result.removeSimulationButton")); result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_supprimerSimulationButton_clicked(); @@ -351,7 +339,6 @@ ImageIcon icon = null; JButton result = new JButton(_("isisfish.result.show.simulation.log"), icon); - result.setToolTipText(_("isisfish.result.tooltip.show.simulation.log")); result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_voirSimulationLogButton_clicked(); @@ -371,7 +358,6 @@ JButton result = new JButton(_("isisfish.filter"), icon); - result.setToolTipText(_("isisfish.filter.simulation")); result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_filterSimulationLogButton_clicked(); Modified: 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 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -102,7 +102,6 @@ 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; } @@ -131,7 +130,6 @@ } else result = new JScrollPane(child); - result.setToolTipText(_("isisfish.resume.scrolledwindow")); __scrolledwindow2__ = result; } @@ -149,7 +147,6 @@ if(__resumeTextArea__ == null){ JTextArea result = new JTextArea(_("isisfish.common.blank")); result.setEditable(false); - result.setToolTipText(_("isisfish.resume.resumeTextArea")); __resumeTextArea__ = result; } @@ -166,7 +163,6 @@ 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; } Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUIJAXX.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUIJAXX.jaxx 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUIJAXX.jaxx 2009-12-02 09:41:41 UTC (rev 2788) @@ -1,45 +0,0 @@ -<!-- -/* *##% - * Copyright (C) 2005 - * 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, USA. - *##%*/ - -/* * - * DataResult.jaxx - * - * 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 layout='{new BorderLayout()}'> - <script> - <![CDATA[ - public ResumePanelUIJAXX (ResultAction action){ - - setContextValue(action); - } - ]]> - </script> - <JScrollPane> - <JTextArea id='resumeTextArea' text='isisfish.common.blank' editable='false'/> - </JScrollPane> -</JPanel> Modified: 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 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -121,7 +121,6 @@ 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; } @@ -141,7 +140,6 @@ 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")); // EC-20090706 : fix bug 1777 : no selection on result map result.setSelectionMode(CellSelectionLayer.NO_SELECTION); @@ -169,7 +167,6 @@ com.bbn.openmap.gui.ToolPanel result = new com.bbn.openmap.gui.ToolPanel (); - result.setToolTipText(_("isisfish.simpleResult.resultatMapToolBar")); __resultatMapToolBar__ = result; } @@ -180,7 +177,6 @@ public LegendPanel getLegendPanel(){ if(__legendPanel__ == null){ LegendPanel result = new LegendPanel(); - result.setToolTipText(_("isisfish.simpleResult.legendPanel")); __legendPanel__ = result; } Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUIJAXX.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUIJAXX.jaxx 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUIJAXX.jaxx 2009-12-02 09:41:41 UTC (rev 2788) @@ -1,54 +0,0 @@ -<!-- -/* *##% - * Copyright (C) 2005 - * 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, USA. - *##%*/ - -/* * - * DataResult.jaxx - * - * 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="simpleResultMapBean" layout='{new BorderLayout()}'> - <script> - <![CDATA[ - import fr.ifremer.isisfish.map.IsisMapBean; - import com.bbn.openmap.InformationDelegator; - import com.bbn.openmap.gui.ToolPanel; - init(); - public SimpleResultatMapBeanUIJAXX (ResultAction action){ - - setContextValue(action); - } - protected void init(){ - simpleResultMapBean.add(new InformationDelegator(), BorderLayout.NORTH); - simpleResultMapBean.add(new IsisMapBean(), BorderLayout.CENTER); - simpleResultMapBean.add(new ToolPanel(), BorderLayout.SOUTH); - } - ]]> - </script> - <!--InformationDelegator constraints='BorderLayout.NORTH'/> - <IsisMapBean constraints='BorderLayout.CENTER'/> - <ToolPanel constraints='BorderLayout.SOUTH'/--> -</JPanel> Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-12-02 09:41:41 UTC (rev 2788) @@ -203,13 +203,8 @@ isisfish.config.vcs.useSshConnexion.description= isisfish.config.vcs.userName.description= isisfish.config.vcs.userPassword.description= -isisfish.dataResult.descriptionLabel=defaultToolTip-fr.ifremer.resultat.DataResult.descriptionLabel isisfish.dataResult.export.csv=Export to CSV -isisfish.dataResult.exportButton=defaultToolTip-fr.ifremer.resultat.DataResult.exportButton -isisfish.dataResult.label=label9 -isisfish.dataResult.matriceTable=defaultToolTip-fr.ifremer.resultat.DataResult.matriceTable -isisfish.dataResult.scrolledwindow2=defaultToolTip-fr.ifremer.resultat.DataResult.scrolledwindow2 -isisfish.dataResult.table2=defaultToolTip-fr.ifremer.resultat.DataResult.table2 +isisfish.dataResult.label=Value isisfish.date.toString=%1$s %2$s isisfish.effortDescription.crewFoodCost=Crew food cost isisfish.effortDescription.crewShareRate=Crew share rate @@ -473,14 +468,6 @@ isisfish.gear.technicalParameter=Technical parameter isisfish.gear.title=Gear isisfish.graphBean.graph.render=Choose a graph render -isisfish.graphBean.graphPanel=defaultToolTip-fr.ifremer.graph.GraphBean.graphPanel -isisfish.graphBean.graphRendererCombo=defaultToolTip-fr.ifremer.graph.GraphBean.graphRendererCombo -isisfish.graphBean.graphSplitPane=defaultToolTip-fr.ifremer.graph.GraphBean.graphSplitPane -isisfish.graphBean.label=defaultToolTip-fr.ifremer.graph.GraphBean.label1 -isisfish.graphBean.palettePanel=defaultToolTip-fr.ifremer.graph.GraphBean.palettePanel -isisfish.graphBean.scrolledwindow=defaultToolTip-fr.ifremer.graph.GraphBean.scrolledwindow1 -isisfish.graphBean.table=defaultToolTip-fr.ifremer.graph.GraphBean.table2 -isisfish.graphBean.table3=defaultToolTip-fr.ifremer.graph.GraphBean.table3 isisfish.graphCombo.render.bar=Verticals bar rendering isisfish.graphCombo.render.bar.3d=3D verticals bars rendering isisfish.graphCombo.render.bar.stacked=Stacked verticals bars rendering @@ -489,13 +476,9 @@ isisfish.graphCombo.render.min.max=Min/max rendering isisfish.graphCombo.render.surface=Area rendering isisfish.graphCombo.render.surface.stacked=Stacked area rendering -isisfish.infoItem..table=defaultToolTip-fr.ifremer.resultat.InfoItem.table29 isisfish.infoItem.label=defaultToolTip-fr.ifremer.resultat.InfoItem.label -isisfish.infoItem.list=defaultToolTip-fr.ifremer.resultat.InfoItem.list -isisfish.infoItem.scrolledwindow=defaultToolTip-fr.ifremer.resultat.InfoItem.scrolledwindow1 -isisfish.infoItem.sum=defaultToolTip-fr.ifremer.resultat.InfoItemDate.sumButton +isisfish.infoItem.sum=Sum all elements isisfish.infoItem.sum.year=Sum elements per year -isisfish.infoItem.table=defaultToolTip-fr.ifremer.resultat.InfoItem.table30 isisfish.input.continueCells=Continue to cells isisfish.input.continueGears=Continue to gears isisfish.input.continueMetiers=Continue to metiers @@ -808,51 +791,26 @@ isisfish.result.capture.metier=Capture par metier isisfish.result.choose.simulation=Choose a Simulation isisfish.result.datas=Datas -isisfish.result.datasRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.donneeRadioButton -isisfish.result.desktopPane=defaultToolTip-fr.ifremer.resultat.ResultatView.desktopPane isisfish.result.dimension=Dimension isisfish.result.end.simulation=Simuation end \: isisfish.result.export=Export isisfish.result.export.file=Export text file isisfish.result.file=File isisfish.result.graph=Graph -isisfish.result.graphRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.graphRadioButton -isisfish.result.hpaned=defaultToolTip-fr.ifremer.resultat.ResultatEdit.hpaned2 -isisfish.result.infoPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.infoPanel -isisfish.result.label=defaultToolTip-fr.ifremer.resultat.ResultatView.label9 isisfish.result.map=Map -isisfish.result.mapRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.mapRadioButton -isisfish.result.menuExport=defaultToolTip-fr.ifremer.resultat.ResultatEdit.menuExport -isisfish.result.menubar=defaultToolTip-fr.ifremer.resultat.ResultatView.menubar1 -isisfish.result.menuitem=defaultToolTip-fr.ifremer.resultat.ResultatView.menuitem2 isisfish.result.new.window=Open a new window -isisfish.result.openWindowButton=defaultToolTip-fr.ifremer.resultat.ResultatView.openWindowButton isisfish.result.quit=Quitter isisfish.result.reject.metier=Rejet par metier isisfish.result.remove.simulation=Remove simulation -isisfish.result.removeSimulationButton=defaultToolTip-fr.ifremer.resultat.ResultatView.supprimerSimulationButton -isisfish.result.resultat=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resultat -isisfish.result.scroll=defaultToolTip-fr.ifremer.resultat.ResultatEdit.scroll isisfish.result.show.simulation.log=Show logs -isisfish.result.simulation=defaultToolTip-fr.ifremer.resultat.ResultatView.simulation -isisfish.result.statusBar=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusbar1 -isisfish.result.statusImage=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusImage +isisfish.result.statusBar=\ isisfish.result.stress.metier=Effort par metier isisfish.result.summary=Summary -isisfish.result.summaryRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resumeRadioButton -isisfish.result.table=defaultToolTip-fr.ifremer.resultat.ResultatView.table33 isisfish.result.title=Results -isisfish.result.tooltip.show.simulation.log=Click to display the log console of the simulation isisfish.result.unload.metier=Debarquement par metier -isisfish.result.vbox=defaultToolTip-fr.ifremer.resultat.ResultatView.vbox1 -isisfish.result.viewPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.viewPanel isisfish.resultChoice.save=Results to save isisfish.resultChoice.saved=Results saved isisfish.resultChoice.title=Result choice -isisfish.resume.matrixInfoGrid=defaultToolTip-fr.ifremer.resultat.ResumePanel.matriceInfoGrid -isisfish.resume.resumeTextArea=defaultToolTip-fr.ifremer.resultat.ResumePanel.resumeTextArea -isisfish.resume.scrolledwindow=defaultToolTip-fr.ifremer.resultat.ResumePanel.scrolledwindow2 -isisfish.resume.table=defaultToolTip-fr.ifremer.resultat.ResumePanel.table1 isisfish.script.check=Check isisfish.script.check.tooltip=Check syntax of the current script isisfish.script.commit=Commit @@ -955,11 +913,7 @@ isisfish.setOfVessels.technicalEfficiency=Technical efficiency isisfish.setOfVessels.title=Caracteristics isisfish.setOfVessels.vesselType=Vessel type -isisfish.simpleResult.legendPanel=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.legendPanel isisfish.simpleResult.more.information=Clic a cell for more information... -isisfish.simpleResult.resultatMap=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.resultatMap -isisfish.simpleResult.resultatMapToolBar=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.resultatMapToolBar -isisfish.simpleResult.table=defaultToolTip-fr.ifremer.isisfish.map.SimpleResultatMapBean.table12 isisfish.simulation.log.console.title=Log console for simulation '%1$s' isisfish.simulation.log.showConsole=display log console for simulation %1$s isisfish.simulation.menu.import=Restor simulation parameter Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-12-02 09:41:41 UTC (rev 2788) @@ -203,13 +203,8 @@ isisfish.config.vcs.useSshConnexion.description=pour indiquer si l'on utilise une connexion s\u00E9curis\u00E9e pour communiquer avec le serveur vcs (ssh2) isisfish.config.vcs.userName.description=le login de l'utilisateur sur le serveur vcs isisfish.config.vcs.userPassword.description= -isisfish.dataResult.descriptionLabel=defaultToolTip-fr.ifremer.resultat.DataResult.descriptionLabel isisfish.dataResult.export.csv=Exporter en CSV -isisfish.dataResult.exportButton=defaultToolTip-fr.ifremer.resultat.DataResult.exportButton -isisfish.dataResult.label=label9 -isisfish.dataResult.matriceTable=defaultToolTip-fr.ifremer.resultat.DataResult.matriceTable -isisfish.dataResult.scrolledwindow2=defaultToolTip-fr.ifremer.resultat.DataResult.scrolledwindow2 -isisfish.dataResult.table2=defaultToolTip-fr.ifremer.resultat.DataResult.table2 +isisfish.dataResult.label=Valeur isisfish.date.toString=%1$s %2$s isisfish.effortDescription.crewFoodCost=Co\u00FBt de l'alimentation pour l'\u00E9quipage isisfish.effortDescription.crewShareRate=Taux de partage de l'\u00E9quipage @@ -473,14 +468,6 @@ isisfish.gear.technicalParameter=Param\u00E8tre technique isisfish.gear.title=Engin isisfish.graphBean.graph.render=Choisir un rendu de graphe -isisfish.graphBean.graphPanel=defaultToolTip-fr.ifremer.graph.GraphBean.graphPanel -isisfish.graphBean.graphRendererCombo=defaultToolTip-fr.ifremer.graph.GraphBean.graphRendererCombo -isisfish.graphBean.graphSplitPane=defaultToolTip-fr.ifremer.graph.GraphBean.graphSplitPane -isisfish.graphBean.label=defaultToolTip-fr.ifremer.graph.GraphBean.label1 -isisfish.graphBean.palettePanel=defaultToolTip-fr.ifremer.graph.GraphBean.palettePanel -isisfish.graphBean.scrolledwindow=defaultToolTip-fr.ifremer.graph.GraphBean.scrolledwindow1 -isisfish.graphBean.table=defaultToolTip-fr.ifremer.graph.GraphBean.table2 -isisfish.graphBean.table3=defaultToolTip-fr.ifremer.graph.GraphBean.table3 isisfish.graphCombo.render.bar=Rendu en barres verticales isisfish.graphCombo.render.bar.3d=Rendu en barres verticales 3D isisfish.graphCombo.render.bar.stacked=Rendu en barres verticales empil\u00E9es @@ -489,13 +476,9 @@ isisfish.graphCombo.render.min.max=Rendu en MinMax isisfish.graphCombo.render.surface=Rendu en aire isisfish.graphCombo.render.surface.stacked=Rendu en aires empil\u00E9es -isisfish.infoItem..table=defaultToolTip-fr.ifremer.resultat.InfoItem.table29 isisfish.infoItem.label=defaultToolTip-fr.ifremer.resultat.InfoItem.label -isisfish.infoItem.list=defaultToolTip-fr.ifremer.resultat.InfoItem.list -isisfish.infoItem.scrolledwindow=defaultToolTip-fr.ifremer.resultat.InfoItem.scrolledwindow1 -isisfish.infoItem.sum=defaultToolTip-fr.ifremer.resultat.InfoItemDate.sumButton -isisfish.infoItem.sum.year=Somme de \u00E9l\u00E9ment par ann\u00E9e -isisfish.infoItem.table=defaultToolTip-fr.ifremer.resultat.InfoItem.table30 +isisfish.infoItem.sum=Somme de tous les \u00E9l\u00E9ments +isisfish.infoItem.sum.year=Somme des \u00E9l\u00E9ments par ann\u00E9e isisfish.input.continueCells=Continuer vers les mailles isisfish.input.continueGears=Continuer vers les engins isisfish.input.continueMetiers=Continuer vers les metiers @@ -808,51 +791,26 @@ isisfish.result.capture.metier=Capturer par m\u00E9tier isisfish.result.choose.simulation=Choisir une simulation isisfish.result.datas=Donn\u00E9es -isisfish.result.datasRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.donneeRadioButton -isisfish.result.desktopPane=defaultToolTip-fr.ifremer.resultat.ResultatView.desktopPane isisfish.result.dimension=Dimension isisfish.result.end.simulation=En fin de Simulation\: isisfish.result.export=Export isisfish.result.export.file=Exporter un fichier texte isisfish.result.file=Fichier isisfish.result.graph=Graphe -isisfish.result.graphRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.graphRadioButton -isisfish.result.hpaned=defaultToolTip-fr.ifremer.resultat.ResultatEdit.hpaned2 -isisfish.result.infoPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.infoPanel -isisfish.result.label=defaultToolTip-fr.ifremer.resultat.ResultatView.label9 isisfish.result.map=Carte -isisfish.result.mapRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.mapRadioButton -isisfish.result.menuExport=defaultToolTip-fr.ifremer.resultat.ResultatEdit.menuExport -isisfish.result.menubar=defaultToolTip-fr.ifremer.resultat.ResultatView.menubar1 -isisfish.result.menuitem=defaultToolTip-fr.ifremer.resultat.ResultatView.menuitem2 isisfish.result.new.window=Ouvrir une nouvelle fen\u00EAtre -isisfish.result.openWindowButton=defaultToolTip-fr.ifremer.resultat.ResultatView.openWindowButton isisfish.result.quit=Quitter isisfish.result.reject.metier=Rejet par metier isisfish.result.remove.simulation=Supprimer Simulation -isisfish.result.removeSimulationButton=defaultToolTip-fr.ifremer.resultat.ResultatView.supprimerSimulationButton -isisfish.result.resultat=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resultat -isisfish.result.scroll=defaultToolTip-fr.ifremer.resultat.ResultatEdit.scroll isisfish.result.show.simulation.log=Voir les logs -isisfish.result.simulation=defaultToolTip-fr.ifremer.resultat.ResultatView.simulation -isisfish.result.statusBar=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusbar1 -isisfish.result.statusImage=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusImage +isisfish.result.statusBar=\ isisfish.result.stress.metier=Effort par metier isisfish.result.summary=R\u00E9sum\u00E9 -isisfish.result.summaryRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resumeRadioButton -isisfish.result.table=defaultToolTip-fr.ifremer.resultat.ResultatView.table33 isisfish.result.title=R\u00E9sultat -isisfish.result.tooltip.show.simulation.log=Cliquer pour afficher la console des logs de la simulation isisfish.result.unload.metier=Debarquement par metier -isisfish.result.vbox=defaultToolTip-fr.ifremer.resultat.ResultatView.vbox1 -isisfish.result.viewPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.viewPanel isisfish.resultChoice.save=R\u00E9sultats \u00E0 sauvegarder isisfish.resultChoice.saved=R\u00E9sultats sauvegard\u00E9 isisfish.resultChoice.title=Choix de r\u00E9sultats -isisfish.resume.matrixInfoGrid=defaultToolTip-fr.ifremer.resultat.ResumePanel.matriceInfoGrid -isisfish.resume.resumeTextArea=defaultToolTip-fr.ifremer.resultat.ResumePanel.resumeTextArea -isisfish.resume.scrolledwindow=defaultToolTip-fr.ifremer.resultat.ResumePanel.scrolledwindow2 -isisfish.resume.table=defaultToolTip-fr.ifremer.resultat.ResumePanel.table1 isisfish.script.check=V\u00E9rifier isisfish.script.check.tooltip=V\u00E9rifie la synthaxe du script isisfish.script.commit=Commit @@ -955,11 +913,7 @@ isisfish.setOfVessels.technicalEfficiency=\u00C9fficacit\u00E9 technique isisfish.setOfVessels.title=Caract\u00E9ristiques isisfish.setOfVessels.vesselType=Type de navire -isisfish.simpleResult.legendPanel=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.legendPanel isisfish.simpleResult.more.information=Cliquer sur une cellule pour plus d'informations... -isisfish.simpleResult.resultatMap=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.resultatMap -isisfish.simpleResult.resultatMapToolBar=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.resultatMapToolBar -isisfish.simpleResult.table=defaultToolTip-fr.ifremer.isisfish.map.SimpleResultatMapBean.table12 isisfish.simulation.log.console.title=Console de log simulation '%1$s' isisfish.simulation.log.showConsole=affichage de la console de log pour la simulation %1$s isisfish.simulation.menu.import=Restaurer les param\u00E9tres d'une simulation
participants (1)
-
chatellier＠users.labs.libre-entreprise.org