[Simexplorer-si-commits] r1514 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: . actions actions/history actions/util ui

Author: tchemit Date: 2008-07-25 16:04:49 +0000 (Fri, 25 Jul 2008) New Revision: 1514 Removed: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 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/DeleteElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java 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/ExportElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GenerateDataAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.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 trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAbstractAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAddAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryDeleteAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryNextAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryPreviousAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryUnconnectAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java 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/ToggleTabAbstractAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java Log: * suppression SimExplorerActionManager. * l'usine d'action est dans le context maintenant Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -119,7 +119,7 @@ public static void dispose(boolean reload) { SimExplorerTab.dispose(); - SimExplorerActionManager.dispose(); + getContext().getActionFactory().dispose(); ErrorDialog.disposeUI(); SimExplorerMainUI.getUI().disposeUI(); @@ -138,7 +138,7 @@ // show edit config if first launch if (context.isFirstLaunch()) { - SimExplorerActionManager.fireAction("config", context); + getContext().getActionFactory().fireAction("config", context); } // launch ui only if required Deleted: 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-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -1,110 +0,0 @@ -/* - * Copyright (C) 2008 Cemagref - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -package fr.cemagref.simexplorer.is.ui.swing; - -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; -import jaxx.runtime.JAXXObject; -import org.codelutin.i18n.I18nable; -import org.codelutin.jaxx.action.factory.ActionFactory; -import org.codelutin.jaxx.action.factory.ActionFactoryFromProvider; - -import javax.swing.AbstractAction; -import javax.swing.AbstractButton; -import javax.swing.JComboBox; - -/** - * La classe responsable de l'enregistrement des actions disponibles - * dans l'application en délégeant à une ActionFactory. - * <p/> - * On peut de plus via la méthode {@link #loadActions(jaxx.runtime.JAXXObject)} de charger - * dans l'ui les actions connues. - * - * @author Code Lutin, Landais Gabriel, Chemit Tony - * @see fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction - */ - at I18nable -public class SimExplorerActionManager { - - /** l'usine d'actions */ - private static ActionFactory<SimExplorerAbstractAction> factory; - - /** @param ui l'ui à charger */ - public static void loadActions(JAXXObject ui) { - getFactory().loadActions(ui); - } - - /** - * Retourne (et instancie la première fois l'usine d'actions) - * - * @return l'usine d'actions - * @see ActionFactory - */ - public static ActionFactory<SimExplorerAbstractAction> getFactory() { - if (factory == null) { - // used a simple factory implementation - factory = ActionFactoryFromProvider.newInstance(SimExplorerAbstractAction.class); - } - return factory; - } - - public static void fireAction(String actionKey, Object source) { - getFactory().fireAction(actionKey, source); - } - - public static void fireSelectedAction(String actionKey, Object source, DataEntityModel selected) { - SelectedAction selectedAction = (SelectedAction) newAction(actionKey); - selectedAction.setSelected(selected); - getFactory().fireAction0(actionKey, source, (SimExplorerAbstractAction) selectedAction); - } - - public static AbstractAction newAction(String actionKey) { - return newAction(actionKey, (AbstractButton) null); - } - - public static void dispose() { - getFactory().dispose(); - //getFactory().resetCache(); - /*for (String actionKey : getFactory().getActionNames()) { - SimExplorerAbstractAction action = (SimExplorerAbstractAction) getFactory().getActionFromCache(actionKey); - //SimExplorerAbstractAction action = (SimExplorerAbstractAction) newAction(actionKey); - if (action != null) { - action.disposeUI(); - } - } - getFactory().resetCache();*/ - } - - - public static void fireAction(String actionKey, Object source, AbstractButton component) { - getFactory().fireAction(actionKey, source, component); - } - - public static void fireAction(String actionKey, Object source, JComboBox component) { - getFactory().fireAction(actionKey, source, component); - } - - 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); - } - -} Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -16,9 +16,6 @@ */ package fr.cemagref.simexplorer.is.ui.swing; -import org.codelutin.i18n.I18n; -import org.codelutin.option.ParserFailedException; - import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; @@ -31,7 +28,13 @@ import fr.cemagref.simexplorer.is.service.remote.RemoteService; import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; import fr.cemagref.simexplorer.is.storage.SortColumn; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction; import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerAbstractContext; +import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; +import org.codelutin.i18n.I18n; +import org.codelutin.jaxx.action.factory.ActionFactory; +import org.codelutin.option.ParserFailedException; /** * Le context de l'application, implanté en singleton. @@ -59,7 +62,24 @@ /** le cache de LE distant */ protected LoggableElementCache remoteCache; + /** l'usine d'actions */ + protected ActionFactory<SimExplorerAbstractAction> actionFactory; + /** + * Retourne (et instancie la première fois l'usine d'actions) + * + * @return l'usine d'actions + * @see ActionFactory + */ + public ActionFactory<SimExplorerAbstractAction> getActionFactory() { + if (actionFactory == null) { + // used a simple factory implementation + actionFactory = org.codelutin.jaxx.action.factory.ActionFactoryFromProvider.newInstance(SimExplorerAbstractAction.class); + } + return actionFactory; + } + + /** * @return <code>true</code> si l'utilisateur est connecté, * <code>false</code> sinon. */ @@ -81,7 +101,7 @@ } public void initI18n() { - I18n.init(getMainConfig().getLocale(),getMainConfig().getEncoding()); + I18n.init(getMainConfig().getLocale(), getMainConfig().getEncoding()); } @@ -164,6 +184,7 @@ } return service; } + public LoggableElementCache getLoggableElementCache(boolean remote) { getStorageService(remote); LoggableElementCache cache; @@ -171,6 +192,12 @@ return cache; } + public void fireSelectedAction(String actionKey, Object source, DataEntityModel selected) { + SelectedAction selectedAction = (SelectedAction) getActionFactory().newAction(actionKey); + selectedAction.setSelected(selected); + getActionFactory().fireAction0(actionKey, source, (SimExplorerAbstractAction) selectedAction); + } + /** * restricted access constructor * @@ -190,7 +217,6 @@ initServices(); } - /** @return le service de storage locale */ protected StorageService getLocalStorageService() { if (localService == null) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -16,7 +16,6 @@ */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; @@ -60,17 +59,16 @@ JComboBox jComboBox = getChangePageComboBox(myTab.getUI()); if (jComboBox == null || !jComboBox.isEnabled()) { return false; - } + } Integer oldPage = ((ListTabModel) myTab.getModel(getContext())).getPagination().getCurrentPage(); Object o = jComboBox.getSelectedItem(); - log.info("selected number page "+o.getClass()+" : "+o); - newPage = o != null?null:Integer.valueOf(o + ""); + newPage = o == null ? null : Integer.valueOf(o + ""); return newPage != null && !oldPage.equals(newPage); } @Override - protected void doAction(ActionEvent e) throws Exception { + protected void doAction(ActionEvent e) throws Exception { ListTabModel model = (ListTabModel) getModel(); model.setPageNumber(newPage); } @@ -88,7 +86,7 @@ return (JComboBox) uiObject; } // find with hard name - AbstractAction action = SimExplorerActionManager.newAction("goPage"); + AbstractAction action = getContext().getActionFactory().newAction("goPage"); uiObject = getUIObject((String) action.getValue(Action.ACTION_COMMAND_KEY)); if (uiObject instanceof JComboBox) { return (JComboBox) uiObject; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -33,7 +33,7 @@ smallIcon = "closeTab.png", hideActionText = true, enabled = true, - multiNames = {"closeTab","closeTab_local","closeTab_remote","closeTab_detail","closeTab_synchronize"} + multiNames = {"closeTab", "closeTab_local", "closeTab_remote", "closeTab_detail", "closeTab_synchronize"} ) public class CloseTabAction extends SimExplorerAbstractTabAction { @@ -51,7 +51,7 @@ protected void setStatus(String status) { // no log } - + @Override protected boolean beforeAction(ActionEvent e) throws Exception { return super.beforeAction(e) && getTabContainer().getTabCount() > 0 && getTab().isTabVisible(getTabContainer()); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -36,7 +36,7 @@ smallIcon = "action/collapseAll.png", mnemonic = 'c', hideActionText = true, - multiNames = {"collapseAllDetail","collapseAllLocal","collapseAllRemote"} + multiNames = {"collapseAllDetail", "collapseAllLocal", "collapseAllRemote"} ) public class CollapseAllAction extends SimExplorerAbstractTabAction { @@ -64,7 +64,7 @@ return false; } - tree = getTreeForAction(getUI(),"collapseAll", getActionName()); + tree = getTreeForAction(getUI(), "collapseAll", getActionName()); node = EntityTreeNodeHelper.getSelectedNodeOrRootNode(tree); return !(node == null || node.isLeaf()); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -51,15 +51,15 @@ @Override public void disposeUI() { super.disposeUI(); - if (ui!=null) { + if (ui != null) { ui.dispose(); - ui=null; + ui = null; } } public ConfigUI getUi() { if (ui == null) { - ui = new ConfigUI().init(getContext(),getContext().getMainConfig(),getContext().getLocalConfig(),getContext().getRemoteConfig()); + ui = new ConfigUI().init(getContext(), getContext().getMainConfig(), getContext().getLocalConfig(), getContext().getRemoteConfig()); } return ui; } 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-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -20,9 +20,9 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.exceptions.UnreachableServiceException; import fr.cemagref.simexplorer.is.service.AuthenticationServiceHelper; -import fr.cemagref.simexplorer.is.ui.swing.ui.LoginUI; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel; +import fr.cemagref.simexplorer.is.ui.swing.ui.LoginUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; import static org.codelutin.i18n.I18n._; @@ -111,7 +111,7 @@ if (SimExplorerTab.local.isTabVisible(container)) { ListTabModel localListModel = (ListTabModel) SimExplorerTab.local.getModel(getContext()); if (!localListModel.isEmpty()) { - getListUpdater( false).refreshListTablePopupMenu(localListModel); + getListUpdater(false).refreshListTablePopupMenu(localListModel); } } // } @@ -146,7 +146,7 @@ int result = JOptionPane.showConfirmDialog(ui, _("simexplorer.login.retry"), _("simexplorer.error.service.failed"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE); return result == JOptionPane.NO_OPTION; } - + private class MyLoginUIHandler extends LoginUI.LoginUIHandler { /** * Tente de se connecter au service. @@ -161,9 +161,9 @@ * @return <code>true</code> si l'utilisateur est connecté */ protected boolean connect(String login, String password) { - - getContext().loginUser( true, login, password); + getContext().loginUser(true, login, password); + boolean isConnected = getContext().isConnected(); if (isConnected) { // keep password Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -17,7 +17,6 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel; @@ -107,7 +106,7 @@ } // suppression de l'élément de l'historique (si present) - SimExplorerActionManager.fireSelectedAction("historyDelete", e.getSource(), selected); + getContext().fireSelectedAction("historyDelete", e.getSource(), selected); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -17,7 +17,6 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; @@ -50,11 +49,11 @@ super(name); } - @Override + @Override protected void setStatus(String status) { // no log } - + @Override protected boolean beforeAction(ActionEvent e) throws Exception { if (!super.beforeAction(e)) { @@ -64,7 +63,7 @@ // on doit retrouver l'élément à traiter à partir de la source selected = findSelectedItem(e); } - return selected != null && selected.getUuid() != null; + return selected != null && selected.getUuid() != null; } @Override @@ -75,7 +74,7 @@ //log.info("detailToTree selected : "+selected); //getModel().synch(selected.isRemote(), element1); // ajout de l'élément dans l'historique - SimExplorerActionManager.fireSelectedAction("historyAdd", e.getSource(),selected); + getContext().fireSelectedAction("historyAdd", e.getSource(), selected); } @Override 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-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -16,8 +16,8 @@ */ package fr.cemagref.simexplorer.is.ui.swing.actions; +import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.ui.swing.actions.util.DownloadAbstractAction; -import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import static org.codelutin.i18n.I18n._; import org.codelutin.util.FileUtil; @@ -67,7 +67,7 @@ protected BufferedInputStream getInputStream() throws SimExplorerException { InputStream bis; - bis= getContext().getStorageService(selected.isRemote()).retrieveElementFull(getContext().getToken(), selected.getUuid(), selected.getVersion().toString()); + bis = getContext().getStorageService(selected.isRemote()).retrieveElementFull(getContext().getToken(), selected.getUuid(), selected.getVersion().toString()); //bis = StorageServiceHelper.retrieveElementFull(getContext(), selected.isRemote(), selected.getUuid(), selected.getVersion().toString()); return new BufferedInputStream(bis); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -19,7 +19,6 @@ import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.service.StorageService; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel; @@ -160,7 +159,7 @@ } // suppression de l'élément de l'historique (si present) - SimExplorerActionManager.fireSelectedAction("historyDeleteExport", e.getSource(), selected); + getContext().fireSelectedAction("historyDeleteExport", e.getSource(), selected); } @Override Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GenerateDataAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GenerateDataAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GenerateDataAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -16,22 +16,22 @@ */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import java.awt.event.ActionEvent; - import fr.cemagref.simexplorer.is.service.random.StorageServiceGenerator; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; +import java.awt.event.ActionEvent; + /** * The Class GenerateDataAction. - * + * * @author Code Lutin, Landais Gabriel, Chemit Tony */ @org.codelutin.jaxx.action.ActionConfig( - actionCommand = "generateData", - name = "simexplorer.action.generateData", - shortDescription = "simexplorer.action.generateData.tooltip", - longDescription = "simexplorer.action.generateData.help", - hideActionText = false) + actionCommand = "generateData", + name = "simexplorer.action.generateData", + shortDescription = "simexplorer.action.generateData.tooltip", + longDescription = "simexplorer.action.generateData.help", + hideActionText = false) public class GenerateDataAction extends SimExplorerAbstractAction { /** The Constant serialVersionUID. */ @@ -39,7 +39,7 @@ /** * Instantiates a new generate data action. - * + * * @param name the name */ public GenerateDataAction(String name) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -16,15 +16,15 @@ */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.ui.swing.ui.ImportDialog; -import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; +import com.healthmarketscience.rmiio.SerializableInputStream; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel; -import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; +import fr.cemagref.simexplorer.is.ui.swing.ui.ImportDialog; +import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; import static org.codelutin.i18n.I18n._; import static org.codelutin.i18n.I18n.n_; @@ -34,8 +34,6 @@ import java.util.Map; import java.util.TreeMap; -import com.healthmarketscience.rmiio.SerializableInputStream; - /** * Action de base pour importer une application * @@ -67,7 +65,7 @@ } public void disposeUI() { - if (ui!=null) { + if (ui != null) { ui.dispose(); } ui = null; @@ -90,7 +88,7 @@ MetaData result = importElement(remote, f); DataEntityModel selected = new DataEntityModel(); - selected.synch(remote,result); + selected.synch(remote, result); // reload the list getListModel(remote).reload(); @@ -99,12 +97,12 @@ if (SimExplorerTab.synchronize.isTabVisible(getTabContainer())) { SynchronizeTabModel model = getSynchronizeModel(); - model.reloadSources(selected.getUuid(), false,false,!remote,remote); + model.reloadSources(selected.getUuid(), false, false, !remote, remote); } // suppression de l'élément de l'historique (si present) - SimExplorerActionManager.fireSelectedAction("historyDelete", e.getSource(), selected); + getContext().fireSelectedAction("historyDelete", e.getSource(), selected); } @Override Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -16,11 +16,9 @@ */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; + import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; -import javax.swing.AbstractButton; - /** * Action pour afficher la dialogue de modification de configuration * @@ -51,7 +49,7 @@ if (getContext().isConnected()) { // unconnect - SimExplorerActionManager.fireAction("unconnect", e.getSource(), (AbstractButton) null); + getContext().getActionFactory().fireAction("unconnect", e.getSource()); } } } \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -27,7 +27,7 @@ * @author Code Lutin, Landais Gabriel, Chemit Tony */ @org.codelutin.jaxx.action.ActionConfig( - actionCommand = "resetSearchApplication", + actionCommand = "resetSearch", name = "simexplorer.action.resetSearch", shortDescription = "simexplorer.action.resetSearch.tooltip", longDescription = "simexplorer.action.resetSearch.help", @@ -51,7 +51,7 @@ if (!model.hasQuery()) { // directly refresh search actions // but do not realize action - getListUpdater( model.isRemote()).resetSearch(); + getListUpdater(model.isRemote()).resetSearch(); return false; } // only reset search if something was previously search Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -28,7 +28,7 @@ * @author Code Lutin, Landais Gabriel, Chemit Tony */ @org.codelutin.jaxx.action.ActionConfig( - actionCommand = "searchApplication", + actionCommand = "search", name = "simexplorer.action.search", shortDescription = "simexplorer.action.search.tooltip", longDescription = "simexplorer.action.search.help", Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -19,12 +19,11 @@ import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction; import fr.cemagref.simexplorer.is.ui.swing.actions.util.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; -import fr.cemagref.simexplorer.is.ui.swing.model.DetailTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.EntityTreeNodeHelper; import fr.cemagref.simexplorer.is.ui.swing.ui.JDetailTab; @@ -55,7 +54,7 @@ smallIcon = "action/show-tab-detail.png", mnemonic = 'd', hideActionText = true, - multiNames = {"showTab_detail","showTabLocal_detail","showTabRemote_detail"} + multiNames = {"showTab_detail", "showTabLocal_detail", "showTabRemote_detail"} ) public class ShowDetailTabAction extends ShowTabAbstractAction<JDetailTab, DetailTabModel> implements SelectedAction { @@ -159,27 +158,37 @@ protected void updateUI(JDetailTab ui, DetailTabModel model) { // ajout de l'élément dans l'historique - SimExplorerActionManager.fireSelectedAction("historyAdd", e.getSource(), selected); + getContext().fireSelectedAction("historyAdd", e.getSource(), selected); } @Override public void disposeUI() { super.disposeUI(); + //Fixme : see why ui can be null... + JDetailTab ui = getTabUI(); if (navigationSelectionListener != null) { - getTabUI().getNavigationTree().removeTreeSelectionListener(navigationSelectionListener); + if (ui != null) { + ui.getNavigationTree().removeTreeSelectionListener(navigationSelectionListener); + } navigationSelectionListener = null; } if (treeActionUpdater != null) { - getTabUI().getNavigationTree().removeTreeSelectionListener(treeActionUpdater); + if (ui != null) { + ui.getNavigationTree().removeTreeSelectionListener(treeActionUpdater); + } treeActionUpdater = null; } if (versionSelectionListener != null) { - getTabUI().getDetailVersions().removeItemListener(versionSelectionListener); + if (ui != null) { + ui.getDetailVersions().removeItemListener(versionSelectionListener); + } versionSelectionListener = null; } if (attachmentSelectionListener != null) { - getTabUI().getDetailAttachments().removeListSelectionListener(attachmentSelectionListener); + if (ui != null) { + ui.getDetailAttachments().removeListSelectionListener(attachmentSelectionListener); + } attachmentSelectionListener = null; } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -70,6 +70,7 @@ protected void setStatus(String status) { // no log } + @Override protected boolean beforeAction(ActionEvent e) throws Exception { if (!super.beforeAction(e)) { 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-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleLocalTabAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -20,7 +20,7 @@ /** * The Class ToggleLocalTabAction. - * + * * @author Code Lutin, Landais Gabriel, Chemit Tony */ @org.codelutin.jaxx.action.ToggleActionConfig( @@ -39,13 +39,13 @@ hideActionText = false ) public class ToggleLocalTabAction extends ToggleTabAbstractAction { - + /** The Constant serialVersionUID. */ private static final long serialVersionUID = 9177105156859413014L; /** * Instantiates a new toggle local tab action. - * + * * @param name the name */ public ToggleLocalTabAction(String name) { 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-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleRemoteTabAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -20,7 +20,7 @@ /** * The Class ToggleRemoteTabAction. - * + * * @author Code Lutin, Landais Gabriel, Chemit Tony */ @org.codelutin.jaxx.action.ToggleActionConfig( @@ -45,7 +45,7 @@ /** * Instantiates a new toggle remote tab action. - * + * * @param name the name */ public ToggleRemoteTabAction(String name) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -16,7 +16,6 @@ */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.HistoryModel; @@ -65,7 +64,7 @@ //DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel(); // remove all remote entries from history - SimExplorerActionManager.fireAction("historyUnconnect", e.getSource()); + getContext().getActionFactory().fireAction("historyUnconnect", e.getSource()); } @@ -117,7 +116,7 @@ } if (SimExplorerTab.local.isTabVisible(container)) { - getListUpdater( false).refreshListTablePopupMenu(getListModel(false)); + getListUpdater(false).refreshListTablePopupMenu(getListModel(false)); } // } //}); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAbstractAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAbstractAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -18,9 +18,9 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; -import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.HistoryModel; +import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; import java.awt.event.ActionEvent; @@ -53,11 +53,11 @@ super(name); } - @Override + @Override protected void setStatus(String status) { // no log } - + @Override protected boolean beforeAction(ActionEvent e) throws Exception { if (!super.beforeAction(e)) { @@ -90,7 +90,7 @@ } @Override - public void updateUI() { + public void updateUI() { if (history.isEmpty()) { if (getTab().isTabVisible(getTabContainer())) { // close tab, no more history Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAddAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAddAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAddAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -18,11 +18,11 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.HistoryModel; import fr.cemagref.simexplorer.is.ui.swing.ui.EntityTreeNodeHelper; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction; import java.util.List; @@ -55,29 +55,29 @@ protected boolean hasHistoryEntry(HistoryModel<EntityTreeNode> model) { // cette action doit toujours être configurée avant lancement - if (selected==null) { - throw new IllegalStateException("the SelectedAction ("+getActionName()+") must have a not null selected before action performed"); + if (selected == null) { + throw new IllegalStateException("the SelectedAction (" + getActionName() + ") must have a not null selected before action performed"); } - return true; + return true; } protected EntityTreeNode getHistoryEntry(HistoryModel<EntityTreeNode> model) { - int pos = 0; + int pos = 0; List<EntityTreeNode> datas = model.getData(); boolean remote = selected.isRemote(); String uuid = selected.getUuid(); Version version = selected.getVersion(); LoggableElement selectedElement = selected.getLe(getContext()); - + boolean wasFound = false; //if (log.isDebugEnabled()) { log.info("----- search entry to go :" + selected + ", " + selected.isRemote()); //} - if (datas!=null) { + if (datas != null) { for (EntityTreeNode node : datas) { boolean remote2 = node.isRemote(); LoggableElement le = node.getLoggableElement(); - if (le != null && remote == remote2 && uuid.equals(le.getMetaData().getUuid()) && version.equals(le.getMetaData().getVersion()) ) { + if (le != null && remote == remote2 && uuid.equals(le.getMetaData().getUuid()) && version.equals(le.getMetaData().getVersion())) { //if (log.isDebugEnabled()) { log.info("----- found entry to go :" + node + ", " + node.isRemote()); //} @@ -96,7 +96,7 @@ // ajout a la fin de l'historique model.addTail(root); // go to new position - model.setCurrentIndex(model.size()-1); + model.setCurrentIndex(model.size() - 1); } EntityTreeNode node; node = model.getCurrent(); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryDeleteAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryDeleteAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryDeleteAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -17,10 +17,10 @@ package fr.cemagref.simexplorer.is.ui.swing.actions.history; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.HistoryModel; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction; import java.util.Iterator; import java.util.List; @@ -53,10 +53,10 @@ if (model.isEmpty()) { return false; } - if (selected==null) { - throw new IllegalStateException("the SelectedAction ("+getActionName()+") must have a not null selected before action performed"); + if (selected == null) { + throw new IllegalStateException("the SelectedAction (" + getActionName() + ") must have a not null selected before action performed"); } - return true; + return true; } protected EntityTreeNode getHistoryEntry(HistoryModel<EntityTreeNode> model) { @@ -110,6 +110,6 @@ } public void setSelected(DataEntityModel selected) { - this.selected=selected; + this.selected = selected; } } \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryNextAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryNextAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryNextAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -21,7 +21,7 @@ /** * The Class HistoryNextAction. - * + * * @author Code Lutin, Landais Gabriel, Chemit Tony */ @org.codelutin.jaxx.action.ActionConfig( @@ -40,7 +40,7 @@ /** * Instantiates a new history next action. - * + * * @param name the name */ public HistoryNextAction(String name) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryPreviousAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryPreviousAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryPreviousAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -21,7 +21,7 @@ /** * The Class HistoryPreviousAction. - * + * * @author Code Lutin, Landais Gabriel, Chemit Tony */ @org.codelutin.jaxx.action.ActionConfig( @@ -40,7 +40,7 @@ /** * Instantiates a new history previous action. - * + * * @param name the name */ public HistoryPreviousAction(String name) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryUnconnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryUnconnectAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryUnconnectAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -24,7 +24,7 @@ /** * The Class HistoryUnconnectAction. - * + * * @author Code Lutin, Landais Gabriel, Chemit Tony */ @org.codelutin.jaxx.action.ActionConfig( @@ -43,7 +43,7 @@ /** * Instantiates a new history unconnect action. - * + * * @param name the name */ public HistoryUnconnectAction(String name) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -17,7 +17,6 @@ package fr.cemagref.simexplorer.is.ui.swing.actions.util; import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import static org.codelutin.i18n.I18n._; import javax.swing.Action; @@ -87,7 +86,7 @@ public void doAction(ActionEvent e) { // suppression de l'historique - SimExplorerActionManager.fireAction("historyReset", e.getSource()); + getContext().getActionFactory().fireAction("historyReset", e.getSource()); getContext().getMainConfig().setLocale(locale); // on doit initialiser la nouvelle locale avant de decharger les ui Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -16,8 +16,8 @@ */ package fr.cemagref.simexplorer.is.ui.swing.actions.util; +import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; -import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import java.awt.event.ActionEvent; import java.io.BufferedInputStream; 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-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -17,9 +17,8 @@ package fr.cemagref.simexplorer.is.ui.swing.actions.util; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; -import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; +import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.JListTab; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; import jaxx.runtime.swing.JAXXTab; @@ -44,7 +43,7 @@ /** * The Class ShowListTabAbstractAction. - * + * * @author Code Lutin, Landais Gabriel, Chemit Tony */ public class ShowListTabAbstractAction extends ShowTabAbstractAction<JListTab, ListTabModel> { @@ -88,19 +87,19 @@ //FIXME see why ui could be null... JListTab ui = getTabUI(); if (listMetaSelectionListener != null) { - if (ui!=null) { + if (ui != null) { ui.getTable().getSelectionModel().removeListSelectionListener(listMetaSelectionListener); } listMetaSelectionListener = null; } if (rowSorterListener != null) { - if (ui!=null) { + if (ui != null) { ui.getTable().getRowSorter().removeRowSorterListener(rowSorterListener); } rowSorterListener = null; } if (rowSorter != null) { - if (ui!=null) { + if (ui != null) { ui.getTable().setRowSorter(rowSorter); } rowSorter = null; @@ -203,7 +202,7 @@ model.setSelectedIndex(getRowAtPoint(ui, e.getPoint())); // launch show tab action - SimExplorerActionManager.fireSelectedAction("showTab_detail", e.getSource(), model.getSelectedItem()); + getContext().fireSelectedAction("showTab_detail", e.getSource(), model.getSelectedItem()); } catch (Exception e1) { showError(e1); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -16,7 +16,6 @@ */ package fr.cemagref.simexplorer.is.ui.swing.actions.util; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import javax.swing.AbstractAction; import javax.swing.JTabbedPane; @@ -65,14 +64,14 @@ public AbstractAction getCloseAction() { if (closeAction == null) { - closeAction = SimExplorerActionManager.newAction("closeTab_" + getTab().name()); + closeAction = getContext().getActionFactory().newAction("closeTab_" + getTab().name()); } return closeAction; } public AbstractAction getShowAction() { if (showAction == null) { - showAction = SimExplorerActionManager.newAction("showTab_" + getTab().name()); + showAction = getContext().getActionFactory().newAction("showTab_" + getTab().name()); } return showAction; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -33,7 +33,7 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; + import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; import fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction; import fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeLocaleAction; @@ -105,14 +105,14 @@ protected void finalizeInit(SimExplorerContext context) { // chargement dans l'ui des actions - SimExplorerActionManager.loadActions(this); + context.getActionFactory().loadActions(this); // add Ctrl-W to close current tab getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_MASK), "closeTab"); - getRootPane().getActionMap().put("closeTab", SimExplorerActionManager.newAction("closeTab")); + getRootPane().getActionMap().put("closeTab", context.getActionFactory().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")); + getRootPane().getActionMap().put("quit", context.getActionFactory().newAction("quit")); // repaint i18n actions refreshI18nActions(context); @@ -134,7 +134,7 @@ Locale locale = context.getMainConfig().getLocale(); //CountryEnum country = context.getConfig().getUserCountry(); - String[] actions = SimExplorerActionManager.getFactory().getActionNames(); + String[] actions = context.getActionFactory().getActionNames(); for (String actionName : actions) { Matcher matcher = ChangeLocaleAction.PATTERN_NAME.matcher(actionName); if (!matcher.matches()) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java 2008-07-25 14:57:10 UTC (rev 1513) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java 2008-07-25 16:04:49 UTC (rev 1514) @@ -17,8 +17,8 @@ package fr.cemagref.simexplorer.is.ui.swing.ui; import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.model.tab.SimExplorerAbstractTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.util.MyTabHeader; import jaxx.runtime.JAXXObject; @@ -63,7 +63,7 @@ } protected void initTab(JAXXTab tab, String tabName, TabContentConfig config) { - SimExplorerActionManager.loadActions((JAXXObject) tab); + SimExplorer.getContext().getActionFactory().loadActions((JAXXObject) tab); } protected SimExplorerTab getTab(String tabName) { @@ -104,7 +104,7 @@ panel.get$objectMap().put(actionName, panel.getCloseTab()); // chargement dans l'ui des actions - SimExplorerActionManager.loadActions(panel); + SimExplorer.getContext().getActionFactory().loadActions(panel); panel.setToolTipText(_(tab.shortDescription())); panel.getLabel().setText(_(tab.name()));