- Simexplorer-si-commits - mailman.cloud.codelutin.com

r355 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:53:40 +0000 (Tue, 22 Jan 2008) New Revision: 355 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java Log: implantations des TabModel pour l'appli Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-01-22 01:53:40 UTC (rev 355) @@ -0,0 +1,58 @@ +/* +* \#\#% 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 +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is.ui.swing.model; + +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; +import fr.cemagref.simexplorer.is.ui.swing.bean.ApplicationBean; +import jaxx.runtime.builder.TabModel; + +/** + * Le model pour un Tab contenant le détail d'une application + * + * @author chemit + */ +public class DetailTabModel implements TabModel { + + protected SimExplorerTab tab; + + protected ApplicationBean bean; + + private static final long serialVersionUID = 4851121531481734868L; + + + public String getName() { + return tab.name(); + } + + public SimExplorerTab getTab() { + return tab; + } + + public ApplicationBean getBean() { + return bean; + } + + public void setName(String name) { + this.tab = SimExplorerTab.valueOf(name); + } + + public void setBean(ApplicationBean bean) { + this.bean = bean; + } +} \ No newline at end of file Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-01-22 01:53:40 UTC (rev 355) @@ -0,0 +1,57 @@ +/* +* \#\#% 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 +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is.ui.swing.model; + +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; +import fr.cemagref.simexplorer.is.ui.swing.bean.ListApplicationBean; +import jaxx.runtime.builder.TabModel; + +/** + * Le model pour un Tab contenant une liste d'application + * + * @author chemit + */ +public class ListTabModel implements TabModel { + + protected SimExplorerTab tab; + + protected ListApplicationBean list; + + private static final long serialVersionUID = -3623331875470531459L; + + public String getName() { + return tab.name(); + } + + public SimExplorerTab getTab() { + return tab; + } + + public ListApplicationBean getList() { + return list; + } + + public void setName(String name) { + this.tab = SimExplorerTab.valueOf(name); + } + + public void setList(ListApplicationBean list) { + this.list = list; + } +} Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-01-22 01:53:40 UTC (rev 355) @@ -0,0 +1,66 @@ +/* +* \#\#% 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 +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is.ui.swing.model; + +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; +import fr.cemagref.simexplorer.is.ui.swing.bean.ListApplicationBean; +import jaxx.runtime.builder.TabModel; + +/** + * Le model pour un Tab contenant 2 listes d'applications + * + * @author chemit + */ +public class SynchronizeTabModel implements TabModel { + + protected SimExplorerTab tab; + + protected ListApplicationBean listLocal; + protected ListApplicationBean listRemote; + + private static final long serialVersionUID = -3623331875470531459L; + + public String getName() { + return tab.name(); + } + + public SimExplorerTab getTab() { + return tab; + } + + public ListApplicationBean getListLocal() { + return listLocal; + } + + public ListApplicationBean getListRemote() { + return listRemote; + } + + public void setName(String name) { + this.tab = SimExplorerTab.valueOf(name); + } + + public void setListLocal(ListApplicationBean listLocal) { + this.listLocal = listLocal; + } + + public void setListRemote(ListApplicationBean listRemote) { + this.listRemote = listRemote; + } +} \ No newline at end of file

1 0

r354 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:52:12 +0000 (Tue, 22 Jan 2008) New Revision: 354 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/PaginationBean.java Log: ajout accesseur sur le bean de pagination pour son init + fix erreur sur le calcul de pages Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/PaginationBean.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/PaginationBean.java 2008-01-22 01:50:46 UTC (rev 353) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/PaginationBean.java 2008-01-22 01:52:12 UTC (rev 354) @@ -63,7 +63,7 @@ } public int getNbPages() { - return (int) (size % width); + return (int) (size / width); } public void increment() { @@ -81,4 +81,16 @@ firstIndex -= width; } } + + public void setFirstIndex(long firstIndex) { + this.firstIndex = firstIndex; + } + + public void setSize(long size) { + this.size = size; + } + + public void setWidth(int width) { + this.width = width; + } }

1 0

r353 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui: . swing
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:50:46 +0000 (Tue, 22 Jan 2008) New Revision: 353 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java Log: renommage de SimEplorerTabManager en SimExplorerTab + utilisation des mod?\195?\168les de tab : donc dans le context g?\195?\169n?\195?\169rale de l'application, plus rien n'appara?\195?\174t. Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-01-22 01:49:37 UTC (rev 352) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-01-22 01:50:46 UTC (rev 353) @@ -22,7 +22,7 @@ import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerMainUI; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTabManager; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import org.codelutin.i18n.I18n; import org.codelutin.option.ui.ConfigTableModel; @@ -65,7 +65,7 @@ ui = null; SimExplorerActionManager.resetCache(); JConfigUI.reloadUI(); - SimExplorerTabManager.getFactory().resetCache(); + SimExplorerTab.getFactory().resetCache(); } /** Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-01-22 01:49:37 UTC (rev 352) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-01-22 01:50:46 UTC (rev 353) @@ -19,8 +19,6 @@ package fr.cemagref.simexplorer.is.ui; import fr.cemagref.simexplorer.is.ui.actions.SimExplorerCommonActions; -import fr.cemagref.simexplorer.is.ui.swing.bean.ApplicationBean; -import fr.cemagref.simexplorer.is.ui.swing.bean.ListApplicationBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.option.ParserException; @@ -46,22 +44,6 @@ private boolean launchUI = true; private boolean firstLaunch; - protected ListApplicationBean localApplications; - protected ListApplicationBean remoteApplications; - protected ApplicationBean applicationBean; - - public ApplicationBean getApplicationBean() { - return applicationBean; - } - - public ListApplicationBean getLocalApplications() { - return localApplications; - } - - public ListApplicationBean getRemoteApplications() { - return remoteApplications; - } - public SimExplorerOptionParser getParser() { if (parser == null) { // creation du parseur Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-01-22 01:49:37 UTC (rev 352) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-01-22 01:50:46 UTC (rev 353) @@ -38,7 +38,7 @@ * 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(JAXXObject,SimExplorerTabManager)} de charger + * On peut de plus via la méthode {@link #loadActions(JAXXObject, SimExplorerTab)} de charger * dans l'ui les actions connues. * * @author tony @@ -61,7 +61,7 @@ * de type <code>SimExplorerAbstractTabAction</code> pour savoir à quel tab * elles se rattachent. */ - private static SimExplorerTabManager loadingTab; + private static SimExplorerTab loadingTab; /** * @param ui l'ui à charger @@ -70,7 +70,7 @@ * @return le tableau des actions instanciées ou récupérées du cache de * la factory */ - public static AbstractAction[] loadActions(JAXXObject ui, SimExplorerTabManager fromTab) { + public static AbstractAction[] loadActions(JAXXObject ui, SimExplorerTab fromTab) { loadingTab = fromTab; try { AbstractAction[] actions; @@ -82,7 +82,7 @@ } /** @return la tab en cours de chargement ou bien <code>null</code> */ - public static SimExplorerTabManager getLoadingTab() { + public static SimExplorerTab getLoadingTab() { return loadingTab; } @@ -97,7 +97,6 @@ factory = new ActionFactory() { @SuppressWarnings({"unchecked"}) protected Map<String, Class<? extends AbstractAction>> init() { - // first init load actions Properties properties = new Properties(); try { properties.load(Class.class.getResourceAsStream(ACTIONS_FILE_PATH)); 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-01-22 01:49:37 UTC (rev 352) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java 2008-01-22 01:50:46 UTC (rev 353) @@ -46,7 +46,7 @@ protected Map<String, TabContentConfig> initFactory() { Map<String, TabContentConfig> result = new TreeMap<String, TabContentConfig>(); - for (SimExplorerTabManager tab : SimExplorerTabManager.values()) { + for (SimExplorerTab tab : SimExplorerTab.values()) { try { String tabName = tab.name(); Field field = tab.getClass().getField(tabName); @@ -62,8 +62,8 @@ SimExplorerActionManager.loadActions((JAXXObject) tab, getTab(tabName)); } - protected SimExplorerTabManager getTab(String tabName) { - return SimExplorerTabManager.valueOf(tabName); + protected SimExplorerTab getTab(String tabName) { + return SimExplorerTab.valueOf(tabName); } @Override

1 0

r352 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:49:37 +0000 (Tue, 22 Jan 2008) New Revision: 352 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java Removed: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java Log: renommage de SimEplorerTabManager en SimExplorerTab Copied: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java (from rev 348, trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java) =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-01-22 01:49:37 UTC (rev 352) @@ -0,0 +1,110 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* 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 2 +* 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, 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.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.tab.JApplicationDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationSynchronizeTab; +import jaxx.runtime.JAXXObject; +import jaxx.runtime.builder.TabContentConfig; +import jaxx.runtime.builder.TabFactory; +import jaxx.runtime.builder.TabModel; + +import javax.swing.JComponent; +import javax.swing.JTabbedPane; + +/** @author tony */ + +public enum SimExplorerTab { + + @TabContentConfig( + impl = JApplicationDetailTab.class, + model = DetailTabModel.class, + parentImpl = JTabbedPane.class, + name = "simexplorer.tab.detail", + shortDescription = "simexplorer.tab.detail.tooltip" + )detail, + + @TabContentConfig( + impl = JApplicationListTab.class, + parentImpl = JTabbedPane.class, + model = ListTabModel.class, + useToogle = true, + name = "simexplorer.tab.local", + shortDescription = "simexplorer.tab.local.tooltip" + )local, + + @TabContentConfig( + impl = JApplicationListTab.class, + parentImpl = JTabbedPane.class, + model = ListTabModel.class, + useToogle = true, + name = "simexplorer.tab.remote", + shortDescription = "simexplorer.tab.remote.tooltip" + )remote, + + @TabContentConfig( + impl = JApplicationSynchronizeTab.class, + parentImpl = JTabbedPane.class, + model = SynchronizeTabModel.class, + useToogle = true, + name = "simexplorer.tab.synchronize", + shortDescription = "simexplorer.tab.synchronize.tooltip" + )synchronize; + + /** l'usine de tabs */ + private static TabFactory factory; + + public static TabFactory getFactory() { + if (factory == null) { + factory = new SimExplorerTabFactory(); + } + return factory; + } + + public JAXXObject getUI() { + return (JAXXObject) getFactory().getUI(name()); + } + + public TabModel getModel() { + return getFactory().getModel(name()); + } + + public boolean isTabVisible(JTabbedPane container) { + JAXXObject ui = getUI(); + return ui != null && getFactory().getTabIndex(container, (JComponent) ui) > -1; + } + + public int getTabIndex(JTabbedPane container) { + JAXXObject ui = getUI(); + return ui == null ? -1 : getFactory().getTabIndex(container, (JComponent) ui); + } + + public void showTab(final JTabbedPane container) { + getFactory().showTab(container, name()); + } + + public void closeTab(JTabbedPane container) { + getFactory().closeTab(container, name()); + } + +} Deleted: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java 2008-01-22 01:06:24 UTC (rev 351) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java 2008-01-22 01:49:37 UTC (rev 352) @@ -1,107 +0,0 @@ -/* -* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit -* -* 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 2 -* 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, 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.swing.tab.JApplicationDetailTab; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationSynchronizeTab; -import jaxx.runtime.JAXXObject; -import jaxx.runtime.builder.TabContentConfig; -import jaxx.runtime.builder.TabModel; -import jaxx.runtime.builder.TabFactory; - -import javax.swing.JComponent; -import javax.swing.JTabbedPane; - -/** @author tony */ - -public enum SimExplorerTabManager { - - @TabContentConfig( - impl = JApplicationDetailTab.class, - model=TabModel.class, - parentImpl = JTabbedPane.class, - name = "simexplorer.tab.detail", - shortDescription = "simexplorer.tab.detail.tooltip" - )detail, - - @TabContentConfig( - impl = JApplicationListTab.class, - parentImpl = JTabbedPane.class, - model=TabModel.class, - useToogle = true, - name = "simexplorer.tab.local", - shortDescription = "simexplorer.tab.local.tooltip" - )local, - - @TabContentConfig( - impl = JApplicationListTab.class, - parentImpl = JTabbedPane.class, - model=TabModel.class, - useToogle = true, - name = "simexplorer.tab.remote", - shortDescription = "simexplorer.tab.remote.tooltip" - )remote, - - @TabContentConfig( - impl = JApplicationSynchronizeTab.class, - parentImpl = JTabbedPane.class, - model=TabModel.class, - useToogle = true, - name = "simexplorer.tab.synchronize", - shortDescription = "simexplorer.tab.synchronize.tooltip" - )synchronize; - - /** l'usine de tabs */ - private static TabFactory factory; - - public static TabFactory getFactory() { - if (factory == null) { - factory = new SimExplorerTabFactory(); - } - return factory; - } - - public JAXXObject getUI() { - return (JAXXObject) getFactory().getUI(name()); - } - - public TabModel getModel() { - return getFactory().getModel(name()); - } - - public boolean isTabVisible(JTabbedPane container) { - JAXXObject ui = getUI(); - return ui != null && getFactory().getTabIndex(container, (JComponent) ui) > -1; - } - - public int getTabIndex(JTabbedPane container) { - JAXXObject ui = getUI(); - return ui == null ? -1 : getFactory().getTabIndex(container, (JComponent) ui); - } - - public void showTab(final JTabbedPane container) { - getFactory().showTab(container, name()); - } - - public void closeTab(JTabbedPane container) { - getFactory().closeTab(container, name()); - } - -}

1 0

r351 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:06:24 +0000 (Tue, 22 Jan 2008) New Revision: 351 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java Log: utilisation des factories Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-01-22 01:04:32 UTC (rev 350) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-01-22 01:06:24 UTC (rev 351) @@ -21,8 +21,9 @@ import fr.cemagref.simexplorer.is.service.MockStorageServiceImpl; import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTabManager; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerMainUI; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import org.codelutin.i18n.I18n; import org.codelutin.option.ui.ConfigTableModel; @@ -55,15 +56,16 @@ public static SimExplorerMainUI getUI() { checkInitContext(); if (ui == null) { - ui = new SimExplorerMainUI(); + ui = new SimExplorerMainUI(); } return ui; } public static void reloadUI() { ui = null; + SimExplorerActionManager.resetCache(); JConfigUI.reloadUI(); - SimExplorerTabManager.reloadUI(); + SimExplorerTabManager.getFactory().resetCache(); } /**

1 0

r350 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:04:32 +0000 (Tue, 22 Jan 2008) New Revision: 350 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java Log: utilisation de la factory d'actions + renommage actions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-22 01:03:39 UTC (rev 349) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-22 01:04:32 UTC (rev 350) @@ -19,7 +19,7 @@ package fr.cemagref.simexplorer.is.ui.swing; import fr.cemagref.simexplorer.is.ui.SimExplorer; -import fr.cemagref.simexplorer.is.ui.swing.action.ChangeI18nAction; +import fr.cemagref.simexplorer.is.ui.swing.action.ChangeI18nAbstractAction; import org.codelutin.i18n.CountryEnum; import org.codelutin.i18n.LanguageEnum; @@ -36,11 +36,8 @@ public SimExplorerMainUI() { super(); - // chargement des classes d'implantations des actions d'ui - SimExplorerActionManager.init(); - // chargement dans l'ui des actions - SimExplorerActionManager.loadActions(this); + SimExplorerActionManager.loadActions(this, null); // repaint i18n actions repaintI18nActions(); @@ -49,14 +46,14 @@ public void repaintI18nActions() { LanguageEnum language = SimExplorer.getContext().getConfig().getLanguage(); CountryEnum country = SimExplorer.getContext().getConfig().getCountry(); - String[] actions = SimExplorerActionManager.getActionNames(); + String[] actions = SimExplorerActionManager.getFactory().getActionNames(); for (String actionName : actions) { - Matcher matcher = ChangeI18nAction.PATTERN_NAME.matcher(actionName); + Matcher matcher = ChangeI18nAbstractAction.PATTERN_NAME.matcher(actionName); if (!matcher.matches()) { continue; } AbstractButton button = (AbstractButton) getObjectById(actionName); - ChangeI18nAction action = (ChangeI18nAction) button.getAction(); + ChangeI18nAbstractAction action = (ChangeI18nAbstractAction) button.getAction(); boolean enable = !action.equalsLocale(language, country); button.setEnabled(enable); }

1 0

r349 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:03:39 +0000 (Tue, 22 Jan 2008) New Revision: 349 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java Log: utilisation de la factory d'actions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-01-22 01:02:59 UTC (rev 348) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-01-22 01:03:39 UTC (rev 349) @@ -20,18 +20,14 @@ import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.util.GlueActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.util.MyToggleButton; -import fr.cemagref.simexplorer.is.ui.swing.util.SelectActionConfig; import jaxx.runtime.JAXXObject; +import jaxx.runtime.builder.ActionFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; +import javax.swing.AbstractAction; import javax.swing.AbstractButton; -import javax.swing.Action; -import javax.swing.Icon; import javax.swing.JComboBox; import java.io.IOException; import java.util.Map; @@ -40,11 +36,9 @@ /** * La classe responsable de l'enregistrement des actions disponibles - * dans l'application ({@link #init()} . + * dans l'application en délégeant à une ActionFactory. * <p/> - * C'est aussi une usine d'actions ({@link #newAction(String,javax.swing.AbstractButton)} . - * <p/> - * On peut de plus via la méthode {@link #loadActions(JAXXObject)} de charger + * On peut de plus via la méthode {@link #loadActions(JAXXObject,SimExplorerTabManager)} de charger * dans l'ui les actions connues. * * @author tony @@ -52,301 +46,94 @@ */ public class SimExplorerActionManager { - static private Log log = LogFactory.getLog(SimExplorerActionManager.class); + private static final Log log = LogFactory.getLog(SimExplorerActionManager.class); /** path in classpath where to find actions mapping */ protected static final String ACTIONS_FILE_PATH = "/actions.properties"; protected static final String ACTION_KEY_PREFIX = "action."; - static Map<String, Class<? extends SimExplorerAbstractAction>> impls; + /** l'usine d'actions */ + private static ActionFactory factory; - @SuppressWarnings({"unchecked"}) - public static void init() { - if (impls == null) { - // first init load actions - Map<String, Class<? extends SimExplorerAbstractAction>> cache = new TreeMap<String, Class<? extends SimExplorerAbstractAction>>(); - Properties properties; - try { - properties = new Properties(); - properties.load(Class.class.getResourceAsStream(ACTIONS_FILE_PATH)); - } catch (IOException e) { - throw new SimExplorerRuntimeException(_("could not load actions.properties file for reason {0} ", e.getMessage())); - } - int prefix = ACTION_KEY_PREFIX.length(); - for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) { - String key = objectObjectEntry.getKey() + ""; - String qfn = objectObjectEntry.getValue() + ""; - try { - Class<? extends SimExplorerAbstractAction> implCass; - implCass = (Class<? extends SimExplorerAbstractAction>) Class.forName(qfn); - log.debug("found action " + implCass); - cache.put(key.substring(prefix), implCass); - } catch (ClassNotFoundException e) { - impls = cache; - throw new SimExplorerRuntimeException(_("could not found for action key {0} class {1} ", key, qfn)); - } - } - impls = cache; - } - } - - public static String[] getActionNames() { - checkInit(); - return impls.keySet().toArray(new String[impls.size()]); - } - - public static void loadActions(JAXXObject ui) { - checkInit(); - for (Map.Entry<String, Class<? extends SimExplorerAbstractAction>> entry : impls.entrySet()) { - String actionKey = entry.getKey(); - Object comp = ui.getObjectById(actionKey); - if (comp == null || !(comp instanceof AbstractButton || comp instanceof JComboBox)) { - continue; - } - if (comp instanceof AbstractButton) { - AbstractButton component = (AbstractButton) comp; - - SimExplorerAbstractAction action = newAction(actionKey, component); - - component.setAction(action); - - if (component instanceof MyToggleButton) { - MyToggleButton glueComponent = (MyToggleButton) component; - glueComponent.setIcon((Icon) action.getValue(Action.SMALL_ICON)); - Integer integer = (Integer) action.getValue(Action.MNEMONIC_KEY); - if (integer != null) { - glueComponent.setNormalMnemonic(integer); - } - glueComponent.setSelectedIcon((Icon) action.getValue(Action.SMALL_ICON + 2)); - integer = (Integer) action.getValue(Action.MNEMONIC_KEY + 2); - if (integer != null) { - glueComponent.setGlueMnemonic(integer); - } - glueComponent.setGlueText((String) action.getValue(Action.NAME + 2)); - glueComponent.setGlueTooltipText((String) action.getValue(Action.SHORT_DESCRIPTION + 2)); - - glueComponent.setNormalText((String) action.getValue(Action.NAME)); - glueComponent.setNormalTooltipText((String) action.getValue(Action.SHORT_DESCRIPTION)); - } - - Boolean value = (Boolean) action.getValue("hideActionText"); - - component.setHideActionText(value != null && value); - continue; - } - if (comp instanceof JComboBox) { - JComboBox component = (JComboBox) comp; - - SimExplorerAbstractAction action = newAction(actionKey, component); - - component.setAction(action); - Integer val = (Integer) action.getValue("selectedIndex"); - if (val != null && val<component.getItemCount()) { - component.setSelectedIndex(val); - } - } - - } - } - /** - * @param actionKey le nom de l'action tel que définie dans le fichier - * de mapping (sans le prefix action.) - * @param component le button où rattacher l'action - * @return une nouvelle instance de l'action associée à sa clef. + * la tab en cours de chargement, utilisé dans l'init des actions + * de type <code>SimExplorerAbstractTabAction</code> pour savoir à quel tab + * elles se rattachent. */ - public static SimExplorerAbstractAction newAction(String actionKey, AbstractButton component) { + private static SimExplorerTabManager loadingTab; - // on vérifie que l'action existe bien - checkRegistredAction(actionKey); - - // on récupère la classe d'implantation de l'action - Class<? extends SimExplorerAbstractAction> klazz = impls.get(actionKey); - - - try { - SimExplorerAbstractAction result = klazz.getConstructor(String.class).newInstance(actionKey); - //result.putValue(Action.ACTION_COMMAND_KEY, actionKey); - - log.debug(actionKey + " : " + result); - // recherche de l'annotation de configuration - ActionConfig anno = initActionConfig(component, klazz, result); - - if (anno == null) { - GlueActionConfig anno2 = initGlueActionConfig(component, klazz, result); - if (anno2 == null && component != null) { - result.putValue(Action.ACTION_COMMAND_KEY, component.getName()); - result.putValue(Action.SHORT_DESCRIPTION, component.getToolTipText()); - result.putValue(Action.SMALL_ICON, component.getIcon()); - result.putValue(Action.NAME, component.getText()); - result.putValue(Action.MNEMONIC_KEY, component.getMnemonic()); - result.putValue("hideActionText", component.getHideActionText()); - if (component instanceof MyToggleButton) { - MyToggleButton glueComponent = (MyToggleButton) component; - result.putValue(Action.SHORT_DESCRIPTION, glueComponent.getNormalTooltipText()); - result.putValue(Action.NAME, glueComponent.getNormalText()); - result.putValue(Action.SMALL_ICON, glueComponent.getIcon()); - result.putValue(Action.MNEMONIC_KEY, glueComponent.getNormalMnemonic()); - result.putValue(Action.SHORT_DESCRIPTION + 2, glueComponent.getGlueTooltipText()); - result.putValue(Action.NAME + 2, glueComponent.getGlueText()); - result.putValue(Action.SMALL_ICON + 2, glueComponent.getSelectedIcon()); - result.putValue(Action.MNEMONIC_KEY + 2, glueComponent.getGlueMnemonic()); - } - } - } - - String text = (String) result.getValue(Action.NAME); - Integer mnemo = (Integer) result.getValue(Action.MNEMONIC_KEY); - if (mnemo != null && mnemo != '\0') { - int pos = text.indexOf((char) mnemo.intValue()); - if (pos == -1) { - pos = text.indexOf(Character.toLowerCase((char) mnemo.intValue())); - } - result.putValue(Action.DISPLAYED_MNEMONIC_INDEX_KEY, pos); - } - return result; - } catch (Exception e) { - throw new SimExplorerRuntimeException(e); - } - } - /** - * @param actionKey le nom de l'action tel que définie dans le fichier - * de mapping (sans le prefix action.) - * @param component le button où rattacher l'action - * @return une nouvelle instance de l'action associée à sa clef. + * @param ui l'ui à charger + * @param fromTab la tab en cours de chargement ou <code>null</code< si l'ui + * n'est pas une tab + * @return le tableau des actions instanciées ou récupérées du cache de + * la factory */ - public static SimExplorerAbstractAction newAction(String actionKey, JComboBox component) { - - // on vérifie que l'action existe bien - checkRegistredAction(actionKey); - - // on récupère la classe d'implantation de l'action - Class<? extends SimExplorerAbstractAction> klazz = impls.get(actionKey); - + public static AbstractAction[] loadActions(JAXXObject ui, SimExplorerTabManager fromTab) { + loadingTab = fromTab; try { - SimExplorerAbstractAction result = klazz.getConstructor(String.class).newInstance(actionKey); - //result.putValue(Action.ACTION_COMMAND_KEY, actionKey); - - log.debug(actionKey + " : " + result); - // recherche de l'annotation de configuration - SelectActionConfig anno = initSelectActionConfig(component, klazz, result); - if (anno == null) { - result.putValue(Action.ACTION_COMMAND_KEY, component.getName()); - result.putValue(Action.SHORT_DESCRIPTION, component.getToolTipText()); - result.putValue("selectedIndex", component.getSelectedIndex()); - - } - return result; - } catch (Exception e) { - throw new SimExplorerRuntimeException(e); + AbstractAction[] actions; + actions = getFactory().loadActions(ui); + return actions; + } finally { + loadingTab = null; } } - private static GlueActionConfig initGlueActionConfig(AbstractButton component, Class<? extends SimExplorerAbstractAction> klazz, SimExplorerAbstractAction result) { - GlueActionConfig anno = klazz.getAnnotation(GlueActionConfig.class); - if (anno != null) { - // inject les données - if (!anno.name().isEmpty()) { - //System.out.println("found action with name : " + anno.name()); - result.putValue(Action.NAME, _(anno.name())); - } - if (!anno.name2().isEmpty()) { - //System.out.println("found action with name2 : " + anno.name2()); - result.putValue(Action.NAME + "2", _(anno.name2())); - } - - if (!anno.shortDescription().isEmpty()) { - result.putValue(Action.SHORT_DESCRIPTION, _(anno.shortDescription())); - } - if (!anno.shortDescription2().isEmpty()) { - result.putValue(Action.SHORT_DESCRIPTION + "2", _(anno.shortDescription2())); - } - - if (!anno.smallIcon().isEmpty()) { - result.putValue(Action.SMALL_ICON, fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon(anno.smallIcon())); - } - if (!anno.smallIcon2().isEmpty()) { - result.putValue(Action.SMALL_ICON + "2", fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon(anno.smallIcon2())); - } - - if (anno.mnemonic() != '\0') { - result.putValue(Action.MNEMONIC_KEY, anno.mnemonic()); - } else if (component != null) { - result.putValue(Action.MNEMONIC_KEY, component.getMnemonic()); - } - if (anno.mnemonic2() != '\0') { - result.putValue(Action.MNEMONIC_KEY + "2", anno.mnemonic2()); - } - //TODO Convert it from String result.putValue(Action.ACCELERATOR_KEY, anno.accelerator()); - - - result.putValue("hideActionText", anno.hideActionText()); - result.putValue(Action.SELECTED_KEY, anno.selected()); - result.setEnabled(anno.enabled()); - } - return anno; + /** @return la tab en cours de chargement ou bien <code>null</code> */ + public static SimExplorerTabManager getLoadingTab() { + return loadingTab; } - private static ActionConfig initActionConfig(AbstractButton component, Class<? extends SimExplorerAbstractAction> klazz, SimExplorerAbstractAction result) { - ActionConfig anno = klazz.getAnnotation(ActionConfig.class); - if (anno != null) { - // inject les données - if (!anno.name().isEmpty()) { - //System.out.println("found action with name : " + anno.name()); - result.putValue(Action.NAME, _(anno.name())); - } - //if (!anno.shortDescription().isEmpty()) { - result.putValue(Action.SHORT_DESCRIPTION, _(anno.shortDescription())); - //} - if (!anno.smallIcon().isEmpty()) { - result.putValue(Action.SMALL_ICON, fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon(anno.smallIcon())); - } - if (anno.mnemonic() != '\0') { - result.putValue(Action.MNEMONIC_KEY, anno.mnemonic()); - } else if (component != null) { - result.putValue(Action.MNEMONIC_KEY, component.getMnemonic()); - } - //TODO Convert it from String result.putValue(Action.ACCELERATOR_KEY, anno.accelerator()); - - - result.putValue("hideActionText", anno.hideActionText()); - result.putValue(Action.SELECTED_KEY, anno.selected()); - result.setEnabled(anno.enabled()); + /** + * Retourne (et instancie la première fois l'usine d'actions) + * + * @return l'usine d'actions + * @see jaxx.runtime.builder.ActionFactory + */ + protected static ActionFactory getFactory() { + if (factory == null) { + factory = new ActionFactory() { + @SuppressWarnings({"unchecked"}) + protected Map<String, Class<? extends AbstractAction>> init() { + // first init load actions + Properties properties = new Properties(); + try { + properties.load(Class.class.getResourceAsStream(ACTIONS_FILE_PATH)); + } catch (IOException e) { + throw new SimExplorerRuntimeException(_("simexplorer.error.load.actions.file", e.getMessage())); + } + Map<String, Class<? extends AbstractAction>> cache = new TreeMap<String, Class<? extends AbstractAction>>(); + int prefix = ACTION_KEY_PREFIX.length(); + for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) { + String key = objectObjectEntry.getKey() + ""; + String qfn = objectObjectEntry.getValue() + ""; + try { + Class<? extends AbstractAction> implCass; + implCass = (Class<? extends SimExplorerAbstractAction>) Class.forName(qfn); + log.debug("found action " + implCass); + cache.put(key.substring(prefix), implCass); + } catch (ClassNotFoundException e) { + throw new SimExplorerRuntimeException(_("simexplorer.error.load.actions.class", key, qfn)); + } + } + return cache; + } + }; } - return anno; + return factory; } - private static SelectActionConfig initSelectActionConfig(JComboBox component, Class<? extends SimExplorerAbstractAction> klazz, SimExplorerAbstractAction result) { - SelectActionConfig anno = klazz.getAnnotation(SelectActionConfig.class); - if (anno != null) { - // inject les données - if (!anno.name().isEmpty()) { - result.putValue(Action.NAME, _(anno.name())); - } - if (!anno.shortDescription().isEmpty()) { - result.putValue(Action.SHORT_DESCRIPTION, _(anno.shortDescription())); - } else { - result.putValue(Action.SHORT_DESCRIPTION, _(component.getToolTipText())); - } - result.putValue("selectedIndex", anno.selectedIndex()); - //TODO Convert it from String result.putValue(Action.ACCELERATOR_KEY, anno.accelerator()); - result.setEnabled(anno.enabled()); - } - return anno; + public static AbstractAction newAction(String actionKey, AbstractButton component) { + return getFactory().newAction(actionKey, component); } - protected static void checkInit() { - if (impls == null) { - throw new SimExplorerRuntimeException("you must init first the " + SimExplorerActionManager.class.getName() + " class via init method"); - } + public static AbstractAction newAction(String actionKey, JComboBox component) { + return getFactory().newAction(actionKey, component); } - protected static void checkRegistredAction(String actionKey) { - checkInit(); - if (!impls.containsKey(actionKey)) { - throw new SimExplorerRuntimeException(_("can not find a registered action for key {0} ", actionKey)); - } + public static void resetCache() { + getFactory().resetCache(); } }

1 0

r348 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:02:59 +0000 (Tue, 22 Jan 2008) New Revision: 348 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java Log: utilisation de la factory Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java 2008-01-22 01:02:40 UTC (rev 347) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java 2008-01-22 01:02:59 UTC (rev 348) @@ -18,235 +18,90 @@ * \#\#% */ 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.tab.JApplicationDetailTab; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationSynchronizeTab; -import fr.cemagref.simexplorer.is.ui.swing.util.MyTabHeader; -import fr.cemagref.simexplorer.is.ui.swing.util.MyToggleButton; -import fr.cemagref.simexplorer.is.ui.swing.util.TabContent; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; +import jaxx.runtime.JAXXObject; +import jaxx.runtime.builder.TabContentConfig; +import jaxx.runtime.builder.TabModel; +import jaxx.runtime.builder.TabFactory; import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JFrame; import javax.swing.JTabbedPane; -import java.awt.Component; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import jaxx.runtime.JAXXObject; - /** @author tony */ -public class SimExplorerTabManager { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(SimExplorerTabManager.class); +public enum SimExplorerTabManager { - public enum Tab { + @TabContentConfig( + impl = JApplicationDetailTab.class, + model=TabModel.class, + parentImpl = JTabbedPane.class, + name = "simexplorer.tab.detail", + shortDescription = "simexplorer.tab.detail.tooltip" + )detail, - @TabContent(impl = JApplicationDetailTab.class, parentImpl = JTabbedPane.class) - detail(n_("simexplorer.tab.detail"), n_("simexplorer.tab.detail.tooltip")) { - public JApplicationDetailTab get() { - return (JApplicationDetailTab) get0(); - } - }, + @TabContentConfig( + impl = JApplicationListTab.class, + parentImpl = JTabbedPane.class, + model=TabModel.class, + useToogle = true, + name = "simexplorer.tab.local", + shortDescription = "simexplorer.tab.local.tooltip" + )local, - @TabContent(impl = JApplicationListTab.class, parentImpl = JTabbedPane.class, useToogle = true) - local(n_("simexplorer.tab.local"), n_("simexplorer.tab.local.tooltip")) { - public JApplicationListTab get() { - return (JApplicationListTab) get0(); - } - }, + @TabContentConfig( + impl = JApplicationListTab.class, + parentImpl = JTabbedPane.class, + model=TabModel.class, + useToogle = true, + name = "simexplorer.tab.remote", + shortDescription = "simexplorer.tab.remote.tooltip" + )remote, - @TabContent(impl = JApplicationListTab.class, parentImpl = JTabbedPane.class, useToogle = true) - remote(n_("simexplorer.tab.remote"), n_("simexplorer.tab.remote.tooltip")) { - public JApplicationListTab get() { - return (JApplicationListTab) get0(); - } - }, + @TabContentConfig( + impl = JApplicationSynchronizeTab.class, + parentImpl = JTabbedPane.class, + model=TabModel.class, + useToogle = true, + name = "simexplorer.tab.synchronize", + shortDescription = "simexplorer.tab.synchronize.tooltip" + )synchronize; - @TabContent(impl = JApplicationSynchronizeTab.class, parentImpl = JTabbedPane.class, useToogle = true) - synchronize(n_("simexplorer.tab.synchronize"), n_("simexplorer.tab.synchronize.tooltip")) { - public JApplicationSynchronizeTab get() { - return (JApplicationSynchronizeTab) get0(); - } - }; + /** l'usine de tabs */ + private static TabFactory factory; - - public abstract JComponent get(); - - private final String text; - - private final String toolTipText; - - private JComponent instance; - - private TabContent annotation; - - Tab(String text, String toolTipText) { - this.text = text; - this.toolTipText = toolTipText; + public static TabFactory getFactory() { + if (factory == null) { + factory = new SimExplorerTabFactory(); } - - public String getText() { - return _(text); - } - - public String getToolTipText() { - return _(toolTipText); - } - - public boolean isUseToggle() { - return getAnnotation().useToogle(); - } - - JComponent get0() { - if (instance == null) { - try { - instance = getAnnotation().impl().newInstance(); - log.info("new tab : "+instance); - // chargement dans l'ui des actions - if (instance instanceof JAXXObject) { - JAXXObject ui = (JAXXObject) instance; - SimExplorerActionManager.loadActions(ui); - Object toolbar = ui.getObjectById("toolbar"); - if (toolbar!=null && toolbar instanceof JAXXObject) { - SimExplorerActionManager.loadActions((JAXXObject) toolbar); - } - } - } catch (InstantiationException e) { - throw new SimExplorerRuntimeException(e); - } catch (IllegalAccessException e) { - throw new SimExplorerRuntimeException(e); - } - } - return instance; - } - - TabContent getAnnotation() { - if (annotation == null) { - try { - annotation = getClass().getField(name()).getAnnotation(TabContent.class); - } catch (NoSuchFieldException e) { - throw new SimExplorerRuntimeException("could not found annotation " + TabContent.class + " on enum " + this); - } - } - if (annotation == null) { - throw new SimExplorerRuntimeException("could not found annotation " + TabContent.class + " on enum " + this); - } - return annotation; - } - + return factory; } - public static void reloadUI() { - for (Tab tab : Tab.values()) { - tab.instance = null; - } + public JAXXObject getUI() { + return (JAXXObject) getFactory().getUI(name()); } - public static void showTab(final JTabbedPane container, Tab tab) { - - final JComponent comp = tab.get(); - int index = getTabIndex(container, tab); - if (index == -1) { - addTab(container, tab, comp); - } - container.setSelectedComponent(comp); - - int index1 = getTabIndex(container, tab); - log.debug(tab + " index " + index1); - if (tab.isUseToggle()) { - MyToggleButton buton = (MyToggleButton) SimExplorer.getUI().getObjectById("toggleTab_" + tab.name()); - buton.setSelected(true); - } + public TabModel getModel() { + return getFactory().getModel(name()); } - public static void closeTab(JTabbedPane container, Tab tab) { - - int index = getTabIndex(container, tab); - if (index != -1) { - container.removeTabAt(index); - log.debug(tab + " index " + index); - } - if (tab.isUseToggle()) { - MyToggleButton buton = (MyToggleButton) SimExplorer.getUI().getObjectById("toggleTab_" + tab.name()); - buton.setSelected(false); - } + public boolean isTabVisible(JTabbedPane container) { + JAXXObject ui = getUI(); + return ui != null && getFactory().getTabIndex(container, (JComponent) ui) > -1; } - public static void toggleTab(JTabbedPane container, Tab tab) { - if (getTabIndex(container, tab) > -1) { - closeTab(container, tab); - } else { - showTab(container, tab); - } + public int getTabIndex(JTabbedPane container) { + JAXXObject ui = getUI(); + return ui == null ? -1 : getFactory().getTabIndex(container, (JComponent) ui); } - protected static void addTab(final JTabbedPane container, final Tab tab, final JComponent comp) { - - container.addTab(tab.getText(), comp); - final MyTabHeader panel = new MyTabHeader(); - - // add a dynamic reference to tab close button to enable - // dynamic action instanciation - panel.get$objectMap().put(panel.getCloseTab().getName() + "_" + tab.name(), panel.getCloseTab()); - - // chargement dans l'ui des actions - SimExplorerActionManager.loadActions(panel); - - panel.setToolTipText(tab.getToolTipText()); - panel.getLabel().setText(tab.getText()); - - panel.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - Component compOld = container.getSelectedComponent(); - if (!comp.equals(compOld)) { - container.setSelectedComponent(comp); - } - } - }); - - container.setTabComponentAt(container.getTabCount() - 1, panel); - container.repaint(); + public void showTab(final JTabbedPane container) { + getFactory().showTab(container, name()); } - public static int getTabIndex(final JTabbedPane container, Tab tab) { - if (container != null) { - for (int i = 0; i < container.getTabCount(); i++) { - Component o = container.getComponentAt(i); - if (o.equals(tab.instance)) { - return i; - } - } - } - return -1; + public void closeTab(JTabbedPane container) { + getFactory().closeTab(container, name()); } - - protected SimExplorerTabManager() { - // do not instanciate - } - - public static void main(String[] args) { - SimExplorer.init(); - JTabbedPane container = SimExplorer.getUI().getContent(); - - JDialog dialog = new JDialog(); - dialog.setSize(800, 600); - dialog.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - dialog.setContentPane(container); - - for (Tab tab : Tab.values()) { - SimExplorerTabManager.showTab(container, tab); - } - dialog.setVisible(true); - } - }

1 0

r347 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:02:40 +0000 (Tue, 22 Jan 2008) New Revision: 347 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java Log: la factory de tab de SimExplorer Added: 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 (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java 2008-01-22 01:02:40 UTC (rev 347) @@ -0,0 +1,129 @@ +/* +* \#\#% 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 +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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, 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.util.MyTabHeader; +import jaxx.runtime.JAXXObject; +import jaxx.runtime.builder.TabContentConfig; +import jaxx.runtime.builder.TabFactory; +import static org.codelutin.i18n.I18n._; + +import javax.swing.AbstractButton; +import javax.swing.JComponent; +import javax.swing.JTabbedPane; +import java.awt.Component; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.lang.reflect.Field; +import java.util.Map; +import java.util.TreeMap; + +/** + * L'implatantion pour SimExplorer de la factory de Tab + * + * @author chemit + * @see TabFactory + */ +public class SimExplorerTabFactory extends TabFactory { + + protected Map<String, TabContentConfig> initFactory() { + Map<String, TabContentConfig> result = new TreeMap<String, TabContentConfig>(); + for (SimExplorerTabManager tab : SimExplorerTabManager.values()) { + try { + String tabName = tab.name(); + Field field = tab.getClass().getField(tabName); + result.put(tabName, field.getAnnotation(TabContentConfig.class)); + } catch (NoSuchFieldException e) { + throw new SimExplorerRuntimeException(e); + } + } + return result; + } + + protected void initTab(JComponent tab, String tabName, TabContentConfig config) { + SimExplorerActionManager.loadActions((JAXXObject) tab, getTab(tabName)); + } + + protected SimExplorerTabManager getTab(String tabName) { + return SimExplorerTabManager.valueOf(tabName); + } + + @Override + protected JComponent addTabHeader(final JTabbedPane container, + String tabName, + TabContentConfig tab, + final JComponent comp) { + + final MyTabHeader panel = new MyTabHeader(); + + // add a dynamic reference to tab close button to enable + // dynamic action instanciation + //TODO add the ActionManager mecanism ? + String actionName = panel.getCloseTab().getName() + "_" + tabName; + + panel.get$objectMap().put(actionName, panel.getCloseTab()); + + // chargement dans l'ui des actions + SimExplorerActionManager.loadActions(panel, getTab(tabName)); + + panel.setToolTipText(_(tab.shortDescription())); + panel.getLabel().setText(_(tab.name())); + + panel.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + Component compOld = container.getSelectedComponent(); + if (!comp.equals(compOld)) { + container.setSelectedComponent(comp); + } + } + }); + return panel; + } + + @Override + public void showTab(final JTabbedPane container, String tabName) { + + super.showTab(container, tabName); + + switchToggleButton(tabName, true); + } + + @Override + public void closeTab(JTabbedPane container, String tabName) { + + super.closeTab(container, tabName); + + switchToggleButton(tabName, false); + } + + protected void switchToggleButton(String tabName, boolean b) { + + TabContentConfig tab = getConfig(tabName); + + if (tab.useToogle()) { + AbstractButton buton; + buton = (AbstractButton) SimExplorer.getUI().getObjectById("toggleTab_" + tabName); + buton.setSelected(b); + } + } + +}

1 0

r346 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 21 Jan '08

21 Jan '08

Author: tchemit Date: 2008-01-21 22:00:45 +0000 (Mon, 21 Jan 2008) New Revision: 346 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java Log: mise en place ui sur la liste d'applications Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java 2008-01-21 21:59:42 UTC (rev 345) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java 2008-01-21 22:00:45 UTC (rev 346) @@ -20,6 +20,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import static org.codelutin.i18n.I18n._; +import static org.codelutin.i18n.I18n.n_; import javax.swing.table.AbstractTableModel; import java.beans.BeanInfo; @@ -27,6 +28,7 @@ import java.beans.Introspector; import java.beans.PropertyDescriptor; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; @@ -40,7 +42,7 @@ public JApplicationTableModel() { } - + public JApplicationTableModel(MetaDataEntity[] data) { this.data = data; } @@ -54,12 +56,12 @@ } private final String[] columnNames = { - _("simexplorer.common.uuid"), - _("simexplorer.common.name"), - _("simexplorer.common.type"), - _("simexplorer.common.description"), - _("simexplorer.common.version"), - _("simexplorer.common.create.date") + n_("simexplorer.common.uuid"), + n_("simexplorer.common.name"), + n_("simexplorer.common.type"), + n_("simexplorer.common.description"), + n_("simexplorer.common.version"), + n_("simexplorer.common.creationDate") }; public int getRowCount() { @@ -73,9 +75,11 @@ public Object getValueAt(int rowIndex, int columnIndex) { Object result = null; MetaDataEntity current = data[rowIndex]; - if (data != null) { + if (current != null) { try { - result = getDescriptors()[columnIndex].getReadMethod().invoke(current); + PropertyDescriptor propertyDescriptor = getDescriptors()[columnIndex]; + Method readMethod = propertyDescriptor.getReadMethod(); + result = readMethod.invoke(current); } catch (IllegalAccessException e) { throw new RuntimeException(e); } catch (InvocationTargetException e) { @@ -85,6 +89,11 @@ return result; } + @Override + public String getColumnName(int column) { + return _(columnNames[column]); + } + protected PropertyDescriptor[] getDescriptors() { if (descriptors == null) { descriptors = new PropertyDescriptor[columnNames.length];

1 0