Author: tchemit Date: 2008-04-20 10:44:42 +0000 (Sun, 20 Apr 2008) New Revision: 604 Added: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/AbstractUIAction.java Removed: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIAction.java Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeFileAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeLocationAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ConfirmAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/DiffAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/HelpAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowMessagesAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java Log: generalisation de l'AbstractAction Copied: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/AbstractUIAction.java (from rev 603, trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIAction.java) =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/AbstractUIAction.java (rev 0) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/AbstractUIAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -0,0 +1,58 @@ +/** + * # #% Copyright (C) 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 org.codelutin.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.ui.DialogUI; +import org.codelutin.ui.DialogUIHandler; + +/** @author chemit */ +public abstract class AbstractUIAction<H extends DialogUIHandler<?, ?>> extends javax.swing.AbstractAction { + + protected static Log log = LogFactory.getLog(AbstractUIAction.class); + + protected transient DialogUI<? extends H> ui; + protected transient H handler; + + private static final long serialVersionUID = 1L; + + protected AbstractUIAction(String name, javax.swing.Icon icon) { + super(name, icon); + } + + public AbstractUIAction() { + } + + protected H getHandler() { + checkInit(); + if (handler == null) { + handler = ui.getHandler(); + } + return handler; + } + + protected void setUi(DialogUI<? extends H> ui) { + this.ui = ui; + this.handler = null; + } + + protected void checkInit() throws IllegalStateException { + if (handler == null && ui == null) { + throw new IllegalStateException("no handler, nor ui referenced in " + this); + } + } + +} Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeFileAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeFileAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeFileAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -16,9 +16,10 @@ import org.codelutin.vcs.ui.util.ui.AbstractTabOneFileUI; import org.codelutin.vcs.ui.util.handler.AbstractTabOneFileUIHandler; +import org.codelutin.ui.AbstractUIAction; /** @author chemit */ -public class ChangeFileAction extends org.codelutin.vcs.ui.util.AbstractUIAction<AbstractTabOneFileUIHandler<?, ?>> { +public class ChangeFileAction extends AbstractUIAction<AbstractTabOneFileUIHandler<?, ?>> { protected boolean goPrevious; Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeLocationAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeLocationAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeLocationAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -17,9 +17,10 @@ import org.codelutin.vcs.type.VCSEntryLocation; import org.codelutin.vcs.ui.util.ui.AbstractTabUI; import org.codelutin.vcs.ui.util.handler.AbstractTabUIHandler; +import org.codelutin.ui.AbstractUIAction; /** @author chemit */ -public class ChangeLocationAction extends org.codelutin.vcs.ui.util.AbstractUIAction<AbstractTabUIHandler<?, ?>> { +public class ChangeLocationAction extends AbstractUIAction<AbstractTabUIHandler<?, ?>> { protected VCSEntryLocation location; Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ConfirmAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ConfirmAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ConfirmAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -16,9 +16,10 @@ import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.ui.handler.ConfirmUIHandler; +import org.codelutin.ui.AbstractUIAction; /** @author chemit */ -public class ConfirmAction extends org.codelutin.vcs.ui.util.AbstractUIAction<ConfirmUIHandler> { +public class ConfirmAction extends AbstractUIAction<ConfirmUIHandler> { protected VCSAction action; Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/DiffAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/DiffAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/DiffAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -14,8 +14,11 @@ */ package org.codelutin.vcs.ui.action; +import org.codelutin.vcs.ui.handler.DiffUIHandler; +import org.codelutin.ui.AbstractUIAction; + /** @author chemit */ -public class DiffAction extends org.codelutin.vcs.ui.util.AbstractUIAction<org.codelutin.vcs.ui.handler.DiffUIHandler> { +public class DiffAction extends AbstractUIAction<DiffUIHandler> { protected boolean goUp; Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/HelpAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/HelpAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/HelpAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -17,9 +17,10 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.ui.DialogUI; import org.codelutin.ui.DialogUIHandler; +import org.codelutin.ui.AbstractUIAction; /** @author chemit */ -public class HelpAction extends org.codelutin.vcs.ui.util.AbstractUIAction<DialogUIHandler<?, ?>> { +public class HelpAction extends AbstractUIAction<DialogUIHandler<?, ?>> { public static <H extends DialogUIHandler<?, ?>> javax.swing.AbstractAction createAction(DialogUI<H> ui) { HelpAction action = new HelpAction(); Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -18,12 +18,13 @@ import static org.codelutin.vcs.ui.VCSUIFactory.CONFIG_UI; import org.codelutin.vcs.ui.util.handler.AbstractUIHandler; import org.codelutin.vcs.ui.util.ui.AbstractUI; +import org.codelutin.ui.AbstractUIAction; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; /** @author chemit */ -public class ShowConfigAction extends org.codelutin.vcs.ui.util.AbstractUIAction<AbstractUIHandler<?, ?>> { +public class ShowConfigAction extends AbstractUIAction<AbstractUIHandler<?, ?>> { public static <H extends AbstractUIHandler<?, ?>> AbstractAction createAction(AbstractUI<H> ui) { ShowConfigAction action = new ShowConfigAction(); Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowMessagesAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowMessagesAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowMessagesAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -15,9 +15,10 @@ package org.codelutin.vcs.ui.action; import org.codelutin.vcs.ui.handler.ConfirmUIHandler; +import org.codelutin.ui.AbstractUIAction; /** @author chemit */ -public class ShowMessagesAction extends org.codelutin.vcs.ui.util.AbstractUIAction<ConfirmUIHandler> { +public class ShowMessagesAction extends AbstractUIAction<ConfirmUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -18,12 +18,13 @@ import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.ui.util.handler.AbstractTabUIHandler; import org.codelutin.vcs.ui.util.ui.AbstractTabUI; +import org.codelutin.ui.AbstractUIAction; import java.util.List; /** @author chemit */ -public class TabUIAction extends org.codelutin.vcs.ui.util.AbstractUIAction<AbstractTabUIHandler<?, ?>> { +public class TabUIAction extends AbstractUIAction<AbstractTabUIHandler<?, ?>> { protected VCSAction action; protected boolean useSelection; Deleted: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -1,58 +0,0 @@ -/** - * # #% Copyright (C) 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 org.codelutin.vcs.ui.util; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.ui.DialogUI; -import org.codelutin.ui.DialogUIHandler; - -/** @author chemit */ -public abstract class AbstractUIAction<H extends DialogUIHandler<?, ?>> extends javax.swing.AbstractAction { - - protected static Log log = LogFactory.getLog(AbstractUIAction.class); - - protected transient DialogUI<? extends H> ui; - protected transient H handler; - - private static final long serialVersionUID = 1L; - - protected AbstractUIAction(String name, javax.swing.Icon icon) { - super(name, icon); - } - - public AbstractUIAction() { - } - - protected H getHandler() { - checkInit(); - if (handler == null) { - handler = ui.getHandler(); - } - return handler; - } - - protected void setUi(DialogUI<? extends H> ui) { - this.ui = ui; - this.handler = null; - } - - protected void checkInit() throws IllegalStateException { - if (handler == null && ui == null) { - throw new IllegalStateException("no handler, nor ui referenced in " + this); - } - } - -}