Author: tchemit Date: 2008-02-04 11:42:02 +0000 (Mon, 04 Feb 2008) New Revision: 613 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java Log: l'init des listeners sur les tab se sont dans les actions showTabXXX Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java 2008-02-04 11:41:16 UTC (rev 612) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java 2008-02-04 11:42:02 UTC (rev 613) @@ -1,5 +1,5 @@ /* -* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, * Tony Chemit, Gabriel Landais * * This program is free software; you can redistribute it and/or @@ -15,13 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* \#\#% */ +* ##% */ package fr.cemagref.simexplorer.is.ui.swing; import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; import fr.cemagref.simexplorer.is.ui.swing.util.MyTabHeader; import jaxx.runtime.JAXXObject; import jaxx.runtime.builder.TabContentConfig; @@ -31,10 +29,7 @@ import javax.swing.AbstractButton; import javax.swing.JComponent; import javax.swing.JTabbedPane; -import javax.swing.JTable; -import javax.swing.AbstractAction; import java.awt.Component; -import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.lang.reflect.Field; @@ -64,28 +59,7 @@ } protected void initTab(JComponent tab, String tabName, TabContentConfig config) { - SimExplorerActionManager.loadActions((JAXXObject) tab, getTab(tabName)); - final SimExplorerTab def = getTab(tabName); - if (def == SimExplorerTab.local || def == SimExplorerTab.remote) { - // add a mouse listener on table - final JApplicationListTab comp = (JApplicationListTab) tab; - - comp.getTable().addMouseListener(new MouseAdapter() { - AbstractAction detailAction = SimExplorerActionManager.newAction("showTab_detail", (AbstractButton) null); - @Override - public void mouseClicked(MouseEvent e) { - if (e.getClickCount() == 2) { - JTable table = (JTable) e.getSource(); - int selectRow = table.getSelectedRow(); - DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel(); - model.setRemote(def== SimExplorerTab.remote); - model.setIndex(selectRow); - detailAction.actionPerformed(new ActionEvent(table, ActionEvent.ACTION_FIRST, "showTab_detail")); - System.out.println("action detail " + selectRow + " : " + table.getValueAt(selectRow, 0)); - } - } - }); - } + SimExplorerActionManager.loadActions((JAXXObject) tab, getTab(tabName)); } protected SimExplorerTab getTab(String tabName) { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java 2008-02-04 11:41:16 UTC (rev 612) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java 2008-02-04 11:42:02 UTC (rev 613) @@ -18,29 +18,36 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; +import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; +import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; -import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; -import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; -import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import jaxx.runtime.JAXXObject; +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; import javax.swing.JTabbedPane; +import javax.swing.JTable; +import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.awt.Component; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; -import jaxx.runtime.JAXXObject; - /** @author chemit */ public class ShowListTabAbstractAction extends ShowTabAbstractAction<JApplicationListTab, ListTabModel> { private static final long serialVersionUID = 3813479850648257169L; protected boolean remote; - - public ShowListTabAbstractAction(String name,boolean remote) { + + public ShowListTabAbstractAction(String name, boolean remote) { super(name); - this.remote=remote; + this.remote = remote; } @Override @@ -70,6 +77,23 @@ } protected void initFirstUsage(final JApplicationListTab ui, final ListTabModel model) { + // add a show detail action when double click on a row of the table + ui.getTable().addMouseListener(new MouseAdapter() { + AbstractAction detailAction = SimExplorerActionManager.newAction("showTab_detail", (AbstractButton) null); + + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + JTable table = (JTable) e.getSource(); + int selectRow = table.getSelectedRow(); + DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel(); + model.setRemote(remote); + model.setIndex(selectRow); + detailAction.actionPerformed(new ActionEvent(table, ActionEvent.ACTION_FIRST, "showTab_detail")); + System.out.println("action detail ("+remote+")" + selectRow + " : " + table.getValueAt(selectRow, 0)); + } + } + }); // push model into tableModel JApplicationTableModel modelTab = (JApplicationTableModel) ui.getTable().getModel(); modelTab.setData(model.getList());