Author: chatellier Date: 2010-11-26 15:49:54 +0000 (Fri, 26 Nov 2010) New Revision: 300 Log: Uniformisation des noms de class g?\195?\169n?\195?\169r?\195?\169es Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorDialog.jaxx Removed: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorConfiguration.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 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-11-26 15:42:15 UTC (rev 299) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-26 15:49:54 UTC (rev 300) @@ -173,12 +173,12 @@ } public void showValidatorsConfiguration() { - ValidatorConfiguration validatorConfiguration = new ValidatorConfiguration(view); + ValidatorDialog validatorDialog = new ValidatorDialog(view); URL sample = Catch.class.getResource("Catch-error-validation.xml"); File sampleFile = new File(sample.getFile()); - validatorConfiguration.getValidationEditor().open(sampleFile); - validatorConfiguration.setLocationRelativeTo(null); - validatorConfiguration.setVisible(true); + validatorDialog.getValidationEditor().open(sampleFile); + validatorDialog.setLocationRelativeTo(null); + validatorDialog.setVisible(true); } /** Deleted: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorConfiguration.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorConfiguration.jaxx 2010-11-26 15:42:15 UTC (rev 299) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorConfiguration.jaxx 2010-11-26 15:49:54 UTC (rev 300) @@ -1,70 +0,0 @@ -<!-- - #%L - Coser :: UI - - $Id$ - $HeadURL$ - %% - 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 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% - --> -<JDialog title="coser.ui.validators.title"> - <Table> - <row> - <cell columns="4" fill="horizontal"> - <JLabel font-style="italic" text="coser.ui.validators.description" /> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel text="coser.ui.validators.validators" /> - </cell> - <cell> - <JLabel text="coser.ui.validators.entity" /> - </cell> - <cell weightx="1" fill="horizontal" columns="2"> - <JComboBox /> - </cell> - </row> - <row> - <cell fill="both" weightx="1" weighty="1"> - <JScrollPane> - <JList /> - </JScrollPane> - </cell> - <cell weightx="2" weighty="1" fill="both" columns="3"> - <org.nuiton.widget.editor.Editor id="validationEditor" /> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JButton text="coser.ui.validators.newValidator" /> - </cell> - <cell fill="horizontal"> - <JButton text="coser.ui.validators.deleteValidator" /> - </cell> - </row> - <row> - <cell columns="4" anchor="east" insets="0"> - <JPanel> - <JButton text="coser.ui.validators.cancel" onActionPerformed="dispose()"/> - <JButton text="coser.ui.validators.valid" onActionPerformed="dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Copied: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorDialog.jaxx (from rev 207, trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorConfiguration.jaxx) =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorDialog.jaxx (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorDialog.jaxx 2010-11-26 15:49:54 UTC (rev 300) @@ -0,0 +1,70 @@ +<!-- + #%L + Coser :: UI + + $Id$ + $HeadURL$ + %% + 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 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% + --> +<JDialog title="coser.ui.validators.title"> + <Table> + <row> + <cell columns="4" fill="horizontal"> + <JLabel font-style="italic" text="coser.ui.validators.description" /> + </cell> + </row> + <row> + <cell fill="horizontal"> + <JLabel text="coser.ui.validators.validators" /> + </cell> + <cell> + <JLabel text="coser.ui.validators.entity" /> + </cell> + <cell weightx="1" fill="horizontal" columns="2"> + <JComboBox /> + </cell> + </row> + <row> + <cell fill="both" weightx="1" weighty="1"> + <JScrollPane> + <JList /> + </JScrollPane> + </cell> + <cell weightx="2" weighty="1" fill="both" columns="3"> + <org.nuiton.widget.editor.Editor id="validationEditor" /> + </cell> + </row> + <row> + <cell fill="horizontal"> + <JButton text="coser.ui.validators.newValidator" /> + </cell> + <cell fill="horizontal"> + <JButton text="coser.ui.validators.deleteValidator" /> + </cell> + </row> + <row> + <cell columns="4" anchor="east" insets="0"> + <JPanel> + <JButton text="coser.ui.validators.cancel" onActionPerformed="dispose()"/> + <JButton text="coser.ui.validators.valid" onActionPerformed="dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog>