- Simexplorer-si-commits - mailman.cloud.codelutin.com

r805 - trunk/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: tchemit Date: 2008-02-11 13:22:10 +0000 (Mon, 11 Feb 2008) New Revision: 805 Modified: trunk/simexplorer-is/pom.xml Log: pan! Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-02-11 13:18:08 UTC (rev 804) +++ trunk/simexplorer-is/pom.xml 2008-02-11 13:22:10 UTC (rev 805) @@ -191,12 +191,12 @@ </dependencies> <modules> - <module>../simexplorer-is-security</module> - <module>../simexplorer-is-entities</module> - <module>../simexplorer-is-storage</module> - <module>../simexplorer-is-service</module> - <module>../simexplorer-is-web</module> - <module>../simexplorer-is-swing</module> - <module>../simexplorer-is-ear</module> + <module>simexplorer-is-security</module> + <module>simexplorer-is-entities</module> + <module>simexplorer-is-storage</module> + <module>simexplorer-is-service</module> + <module>simexplorer-is-web</module> + <module>simexplorer-is-swing</module> + <module>simexplorer-is-ear</module> </modules> </project>

1 0

r804 - in trunk: . simexplorer-is
by glandais＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: glandais Date: 2008-02-11 13:18:08 +0000 (Mon, 11 Feb 2008) New Revision: 804 Added: trunk/simexplorer-is/simexplorer-is-swing/ Removed: trunk/simexplorer-is-swing/ Log: Moving modules under main project Copied: trunk/simexplorer-is/simexplorer-is-swing (from rev 803, trunk/simexplorer-is-swing)

1 0

r803 - trunk/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: tchemit Date: 2008-02-11 13:17:34 +0000 (Mon, 11 Feb 2008) New Revision: 803 Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: demande de confirmation avant suppression Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-11 13:17:26 UTC (rev 802) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-11 13:17:34 UTC (rev 803) @@ -107,11 +107,13 @@ simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Disconnect from remote server simexplorer.change.config.property= +simexplorer.common.cancel= simexplorer.common.close=Close simexplorer.common.creationDate=create date simexplorer.common.description=description simexplorer.common.key=key simexplorer.common.name=name +simexplorer.common.ok= simexplorer.common.type=type simexplorer.common.value=value simexplorer.common.version=version @@ -135,8 +137,9 @@ simexplorer.config.main.userMail.description=User email adress simexplorer.config.main.version.description=Version of application simexplorer.config.menu=Configuration +simexplorer.confirm.delete= simexplorer.error.dialog.message=An error was found -simexplorer.error.dialog.title=Error detected! +simexplorer.error.dialog.title=Error detected\! simexplorer.error.load.actions.class=could not found for action key {0} class {1} simexplorer.error.load.actions.file=could not load actions.properties file for reason {0} simexplorer.error.unfound.config.property= Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-11 13:17:26 UTC (rev 802) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-11 13:17:34 UTC (rev 803) @@ -107,11 +107,13 @@ simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Se d\u00E9connecter du serveur distant simexplorer.change.config.property= +simexplorer.common.cancel=Annuler simexplorer.common.close=Fermer simexplorer.common.creationDate=date de cr\u00E9ation simexplorer.common.description=description simexplorer.common.key=nom descriptor simexplorer.common.name=nom +simexplorer.common.ok=Ok simexplorer.common.type=type simexplorer.common.value=valeur simexplorer.common.version=version @@ -135,8 +137,9 @@ simexplorer.config.main.userMail.description=Le courriel de l'utilisateur simexplorer.config.main.version.description=La version du logiciel simexplorer.config.menu=Configuration -simexplorer.error.dialog.message=Une erreur est survenue! -simexplorer.error.dialog.title=Erreur detectée +simexplorer.confirm.delete=Confirmer la suppression de ''{0}'' +simexplorer.error.dialog.message=Une erreur est survenue\! +simexplorer.error.dialog.title=Erreur detect\u00E9e simexplorer.error.load.actions.class=could not found for action key {0} class {1} simexplorer.error.load.actions.file=could not load actions.properties file for reason {0} simexplorer.error.unfound.config.property=

1 0

r802 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions: . util
by tchemit＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: tchemit Date: 2008-02-11 13:17:26 +0000 (Mon, 11 Feb 2008) New Revision: 802 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAttachmentAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteLoggableElementAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DeleteAbstractAction.java Log: demande de confirmation avant suppression Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAttachmentAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAttachmentAction.java 2008-02-11 13:17:01 UTC (rev 801) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAttachmentAction.java 2008-02-11 13:17:26 UTC (rev 802) @@ -44,6 +44,10 @@ protected Attachment attachment; private static final long serialVersionUID = 7535647131305304738L; + @Override + protected String getDeleteMessage() { + return attachment.toString(); + } public DeleteAttachmentAction(String name) { super(name); @@ -57,12 +61,12 @@ @Override protected void initModel(DetailTabModel model) { super.initModel(model); - attachment = model.getSelectedAttachment(); + attachment = model.getSelectedAttachment(); } @Override protected void doAction(ActionEvent e) throws Exception { - throw new SimExplorerRuntimeException(this+" is not implemented yet!"); + super.doAction(e); } @Override Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteLoggableElementAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteLoggableElementAction.java 2008-02-11 13:17:01 UTC (rev 801) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteLoggableElementAction.java 2008-02-11 13:17:26 UTC (rev 802) @@ -54,6 +54,6 @@ @Override protected void doAction(ActionEvent e) throws Exception { - throw new SimExplorerRuntimeException(this+" is not implemented yet!"); + super.doAction(e); } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DeleteAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DeleteAbstractAction.java 2008-02-11 13:17:01 UTC (rev 801) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DeleteAbstractAction.java 2008-02-11 13:17:26 UTC (rev 802) @@ -21,7 +21,9 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; - +import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; +import static org.codelutin.i18n.I18n._; +import javax.swing.JOptionPane; import java.awt.event.ActionEvent; /** @@ -37,11 +39,13 @@ String uuid; Version version; + protected String getDeleteMessage() { + return element.getName()+" ["+version+"]"; + } protected DeleteAbstractAction(String name) { super(name); } - protected void initModel(DetailTabModel model) { element = model.getDetail(); version = model.getSelectedVersion(); @@ -76,6 +80,14 @@ @Override protected void doAction(ActionEvent e) throws Exception { super.doAction(e); + // demande de confirmation avant d'effacer + int result = JOptionPane.showConfirmDialog(null, _("simexplorer.confirm.delete",getDeleteMessage()), "delete", JOptionPane.YES_NO_OPTION); + if (result != JOptionPane.OK_OPTION) { + // do nothing + return; + } + //TODO do action + throw new SimExplorerRuntimeException(this+" is not implemented yet!"); } @Override

1 0

r801 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util
by tchemit＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: tchemit Date: 2008-02-11 13:17:01 +0000 (Mon, 11 Feb 2008) New Revision: 801 Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFile.jaxx trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFilePanel.jaxx Log: ajout dialogue jaxx pour choisir un fichier... Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFile.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFile.jaxx (rev 0) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFile.jaxx 2008-02-11 13:17:01 UTC (rev 801) @@ -0,0 +1,39 @@ +<JDialog title='{_("simexplorer.error.dialog.title")}'> + <script> + import static org.codelutin.i18n.I18n._; + import static jaxx.runtime.UIHelper.createImageIcon; + JRootPane rootPane = getRootPane(); + rootPane.setDefaultButton(cancel); + rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "cancel"); + rootPane.getActionMap().put("cancel", cancel.getAction()); + + protected void doOk() { + // TODO implements it + } + + protected void doCancel() { + dispose(); + } + + </script> + <Table> + <row fill='both' weightx="1"> + <cell> + <fr.cemagref.simexplorer.is.ui.swing.util.ChooseFilePanel /> + </cell> + </row> + <row fill='both' weightx='1' weighty='1'> + <cell> + <JPanel id='content' visible='false'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JPanel layout='{new GridLayout(1, 0, 6, 6)}'> + <JButton id='ok' text='{_("simexplorer.common.ok")}' onActionPerformed='doOk()'/> + <JButton id='cancel' text='{_("simexplorer.common.cancel")}' onActionPerformed='doCancel()'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFilePanel.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFilePanel.jaxx (rev 0) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ChooseFilePanel.jaxx 2008-02-11 13:17:01 UTC (rev 801) @@ -0,0 +1,39 @@ +<Table> + <script> +import static org.codelutin.i18n.I18n._; +import static jaxx.runtime.UIHelper.createImageIcon; + +protected void chooseDir() { + String dir= org.codelutin.util.FileUtil.getDirectory(); + if (dir!=null) { + directory.setText(dir); + } +} + </script> + <row fill='both'> + <cell> + <JPanel> + <JLabel id='message'/> + </JPanel> + </cell> + </row> + <row fill='both'> + <cell> + <JTextField id='directory'/> + </cell> + <cell> + <JButton id='chooseDirectory' + icon='{createImageIcon("action/fileChooser.png")}' + onActionPerformed='chooseDir()'/> + </cell> + </row> + + <row fill='both'> + <cell> + <JLabel id='fileLabel' labelFor='{file}'/> + </cell> + <cell weightx='1'> + <JTextField id='file'/> + </cell> + </row> +</Table>

1 0

r800 - in trunk: . simexplorer-is
by glandais＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: glandais Date: 2008-02-11 13:16:26 +0000 (Mon, 11 Feb 2008) New Revision: 800 Added: trunk/simexplorer-is-swing/ Removed: trunk/simexplorer-is/simexplorer-is-swing/ Log: Copied: trunk/simexplorer-is-swing (from rev 799, trunk/simexplorer-is/simexplorer-is-swing)

1 0

r799 - trunk
by glandais＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: glandais Date: 2008-02-11 13:11:40 +0000 (Mon, 11 Feb 2008) New Revision: 799 Removed: trunk/simexplorer-si-template/ Log:

1 0

r798 - in trunk: . simexplorer-is
by glandais＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: glandais Date: 2008-02-11 13:11:30 +0000 (Mon, 11 Feb 2008) New Revision: 798 Added: trunk/simexplorer-is/simexplorer-is-web/ Removed: trunk/simexplorer-is-web/ Log: Copied: trunk/simexplorer-is/simexplorer-is-web (from rev 797, trunk/simexplorer-is-web)

1 0

r797 - in trunk: . simexplorer-is
by glandais＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: glandais Date: 2008-02-11 13:11:20 +0000 (Mon, 11 Feb 2008) New Revision: 797 Added: trunk/simexplorer-is/simexplorer-is-swing/ Removed: trunk/simexplorer-is-swing/ Log: Moving modules under main project Copied: trunk/simexplorer-is/simexplorer-is-swing (from rev 796, trunk/simexplorer-is-swing)

1 0

r796 - in trunk: . simexplorer-is
by glandais＠users.labs.libre-entreprise.org 11 Feb '08

11 Feb '08

Author: glandais Date: 2008-02-11 13:11:09 +0000 (Mon, 11 Feb 2008) New Revision: 796 Added: trunk/simexplorer-is/simexplorer-is-storage/ Removed: trunk/simexplorer-is-storage/ Log: Moving modules under main project Copied: trunk/simexplorer-is/simexplorer-is-storage (from rev 795, trunk/simexplorer-is-storage)

1 0