Author: tchemit Date: 2008-02-24 19:49:59 +0000 (Sun, 24 Feb 2008) New Revision: 1217 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/ui/SimExplorerTab.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java Log: suppression methodes inutiles ajout d'une methode dispose pour nettoyer les onglet avant une fermeture 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-02-24 19:47:55 UTC (rev 1216) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-02-24 19:49:59 UTC (rev 1217) @@ -114,6 +114,7 @@ public static void dispose(boolean reload) { SimExplorerTab.dispose(); + SimExplorerAbstractAction.dispose(); SimExplorerActionManager.dispose(); ErrorDialog.disposeUI(); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTab.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTab.java 2008-02-24 19:47:55 UTC (rev 1216) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTab.java 2008-02-24 19:49:59 UTC (rev 1217) @@ -18,7 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.ui; -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.SimExplorerTabModel; @@ -44,10 +43,7 @@ parentImpl = JTabbedPane.class, name = "simexplorer.tab.detail", shortDescription = "simexplorer.tab.detail.tooltip" - )detail { - public <U extends JAXXTab, M extends SimExplorerTabModel> void updateUI(SimExplorerContext context, SimExplorerMainUI mainUi, U ui, M model) { - DetailTabRefreshHelper.refreshDetailTab(mainUi, (JDetailTab) ui, (DetailTabModel) model); - }}, + )detail, @TabContentConfig( impl = JListTab.class, @@ -56,10 +52,7 @@ useToogle = true, name = "simexplorer.tab.local", shortDescription = "simexplorer.tab.local.tooltip" - )local { - public <U extends JAXXTab, M extends SimExplorerTabModel> void updateUI(SimExplorerContext context, SimExplorerMainUI mainUi, U ui, M model) { - ListTabRefreshHelper.refreshListTabUI(mainUi, (JListTab) ui, (ListTabModel) model); - }}, + )local, @TabContentConfig( impl = JListTab.class, @@ -68,10 +61,7 @@ useToogle = true, name = "simexplorer.tab.remote", shortDescription = "simexplorer.tab.remote.tooltip" - )remote { - public <U extends JAXXTab, M extends SimExplorerTabModel> void updateUI(SimExplorerContext context, SimExplorerMainUI mainUi, U ui, M model) { - ListTabRefreshHelper.refreshListTabUI(mainUi, (JListTab) ui, (ListTabModel) model); - }}, + )remote, @TabContentConfig( impl = JSynchronizeTab.class, @@ -80,11 +70,7 @@ useToogle = false, name = "simexplorer.tab.synchronize", shortDescription = "simexplorer.tab.synchronize.tooltip" - )synchronize { - public <U extends JAXXTab, M extends SimExplorerTabModel> void updateUI(SimExplorerContext context, SimExplorerMainUI mainUi, U ui, M model) { - SynchronizeTabRefreshHelper.refreshSynchronizeTab(mainUi,context,(JSynchronizeTab) ui, (SynchronizeTabModel) model); - } - }; + )synchronize; /** l'usine de tabs */ private static SimExplorerTabFactory factory; @@ -135,16 +121,7 @@ return (ListTabModel) getListTab(remote).getModel(); } - public static void dispose() { - SimExplorerTab.getFactory().resetCache(); - // remove listeners on detail tab model - for (SimExplorerTab tab : SimExplorerTab.values()) { - tab.removePropertyChangeListeners(); - } - } - public abstract <U extends JAXXTab, M extends SimExplorerTabModel> void updateUI(SimExplorerContext context, SimExplorerMainUI mainUi, U ui, M model); - public JAXXTab getUI() { return getFactory().getUI(name()); } @@ -176,11 +153,10 @@ getModel().setSelectedItem(null); } - public void updateUI(SimExplorerContext context, SimExplorerMainUI mainUI) { - updateUI(context,mainUI, getUI(), getModel()); + public static void dispose() { + for (SimExplorerTab simExplorerTab : values()) { + simExplorerTab.getModel().removePropertyChangeListeners(); + } + getFactory().resetCache(); } - - public void removePropertyChangeListeners() { - getModel().removePropertyChangeListeners(); - } } 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-02-24 19:47:55 UTC (rev 1216) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java 2008-02-24 19:49:59 UTC (rev 1217) @@ -61,7 +61,7 @@ } protected void initTab(JAXXTab tab, String tabName, TabContentConfig config) { - SimExplorerActionManager.loadActions((JAXXObject) tab, getTab(tabName)); + SimExplorerActionManager.loadActions((JAXXObject) tab); } protected SimExplorerTab getTab(String tabName) { @@ -89,7 +89,7 @@ panel.get$objectMap().put(actionName, panel.getCloseTab()); // chargement dans l'ui des actions - SimExplorerActionManager.loadActions(panel, getTab(tabName)); + SimExplorerActionManager.loadActions(panel); panel.setToolTipText(_(tab.shortDescription())); panel.getLabel().setText(_(tab.name()));