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

24 Feb 2008

Author: tchemit
Date: 2008-02-24 21:34:08 +0000 (Sun, 24 Feb 2008)
New Revision: 1223

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/CloseTabAction.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/ExportElementAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoLastPageAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoNextPageAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoPreviousPageAction.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/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/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/util/ShowListTabAbstractAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java
Log:
integration context dans les modeles

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-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -63,7 +63,7 @@
         if (jComboBox == null || !jComboBox.isEnabled()) {
             return false;
         }        
-        Integer oldPage = ((ListTabModel) myTab.getModel()).getPagination().getCurrentPage();
+        Integer oldPage = ((ListTabModel) myTab.getModel(getContext())).getPagination().getCurrentPage();
 
         Object o = jComboBox.getSelectedItem();
         log.info("selected number page "+o.getClass()+" : "+o);

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-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -55,7 +55,7 @@
 
     @Override
     protected void doAction(ActionEvent e) throws Exception {
-        getTab().closeTab(getMainUI(), getTabContainer());
+        closeTab(getTab());
     }
 
     @Override

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java	2008-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -107,13 +107,13 @@
         JTabbedPane container = ui.getContent();
 
         if (SimExplorerTab.detail.isTabVisible(container)) {
-            getDetailUpdater(this).refreshWithConnectAction();
+            getDetailUpdater().refreshWithConnectAction();
         }
 
         if (SimExplorerTab.local.isTabVisible(container)) {
-            ListTabModel localListModel = (ListTabModel) SimExplorerTab.local.getModel();
+            ListTabModel localListModel = (ListTabModel) SimExplorerTab.local.getModel(getContext());
             if (!localListModel.isEmpty()) {
-                getListUpdater(this,false).refreshListTablePopupMenu(localListModel);
+                getListUpdater( false).refreshListTablePopupMenu(localListModel);
             }
         }
         //  }

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-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -97,11 +97,11 @@
         String uuid = selected.getUuid();
         StorageServiceHelper.deleteElement(getContext(), remote, uuid, selected.getVersion().toString());
 
-        SimExplorerTab.getListModel(remote).reload();
+        getListModel(remote).reload();
 
         if (SimExplorerTab.synchronize.isTabVisible(getTabContainer())) {
 
-            SynchronizeTabModel model = (SynchronizeTabModel) SimExplorerTab.synchronize.getModel();
+            SynchronizeTabModel model = getSynchronizeModel();
 
             model.reloadSources(getContext(), uuid, !remote,remote,!remote,remote);
         }

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-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -152,10 +152,10 @@
         String uuid = selected.getUuid();
         fr.cemagref.simexplorer.is.service.StorageServiceHelper.exportElementTo(getContext().getToken(), fromService, toService, uuid, selected.getVersion().toString());
 
-        SimExplorerTab.getListModel(!remote).reload();
+        getListModel(!remote).reload();
 
         if (SimExplorerTab.synchronize.isTabVisible(getTabContainer())) {
-            SynchronizeTabModel model = (SynchronizeTabModel) SimExplorerTab.synchronize.getModel();
+            SynchronizeTabModel model = getSynchronizeModel();
 
             model.reloadSources(getContext(), uuid, false,false,remote,!remote);
         }

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoLastPageAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoLastPageAction.java	2008-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoLastPageAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -51,7 +51,7 @@
         if (myTab == null) {
             return false;
         }
-        ListTabModel model = (ListTabModel) myTab.getModel();
+        ListTabModel model = (ListTabModel) myTab.getModel(getContext());
         Integer oldPage = model.getPagination().getCurrentPage();
         boolean b = oldPage < model.getPagination().getNbPages();
         if (b) {

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoNextPageAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoNextPageAction.java	2008-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoNextPageAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -51,7 +51,7 @@
         if (myTab == null) {
             return false;
         }
-        ListTabModel model = (ListTabModel) myTab.getModel();
+        ListTabModel model = (ListTabModel) myTab.getModel(getContext());
         Integer oldPage = model.getPagination().getCurrentPage();
         boolean b = oldPage < model.getPagination().getNbPages();
         if (b) {

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoPreviousPageAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoPreviousPageAction.java	2008-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoPreviousPageAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -51,7 +51,7 @@
         if (myTab == null) {
             return false;
         }
-        ListTabModel model = (ListTabModel) myTab.getModel();
+        ListTabModel model = (ListTabModel) myTab.getModel(getContext());
         Integer oldPage = model.getPagination().getCurrentPage();
         boolean b = oldPage > 0;
         if (b) {

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-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -20,6 +20,7 @@
 
 import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction;
 import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel;
+import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI;
 
 import java.awt.event.ActionEvent;
 
@@ -53,7 +54,7 @@
         if (!model.hasQuery()) {
             // directly refresh search actions
             // but do not realize action
-            getListUpdater(this, 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/ShowDetailTabAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java	2008-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -107,7 +107,7 @@
         }
 
         // préparation du modèle de détail
-        DetailTabModel detailModel = (DetailTabModel) SimExplorerTab.detail.getModel();
+        DetailTabModel detailModel = getDetailModel();
 
         // synchronisation de l'élément sélectionné
         detailModel.setSelectedItem(selected);
@@ -140,7 +140,7 @@
         ui.getDetailAttachments().addListSelectionListener(attachmentSelectionListener);
 
         // init updater listens the model
-        getDetailUpdater(this).initListeners();
+        getDetailUpdater().initListeners();
     }
 
     public void setSelected(DataEntityModel selected) {

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-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -26,7 +26,6 @@
 import fr.cemagref.simexplorer.is.ui.swing.ui.EntityTreeNodeHelper;
 import fr.cemagref.simexplorer.is.ui.swing.ui.JSynchronizeTab;
 import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI;
-import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab;
 import fr.cemagref.simexplorer.is.ui.swing.ui.TreeActionsUpdater;
 
 import javax.swing.AbstractButton;
@@ -80,7 +79,7 @@
         }
 
         // init synchronize tab model
-        sources = ((SynchronizeTabModel) SimExplorerTab.synchronize.getModel()).guessSources(getContext(), selected);
+        sources = getSynchronizeModel().guessSources(getContext(), selected);
         return true;
     }
 
@@ -97,7 +96,7 @@
         ui.getTree(true).addTreeSelectionListener(navigationRemoteListener);
         ui.getTree(true).addTreeSelectionListener(navigationActionsRemoteListener);
         // init updater listens the model
-        getSynchronizeUpdater(this).initListeners();
+        getSynchronizeUpdater().initListeners();
 
         ui.getShowTabLocal_detail().setHideActionText(true);
         ui.getShowTabRemote_detail().setHideActionText(true);

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-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -22,10 +22,8 @@
 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;
-import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel;
 import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI;
 import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab;
-import fr.cemagref.simexplorer.is.ui.swing.ui.ListTabUpdater;
 
 import javax.swing.JTabbedPane;
 import java.awt.event.ActionEvent;
@@ -97,11 +95,11 @@
 
         if (SimExplorerTab.remote.isTabVisible(container)) {
             // close tab
-            SimExplorerTab.remote.closeTab(getMainUI(), container);
+            closeTab(SimExplorerTab.remote);
         }
         if (SimExplorerTab.synchronize.isTabVisible(container)) {
             // close tab
-            SimExplorerTab.synchronize.closeTab(getMainUI(), container);
+            closeTab(SimExplorerTab.synchronize);
         }
         /*if (SimExplorerTab.detail.isTabVisible(container) && history != null) {
             if (history.isEmpty()) {
@@ -112,16 +110,16 @@
                 EntityTreeNode node = history.getCurrent();
 
                 model.synch(node);                
-                getDetailUpdater(this).updateDetailNavigationTree(tabUI, model.getHistory());
+                getDetailUpdater().updateDetailNavigationTree(tabUI, model.getHistory());
             }
         }*/
 
         if (SimExplorerTab.detail.isTabVisible(container)) {
-            getDetailUpdater(this).refreshWithConnectAction();
+            getDetailUpdater().refreshWithConnectAction();
         }
 
         if (SimExplorerTab.local.isTabVisible(container)) {
-            getListUpdater(this,false).refreshListTablePopupMenu((ListTabModel) SimExplorerTab.local.getModel());
+            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-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAbstractAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -90,7 +90,7 @@
         if (history.isEmpty()) {
             if (getTab().isTabVisible(getTabContainer())) {
                 // close tab, no more history
-                getTab().closeTab(getMainUI(), getTabContainer());
+                closeTab(getTab());
             }
         }
     }

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java	2008-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -20,14 +20,11 @@
 
 import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
 import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
-import fr.cemagref.simexplorer.is.ui.swing.actions.ImportElementAction;
 import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel;
 import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel;
 import fr.cemagref.simexplorer.is.ui.swing.ui.JListTab;
-import fr.cemagref.simexplorer.is.ui.swing.ui.ListTabUpdater;
 import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI;
 import jaxx.runtime.swing.JAXXTab;
-import static org.codelutin.i18n.I18n._;
 
 import javax.swing.JTabbedPane;
 import javax.swing.JTable;
@@ -55,7 +52,6 @@
     protected boolean remote;
 
     ListMetaSelectionListener listMetaSelectionListener;
-
     TableRowSorterListener rowSorterListener;
     MyTableRowSorter rowSorter;
 
@@ -93,9 +89,6 @@
             rowSorter=null;
         }
     }
-    public ListTabUpdater getUpdater() {
-        return getListUpdater(this, getModel().isRemote());
-    }
 
     protected void initFirstUsage(final JListTab ui, final ListTabModel model) {
 
@@ -104,8 +97,6 @@
         // init remote property on model
         model.synch(remote, (LoggableElement) null);
 
-
-
         //FIXME : when we change locale, this is no more enabled ?
 
         SimExplorerMainUI.EnableButton(ui.getImportElement());
@@ -117,7 +108,7 @@
             @Override
             public void keyReleased(KeyEvent e) {
                 // rafraichissement des actions de recherche
-                getUpdater().refreshSearchActions();
+                getListUpdater( getModel().isRemote()).refreshSearchActions();
             }
         });
 
@@ -136,10 +127,10 @@
         rowSorter.addRowSorterListener(rowSorterListener);
 
         // init updater listens the model
-        getListUpdater(this, model.isRemote()).initListeners();
+        getListUpdater( model.isRemote()).initListeners();
 
         // init model
-        model.initTabModel(getContext(), remote);
+        model.initTabModel(remote);
 
     }
 

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java	2008-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -20,9 +20,13 @@
 
 import fr.cemagref.simexplorer.is.ui.swing.SimExplorer;
 import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext;
+import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel;
+import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel;
+import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel;
 import fr.cemagref.simexplorer.is.ui.swing.ui.DetailTabUpdater;
 import fr.cemagref.simexplorer.is.ui.swing.ui.ListTabUpdater;
 import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI;
+import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab;
 import fr.cemagref.simexplorer.is.ui.swing.ui.SynchronizeTabUpdater;
 import fr.cemagref.simexplorer.is.ui.swing.ui.util.ErrorDialog;
 import jaxx.runtime.JAXXObject;
@@ -45,44 +49,6 @@
 
     protected ActionEvent e;
 
-    protected static DetailTabUpdater detailUpdater;
-    protected static ListTabUpdater localUpdater;
-    protected static ListTabUpdater remoteUpdater;
-    protected static SynchronizeTabUpdater synchronizeUpdater;
-
-    protected static DetailTabUpdater getDetailUpdater(SimExplorerAbstractAction action) {
-        if (detailUpdater == null) {
-            detailUpdater = new DetailTabUpdater(action.getContext());
-        }
-        return detailUpdater;
-    }
-
-
-    protected static ListTabUpdater getListUpdater(SimExplorerAbstractAction action,boolean remote) {        
-        return remote?getRemoteUpdater(action):getLocalUpdater(action);
-    }
-
-    protected static ListTabUpdater getLocalUpdater(SimExplorerAbstractAction action) {
-        if (localUpdater == null) {
-            localUpdater = new ListTabUpdater(action.getContext(), false);
-        }
-        return localUpdater;
-    }
-
-    protected static ListTabUpdater getRemoteUpdater(SimExplorerAbstractAction action) {
-        if (remoteUpdater == null) {
-            remoteUpdater = new ListTabUpdater(action.getContext(), true);
-        }
-        return remoteUpdater;
-    }
-
-    public static SynchronizeTabUpdater getSynchronizeUpdater(SimExplorerAbstractAction action) {
-        if (synchronizeUpdater == null) {
-            synchronizeUpdater = new SynchronizeTabUpdater(action.getContext());
-        }
-        return synchronizeUpdater;
-    }
-
     public void actionPerformed(java.awt.event.ActionEvent e) {
 
         log.debug("------------------------------------------------------------");
@@ -171,22 +137,41 @@
         return "simexplorer.action." + getActionName() + ".tooltip";
     }
 
-    public static void dispose() {
-        if (detailUpdater != null) {
-            detailUpdater.removeListeners();
-            detailUpdater = null;
-        }
-        if (localUpdater != null) {
-            localUpdater.removeListeners();
-            localUpdater = null;
-        }
-        if (remoteUpdater != null) {
-            remoteUpdater.removeListeners();
-            remoteUpdater = null;
-        }
-        if (synchronizeUpdater != null) {
-            synchronizeUpdater.removeListeners();
-            synchronizeUpdater = null;
-        }
+    public DetailTabModel getDetailModel() {
+        return (DetailTabModel) SimExplorerTab.detail.getModel(getContext());
     }
+
+    public ListTabModel getListModel(boolean remote) {
+        return (ListTabModel) SimExplorerTab.getListTab(remote).getModel(getContext());
+    }
+
+    public SynchronizeTabModel getSynchronizeModel() {
+        return (SynchronizeTabModel) SimExplorerTab.synchronize.getModel(getContext());
+    }
+
+
+    public DetailTabUpdater getDetailUpdater() {
+        return getMainUI().getDetailUpdater(getContext());
+    }
+
+    public ListTabUpdater getListUpdater(boolean remote) {
+        return getMainUI().getListUpdater(getContext(), remote);
+    }
+
+    public ListTabUpdater getLocalUpdater() {
+        return getMainUI().getLocalUpdater(getContext());
+    }
+
+    public ListTabUpdater getRemoteUpdater() {
+        return getMainUI().getRemoteUpdater(getContext());
+    }
+
+    public SynchronizeTabUpdater getSynchronizeUpdater() {
+        return getMainUI().getSynchronizeUpdater(getContext());
+    }
+
+    public void closeTab(SimExplorerTab tab) {
+        tab.closeTab(getContext(),getMainUI(),getMainUI().getContent());
+    }
+
 }

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java	2008-02-24 21:33:36 UTC (rev 1222)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java	2008-02-24 21:34:08 UTC (rev 1223)
@@ -119,7 +119,7 @@
     }
 
     public SimExplorerTabModel getModel() {
-        return getTab().getModel();
+        return getTab().getModel(getContext());
     }
 
     @Override
@@ -162,7 +162,7 @@
             log.warn("could not find a tab for source " + e.getSource());
             return null;
         }
-        DataEntityModel entityModel = sourceTab.getModel().getSelectedItem();
+        DataEntityModel entityModel = sourceTab.getModel(getContext()).getSelectedItem();
         if (entityModel != null) {
             entityModel = entityModel.cloneSafe();
         }

    

r1223 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions: . history util

tchemit＠users.labs.libre-entreprise.org

tags

participants (1)