Author: tchemit Date: 2008-02-19 13:53:43 +0000 (Tue, 19 Feb 2008) New Revision: 1114 Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/reset-password.png trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/reset-search.png trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/ trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties Removed: trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 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 trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/reset-search.png trunk/simexplorer-is/simexplorer-is-swing/src/resources/log4j.properties Log: utilisation de la factory simple d'actions de jaxx ajustement actions Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-19 13:53:43 UTC (rev 1114) @@ -22,15 +22,12 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.swing.actions.ConnectAction; -import fr.cemagref.simexplorer.is.ui.swing.actions.ImportAction; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.util.ErrorDialog; import org.codelutin.i18n.I18n; import org.codelutin.option.ui.ConfigTableModel; import org.codelutin.option.ui.ConfigUI; -import javax.swing.AbstractButton; import java.awt.event.ActionEvent; import java.io.IOException; import java.io.PrintWriter; @@ -88,10 +85,8 @@ for (SimExplorerTab tab : SimExplorerTab.values()) { tab.removePropertyChangeListeners(); } - ConnectAction connectAction = (ConnectAction) SimExplorerActionManager.newAction("connect", (AbstractButton) null); - connectAction.disposeUI(); - ImportAction importAction = (ImportAction) SimExplorerActionManager.newAction("importElement", (AbstractButton) null); - importAction.disposeUI(); + // on nettoye les ui cachees dans les actions + SimExplorerActionManager.disposeUI(); } /** Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-19 13:53:43 UTC (rev 1114) @@ -39,6 +39,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; +import fr.cemagref.simexplorer.is.exceptions.UnreachableServiceException; import fr.cemagref.simexplorer.is.service.MockStorageServiceImpl; import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.service.StorageServiceClient; @@ -89,9 +90,12 @@ } } - public static String loginUser(SimExplorerContext context, boolean remote,String login,String hashPassword) { + public static String loginUser(SimExplorerContext context, boolean remote,String login,String hashPassword) throws UnreachableServiceException { StorageService service = getService(context, remote); try { + if (service==null) { + throw new UnreachableServiceException("could not find service "+(remote?"remote":"local")); + } String token; token = service.loginUser(login, hashPassword); return token; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-02-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-02-19 13:53:43 UTC (rev 1114) @@ -18,21 +18,17 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing; -import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; import jaxx.runtime.JAXXObject; import jaxx.runtime.builder.ActionFactory; +import jaxx.runtime.builder.SimpleActionFactoryImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.codelutin.i18n.I18n._; import javax.swing.AbstractAction; import javax.swing.AbstractButton; import javax.swing.JComboBox; -import java.io.IOException; -import java.util.Map; -import java.util.Properties; -import java.util.TreeMap; +import java.awt.event.ActionEvent; /** * La classe responsable de l'enregistrement des actions disponibles @@ -48,11 +44,6 @@ private static final Log log = LogFactory.getLog(SimExplorerActionManager.class); - /** path in classpath where to find actions mapping */ - protected static final String ACTIONS_FILE_PATH = "/actions.properties"; - - protected static final String ACTION_KEY_PREFIX = "action."; - /** l'usine d'actions */ private static ActionFactory factory; @@ -94,45 +85,58 @@ */ protected static ActionFactory getFactory() { if (factory == null) { - factory = new ActionFactory() { - @SuppressWarnings({"unchecked"}) - protected Map<String, Class<? extends AbstractAction>> init() { - Properties properties = new Properties(); - try { - properties.load(Class.class.getResourceAsStream(ACTIONS_FILE_PATH)); - } catch (IOException e) { - throw new SimExplorerRuntimeException(_("simexplorer.error.load.actions.file", e.getMessage())); - } - Map<String, Class<? extends AbstractAction>> cache = new TreeMap<String, Class<? extends AbstractAction>>(); - int prefix = ACTION_KEY_PREFIX.length(); - for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) { - String key = objectObjectEntry.getKey() + ""; - String qfn = objectObjectEntry.getValue() + ""; - try { - Class<? extends AbstractAction> implCass; - implCass = (Class<? extends SimExplorerAbstractAction>) Class.forName(qfn); - log.debug("found action " + implCass); - cache.put(key.substring(prefix), implCass); - } catch (ClassNotFoundException e) { - throw new SimExplorerRuntimeException(_("simexplorer.error.load.actions.class", key, qfn)); - } - } - return cache; - } - }; + // used a simple factory implementation + factory = new SimpleActionFactoryImpl(); } return factory; } - public static AbstractAction newAction(String actionKey, AbstractButton component) { - return getFactory().newAction(actionKey, component); + public static void fireAction(String actionKey, Object source) { + fireAction(actionKey,source, (AbstractButton) null); } - public static AbstractAction newAction(String actionKey, JComboBox component) { - return getFactory().newAction(actionKey, component); + public static AbstractAction newAction(String actionKey) { + return newAction(actionKey, (AbstractButton) null); } public static void resetCache() { getFactory().resetCache(); } + + public static void disposeUI() { + for (String actionKey : getFactory().getActionNames()) { + SimExplorerAbstractAction action = (SimExplorerAbstractAction) newAction(actionKey); + if (action!=null) { + action.disposeUI(); + } + } + } + + + public static void fireAction(String actionKey, Object source, AbstractButton component) { + AbstractAction action = newAction(actionKey, component); + fireAction0(actionKey, source, action); + } + + public static void fireAction(String actionKey, Object source, JComboBox component) { + AbstractAction action = newAction(actionKey, component); + fireAction0(actionKey, source, action); + } + + protected static AbstractAction newAction(String actionKey, AbstractButton component) { + return getFactory().newAction(actionKey, component); + } + + protected static AbstractAction newAction(String actionKey, JComboBox component) { + return getFactory().newAction(actionKey, component); + } + + protected static void fireAction0(String actionKey, Object source, AbstractAction action) { + if (action == null) { + log.warn("could not find action " + actionKey); + return; + } + ActionEvent event = new ActionEvent(source, ActionEvent.ACTION_FIRST, actionKey); + action.actionPerformed(event); + } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-19 13:53:43 UTC (rev 1114) @@ -23,14 +23,10 @@ import org.codelutin.i18n.CountryEnum; import org.codelutin.i18n.LanguageEnum; -import javax.swing.AbstractAction; import javax.swing.AbstractButton; import javax.swing.JComponent; -import javax.swing.JTabbedPane; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; -import java.awt.Component; -import java.awt.event.ActionEvent; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import java.util.regex.Matcher; @@ -49,25 +45,11 @@ SimExplorerActionManager.loadActions(this, null); // add Ctrl-W to close current tab - getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_MASK), "closeSelectedTab"); - getRootPane().getActionMap().put("closeSelectedTab", new AbstractAction() { - private static final long serialVersionUID = -3166738263954350322L; - - public void actionPerformed(ActionEvent e) { - JTabbedPane container = getContent(); - Component header = container.getSelectedComponent(); - - for (SimExplorerTab tab : SimExplorerTab.values()) { - if (tab.isTabVisible(container) && header.equals(tab.getUI())) { - // this is the actually selected tab - tab.closeTab(container); - } - } - } - }); + getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_MASK), "closeTab"); + getRootPane().getActionMap().put("closeTab", SimExplorerActionManager.newAction("closeTab")); // override Ctrl-F4 close application getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_F4, InputEvent.CTRL_MASK), "quit"); - getRootPane().getActionMap().put("quit", SimExplorerActionManager.newAction("quit", (AbstractButton) null)); + getRootPane().getActionMap().put("quit", SimExplorerActionManager.newAction("quit")); // repaint i18n actions refreshI18nActions(); Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties 2008-02-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties 2008-02-19 13:53:43 UTC (rev 1114) @@ -1,77 +0,0 @@ -# authentication actions -action.connect=fr.cemagref.simexplorer.is.ui.swing.actions.ConnectAction -action.unconnect=fr.cemagref.simexplorer.is.ui.swing.actions.UnconnectAction - -# config action -action.config=fr.cemagref.simexplorer.is.ui.swing.actions.ConfigAction - -# quit action -action.quit=fr.cemagref.simexplorer.is.ui.swing.actions.QuitAction - -# i18n actions -action.i18n_fr_FR=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeI18nFRAction -action.i18n_en_GB=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeI18nGBAction - -# close tab actions -action.closeTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction -action.closeTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction -action.closeTab_detail=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction -action.closeTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction - -# show tab actions -action.showTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.ShowLocalTabAction -action.showTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.ShowRemoteTabAction -action.showTab_detail=fr.cemagref.simexplorer.is.ui.swing.actions.ShowDetailTabAction -action.showTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.actions.ShowSynchronizeTabAction - -# toggle tab actions -action.toggleTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.ToggleLocalTabAction -action.toggleTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.ToggleRemoteTabAction - -# search actions -action.search=fr.cemagref.simexplorer.is.ui.swing.actions.SearchAction -action.resetSearch=fr.cemagref.simexplorer.is.ui.swing.actions.ResetSearchAction -action.advancedSearch=fr.cemagref.simexplorer.is.ui.swing.actions.AdvancedSearchAction - -# list navigation actions -action.goFirstPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoFirstPageAction -action.goPreviousPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoPreviousPageAction -action.goPage=fr.cemagref.simexplorer.is.ui.swing.actions.ChangePageAction -action.goNextPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoNextPageAction -action.goLastPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoLastPageAction -action.changeSizor=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeSizorAction - -# collapse tree node actions -action.collapseAllDetail=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction -action.collapseAllLocal=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction -action.collapseAllRemote=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction - -# expand tree node actions -action.expandAllDetail=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction -action.expandAllLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction -action.expandAllRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction - -# download actions -action.downloadElement=fr.cemagref.simexplorer.is.ui.swing.actions.DownloadElementAction -action.downloadAttachment=fr.cemagref.simexplorer.is.ui.swing.actions.DownloadAttachmentAction - -# delete action -action.deleteElement=fr.cemagref.simexplorer.is.ui.swing.actions.DeleteElementAction - -# detail to tree action -action.detailToTree=fr.cemagref.simexplorer.is.ui.swing.actions.DetailToTreeAction - -# navigation history actions -action.historyNext=fr.cemagref.simexplorer.is.ui.swing.actions.HistoryNextAction -action.historyPrevious=fr.cemagref.simexplorer.is.ui.swing.actions.HistoryPreviousAction - -# import- export actions -action.exportElement=fr.cemagref.simexplorer.is.ui.swing.actions.ExportAction -action.exportElementToLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExportToLocalAction -action.exportElementToRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExportToRemoteAction -action.importElement=fr.cemagref.simexplorer.is.ui.swing.actions.ImportAction - -# help actions -action.site=fr.cemagref.simexplorer.is.ui.swing.actions.SiteAction -action.help=fr.cemagref.simexplorer.is.ui.swing.actions.HelpAction -action.about=fr.cemagref.simexplorer.is.ui.swing.actions.AboutAction \ No newline at end of file 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-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-19 13:53:43 UTC (rev 1114) @@ -90,6 +90,9 @@ simexplorer.action.quit=Quit simexplorer.action.quit.help= simexplorer.action.quit.tooltip=Quit SimExplorer SI +simexplorer.action.resetPassword=Reset password +simexplorer.action.resetPassword.help= +simexplorer.action.resetPassword.tooltip=Reset you remote connexion password (a new password will be asked at next connexion) simexplorer.action.resetSearch=reset simexplorer.action.resetSearch.help= simexplorer.action.resetSearch.tooltip=reset search @@ -160,8 +163,6 @@ 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} -simexplorer.error.load.actions.file=could not load actions.properties file for reason {0} simexplorer.error.unfound.config.property= simexplorer.help.menu=Help simexplorer.login.failed=Authentication failed @@ -182,6 +183,7 @@ simexplorer.option.description.resetConfig=Reset user configuration. simexplorer.option.description.showConfig=See configuration details simexplorer.option.description.ui=launch or not user interface (value) +simexplorer.service.failed= simexplorer.tab.detail=Detail simexplorer.tab.detail.tooltip=Screen of details of an element simexplorer.tab.local=Local elements 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-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-19 13:53:43 UTC (rev 1114) @@ -90,6 +90,9 @@ simexplorer.action.quit=Quitter simexplorer.action.quit.help= simexplorer.action.quit.tooltip=Pour quitter l'application +simexplorer.action.resetPassword=R\u00E9initialiser mot de passe +simexplorer.action.resetPassword.help= +simexplorer.action.resetPassword.tooltip=R\u00E9initialiser votre mot de passe (un novueau vous sera demand\u00E9 \u00E0 la prochainne connexion) simexplorer.action.resetSearch=r\u00E9initialiser simexplorer.action.resetSearch.help= simexplorer.action.resetSearch.tooltip=R\u00E9initialiser la recherche @@ -160,8 +163,6 @@ 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} -simexplorer.error.load.actions.file=could not load actions.properties file for reason {0} simexplorer.error.unfound.config.property= simexplorer.help.menu=Aide simexplorer.login.failed=L'authentification a \u00E9chou\u00E9e @@ -182,6 +183,7 @@ simexplorer.option.description.resetConfig=R\u00E9initialisation de la configuration. simexplorer.option.description.showConfig=Voir les d\u00E9tails d'une configuration simexplorer.option.description.ui=launch or not user interface (value) +simexplorer.service.failed= simexplorer.tab.detail=D\u00E9tail simexplorer.tab.detail.tooltip=L'\u00E9cran affichant les d\u00E9tails d'un \u00E9l\u00E9ment simexplorer.tab.local=Liste locale Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/reset-password.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/reset-password.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/reset-search.png =================================================================== (Binary files differ) Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/reset-search.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/reset-search.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties (from rev 1113, trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties 2008-02-19 13:53:43 UTC (rev 1114) @@ -0,0 +1,79 @@ +# authentication actions +action.connect=fr.cemagref.simexplorer.is.ui.swing.actions.ConnectAction +action.unconnect=fr.cemagref.simexplorer.is.ui.swing.actions.UnconnectAction +action.resetPassword=fr.cemagref.simexplorer.is.ui.swing.actions.ResetPasswordAction + +# config action +action.config=fr.cemagref.simexplorer.is.ui.swing.actions.ConfigAction + +# quit action +action.quit=fr.cemagref.simexplorer.is.ui.swing.actions.QuitAction + +# i18n actions +action.i18n_fr_FR=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeI18nFRAction +action.i18n_en_GB=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeI18nGBAction + +# close tab actions +action.closeTab=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction +action.closeTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction +action.closeTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction +action.closeTab_detail=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction +action.closeTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction + +# show tab actions +action.showTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.ShowLocalTabAction +action.showTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.ShowRemoteTabAction +action.showTab_detail=fr.cemagref.simexplorer.is.ui.swing.actions.ShowDetailTabAction +action.showTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.actions.ShowSynchronizeTabAction + +# toggle tab actions +action.toggleTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.ToggleLocalTabAction +action.toggleTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.ToggleRemoteTabAction + +# search actions +action.search=fr.cemagref.simexplorer.is.ui.swing.actions.SearchAction +action.resetSearch=fr.cemagref.simexplorer.is.ui.swing.actions.ResetSearchAction +action.advancedSearch=fr.cemagref.simexplorer.is.ui.swing.actions.AdvancedSearchAction + +# list navigation actions +action.goFirstPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoFirstPageAction +action.goPreviousPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoPreviousPageAction +action.goPage=fr.cemagref.simexplorer.is.ui.swing.actions.ChangePageAction +action.goNextPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoNextPageAction +action.goLastPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoLastPageAction +action.changeSizor=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeSizorAction + +# collapse tree node actions +action.collapseAllDetail=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction +action.collapseAllLocal=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction +action.collapseAllRemote=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction + +# expand tree node actions +action.expandAllDetail=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction +action.expandAllLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction +action.expandAllRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction + +# download actions +action.downloadElement=fr.cemagref.simexplorer.is.ui.swing.actions.DownloadElementAction +action.downloadAttachment=fr.cemagref.simexplorer.is.ui.swing.actions.DownloadAttachmentAction + +# delete action +action.deleteElement=fr.cemagref.simexplorer.is.ui.swing.actions.DeleteElementAction + +# detail to tree action +action.detailToTree=fr.cemagref.simexplorer.is.ui.swing.actions.DetailToTreeAction + +# navigation history actions +action.historyNext=fr.cemagref.simexplorer.is.ui.swing.actions.HistoryNextAction +action.historyPrevious=fr.cemagref.simexplorer.is.ui.swing.actions.HistoryPreviousAction + +# import- export actions +action.exportElement=fr.cemagref.simexplorer.is.ui.swing.actions.ExportAction +action.exportElementToLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExportToLocalAction +action.exportElementToRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExportToRemoteAction +action.importElement=fr.cemagref.simexplorer.is.ui.swing.actions.ImportAction + +# help actions +action.site=fr.cemagref.simexplorer.is.ui.swing.actions.SiteAction +action.help=fr.cemagref.simexplorer.is.ui.swing.actions.HelpAction +action.about=fr.cemagref.simexplorer.is.ui.swing.actions.AboutAction \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/log4j.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/log4j.properties 2008-02-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/log4j.properties 2008-02-19 13:53:43 UTC (rev 1114) @@ -8,5 +8,6 @@ # package level log4j.logger.fr.cemagref.simexplorer.is=INFO log4j.logger.org.codelutin=INFO +log4j.logger.jaxx=INFO