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

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

22 Jan '08

Author: tchemit Date: 2008-01-22 02:01:46 +0000 (Tue, 22 Jan 2008) New Revision: 365 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleLocalTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleRemoteTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleSynchronizeTabAction.java Log: renommage GlueAction en ToggleAction Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleLocalTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleLocalTabAction.java 2008-01-22 02:00:21 UTC (rev 364) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleLocalTabAction.java 2008-01-22 02:01:46 UTC (rev 365) @@ -19,11 +19,10 @@ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; -import fr.cemagref.simexplorer.is.ui.swing.util.GlueActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.action.ToggleTabAbstractAction; /** @author chemit */ - at GlueActionConfig( + at jaxx.runtime.builder.ToggleActionConfig( actionCommand = "toggleTab_local", container = SimExplorerUI.class, name = "simexplorer.action.show.local", @@ -40,10 +39,10 @@ hideActionText = false ) -public class ToggleLocalTabAction extends SimExplorerAbstractTabAction { +public class ToggleLocalTabAction extends ToggleTabAbstractAction { private static final long serialVersionUID = 9177105156859413014L; public ToggleLocalTabAction(String name) { - super(name, "toggleTab"); + super(name); } } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleRemoteTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleRemoteTabAction.java 2008-01-22 02:00:21 UTC (rev 364) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleRemoteTabAction.java 2008-01-22 02:01:46 UTC (rev 365) @@ -19,11 +19,10 @@ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; -import fr.cemagref.simexplorer.is.ui.swing.util.GlueActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.action.ToggleTabAbstractAction; /** @author chemit */ - at GlueActionConfig( + at jaxx.runtime.builder.ToggleActionConfig( actionCommand = "toggleTab_remote", container = SimExplorerUI.class, name = "simexplorer.action.show.remote", @@ -39,11 +38,11 @@ selected = true, hideActionText = false ) -public class ToggleRemoteTabAction extends SimExplorerAbstractTabAction { +public class ToggleRemoteTabAction extends ToggleTabAbstractAction { private static final long serialVersionUID = -2309266315349330872L; public ToggleRemoteTabAction(String name) { - super(name, "toggleTab"); + super(name); } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleSynchronizeTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleSynchronizeTabAction.java 2008-01-22 02:00:21 UTC (rev 364) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleSynchronizeTabAction.java 2008-01-22 02:01:46 UTC (rev 365) @@ -19,11 +19,10 @@ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; -import fr.cemagref.simexplorer.is.ui.swing.util.GlueActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.action.ToggleTabAbstractAction; /** @author chemit */ - at GlueActionConfig( + at jaxx.runtime.builder.ToggleActionConfig( actionCommand = "toggleTab_synchronize", container = SimExplorerUI.class, name = "simexplorer.action.show.synchronize", @@ -39,10 +38,10 @@ selected = true, hideActionText = false ) -public class ToggleSynchronizeTabAction extends SimExplorerAbstractTabAction { +public class ToggleSynchronizeTabAction extends ToggleTabAbstractAction { private static final long serialVersionUID = -3389620707293969262L; public ToggleSynchronizeTabAction(String name) { - super(name, "toggleTab"); + super(name); } } \ No newline at end of file

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 02:00:21 +0000 (Tue, 22 Jan 2008) New Revision: 364 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java Log: normalisation nom action Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java 2008-01-22 02:00:03 UTC (rev 363) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java 2008-01-22 02:00:21 UTC (rev 364) @@ -19,20 +19,21 @@ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import java.awt.event.ActionEvent; + /** * Action pour fermer un tab * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "closeTab", container = fr.cemagref.simexplorer.is.ui.swing.util.MyTabHeader.class, name = "simexplorer.action.closeTab", shortDescription = "simexplorer.action.closeTab.tooltip", longDescription = "simexplorer.action.closeTab.help", - smallIcon = "window-close.png", + smallIcon = "closeTab.png", hideActionText = true ) public class CloseTabAction extends SimExplorerAbstractTabAction { @@ -44,10 +45,7 @@ } @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - //TODO femrer le modele avant - - // close ui - super.actionPerformed(e); + protected void doAction(ActionEvent e) throws Exception { + tab.closeTab(getMainUI().getContent()); } }

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 02:00:03 +0000 (Tue, 22 Jan 2008) New Revision: 363 Removed: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAction.java Log: renommage action (car abstraite) Deleted: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAction.java 2008-01-22 01:59:47 UTC (rev 362) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAction.java 2008-01-22 02:00:03 UTC (rev 363) @@ -1,57 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit, Gariel 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.action; - -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; - -import java.awt.event.ActionEvent; - -/** - * Action pour afficher une tab - * - * @author chemit - */ -public abstract class ShowTabAction extends SimExplorerAbstractTabAction { - - private static final long serialVersionUID = -4030583314708934811L; - - protected ShowTabAction(String name) { - super(name, "showTab"); - } - - @Override - public void actionPerformed(ActionEvent e) { - - initAction(); - - // load ui - super.actionPerformed(e); - - // set model - afterAction(); - } - - protected void afterAction() { - - } - - protected void initAction() { - - } -}

1 0

r362 - trunk/simexplorer-is-swing/src/resources/icons
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:59:47 +0000 (Tue, 22 Jan 2008) New Revision: 362 Added: trunk/simexplorer-is-swing/src/resources/icons/closeTab.png Removed: trunk/simexplorer-is-swing/src/resources/icons/window-close.png Log: normalisation nom action Copied: trunk/simexplorer-is-swing/src/resources/icons/closeTab.png (from rev 317, trunk/simexplorer-is-swing/src/resources/icons/window-close.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/closeTab.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/simexplorer-is-swing/src/resources/icons/window-close.png =================================================================== (Binary files differ)

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 01:58:21 +0000 (Tue, 22 Jan 2008) New Revision: 361 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAbstractAction.java Log: action g?\195?\169n?\195?\169rique Copied: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAbstractAction.java (from rev 317, trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAction.java) =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAbstractAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAbstractAction.java 2008-01-22 01:58:21 UTC (rev 361) @@ -0,0 +1,40 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gariel 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.action; + +import java.awt.event.ActionEvent; + +/** + * Action pour afficher une tab + * + * @author chemit + */ +public abstract class ShowTabAbstractAction extends SimExplorerAbstractTabAction { + + private static final long serialVersionUID = -4030583314708934811L; + + protected ShowTabAbstractAction(String name) { + super(name, "showTab"); + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + tab.showTab(getTabContainer()); + } +}

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 01:57:50 +0000 (Tue, 22 Jan 2008) New Revision: 360 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java Log: action de base revisit?\195?\169e (reste ?\195?\160 ajouter la gestion de s?\195?\169curit?\195?\169 sur action) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-22 01:57:11 UTC (rev 359) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-22 01:57:50 UTC (rev 360) @@ -18,14 +18,16 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTabManager; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; +import jaxx.runtime.builder.TabModel; +import jaxx.runtime.JAXXObject; import org.apache.commons.beanutils.Converter; import org.codelutin.i18n.I18n; import org.codelutin.util.ConverterUtil; +import javax.swing.JComponent; import javax.swing.JTabbedPane; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -36,53 +38,54 @@ */ public abstract class SimExplorerAbstractTabAction extends SimExplorerAbstractAction implements ActionParameter { - protected SimExplorerTabManager.Tab tab; + protected SimExplorerTab tab; + protected String param; - protected String methodName; - - protected Method method; - private static final long serialVersionUID = 5285229914266682509L; - protected String param; - protected SimExplorerAbstractTabAction(String name, String prefixPatternName) { super(name); - methodName = prefixPatternName; - Pattern patternName = Pattern.compile(prefixPatternName + "_(\\w+)"); - Matcher matcher = patternName.matcher(name); - if (!matcher.matches()) { - throw new IllegalArgumentException(I18n._("{0} should have a name like this {1}, but was {2}", getClass().getName(), patternName, name)); - } - param = matcher.group(1); - Converter convertorLanguage = ConverterUtil.getConverter(SimExplorerTabManager.Tab.class); - tab = (SimExplorerTabManager.Tab) convertorLanguage.convert(SimExplorerTabManager.Tab.class, param); - } + if (prefixPatternName != null) { + Pattern patternName = Pattern.compile(prefixPatternName + "_(\\w+)"); + Matcher matcher = patternName.matcher(name); + if (!matcher.matches()) { + throw new IllegalArgumentException(I18n._("{0} should have a name like this {1}, but was {2}", getClass().getName(), patternName, name)); + } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - try { - getMethod().invoke(null, getMainUI().getContent(), tab); - } catch (IllegalAccessException e1) { - throw new RuntimeException(e1); - } catch (InvocationTargetException e1) { - throw new RuntimeException(e1); - } - } + param = prefixPatternName; - protected Method getMethod() { - if (method == null) { - try { - method = SimExplorerTabManager.class.getMethod(methodName, JTabbedPane.class, SimExplorerTabManager.Tab.class); - } catch (NoSuchMethodException e) { - throw new RuntimeException("could not found method '" + methodName + "' on " + SimExplorerTabManager.class); - } + Converter convertorLanguage = ConverterUtil.getConverter(SimExplorerTab.class); + tab = (SimExplorerTab) convertorLanguage.convert(SimExplorerTab.class, matcher.group(1)); + } else { + param = name; + tab = SimExplorerActionManager.getLoadingTab(); } - return method; + log.info(">>> " + this); } public String getParam() { return param; } + + public JTabbedPane getTabContainer() { + return getMainUI().getContent(); + } + + public JAXXObject getTab() { + return tab.getUI(); + } + + public TabModel getModel() { + return tab.getModel(); + } + + protected JComponent getUIObject(String name) { + return getUIObject(name, getTab()); + } + + @Override + public String toString() { + String s = super.toString(); + return s.substring(s.lastIndexOf(".") + 1) + "<tab: " + tab + ", param: " + param + ">"; + } }

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 01:57:11 +0000 (Tue, 22 Jan 2008) New Revision: 359 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java Log: action de base revisit?\195?\169e (reste ?\195?\160 ajouter la gestion de s?\195?\169curit?\195?\169 sur action) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java 2008-01-22 01:56:24 UTC (rev 358) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java 2008-01-22 01:57:11 UTC (rev 359) @@ -20,10 +20,15 @@ import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.SimExplorerContext; +import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerMainUI; +import jaxx.runtime.JAXXObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.JComponent; +import java.awt.event.ActionEvent; + /** * La classe de base à utiliser pour toutes les action de l'application * @@ -35,13 +40,32 @@ static protected Log log = LogFactory.getLog(SimExplorerAbstractAction.class); + public void actionPerformed(java.awt.event.ActionEvent e) { + + log.info("------------------------------------------------------------"); + log.info("action : " + this); + log.info("event : " + e); + log.info("source : " + e.getSource()); + try { + boolean accepted = beforeAction(e); + log.info("doAction : ("+accepted+") : " + getActionName()); + if (accepted) { + doAction(e); + afterAction(e); + } + } catch (Exception e1) { + throw new SimExplorerRuntimeException(e1); + } finally { + // always clear action after use : actions are staless + clear(); + } + } + protected SimExplorerAbstractAction(String name) { super(name); + log.info("> " + this); } - protected SimExplorerAbstractAction() { - } - protected SimExplorerContext getContext() { return SimExplorer.getContext(); } @@ -50,11 +74,35 @@ return SimExplorer.getUI(); } + protected String getActionName() { + return (String) getValue(ACTION_COMMAND_KEY); + } + protected String getName() { return (String) getValue(NAME); } - public void actionPerformed(java.awt.event.ActionEvent e) { - log.info(this); + protected boolean beforeAction(ActionEvent e) throws Exception { + // nothing by default + return true; } + + protected void doAction(ActionEvent e) throws Exception { + // nothing by default + } + + protected void afterAction(ActionEvent e) throws Exception { + // nothing by default + } + + protected void clear() { + // nothing by default + } + + protected JComponent getUIObject(String name, JAXXObject container) { + if (container == null) { + return null; + } + return (JComponent) container.getObjectById(name); + } }

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 01:56:24 +0000 (Tue, 22 Jan 2008) New Revision: 358 Removed: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAction.java Log: renommage action (car abstraite) Deleted: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAction.java 2008-01-22 01:56:03 UTC (rev 357) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAction.java 2008-01-22 01:56:24 UTC (rev 358) @@ -1,42 +0,0 @@ -/* -* ##% 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.action; - -import java.awt.event.ActionEvent; - -/** - * Action pour siwtcher un tab - * - * @author chemit - */ -public abstract class ToggleTabAction extends SimExplorerAbstractTabAction { - - private static final long serialVersionUID = -5457476021698351850L; - - - public ToggleTabAction(String name) { - super(name, "toggleTab"); - } - - @Override - public void actionPerformed(ActionEvent e) { - super.actionPerformed(e); - //TODO - } -}

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 01:56:03 +0000 (Tue, 22 Jan 2008) New Revision: 357 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAbstractAction.java Log: dispatch action Copied: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAbstractAction.java (from rev 317, trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAction.java) =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAbstractAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAbstractAction.java 2008-01-22 01:56:03 UTC (rev 357) @@ -0,0 +1,77 @@ +/* +* ##% 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.action; + +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; + +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; +import javax.swing.JTabbedPane; +import java.awt.event.ActionEvent; + +/** + * Action pour siwtcher un tab + * + * @author chemit + */ +public abstract class ToggleTabAbstractAction extends SimExplorerAbstractTabAction { + + private static final long serialVersionUID = -5457476021698351850L; + + AbstractAction showAction; + AbstractAction closeAction; + + AbstractAction action; + + public ToggleTabAbstractAction(String name) { + super(name, "toggleTab"); + } + + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + super.beforeAction(e); + // find real action to perform + JTabbedPane container = getMainUI().getContent(); + if (tab.isTabVisible(container) ) { + action = getCloseAction(); + } else { + action = getShowAction(); + } + return action != null; + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + action.actionPerformed(e); + } + + public AbstractAction getCloseAction() { + if (closeAction == null) { + closeAction = SimExplorerActionManager.newAction("closeTab_" + tab.name(), (AbstractButton) null); + } + return closeAction; + } + + public AbstractAction getShowAction() { + if (showAction == null) { + showAction = SimExplorerActionManager.newAction("showTab_" + tab.name(), (AbstractButton) null); + } + return showAction; + } +}

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 01:53:58 +0000 (Tue, 22 Jan 2008) New Revision: 356 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ChangeI18nAbstractAction.java Removed: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ChangeI18nAction.java Log: renommage action (car abstraite) Copied: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ChangeI18nAbstractAction.java (from rev 317, trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ChangeI18nAction.java) =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ChangeI18nAbstractAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ChangeI18nAbstractAction.java 2008-01-22 01:53:58 UTC (rev 356) @@ -0,0 +1,87 @@ +/* +* ##% 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.action; + +import fr.cemagref.simexplorer.is.ui.SimExplorer; +import org.apache.commons.beanutils.Converter; +import org.codelutin.i18n.CountryEnum; +import org.codelutin.i18n.I18n; +import org.codelutin.i18n.LanguageEnum; +import org.codelutin.util.ConverterUtil; + +import java.awt.event.ActionEvent; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Une action pour recharger la locale. + * <p/> + * Le nom de l'action doit etre de la forme i18n_XX_YY où XX est la langue + * et YY le pays de la locale à charger. + * + * @author chemit + * @see LanguageEnum + * @see CountryEnum + */ +public abstract class ChangeI18nAbstractAction extends SimExplorerAbstractAction { + + public static final Pattern PATTERN_NAME = Pattern.compile("i18n_(\\w\\w)_(\\w\\w)"); + + protected LanguageEnum language; + + protected CountryEnum country; + private static final long serialVersionUID = 4180668477670765253L; + + public ChangeI18nAbstractAction(String name) { + super(name); + Matcher matcher = PATTERN_NAME.matcher(name); + if (!matcher.matches()) { + throw new IllegalArgumentException(I18n._(getClass().getName() + " should have a nmae like this 'i18n_XX_YY', but was {0}", name)); + } + Converter convertorLanguage = ConverterUtil.getConverter(LanguageEnum.class); + language = (LanguageEnum) convertorLanguage.convert(LanguageEnum.class, matcher.group(1)); + + convertorLanguage = ConverterUtil.getConverter(CountryEnum.class); + country = (CountryEnum) convertorLanguage.convert(CountryEnum.class, matcher.group(2)); + } + + @Override + public void actionPerformed(java.awt.event.ActionEvent e) { + super.actionPerformed(e); + //TODO Should ask confirm from user since it will close ui, and re instanciate ui + + getMainUI().getQuit().getAction().actionPerformed(new ActionEvent(this, ActionEvent.ACTION_FIRST, "cancel")); + SimExplorer.reloadUI(); + getContext().getConfig().setI18n(language, country); + getContext().getConfig().initI18n(); + + SimExplorer.launch(); + + SimExplorer.getContext().saveSafely(); + } + + public boolean equalsLocale(LanguageEnum lang, CountryEnum countr) { + return language == lang && country == countr; + } + + @Override + public String toString() { + return super.toString() + " Language " + language + " Country " + country; + } +} \ No newline at end of file Deleted: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ChangeI18nAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ChangeI18nAction.java 2008-01-22 01:53:40 UTC (rev 355) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ChangeI18nAction.java 2008-01-22 01:53:58 UTC (rev 356) @@ -1,88 +0,0 @@ -/* -* ##% 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.action; - -import fr.cemagref.simexplorer.is.ui.SimExplorer; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import org.apache.commons.beanutils.Converter; -import org.codelutin.i18n.CountryEnum; -import org.codelutin.i18n.I18n; -import org.codelutin.i18n.LanguageEnum; -import org.codelutin.util.ConverterUtil; - -import java.awt.event.ActionEvent; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * Une action pour recharger la locale. - * <p/> - * Le nom de l'action doit etre de la forme i18n_XX_YY où XX est la langue - * et YY le pays de la locale à charger. - * - * @author chemit - * @see LanguageEnum - * @see CountryEnum - */ -public abstract class ChangeI18nAction extends SimExplorerAbstractAction { - - public static final Pattern PATTERN_NAME = Pattern.compile("i18n_(\\w\\w)_(\\w\\w)"); - - protected LanguageEnum language; - - protected CountryEnum country; - private static final long serialVersionUID = 4180668477670765253L; - - public ChangeI18nAction(String name) { - super(name); - Matcher matcher = PATTERN_NAME.matcher(name); - if (!matcher.matches()) { - throw new IllegalArgumentException(I18n._(getClass().getName() + " should have a nmae like this 'i18n_XX_YY', but was {0}", name)); - } - Converter convertorLanguage = ConverterUtil.getConverter(LanguageEnum.class); - language = (LanguageEnum) convertorLanguage.convert(LanguageEnum.class, matcher.group(1)); - - convertorLanguage = ConverterUtil.getConverter(CountryEnum.class); - country = (CountryEnum) convertorLanguage.convert(CountryEnum.class, matcher.group(2)); - } - - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO Should ask confirm from user since it will close ui, and re instanciate ui - - getMainUI().getQuit().getAction().actionPerformed(new ActionEvent(this, ActionEvent.ACTION_FIRST, "cancel")); - SimExplorer.reloadUI(); - getContext().getConfig().setI18n(language, country); - getContext().getConfig().initI18n(); - - SimExplorer.launch(); - - SimExplorer.getContext().saveSafely(); - } - - public boolean equalsLocale(LanguageEnum lang, CountryEnum countr) { - return language == lang && country == countr; - } - - @Override - public String toString() { - return super.toString() + " Language " + language + " Country " + country; - } -} \ No newline at end of file

1 0