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

r534 - trunk/simexplorer-is-swing/src/resources
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 23:46:29 +0000 (Thu, 24 Jan 2008) New Revision: 534 Modified: trunk/simexplorer-is-swing/src/resources/actions.properties Log: ajout action delete Modified: trunk/simexplorer-is-swing/src/resources/actions.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-24 23:46:17 UTC (rev 533) +++ trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-24 23:46:29 UTC (rev 534) @@ -36,6 +36,7 @@ action.collapseAllApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.CollapseAllAction action.expandAllApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.ExpandAllAction action.download=fr.cemagref.simexplorer.is.ui.swing.action.application.DownloadAction +action.delete=fr.cemagref.simexplorer.is.ui.swing.action.application.DeleteAction action.exportApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.ExportApplicationAction action.importApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.ImportApplicationAction

1 0

r533 - trunk/simexplorer-is-swing/src/resources/icons/action
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 23:46:17 +0000 (Thu, 24 Jan 2008) New Revision: 533 Added: trunk/simexplorer-is-swing/src/resources/icons/action/delete.png trunk/simexplorer-is-swing/src/resources/icons/action/local.png trunk/simexplorer-is-swing/src/resources/icons/action/remote.png Log: icons Added: trunk/simexplorer-is-swing/src/resources/icons/action/delete.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/delete.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/action/local.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/local.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/action/remote.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/remote.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

r532 - trunk/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 22:57:17 +0000 (Thu, 24 Jan 2008) New Revision: 532 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: i18n 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-01-24 22:55:44 UTC (rev 531) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-01-24 22:57:17 UTC (rev 532) @@ -1,4 +1,4 @@ -#Thu Jan 24 00:19:30 GMT 2008 +#Thu Jan 24 22:33:19 GMT 2008 simexplorer.action.about=About simexplorer.action.about.help= simexplorer.action.about.tooltip=Show About dialog @@ -116,6 +116,7 @@ simexplorer.common.type=type simexplorer.common.version=version simexplorer.config.i18n.menu=Language +simexplorer.config.main.autoConnect.description=Flag to auto connect to remote server at init time simexplorer.config.main.backupDirectory.description=Directory to put all SimExplorer backup files simexplorer.config.main.baseDirectory.description=Directory of the local databse of SimExplorer simexplorer.config.main.configFileName.description=The path of the configuration file @@ -125,6 +126,7 @@ simexplorer.config.main.language.description=Language of user's locale simexplorer.config.main.lastName.description=User last name simexplorer.config.main.login.description=User login to remote server +simexplorer.config.main.password.description=User password to connect remote server simexplorer.config.main.serverURL.description=URL of the remote server simexplorer.config.main.showLocalTab.description=Show at launch time, the local tab simexplorer.config.main.showRemoteTab.description=Show at launch time, the remote tab 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-01-24 22:55:44 UTC (rev 531) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-01-24 22:57:17 UTC (rev 532) @@ -1,4 +1,4 @@ -#Thu Jan 24 00:19:30 GMT 2008 +#Thu Jan 24 22:33:19 GMT 2008 simexplorer.action.about=A propos simexplorer.action.about.help= simexplorer.action.about.tooltip=Afficher les cr\u00E9dits @@ -116,6 +116,7 @@ simexplorer.common.type=type simexplorer.common.version=version simexplorer.config.i18n.menu=Langue +simexplorer.config.main.autoConnect.description=Se connecter automatiquement au démarrage simexplorer.config.main.backupDirectory.description=le r\u00E9pertoire des sauvegardes simexplorer.config.main.baseDirectory.description=le r\u00E9pertoire de la base locale simexplorer.config.main.configFileName.description=Le chemin du fichier de configuration @@ -125,6 +126,7 @@ simexplorer.config.main.language.description=La langue de la locale utilisateur simexplorer.config.main.lastName.description=Le nom de l'utilisateur simexplorer.config.main.login.description=Le login de l'utilisateur +simexplorer.config.main.password.description=Le mot de passe utilisateur (non visible) simexplorer.config.main.serverURL.description=l'url du serveur distant simexplorer.config.main.showLocalTab.description=Voir au d\u00E9marrage l'onglet Local simexplorer.config.main.showRemoteTab.description=Voir au d\u00E9mrrage l'onglet Distant

1 0

r531 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 22:55:44 +0000 (Thu, 24 Jan 2008) New Revision: 531 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java Log: les actions avancent Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-01-24 22:55:00 UTC (rev 530) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-01-24 22:55:44 UTC (rev 531) @@ -20,6 +20,7 @@ import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.service.StorageService; +import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; import java.awt.event.ActionEvent; @@ -61,6 +62,7 @@ if (login == null || password == null) { //TODO show login ui password = "password"; + getContext().getConfig().setPassword(password); } return true; } @@ -71,7 +73,8 @@ StorageService service = getContext().getRemoteStorageService(); try { - service.loginUser(login, password); + String token = service.loginUser(login, password); + getContext().setToken(token); } catch (SimExplorerServiceException e1) { //TODO alert user of error log.warn("could not connect user for reason " + e1.getMessage()); @@ -81,7 +84,7 @@ @Override protected void afterAction(ActionEvent e) throws Exception { - super.afterAction(e); + SimExplorer.getUI().refreshConnnectState(true); } @Override Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-01-24 22:55:00 UTC (rev 530) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-01-24 22:55:44 UTC (rev 531) @@ -19,11 +19,8 @@ package fr.cemagref.simexplorer.is.ui.swing.action.auth; import fr.cemagref.simexplorer.is.ui.SimExplorer; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; -import javax.swing.JTabbedPane; import java.awt.event.ActionEvent; /** @@ -59,28 +56,10 @@ super.doAction(e); getContext().setToken(null); //TODO disconnect from server ? - - JTabbedPane container = SimExplorer.getUI().getContent(); - - if (SimExplorerTab.remote.isTabVisible(container)) { - // close tab - SimExplorerTab.remote.closeTab(container); - } - if (SimExplorerTab.synchronize.isTabVisible(container)) { - // close tab - SimExplorerTab.synchronize.closeTab(container); - } - if (SimExplorerTab.detail.isTabVisible(container)) { - DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel(); - if (model.isRemote()) { - // close tab - SimExplorerTab.detail.closeTab(container); - } - } } @Override protected void afterAction(ActionEvent e) throws Exception { - super.afterAction(e); + SimExplorer.getUI().refreshConnnectState(false); } } \ No newline at end of file

1 0

r530 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 22:55:00 +0000 (Thu, 24 Jan 2008) New Revision: 530 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java Log: icone pour action groups Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java 2008-01-24 22:54:46 UTC (rev 529) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java 2008-01-24 22:55:00 UTC (rev 530) @@ -32,7 +32,7 @@ shortDescription = "simexplorer.action.groups.tooltip", longDescription = "simexplorer.action.groups.help", //smallIcon = "action/groups.png", - smallIcon = "action/users.png", + smallIcon = "action/groups.png", mnemonic = 'G', hideActionText = false )

1 0

r529 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 22:54:46 +0000 (Thu, 24 Jan 2008) New Revision: 529 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java Log: pour un reset de recherche, on doit toujours vider la zone de saisie m?\195?\170me si aucune recherche n'est actuellement lanc?\195?\169e Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java 2008-01-24 22:54:04 UTC (rev 528) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java 2008-01-24 22:54:46 UTC (rev 529) @@ -54,6 +54,8 @@ protected boolean beforeAction(ActionEvent e) throws Exception { ListTabModel model = (ListTabModel) getModel(); String query = model.getQuery(); + // always clean the input text (should be done in jaxx) + ((JApplicationListTab)getUI()).getSearchText().setText(model.getQuery()); // only reset search if something was previously search return query != null && !query.isEmpty(); }

1 0

r528 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 22:54:04 +0000 (Thu, 24 Jan 2008) New Revision: 528 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java Log: suppression param Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-24 22:53:47 UTC (rev 527) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-24 22:54:04 UTC (rev 528) @@ -152,7 +152,7 @@ tree.setSelectionRow(0); // refresh ui - getMainUI().refreshDetailTabUI(model, ui); + getMainUI().refreshDetailTabUI(ui); } @Override

1 0

r527 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 22:53:47 +0000 (Thu, 24 Jan 2008) New Revision: 527 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java Log: m?\195?\169thode pour rafraichir l'ui selon l'?\195?\169tat de connexion Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-24 22:53:19 UTC (rev 526) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-24 22:53:47 UTC (rev 527) @@ -30,6 +30,7 @@ import javax.swing.AbstractButton; import javax.swing.JComboBox; +import javax.swing.JTabbedPane; import javax.swing.JTree; import javax.swing.SwingUtilities; import java.util.regex.Matcher; @@ -67,7 +68,7 @@ } } - public void refreshDetailTabUI(final DetailTabModel model, final JApplicationDetailTab ui) { + public void refreshDetailTabUI(final JApplicationDetailTab ui) { SwingUtilities.invokeLater(new Runnable() { public void run() { @@ -89,7 +90,7 @@ // refresh search text ui.getSearchText().setText(model.getQuery()); - + // refresh changePage combobox refreshChangePageCombo(ui, model); @@ -108,6 +109,40 @@ }); } + public void refreshConnnectState(final boolean isConnected) { + + //SwingUtilities.invokeLater(new Runnable() { + // public void run() { + getConnect().setEnabled(!isConnected); + getUnconnect().setEnabled(isConnected); + getShowTab_remote().setEnabled(isConnected); + getShowTab_synchronize().setEnabled(isConnected); + getToggleTab_remote().setEnabled(isConnected); + getToggleTab_synchronize().setEnabled(isConnected); + if (!isConnected) { + // close all connected ui + JTabbedPane container = getContent(); + + if (SimExplorerTab.remote.isTabVisible(container)) { + // close tab + SimExplorerTab.remote.closeTab(container); + } + if (SimExplorerTab.synchronize.isTabVisible(container)) { + // close tab + SimExplorerTab.synchronize.closeTab(container); + } + if (SimExplorerTab.detail.isTabVisible(container)) { + DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel(); + if (model.isRemote()) { + // close tab + SimExplorerTab.detail.closeTab(container); + } + } + } + // } + //}); + } + protected void refreshPagination(JApplicationListTab ui, PaginationModel pagination) { int page = pagination.getCurrentPage(); boolean notLast = page + 1 < pagination.getNbPages();

1 0

r526 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 22:53:19 +0000 (Thu, 24 Jan 2008) New Revision: 526 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java Log: implantation autoConnect au d?\195?\169marrage de l'appli Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-01-24 22:51:53 UTC (rev 525) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-01-24 22:53:19 UTC (rev 526) @@ -26,6 +26,7 @@ import org.codelutin.option.ui.ConfigTableModel; import java.io.IOException; +import java.awt.event.ActionEvent; /** * L'application principale @@ -101,15 +102,31 @@ // show local tab mainUI.getToggleTab_local().doClick(); } - if (conf.isShowRemoteTab()) { - // show remote tab - mainUI.getToggleTab_remote().doClick(); + if (conf.isAutoConnect()) { + try { + // try to connect + mainUI.getConnect().getAction().actionPerformed(new ActionEvent(mainUI,0,"connect")); + } catch (Exception e) { + // ignore ? + System.err.println(e.getMessage()); + } } - if (conf.isShowSynchTab()) { - // show synchronize tab - mainUI.getToggleTab_synchronize().doClick(); + + boolean isConnected = context.isConnected(); + + // refresh ui accessibles actions + mainUI.refreshConnnectState(isConnected); + + if (isConnected) { + if (conf.isShowRemoteTab()) { + // show remote tab + mainUI.getToggleTab_remote().doClick(); + } + if (conf.isShowSynchTab()) { + // show synchronize tab + mainUI.getToggleTab_synchronize().doClick(); + } } - mainUI.setVisible(true); }

1 0

r525 - in trunk/simexplorer-is-swing/src/resources: . icons/action
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 22:51:53 +0000 (Thu, 24 Jan 2008) New Revision: 525 Added: trunk/simexplorer-is-swing/src/resources/icons/action/groups.png Modified: trunk/simexplorer-is-swing/src/resources/commandline.properties trunk/simexplorer-is-swing/src/resources/icons/action/users.png Log: icons pour admin (m?\195?\170me si cela ne servira pas tout de suite) + ajout propri?\195?\169t?\195?\169 dans config : autoConnect pour lancer une connexion au demarrage de l'appli avant affichage des tabs remote Modified: trunk/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/commandline.properties 2008-01-24 22:15:48 UTC (rev 524) +++ trunk/simexplorer-is-swing/src/resources/commandline.properties 2008-01-24 22:51:53 UTC (rev 525) @@ -67,3 +67,6 @@ main.config.definition.showSynchTab=java.lang.Boolean:False main.config.modifiers.showSynchTab= + +main.config.definition.autoConnect=java.lang.Boolean:False +main.config.modifiers.autoConnect= Added: trunk/simexplorer-is-swing/src/resources/icons/action/groups.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/groups.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/simexplorer-is-swing/src/resources/icons/action/users.png =================================================================== (Binary files differ)

1 0