December 2010 - Coser-commits - mailman.cloud.codelutin.com

r353 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project
by chatellier＠users.labs.libre-entreprise.org 03 Dec '10

03 Dec '10

Author: chatellier Date: 2010-12-03 13:32:19 +0000 (Fri, 03 Dec 2010) New Revision: 353 Log: Add author and comment in summary Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx 2010-12-03 13:13:30 UTC (rev 352) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx 2010-12-03 13:32:19 UTC (rev 353) @@ -40,6 +40,14 @@ </row> <row> <cell anchor="west"> + <JLabel text="coser.ui.project.projectauthor" /> + </cell> + <cell anchor="west"> + <JLabel text="{getProject().getAuthor()}" /> + </cell> + </row> + <row> + <cell anchor="west"> <JLabel text="coser.ui.project.summary.catchFileName" /> </cell> <cell anchor="west"> @@ -71,6 +79,19 @@ </cell> </row> <row> + <cell anchor="northwest"> + <JLabel text="coser.ui.project.projectcomment" /> + </cell> + <cell anchor="west" fill="horizontal"> + <JTextArea text="{getProject().getComment()}" editable="false" rows="3" /> + </cell> + </row> + <row> + <cell weightx="1" columns="2" fill="horizontal"> + <JSeparator /> + </cell> + </row> + <row> <cell anchor="west"> <JLabel text="coser.ui.project.summary.validated" /> </cell>

1 0

r352 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets
by chatellier＠users.labs.libre-entreprise.org 03 Dec '10

03 Dec '10

Author: chatellier Date: 2010-12-03 13:13:30 +0000 (Fri, 03 Dec 2010) New Revision: 352 Log: Fix accordion pane Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPane.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPaneSubPanel.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPane.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPane.java 2010-12-03 10:45:54 UTC (rev 351) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPane.java 2010-12-03 13:13:30 UTC (rev 352) @@ -130,10 +130,10 @@ return; if (!showAnimation) { this.previouslySelected = -1; - doLayout(); // fix echatellier 20101202 strange , add this to display } - else + else { this.previouslySelected = selected; + } this.selected = num; for (int i = 0; i < children.size(); i++) { AccordionPaneSubPanel subPanel = (AccordionPaneSubPanel) children @@ -180,8 +180,9 @@ timer = new Timer(1, a); timer.start(); } - this.validate(); - this.repaint(); + doLayout(); // ec-20101202 : par moment ca fonctionne mal + validate(); + repaint(); } /** Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPaneSubPanel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPaneSubPanel.java 2010-12-03 10:45:54 UTC (rev 351) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPaneSubPanel.java 2010-12-03 13:13:30 UTC (rev 352) @@ -37,17 +37,18 @@ protected AccordionPane accordionPane; - JPanel titlePanel; - JLabel titleLabel; - JComponent child; - int index; - static Cursor handCursor = null; - static int mousePressedInd = -1; + protected JPanel titlePanel; + protected JLabel titleLabel; + protected JComponent child; + protected int index; + protected Cursor handCursor = null; + protected int mousePressedInd = -1; public AccordionPaneSubPanel() { this.setBorder(BorderFactory.createEtchedBorder()); - if (handCursor == null) + if (handCursor == null) { handCursor = new Cursor(Cursor.HAND_CURSOR); + } this.setLayout(new BorderLayout()); }

1 0

r351 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets
by chatellier＠users.labs.libre-entreprise.org 03 Dec '10

03 Dec '10

Author: chatellier Date: 2010-12-03 10:45:54 +0000 (Fri, 03 Dec 2010) New Revision: 351 Log: Add new Accordion component Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionLayout.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPane.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPaneSubPanel.java Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionLayout.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionLayout.java (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionLayout.java 2010-12-03 10:45:54 UTC (rev 351) @@ -0,0 +1,156 @@ +/* %%Ignore-License + * Copyright (C) 2007 Craig Knudsen + * + * AccordionPane is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 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 Lesser General Public + * License for more details. + * + * A copy of the GNU Lesser General Public License can be found at www.gnu.org. + * To receive a hard copy, you can write to: + * Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA. + */ + +package fr.ifremer.coser.ui.widgets; + +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Insets; +import java.awt.LayoutManager; + +public class AccordionLayout implements LayoutManager { + + protected AccordionPane accordionPane; + + /** + * Constructs a AccordionLayout. + * + * @param accordionPane accordionPane + */ + public AccordionLayout(AccordionPane accordionPane) { + this.accordionPane = accordionPane; + } + + protected Dimension layoutSize(Container parent, boolean minimum) { + Dimension dim = new Dimension(0, 0); + synchronized (parent.getTreeLock()) { + int n = parent.getComponentCount(); + int cnt = 0; + for (int i = 0; i < n; i++) { + Component c = parent.getComponent(i); + if (c.isVisible()) { + Dimension d = (minimum) ? c.getMinimumSize() : c + .getPreferredSize(); + dim.height += d.height; + if (d.width > dim.width) { + dim.width = d.width; + } + } + cnt++; + if (cnt == accordionPane.children.size()) { + break; + } + } + } + Insets insets = parent.getInsets(); + dim.width += insets.left + insets.right; + dim.height += insets.top + insets.bottom; + return dim; + } + + /** + * Lays out the container. + */ + @Override + public void layoutContainer(Container parent) { + Insets insets = parent.getInsets(); + synchronized (parent.getTreeLock()) { + int n = parent.getComponentCount(); + Dimension pd = parent.getSize(); + // do layout + int cnt = 0; + int totalhei = pd.height - insets.top - insets.bottom; + int x = insets.left; + int y = insets.top; + int selInd = accordionPane.selected; + int numPanes = accordionPane.children.size(); + // Calculate the remainder and set it in the AccordionPane in case the + // JPanel was resized. + AccordionPaneSubPanel firstSubPanel = (AccordionPaneSubPanel) parent + .getComponent(0); + // Get height of title area + int remainder = totalhei + - (firstSubPanel.titlePanel.getHeight() * numPanes); + accordionPane.remainder = remainder; + for (int i = 0; i < n; i++) { + Component c = parent.getComponent(i); + AccordionPaneSubPanel subPanel = (AccordionPaneSubPanel) c; + // Get height of title area + int titleH = subPanel.titlePanel.getHeight(); + if (accordionPane.transitionStep > 0) { + // We're in the middle of the animation + if (subPanel.index == selInd) { + int hei = titleH + accordionPane.transitionStep; + c.setBounds(x, y, + pd.width - insets.left - insets.right, hei); + y += hei; + } else if (subPanel.index == accordionPane.previouslySelected) { + int hei = titleH + + (remainder - accordionPane.transitionStep); + c.setBounds(x, y, + pd.width - insets.left - insets.right, hei); + y += hei; + } else { + int hei = titleH; + c.setBounds(x, y, + pd.width - insets.left - insets.right, hei); + y += hei; + } + } else { + if (subPanel.index == selInd) { + int hei = titleH + remainder; + c.setBounds(x, y, + pd.width - insets.left - insets.right, hei); + y += hei; + } else { + int hei = titleH; + c.setBounds(x, y, + pd.width - insets.left - insets.right, hei); + y += hei; + } + } + cnt++; + if (cnt == numPanes) { + break; + } + } + } + } + + @Override + public Dimension minimumLayoutSize(Container parent) { + return layoutSize(parent, false); + } + + @Override + public Dimension preferredLayoutSize(Container parent) { + return layoutSize(parent, false); + } + + @Override + public void addLayoutComponent(String name, Component comp) { + + } + + @Override + public void removeLayoutComponent(Component comp) { + + } +} \ No newline at end of file Property changes on: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionLayout.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPane.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPane.java (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPane.java 2010-12-03 10:45:54 UTC (rev 351) @@ -0,0 +1,268 @@ +/* %%Ignore-License + * Copyright (C) 2007 Craig Knudsen + * + * AccordionPane is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 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 Lesser General Public + * License for more details. + * + * A copy of the GNU Lesser General Public License can be found at www.gnu.org. + * To receive a hard copy, you can write to: + * Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA. + */ + +package fr.ifremer.coser.ui.widgets; + +import java.awt.Color; +import java.awt.Component; +import java.awt.Graphics; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.List; + +import javax.swing.Icon; +import javax.swing.JPanel; +import javax.swing.Timer; + +/** + * The AccordionPane class implements a vertical accordion container, similar to + * those seen in many AJAX/DHTML frameworks. Multiple child panels are added, + * but only one of those will be visible at a time. The user can switch between + * visible panels by clicking on the title area of one of the inactive panels. + * + * @author Craig Knudsen, craig at k5n.us + */ +// TODO: add/remove ChangeListener support +// TODO: add support for setting icons +// TODO: tooltip text for titles +// TODO: enable/disable panels +public class AccordionPane extends JPanel { + + /** serialVersionUID. */ + private static final long serialVersionUID = -4266521429712806753L; + + protected List<AccordionPaneSubPanel> children; + protected int selected = -1; + protected int previouslySelected = -1; // used in animation transition + // background color for pane title + protected Color paneBackgroundColor; + // background color for current pane title + protected Color activePaneBackgroundColor; + protected Timer timer; + protected int transitionStep = 0; + protected int remainder = -1; + + /** + * Create a new AccordionPane object. After creating the AccordionPane, you + * will need to call addPanel to add UI components to it. + */ + public AccordionPane() { + this.children = new ArrayList<AccordionPaneSubPanel>(); + this.selected = -1; + this.setLayout(new AccordionLayout(this)); + this.paneBackgroundColor = super.getBackground(); + this.activePaneBackgroundColor = new Color(255, 255, 200); + } + + /** + * Set the background color for the active and inactive pane title areas. + * + * @param normalColor + * The color to use for the non-active panels + * @param activeColor + * The color to use for the currently selected panel + */ + public void setTitleBackgroundColors(Color normalColor, Color activeColor) { + this.paneBackgroundColor = normalColor; + this.activePaneBackgroundColor = activeColor; + repaint(); + } + + public void add(AccordionPaneSubPanel subPanel) { + subPanel.setAccordionPane(this); + subPanel.setIndex(this.children.size()); + this.children.add(subPanel); + super.add(subPanel); + } + + public void paint(Graphics g) { + // Do some initializing on the first paint call + if (this.selected < 0 && this.children.size() > 0) { + this.setSelected(0, false); + } + if (this.transitionStep >= this.remainder && this.remainder > 0 + && timer != null) { + this.timer.stop(); + this.timer = null; + System.out.println("Killed timer."); + } + super.paint(g); + } + + /** + * Set the currently active/selected pane. + * + * @param num + * The pane number to select (0 is first) + */ + public void setSelected(int num) { + setSelected(num, false); + } + + /** + * Set the currently active/selected pane. + * + * @param num + * The pane number to select (0 is first) + * @param showAnimation + * Show the animation transition from the previously selected pane to + * the newly selected pane. + */ + public void setSelected(int num, boolean showAnimation) { + if (num == selected) + return; + if (!showAnimation) { + this.previouslySelected = -1; + doLayout(); // fix echatellier 20101202 strange , add this to display + } + else + this.previouslySelected = selected; + this.selected = num; + for (int i = 0; i < children.size(); i++) { + AccordionPaneSubPanel subPanel = (AccordionPaneSubPanel) children + .get(i); + // subPanel.child.setVisible ( i == num + // || ( i == this.previouslySelected && showAnimation ) ); + subPanel.titlePanel + .setBackground(i == num ? this.activePaneBackgroundColor + : this.paneBackgroundColor); + } + if (this.previouslySelected >= 0 && showAnimation) { + ActionListener a = new ActionListener() { + public void actionPerformed(ActionEvent e) { + // Add another step in the animation transition + if (remainder - transitionStep < 10) { + transitionStep++; + } else if (remainder - transitionStep < 25) { + transitionStep += 3; + } else { + transitionStep += 10; + } + // System.out.println ( "transitionStep=" + transitionStep ); + if (transitionStep >= remainder) { + // We're done with the animation + transitionStep = -1; + timer.stop(); + } else { + timer.setInitialDelay(1); + timer.restart(); + } + doLayout(); + validate(); + repaint(); + } + }; + + if (timer != null) { + timer.stop(); + timer = null; + } + + // Animate the transition from one panel to another panel. + this.transitionStep = 0; + timer = new Timer(1, a); + timer.start(); + } + this.validate(); + this.repaint(); + } + + /** + * Get the index of the currently selected pane. + * + * @return the index of the currently selected pane + */ + public int getSelectedIndex() { + return this.selected; + } + + /** + * Get the number of panes in the AccordionPane. + * + * @return the number of panes + */ + public int getPaneCount() { + return this.children.size(); + } + + /** + * Set the text title at the specified location + * + * @param index + * the index number of the pane + * @param newTitle + * the new title for the specified pane. + */ + public void setTitleAt(int index, String newTitle) { + AccordionPaneSubPanel subPanel = (AccordionPaneSubPanel) this.children + .get(index); + subPanel.titleLabel.setText(newTitle); + } + + /** + * Get the text title at the specified location + * + * @param index + * the index number of the pane + * @return the text title of the specified pane + */ + public String getTitleAt(int index) { + AccordionPaneSubPanel subPanel = (AccordionPaneSubPanel) this.children + .get(index); + return subPanel.titleLabel.getText(); + } + + /** + * Set the icon for the specified location. + * + * @param index + * @param icon + */ + public void setIconAt(int index, Icon icon) { + AccordionPaneSubPanel subPanel = (AccordionPaneSubPanel) this.children + .get(index); + subPanel.titleLabel.setIcon(icon); + } + + /** + * Returns the component at index. + * + * @param index + * the index of the item being queried + * @return component + */ + public Component getComponentAt(int index) { + AccordionPaneSubPanel subPanel = (AccordionPaneSubPanel) this.children + .get(index); + return subPanel.child; + } + + /** + * Returns the currently selected component for this AccordionPane. + * + * @return the currently selected component + */ + public Component getSelectedComponent() { + AccordionPaneSubPanel subPanel = (AccordionPaneSubPanel) this.children + .get(this.selected); + return subPanel.child; + } + +} \ No newline at end of file Property changes on: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPane.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPaneSubPanel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPaneSubPanel.java (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPaneSubPanel.java 2010-12-03 10:45:54 UTC (rev 351) @@ -0,0 +1,127 @@ +/* %%Ignore-License + * Copyright (C) 2007 Craig Knudsen + * + * AccordionPane is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 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 Lesser General Public + * License for more details. + * + * A copy of the GNU Lesser General Public License can be found at www.gnu.org. + * To receive a hard copy, you can write to: + * Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA. + */ + +package fr.ifremer.coser.ui.widgets; + +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Cursor; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + +import javax.swing.BorderFactory; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JPanel; + +public class AccordionPaneSubPanel extends JPanel { + + /** serialVersionUID. */ + private static final long serialVersionUID = 4836598811061630517L; + + protected AccordionPane accordionPane; + + JPanel titlePanel; + JLabel titleLabel; + JComponent child; + int index; + static Cursor handCursor = null; + static int mousePressedInd = -1; + + public AccordionPaneSubPanel() { + this.setBorder(BorderFactory.createEtchedBorder()); + if (handCursor == null) + handCursor = new Cursor(Cursor.HAND_CURSOR); + + this.setLayout(new BorderLayout()); + } + + public void setAccordionPane(AccordionPane accordionPane) { + this.accordionPane = accordionPane; + + if (titlePanel != null) { + this.titlePanel.setBackground(accordionPane.paneBackgroundColor); + } + } + + public void setIndex(int index) { + this.index = index; + } + + public JPanel getTitlePanel() { + return titlePanel; + } + + public JLabel getTitleLabel() { + return titleLabel; + } + + public void setTitle(String title) { + this.titleLabel = new JLabel(title); + this.titlePanel = new JPanel(); + //this.titlePanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 3, 3)); + this.titlePanel.setBorder(BorderFactory.createRaisedBevelBorder()); + this.titlePanel.setLayout(new BorderLayout()); + this.titlePanel.add(this.titleLabel, BorderLayout.WEST); + if (accordionPane != null) { + this.titlePanel.setBackground(accordionPane.paneBackgroundColor); + } + // Set cursor to hand cursor to indicate the user can select the title area + titlePanel.setCursor(handCursor); + this.add(titlePanel, BorderLayout.NORTH); + + // Add mouse listener for titlePanel so we can change the cursor and also + // listen for mouse click. + this.titlePanel.addMouseListener(new MouseListener() { + public void mouseEntered(MouseEvent me) { + } + + public void mouseExited(MouseEvent me) { + } + + public void mouseClicked(MouseEvent me) { + if (accordionPane.selected != index) { + accordionPane.setSelected(index); + } + } + + public void mousePressed(MouseEvent me) { + mousePressedInd = index; + } + + public void mouseReleased(MouseEvent me) { + if (mousePressedInd == index) { + if (accordionPane.selected != index) { + accordionPane.setSelected(index); + } + } + mousePressedInd = -1; + } + }); + + } + + public Component add(Component child) { + // child.setVisible ( false ); + this.add(child, BorderLayout.CENTER); + //validate(); + //repaint(); + return child; + } +} \ No newline at end of file Property changes on: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPaneSubPanel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r350 - trunk/coser-ui
by chatellier＠users.labs.libre-entreprise.org 03 Dec '10

03 Dec '10

Author: chatellier Date: 2010-12-03 10:05:28 +0000 (Fri, 03 Dec 2010) New Revision: 350 Log: Test this new conf Modified: trunk/coser-ui/pom.xml Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2010-12-03 09:42:44 UTC (rev 349) +++ trunk/coser-ui/pom.xml 2010-12-03 10:05:28 UTC (rev 350) @@ -266,8 +266,8 @@ <verbose>false</verbose> <jnlp> - <inputTemplateResourcePath>src/main/jnlp</inputTemplateResourcePath> - <inputTemplate>coser-jnlp.vm</inputTemplate> + <inputTemplateResourcePath>${project.basedir}</inputTemplateResourcePath> + <inputTemplate>src/main/jnlp/coser-jnlp.vm</inputTemplate> <mainClass>${maven.jar.main.class}</mainClass> <allPermissions>true</allPermissions> <offlineAllowed>true</offlineAllowed>

1 0

r349 - in trunk/coser-business/src/main/resources: fr/ifremer/coser/data i18n
by chatellier＠users.labs.libre-entreprise.org 03 Dec '10

03 Dec '10

Author: chatellier Date: 2010-12-03 09:42:44 +0000 (Fri, 03 Dec 2010) New Revision: 349 Log: Fix du control sur age Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml 2010-12-02 17:24:20 UTC (rev 348) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml 2010-12-03 09:42:44 UTC (rev 349) @@ -78,8 +78,9 @@ </field-validator> </field> <field name="age"> - <field-validator type="requiredstring"> - <message>Missing age attribute</message> + <field-validator type="checkDouble"> + <param name="notAvailable">NA</param> + <message>age attribute is not a valid double</message> </field-validator> </field> </validators> \ No newline at end of file Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-02 17:24:20 UTC (rev 348) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-03 09:42:44 UTC (rev 349) @@ -4,7 +4,6 @@ Can't\ read\ file\ %s\ for\ category\ %s= Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator= Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s= -Missing\ age\ attribute= Missing\ file\ %s= Missing\ haul\ name= Missing\ maturity\ attribute= @@ -18,6 +17,7 @@ Species\ %s\ doesn't\ exist\ in\ referential= Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s= Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s= +age\ attribute\ is\ not\ a\ valid\ double= coser.business.category.catch=Catch coser.business.category.haul=Haul coser.business.category.length=Length Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-02 17:24:20 UTC (rev 348) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-03 09:42:44 UTC (rev 349) @@ -4,7 +4,6 @@ Can't\ read\ file\ %s\ for\ category\ %s=Impossible de lire le fichier %s pour la cat\u00E9gorie %s \! Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator=Impossible de lire le fichier '%s'.\nMerci de v\u00E9rifier le s\u00E9parateur utilis\u00E9 est bien un point-virgule ';' Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s= -Missing\ age\ attribute=Attribut age manquant Missing\ file\ %s=Fichier manquant \: %s Missing\ haul\ name=Nom de trait manquant Missing\ maturity\ attribute=Attribut maturit\u00E9 manquant @@ -18,6 +17,7 @@ Species\ %s\ doesn't\ exist\ in\ referential=L'esp\u00E8ce %s n'existe pas dans le r\u00E9f\u00E9rentiel Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans\n%s.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s. Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans %s.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s. +age\ attribute\ is\ not\ a\ valid\ double=L'attribut Age n'est pas un r\u00E9el valide coser.business.category.catch=Captures coser.business.category.haul=Traits coser.business.category.length=Tailles

1 0

r348 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control
by chatellier＠users.labs.libre-entreprise.org 02 Dec '10

02 Dec '10

Author: chatellier Date: 2010-12-02 17:24:20 +0000 (Thu, 02 Dec 2010) New Revision: 348 Log: Hack pour que les colonnes ne soit pas redimentionn?\195?\169es Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-12-02 16:50:48 UTC (rev 347) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-12-02 17:24:20 UTC (rev 348) @@ -61,6 +61,7 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.TreeSelectionEvent; +import javax.swing.table.TableColumn; import javax.swing.tree.TreePath; import jaxx.runtime.JAXXUtil; @@ -413,13 +414,13 @@ } try { + // hack parce que impossible de faire un faire + // sans que les colonnes soit redimentionnées + view.getGlobalControlErrorTable().setAutoCreateColumnsFromModel(false); + List<ControlError> errors = get(); view.getGlobalControlErrorModel().setControlErrors(errors); - // hack parce que impossible de faire un faire - // sans que les colonnes soit redimentionnées - SwingUtil.fixTableColumnWidth(view.getGlobalControlErrorTable(), 1, 25); - // active le bouton de sauvegarde si la liste d'erreur // ne contient pas de message d'erreur // warning, c'est ok Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java 2010-12-02 16:50:48 UTC (rev 347) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java 2010-12-02 17:24:20 UTC (rev 348) @@ -70,6 +70,7 @@ this.controlErrors = controlErrors; getValidationErrorAsMaps(controlErrors); modelSupport.fireNewRoot(); + } public List<ControlError> getControlErrors() {

1 0

r347 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui java/fr/ifremer/coser/ui/project resources/i18n
by chatellier＠users.labs.libre-entreprise.org 02 Dec '10

02 Dec '10

Author: chatellier Date: 2010-12-02 16:50:48 +0000 (Thu, 02 Dec 2010) New Revision: 347 Log: Ajout d'infos dans le r?\195?\169sum?\195?\169 Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-12-02 16:29:53 UTC (rev 346) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-12-02 16:50:48 UTC (rev 347) @@ -421,6 +421,15 @@ projectSummaryView.setHandler(this); projectSummaryView.setProject(project); + int selectionCount = 0; + int resultCount = 0; + for (Selection selection : project.getSelections().values()) { + selectionCount++; + resultCount += selection.getRsufiResults().size(); + } + projectSummaryView.getProjectSelectionCount().setText(String.valueOf(selectionCount)); + projectSummaryView.getProjectResultCount().setText(String.valueOf(resultCount)); + setMainComponent(projectSummaryView); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx 2010-12-02 16:29:53 UTC (rev 346) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx 2010-12-02 16:50:48 UTC (rev 347) @@ -40,6 +40,38 @@ </row> <row> <cell anchor="west"> + <JLabel text="coser.ui.project.summary.catchFileName" /> + </cell> + <cell anchor="west"> + <JLabel text="{getProject().getCatchFileName()}" /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.project.summary.haulFileName" /> + </cell> + <cell anchor="west"> + <JLabel text="{getProject().getHaulFileName()}" /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.project.summary.strataFileName" /> + </cell> + <cell anchor="west"> + <JLabel text="{getProject().getStrataFileName()}" /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.project.summary.lengthFileName" /> + </cell> + <cell anchor="west"> + <JLabel text="{getProject().getLengthFileName()}" /> + </cell> + </row> + <row> + <cell anchor="west"> <JLabel text="coser.ui.project.summary.validated" /> </cell> <cell anchor="west"> @@ -49,6 +81,22 @@ </JPanel> </cell> </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.project.summary.selectionCount" /> + </cell> + <cell anchor="west"> + <JLabel id="projectSelectionCount" /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.project.summary.resultCount" /> + </cell> + <cell anchor="west"> + <JLabel id="projectResultCount" /> + </cell> + </row> </Table> </cell> </row> Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-02 16:29:53 UTC (rev 346) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-02 16:50:48 UTC (rev 347) @@ -83,7 +83,7 @@ coser.ui.mainframe.menu.openProject=Open project coser.ui.mainframe.menu.options=Options coser.ui.mainframe.menu.quit=Quit -coser.ui.mainframe.menu.validators=Validators +coser.ui.mainframe.menu.validators=Controls coser.ui.mainframe.menu.view=View coser.ui.mainframe.menu.view.lookandfeel=Look and feel coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi @@ -107,7 +107,13 @@ coser.ui.project.projectname=Project name \: coser.ui.project.saveProject=Save project coser.ui.project.strataFile=Strata file \: +coser.ui.project.summary.catchFileName=Catch file name \: +coser.ui.project.summary.haulFileName=Haul file name \: +coser.ui.project.summary.lengthFileName=Length file name \: coser.ui.project.summary.path=Project path \: +coser.ui.project.summary.resultCount=Result count \: +coser.ui.project.summary.selectionCount=Selection count \: +coser.ui.project.summary.strataFileName=Strata file name \: coser.ui.project.summary.title=Project summary coser.ui.project.summary.validated=Control validated \: coser.ui.project.useCustomReferenceSpeciesFile=Use custom reference file @@ -123,8 +129,8 @@ coser.ui.result.extractDataTitle=Extract RSufi data coser.ui.result.newResult=New Result coser.ui.result.otherDataFile=Other files \: -coser.ui.result.requireddataFile1Path= -coser.ui.result.requireddataFile2Path= +coser.ui.result.requireddataFile1Path=ESTPOPind file is required +coser.ui.result.requireddataFile2Path=ESTCOMind file is required coser.ui.result.requiredname=Result name is required coser.ui.result.requiredrsufiVersion=Rsufi version is required coser.ui.result.resultName=Result name \: Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-02 16:29:53 UTC (rev 346) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-02 16:50:48 UTC (rev 347) @@ -107,7 +107,13 @@ coser.ui.project.projectname=Nom du projet \: coser.ui.project.saveProject=Sauver le projet coser.ui.project.strataFile=Fichier des strates \: +coser.ui.project.summary.catchFileName=Nom du fichier captures \: +coser.ui.project.summary.haulFileName=Nom du fichier traits \: +coser.ui.project.summary.lengthFileName=Nom du fichier tailles \: coser.ui.project.summary.path=Chemin du projet \: +coser.ui.project.summary.resultCount=Nombre de r\u00E9sultats \: +coser.ui.project.summary.selectionCount=Nombre de s\u00E9lections \: +coser.ui.project.summary.strataFileName=Nom du fichier strates \: coser.ui.project.summary.title=R\u00E9sum\u00E9 du projet coser.ui.project.summary.validated=Contr\u00F4le valid\u00E9 \: coser.ui.project.useCustomReferenceSpeciesFile=Utiliser un autre fichier de r\u00E9f\u00E9rence @@ -123,8 +129,8 @@ coser.ui.result.extractDataTitle=Extraction des donn\u00E9es RSufi coser.ui.result.newResult=Nouveau r\u00E9sultat coser.ui.result.otherDataFile=Autre fichiers \: -coser.ui.result.requireddataFile1Path= -coser.ui.result.requireddataFile2Path= +coser.ui.result.requireddataFile1Path=Le fichier ESTPOPind est requis +coser.ui.result.requireddataFile2Path=le fichier ESTCOMind est requis coser.ui.result.requiredname=Le nom du r\u00E9sultat est requis coser.ui.result.requiredrsufiVersion=Le champ 'rsufiVersion' est requis coser.ui.result.resultName=Nom du r\u00E9sultat \:

1 0

r346 - in trunk: coser-business/src/site/rst coser-business/src/site/rst/en coser-ui/src/site coser-ui/src/site/rst coser-ui/src/site/rst/en
by chatellier＠users.labs.libre-entreprise.org 02 Dec '10

02 Dec '10

Author: chatellier Date: 2010-12-02 16:29:53 +0000 (Thu, 02 Dec 2010) New Revision: 346 Log: Fix site and licenses Added: trunk/coser-ui/src/site/rst/ trunk/coser-ui/src/site/rst/en/ trunk/coser-ui/src/site/rst/index.rst Removed: trunk/coser-ui/src/site/en/ trunk/coser-ui/src/site/index.rst Modified: trunk/coser-business/src/site/rst/en/index.rst trunk/coser-business/src/site/rst/index.rst trunk/coser-ui/src/site/rst/en/index.rst trunk/coser-ui/src/site/site_en.xml trunk/coser-ui/src/site/site_fr.xml Modified: trunk/coser-business/src/site/rst/en/index.rst =================================================================== --- trunk/coser-business/src/site/rst/en/index.rst 2010-12-02 16:28:10 UTC (rev 345) +++ trunk/coser-business/src/site/rst/en/index.rst 2010-12-02 16:29:53 UTC (rev 346) @@ -1,2 +1,26 @@ +.. - +.. * #%L +.. * Coser :: Business +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2010 Ifremer, Codelutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - Coser :: Business ================= \ No newline at end of file Modified: trunk/coser-business/src/site/rst/index.rst =================================================================== --- trunk/coser-business/src/site/rst/index.rst 2010-12-02 16:28:10 UTC (rev 345) +++ trunk/coser-business/src/site/rst/index.rst 2010-12-02 16:29:53 UTC (rev 346) @@ -1,2 +1,26 @@ +.. - +.. * #%L +.. * Coser :: Business +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2010 Ifremer, Codelutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - Coser :: Business ================= \ No newline at end of file Deleted: trunk/coser-ui/src/site/index.rst =================================================================== --- trunk/coser-ui/src/site/index.rst 2010-12-02 16:28:10 UTC (rev 345) +++ trunk/coser-ui/src/site/index.rst 2010-12-02 16:29:53 UTC (rev 346) @@ -1,2 +0,0 @@ -Coser :: UI -=========== \ No newline at end of file Modified: trunk/coser-ui/src/site/rst/en/index.rst =================================================================== --- trunk/coser-ui/src/site/en/index.rst 2010-12-02 13:09:07 UTC (rev 333) +++ trunk/coser-ui/src/site/rst/en/index.rst 2010-12-02 16:29:53 UTC (rev 346) @@ -1,2 +1,26 @@ +.. - +.. * #%L +.. * Coser :: UI +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2010 Ifremer, Codelutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Coser :: UI =========== \ No newline at end of file Copied: trunk/coser-ui/src/site/rst/index.rst (from rev 333, trunk/coser-ui/src/site/index.rst) =================================================================== --- trunk/coser-ui/src/site/rst/index.rst (rev 0) +++ trunk/coser-ui/src/site/rst/index.rst 2010-12-02 16:29:53 UTC (rev 346) @@ -0,0 +1,26 @@ +.. - +.. * #%L +.. * Coser :: UI +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2010 Ifremer, Codelutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - +Coser :: UI +=========== \ No newline at end of file Modified: trunk/coser-ui/src/site/site_en.xml =================================================================== --- trunk/coser-ui/src/site/site_en.xml 2010-12-02 16:28:10 UTC (rev 345) +++ trunk/coser-ui/src/site/site_en.xml 2010-12-02 16:29:53 UTC (rev 346) @@ -9,18 +9,18 @@ Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as + it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> Modified: trunk/coser-ui/src/site/site_fr.xml =================================================================== --- trunk/coser-ui/src/site/site_fr.xml 2010-12-02 16:28:10 UTC (rev 345) +++ trunk/coser-ui/src/site/site_fr.xml 2010-12-02 16:29:53 UTC (rev 346) @@ -9,18 +9,18 @@ Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as + it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% -->

1 0

r345 - trunk/coser-ui/src/main/jnlp
by chatellier＠users.labs.libre-entreprise.org 02 Dec '10

02 Dec '10

Author: chatellier Date: 2010-12-02 16:28:10 +0000 (Thu, 02 Dec 2010) New Revision: 345 Log: Remove used property Modified: trunk/coser-ui/src/main/jnlp/coser-jnlp.vm Modified: trunk/coser-ui/src/main/jnlp/coser-jnlp.vm =================================================================== --- trunk/coser-ui/src/main/jnlp/coser-jnlp.vm 2010-12-02 16:27:36 UTC (rev 344) +++ trunk/coser-ui/src/main/jnlp/coser-jnlp.vm 2010-12-02 16:28:10 UTC (rev 345) @@ -19,7 +19,6 @@ #end <resources> <j2se version="$j2seVersion" java-vm-args="-Xmx1024M"/> - <property name="vradi.remote.endpoint" value="${jnlpCodebase}vradi-services-web" /> $dependencies $extensions </resources>

1 0

r344 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui resources/i18n
by chatellier＠users.labs.libre-entreprise.org 02 Dec '10

02 Dec '10

Author: chatellier Date: 2010-12-02 16:27:36 +0000 (Thu, 02 Dec 2010) New Revision: 344 Log: Renomage et d?\195?\169sactivation Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2010-12-02 16:27:01 UTC (rev 343) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2010-12-02 16:27:36 UTC (rev 344) @@ -48,7 +48,7 @@ <JMenu id='menuOptions' text="coser.ui.mainframe.menu.options"> <JMenuItem text="coser.ui.mainframe.menu.configuration" onActionPerformed="getHandler().showCoserConfiguration()"/> - <JMenuItem text="coser.ui.mainframe.menu.validators" onActionPerformed="getHandler().showValidatorsConfiguration()"/> + <JMenuItem text="coser.ui.mainframe.menu.validators" onActionPerformed="getHandler().showValidatorsConfiguration()" enabled="false"/> <JSeparator/> <JMenuItem actionIcon="i18n-fr" text="coser.ui.mainframe.menu.locale.fr" onActionPerformed="getHandler().switchLanguage(this, Locale.FRANCE)"/> <JMenuItem actionIcon="i18n-gb" text="coser.ui.mainframe.menu.locale.uk" onActionPerformed="getHandler().switchLanguage(this, Locale.UK)"/> Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-02 16:27:01 UTC (rev 343) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-02 16:27:36 UTC (rev 344) @@ -83,7 +83,7 @@ coser.ui.mainframe.menu.openProject=Ouvrir un projet coser.ui.mainframe.menu.options=Options coser.ui.mainframe.menu.quit=Quitter -coser.ui.mainframe.menu.validators=Validateurs +coser.ui.mainframe.menu.validators=Contr\u00F4les coser.ui.mainframe.menu.view=Vue coser.ui.mainframe.menu.view.lookandfeel=Th\u00E8me coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi

1 0