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

r1005 - trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata
by tchemit＠users.labs.libre-entreprise.org 15 Feb '08

15 Feb '08

Author: tchemit Date: 2008-02-15 15:45:52 +0000 (Fri, 15 Feb 2008) New Revision: 1005 Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java Log: unboxing add TODO Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java 2008-02-15 15:45:10 UTC (rev 1004) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java 2008-02-15 15:45:52 UTC (rev 1005) @@ -63,7 +63,7 @@ // tokenize on dot StringTokenizer st = new StringTokenizer(version, "."); while (st.hasMoreTokens()) { - addSubVersion(Integer.valueOf(st.nextToken()).intValue()); + addSubVersion(Integer.valueOf(st.nextToken())); } } } @@ -84,6 +84,8 @@ } /** + * TODO, this is not immuable method :) modified internal state, also we + * TODO should not to this, but return a new instance of Version * Set a sub version. * * @param position @@ -99,6 +101,7 @@ } /** + * TODO as the method modified internal state, it should be at least protected * Add a new sub version. * * @param subVersion @@ -182,8 +185,8 @@ return result; } - /* (non-Javadoc) - * @see java.lang.Object#clone() + /* + * TODO suppress it if we want a immuable class */ @Override public Version clone() throws CloneNotSupportedException { @@ -194,7 +197,10 @@ return version; } - /* (non-Javadoc) + /* + * TODO when the class will be immuable, we can use super method, since + * TODO a reference of Version will be unqiue :) + * (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ @Override @@ -204,7 +210,10 @@ .equals(((Version) o).pointedVersion)); } - /* (non-Javadoc) + /* + * TODO when the class will be immuable, we can use super method, since + * TODO a reference of Version will be unqiue :) + * (non-Javadoc) * @see java.lang.Object#hashCode() */ @Override @@ -213,6 +222,7 @@ } /** + * TODO suppress it if we want a immuable class * Safe clone. * * @return the version

1 0

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

15 Feb '08

Author: tchemit Date: 2008-02-15 15:45:10 +0000 (Fri, 15 Feb 2008) New Revision: 1004 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: normalized i18n Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-15 15:44:57 UTC (rev 1003) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-15 15:45:10 UTC (rev 1004) @@ -63,12 +63,12 @@ simexplorer.action.help=Help simexplorer.action.help.help= simexplorer.action.help.tooltip=Show help dialog -simexplorer.action.hide.local=Applications (local) +simexplorer.action.hide.local=List (local) simexplorer.action.hide.local.help= -simexplorer.action.hide.local.tooltip=hide local applications -simexplorer.action.hide.remote=Applications (remote) +simexplorer.action.hide.local.tooltip=hide the list of local elements +simexplorer.action.hide.remote=List (remote) simexplorer.action.hide.remote.help= -simexplorer.action.hide.remote.tooltip=Hide the list of remote applications +simexplorer.action.hide.remote.tooltip=Hide the list of remote elements simexplorer.action.hide.synchronize=Synchronize simexplorer.action.hide.synchronize.help= simexplorer.action.hide.synchronize.tooltip=Hide Synchronize screen @@ -86,7 +86,8 @@ simexplorer.action.i18n.fr.tooltip=Change to french language simexplorer.action.import=import simexplorer.action.import.help= -simexplorer.action.import.tooltip=import application +simexplorer.action.import.local.tooltip=Import into local database +simexplorer.action.import.remote.tooltip=Import into remote database simexplorer.action.quit=Quit simexplorer.action.quit.help= simexplorer.action.quit.tooltip=Quit SimExplorer SI @@ -97,15 +98,15 @@ simexplorer.action.search.help= simexplorer.action.search.tooltip=Launch search simexplorer.action.searchText.tooltip=Text to search in applications -simexplorer.action.show.detail=Application detail +simexplorer.action.show.detail=Element detail simexplorer.action.show.detail.help= -simexplorer.action.show.detail.tooltip=show Detail of Application -simexplorer.action.show.local=Applications (local) +simexplorer.action.show.detail.tooltip=show Detail of an element +simexplorer.action.show.local=List (local) simexplorer.action.show.local.help= -simexplorer.action.show.local.tooltip=Show the list of local applications (need connexion) -simexplorer.action.show.remote=Applications (remote) +simexplorer.action.show.local.tooltip=Show the list of local elements +simexplorer.action.show.remote=List (remote) simexplorer.action.show.remote.help= -simexplorer.action.show.remote.tooltip=Show the list of remote applications (need connexion) +simexplorer.action.show.remote.tooltip=Show the list of remote elements (need connexion) simexplorer.action.show.synchronize=Synchronize simexplorer.action.show.synchronize.help= simexplorer.action.show.synchronize.tooltip=Show synchronize screen (need connexion) @@ -117,6 +118,7 @@ simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Disconnect from remote server simexplorer.change.config.property= +simexplorer.choose.import.label=Import type simexplorer.common.apply=Apply simexplorer.common.cancel=Cancel simexplorer.common.close=Close @@ -150,6 +152,8 @@ simexplorer.config.main.version.description=Version of application simexplorer.config.menu=Configuration simexplorer.confirm.delete= +simexplorer.entities.applicationExploration=Exploration Application +simexplorer.entities.library=Library simexplorer.error.dialog.message=An error was found simexplorer.error.dialog.title=Error detected\! simexplorer.error.load.actions.class=could not found for action key {0} class {1} @@ -158,7 +162,7 @@ simexplorer.help.menu=Help simexplorer.login.failed=Authentication failed simexplorer.login.retry=Do you want to retry ? -simexplorer.login.title=Authentication to central server +simexplorer.login.title=Authentication to remote server simexplorer.main.menu=Main simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration= @@ -183,11 +187,11 @@ simexplorer.option.description.showConfig=See configuration details simexplorer.option.description.ui=launch or not user interface (value) simexplorer.tab.detail=Detail -simexplorer.tab.detail.tooltip=Screen of details of an Element -simexplorer.tab.local=Local applications -simexplorer.tab.local.tooltip=List of all applications existing on local database -simexplorer.tab.remote=Remote applications -simexplorer.tab.remote.tooltip=List of all applications existing on remote server +simexplorer.tab.detail.tooltip=Screen of details of an element +simexplorer.tab.local=Local elements +simexplorer.tab.local.tooltip=List of all elements existing on local database +simexplorer.tab.remote=Remote elements +simexplorer.tab.remote.tooltip=List of all elements existing on remote server simexplorer.tab.synchronize=Synchronize simexplorer.tab.synchronize.tooltip=Screen to synchronize applications {0}\ should\ have\ a\ name\ like\ this\ {1},\ but\ was\ {2}= Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-15 15:44:57 UTC (rev 1003) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-15 15:45:10 UTC (rev 1004) @@ -63,12 +63,12 @@ simexplorer.action.help=Aide simexplorer.action.help.help= simexplorer.action.help.tooltip=Acc\u00E9der \u00E0 l'aide -simexplorer.action.hide.local=Applications locales +simexplorer.action.hide.local=Liste locale simexplorer.action.hide.local.help= -simexplorer.action.hide.local.tooltip=Cacher la liste des applications locales -simexplorer.action.hide.remote=Applications distantes +simexplorer.action.hide.local.tooltip=Cacher la liste des élements du serveur local +simexplorer.action.hide.remote=Liste distante simexplorer.action.hide.remote.help= -simexplorer.action.hide.remote.tooltip=Cacher la liste des applications distantes +simexplorer.action.hide.remote.tooltip=Cacher la liste des éléments du serveur distant simexplorer.action.hide.synchronize=Synchronisation simexplorer.action.hide.synchronize.help= simexplorer.action.hide.synchronize.tooltip=Cacher l'\u00E9cran de synchronisation @@ -86,7 +86,8 @@ simexplorer.action.i18n.fr.tooltip=Traduire l'application en fran\u00E7ais simexplorer.action.import=importer simexplorer.action.import.help= -simexplorer.action.import.tooltip=Importer une application +simexplorer.action.import.local.tooltip=Importer dans la base locale +simexplorer.action.import.remote.tooltip=Importer dans la base distante simexplorer.action.quit=Quitter simexplorer.action.quit.help= simexplorer.action.quit.tooltip=Pour quitter l'application @@ -99,13 +100,13 @@ simexplorer.action.searchText.tooltip=Le texte de recherche simexplorer.action.show.detail=D\u00E9tail simexplorer.action.show.detail.help= -simexplorer.action.show.detail.tooltip=Affcihier les d\u00E9tail de l'application -simexplorer.action.show.local=Applications locales +simexplorer.action.show.detail.tooltip=Affciher les d\u00E9tail de l'élément +simexplorer.action.show.local=Liste locale simexplorer.action.show.local.help= -simexplorer.action.show.local.tooltip=Afficher la liste des applications locales -simexplorer.action.show.remote=Applications distantes +simexplorer.action.show.local.tooltip=Afficher la liste des éléments du serveur local +simexplorer.action.show.remote=Liste distante simexplorer.action.show.remote.help= -simexplorer.action.show.remote.tooltip=Afficher la liste des applications distantes +simexplorer.action.show.remote.tooltip=Afficher la liste des éléments du serveur distant simexplorer.action.show.synchronize=Synchroniser simexplorer.action.show.synchronize.help= simexplorer.action.show.synchronize.tooltip=Afficher l'\u00E9cran de synchronisation des applications @@ -117,6 +118,7 @@ simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Se d\u00E9connecter du serveur distant simexplorer.change.config.property= +simexplorer.choose.import.label=Type d'\u00E9l\u00E9ment \u00E0 importer simexplorer.common.apply=Appliquer simexplorer.common.cancel=Annuler simexplorer.common.close=Fermer @@ -150,6 +152,8 @@ simexplorer.config.main.version.description=La version du logiciel simexplorer.config.menu=Configuration simexplorer.confirm.delete=Confirmer la suppression de ''{0}'' +simexplorer.entities.applicationExploration=Exploration d'application +simexplorer.entities.library=Librairie 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} @@ -184,10 +188,10 @@ simexplorer.option.description.ui=launch or not user interface (value) simexplorer.tab.detail=D\u00E9tail simexplorer.tab.detail.tooltip=L'\u00E9cran affichant les d\u00E9tails d'un \u00E9l\u00E9ment -simexplorer.tab.local=Applications locales -simexplorer.tab.local.tooltip=La liste des applications pr\u00E9sentes localement -simexplorer.tab.remote=Applications distantes -simexplorer.tab.remote.tooltip=La liste des applications pr\u00E9sentes sur le serveur distant +simexplorer.tab.local=Liste locale +simexplorer.tab.local.tooltip=La liste des éléments pr\u00E9sents sur le serveur local +simexplorer.tab.remote=Liste distante +simexplorer.tab.remote.tooltip=La liste des éléments pr\u00E9sents sur le serveur distant simexplorer.tab.synchronize=Synchronisation -simexplorer.tab.synchronize.tooltip=L'\u00E9cran de synchronisation des applications +simexplorer.tab.synchronize.tooltip=L'\u00E9cran de synchronisation des éléments {0}\ should\ have\ a\ name\ like\ this\ {1},\ but\ was\ {2}=

1 0

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

15 Feb '08

Author: tchemit Date: 2008-02-15 15:44:57 +0000 (Fri, 15 Feb 2008) New Revision: 1003 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx Log: change size Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-02-15 15:44:42 UTC (rev 1002) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-02-15 15:44:57 UTC (rev 1003) @@ -1,5 +1,5 @@ <JFrame name="mainFrame" title='simexplorer.main.ui.title' - defaultCloseOperation='DISPOSE_ON_CLOSE' width='700' height='536'> + defaultCloseOperation='DISPOSE_ON_CLOSE' width='700' height='520'> <style source="/common.css"/> <JMenuBar>

1 0

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

15 Feb '08

Author: tchemit Date: 2008-02-15 15:44:42 +0000 (Fri, 15 Feb 2008) New Revision: 1002 Added: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ImportDialog.jaxx Log: implements import action Added: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ImportDialog.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ImportDialog.jaxx (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ImportDialog.jaxx 2008-02-15 15:44:42 UTC (rev 1002) @@ -0,0 +1,76 @@ +<JDialog> + <script> +AbstractAction cancelAction = new AbstractAction(_("simexplorer.common.cancel")){ + private static final long serialVersionUID = -4585698788717305452L; + + public void actionPerformed(ActionEvent e) { + filePath.setText(null); + dispose(); + } +}; + +public java.io.File getFile() { + setVisible(true); + if (filePath.getText().equals("")) { + return null; + } + java.io.File f= new java.io.File(filePath.getText()); + filePath.setText(null); + return f; +} + +protected void chooseDir() { + File dir= org.codelutin.util.FileUtil.getFile(new String[0]); + if (dir!=null) { + filePath.setText(dir.toString()); + } +} +public ImportDialog(JFrame frame) { + super(frame,true); + JRootPane rootPane = getRootPane(); + rootPane.setDefaultButton(ok); + rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"),"cancel"); + rootPane.getActionMap().put("cancel", cancelAction); +} +protected void check() { + String t = filePath.getText(); + java.io.File f = new File(t); + ok.setEnabled(!t.equals("") && f.exists() && f.isFile()); +} + </script> + <Table> + <row fill='vertical'> + <cell anchor='west' fill='horizontal' weightx="2"> + <JLabel text='simexplorer.choose.import.label'/> + </cell> + <cell anchor='west'> + <VBox> + <JRadioButton id='selected' text='simexplorer.entities.applicationExploration' value='ApplicationExploration' buttonGroup='typeImport' onActionPerformed='filePath.setText(null)'/> + <JRadioButton text='simexplorer.entities.library' value='Library' buttonGroup='typeImport' onActionPerformed='filePath.setText(null)'/> + </VBox> + </cell> + </row> + <row> + <cell columns='2' weightx='1' fill='horizontal'> + <Table> + <row fill="both"> + <cell weightx='1' fill='both' insets='0,0,0,0'> + <JTextField id='filePath' onCaretUpdate='check()' margin='0,0,0,0'/> + </cell> + <cell anchor='east' insets='0,2,0,0'> + <JButton id='chooseDirectory' icon='{createImageIcon("fileChooser.png")}' onActionPerformed='chooseDir()' margin='0,0,0,0'/> + </cell> + </row> + </Table> + </cell> + </row> + <row fill='horizontal'> + <cell columns='2'> + <JPanel layout='{new GridLayout(1, 0, 2, 2)}'> + <JButton id='ok' text='simexplorer.action.import' enabled='false' onActionPerformed='dispose();'/> + <JButton id='cancel' text='simexplorer.common.cancel' action='{cancelAction}'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog>

1 0

r1001 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 15 Feb '08

15 Feb '08

Author: tchemit Date: 2008-02-15 15:44:28 +0000 (Fri, 15 Feb 2008) New Revision: 1001 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java Log: dispose importElement action ui rename resetUI and reloadUI in disposeUI Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-02-15 15:43:57 UTC (rev 1000) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-02-15 15:44:28 UTC (rev 1001) @@ -57,7 +57,7 @@ super(name); } - public void resetUI() { + public void disposeUI() { ui=null; }

1 0

r1000 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 15 Feb '08

15 Feb '08

Author: tchemit Date: 2008-02-15 15:43:57 +0000 (Fri, 15 Feb 2008) New Revision: 1000 Removed: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleSynchronizeTabAction.java Log: no more used Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleSynchronizeTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleSynchronizeTabAction.java 2008-02-15 15:43:48 UTC (rev 999) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleSynchronizeTabAction.java 2008-02-15 15:43:57 UTC (rev 1000) @@ -1,45 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit, Gabriel Landais -* -* 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. -* ##% */ -package fr.cemagref.simexplorer.is.ui.swing.actions; - -import fr.cemagref.simexplorer.is.ui.swing.actions.util.ToggleTabAbstractAction; - -/** @author chemit */ - at jaxx.runtime.builder.ToggleActionConfig( - actionCommand = "toggleTab_synchronize", - name = "simexplorer.action.show.synchronize", - shortDescription = "simexplorer.action.show.synchronize.tooltip", - longDescription = "simexplorer.action.show.synchronize.help", - smallIcon = "action/reload.png", - mnemonic = 'S', - name2 = "simexplorer.action.hide.synchronize", - shortDescription2 = "simexplorer.action.hide.synchronize.tooltip", - longDescription2 = "simexplorer.action.hide.synchronize.help", - smallIcon2 = "action/reload.png", - mnemonic2 = 'S', - selected = true, - hideActionText = false -) -public class ToggleSynchronizeTabAction extends ToggleTabAbstractAction { - private static final long serialVersionUID = -3389620707293969262L; - - public ToggleSynchronizeTabAction(String name) { - super(name); - } -} \ No newline at end of file

1 0

r999 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 15 Feb '08

15 Feb '08

Author: tchemit Date: 2008-02-15 15:43:48 +0000 (Fri, 15 Feb 2008) New Revision: 999 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowLocalTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowRemoteTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleLocalTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleRemoteTabAction.java Log: change mnemonic Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowLocalTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowLocalTabAction.java 2008-02-15 15:43:31 UTC (rev 998) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowLocalTabAction.java 2008-02-15 15:43:48 UTC (rev 999) @@ -31,7 +31,7 @@ shortDescription = "simexplorer.action.show.local.tooltip", longDescription = "simexplorer.action.show.local.help", smallIcon = "action/local.png", - mnemonic = 'A', + mnemonic = 'L', hideActionText = false ) public class ShowLocalTabAction extends ShowListTabAbstractAction { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowRemoteTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowRemoteTabAction.java 2008-02-15 15:43:31 UTC (rev 998) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowRemoteTabAction.java 2008-02-15 15:43:48 UTC (rev 999) @@ -31,7 +31,7 @@ shortDescription = "simexplorer.action.show.remote.tooltip", longDescription = "simexplorer.action.show.remote.help", smallIcon = "action/remote.png", - mnemonic = 'p', + mnemonic = 'i', hideActionText = false ) public class ShowRemoteTabAction extends ShowListTabAbstractAction { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleLocalTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleLocalTabAction.java 2008-02-15 15:43:31 UTC (rev 998) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleLocalTabAction.java 2008-02-15 15:43:48 UTC (rev 999) @@ -27,12 +27,12 @@ shortDescription = "simexplorer.action.show.local.tooltip", longDescription = "simexplorer.action.show.local.help", smallIcon = "action/local.png", - mnemonic = 'A', + mnemonic = 'L', name2 = "simexplorer.action.hide.local", shortDescription2 = "simexplorer.action.hide.local.tooltip", longDescription2 = "simexplorer.action.hide.local.help", //smallIcon = "action/hide-local.png", - mnemonic2 = 'A', + mnemonic2 = 'L', selected = true, hideActionText = false ) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleRemoteTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleRemoteTabAction.java 2008-02-15 15:43:31 UTC (rev 998) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleRemoteTabAction.java 2008-02-15 15:43:48 UTC (rev 999) @@ -27,12 +27,12 @@ shortDescription = "simexplorer.action.show.remote.tooltip", longDescription = "simexplorer.action.show.remote.help", smallIcon = "action/remote.png", - mnemonic = 'P', + mnemonic = 'S', name2 = "simexplorer.action.hide.remote", shortDescription2 = "simexplorer.action.hide.remote.tooltip", longDescription2 = "simexplorer.action.hide.remote.help", //smallIcon = "action/hide-remote.png", - mnemonic2 = 'P', + mnemonic2 = 'S', selected = true, hideActionText = false )

1 0

r998 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 15 Feb '08

15 Feb '08

Author: tchemit Date: 2008-02-15 15:43:31 +0000 (Fri, 15 Feb 2008) New Revision: 998 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java Log: suppress downloadXXX mehtods (use retrieve ones) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-15 15:43:11 UTC (rev 997) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-15 15:43:31 UTC (rev 998) @@ -79,8 +79,7 @@ protected BufferedInputStream getInputStream() { BufferedInputStream bis; - bis = StorageServiceHelper.downloadElementData(getContext(), ((DetailTabModel) getModel()).isRemote(), getUuid(), getVersion().toString(), attachment); - //TODO bis = StorageServiceHelper.retrieveElementData(getContext(), ((DetailTabModel) getModel()).isRemote(), getUuid(), getVersion().toString(), attachment); + bis = StorageServiceHelper.retrieveElementData(getContext(), ((DetailTabModel) getModel()).isRemote(), getUuid(), getVersion().toString(), attachment); return bis; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java 2008-02-15 15:43:11 UTC (rev 997) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java 2008-02-15 15:43:31 UTC (rev 998) @@ -68,8 +68,7 @@ protected BufferedInputStream getInputStream() { BufferedInputStream bis; - bis = StorageServiceHelper.downloadElementFull(getContext(), ((DetailTabModel) getModel()).isRemote(), getUuid(), getVersion().toString()); - //TODO bis = StorageServiceHelper.retrieveElementFull(getContext(), ((DetailTabModel) getModel()).isRemote(), getUuid(), getVersion().toString()); + bis = StorageServiceHelper.retrieveElementFull(getContext(), ((DetailTabModel) getModel()).isRemote(), getUuid(), getVersion().toString()); return bis; }

1 0

r997 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 15 Feb '08

15 Feb '08

Author: tchemit Date: 2008-02-15 15:43:11 +0000 (Fri, 15 Feb 2008) New Revision: 997 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportAction.java Log: implements import action Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportAction.java 2008-02-15 15:42:44 UTC (rev 996) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportAction.java 2008-02-15 15:43:11 UTC (rev 997) @@ -18,11 +18,16 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; +import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; +import fr.cemagref.simexplorer.is.ui.swing.ImportDialog; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import java.awt.event.ActionEvent; +import java.io.File; +import static org.codelutin.i18n.I18n.*; + /** * Action de base pour importer une application * @@ -31,24 +36,69 @@ @jaxx.runtime.builder.ActionConfig( actionCommand = "importElement", name = "simexplorer.action.import", - shortDescription = "simexplorer.action.import.tooltip", longDescription = "simexplorer.action.import.help", smallIcon = "action/import-element.png", - mnemonic = 'i', + mnemonic = 'I', hideActionText = false ) public class ImportAction extends SimExplorerAbstractTabAction { + protected ImportDialog ui; + + protected File f; + protected Boolean remote; private static final long serialVersionUID = 3377670691203328711L; - public ImportAction(String name) { super(name); + ui = new ImportDialog(getMainUI()); } + public void disposeUI() { + ui = null; + } + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!super.beforeAction(e)) { + return false; + } + ListTabModel model = (ListTabModel) getModel(); + remote = model.isRemote(); + f = getUi(remote).getFile(); + + return f != null; + } + + @Override protected void doAction(ActionEvent e) throws Exception { - super.doAction(e); - throw new SimExplorerRuntimeException(this + " is not implemented yet!"); + StorageServiceHelper.importElement(getContext(), remote, f); } + + @Override + protected void afterAction(ActionEvent e) throws Exception { + super.afterAction(e); + //TODO should invalidate the 'remote' list + //TODO look if detail history is touch by this modification + //TODO look if synchronize is touched by this modification + } + + @Override + protected void clear() { + super.clear(); + f = null; + remote = null; + // this is a multi-tab action, must reset tab after each action + setTab(null); + } + + protected ImportDialog getUi(Boolean remote) { + if (ui == null) { + ui = new ImportDialog(getMainUI()); + } + ui.setTitle(remote? _("simexplorer.action.import.remote.tooltip"):_("simexplorer.action.import.local.tooltip")); + ui.getTypeImport().setSelected(ui.getSelected().getModel(),true); + ui.getTypeImport().updateSelectedValue(); + return ui; + } } \ No newline at end of file

1 0

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

15 Feb '08

Author: tchemit Date: 2008-02-15 15:42:44 +0000 (Fri, 15 Feb 2008) New Revision: 996 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java Log: import action has not same toolTip in local and remote list tab add FIXME... Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-15 15:42:01 UTC (rev 995) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-15 15:42:44 UTC (rev 996) @@ -44,6 +44,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import static org.codelutin.i18n.I18n._; + /** @author chemit */ public class ShowListTabAbstractAction extends ShowTabAbstractAction<JListTab, ListTabModel> { private static final long serialVersionUID = 3813479850648257169L; @@ -84,7 +86,10 @@ ui.getExportElement().setHideActionText(false); ui.getDownloadElement().setHideActionText(false); ui.getDeleteElement().setHideActionText(false); - + //FIXME : when we change locale, this is no more enabled ? + ui.getImportElement().setEnabled(true); + ui.getImportElement().getAction().setEnabled(true); + ui.getImportElement().setToolTipText(model.isRemote()? _("simexplorer.action.import.remote.tooltip"):_("simexplorer.action.import.local.tooltip")); ui.getTable().getSelectionModel().addListSelectionListener(new ListSelectionListener() { public void valueChanged(ListSelectionEvent e) { int index = ui.getTable().getSelectedRow();

1 0