Author: tchemit Date: 2008-04-06 19:06:37 +0000 (Sun, 06 Apr 2008) New Revision: 431 Removed: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/VCSAbsractAction.java Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/AbstractTabUIHandler.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/ConfirmUIHandler.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java Log: clean code + suppress unused action Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java 2008-04-06 18:49:38 UTC (rev 430) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java 2008-04-06 19:06:37 UTC (rev 431) @@ -15,15 +15,15 @@ package org.codelutin.vcs.ui; import org.codelutin.vcs.type.VCSAction; -import org.codelutin.vcs.ui.handler.VCSAbsractAction; +import javax.swing.AbstractAction; import javax.swing.JMenuItem; import java.awt.event.ActionEvent; /** @author chemit */ public abstract class AbstractVCSPopup extends javax.swing.JPopupMenu { - protected VCSAbsractAction dispatchAction; + protected AbstractAction dispatchAction; public abstract JMenuItem getRefresh(); @@ -37,12 +37,12 @@ public abstract JMenuItem getDelete(); - public void setDispatchAction(VCSAbsractAction action) { + public void setDispatchAction(javax.swing.AbstractAction action) { this.dispatchAction = action; } protected void doAction(VCSAction action, JMenuItem item) { - dispatchAction.setAction(action); + //dispatchAction.setAction(action); ActionEvent e = new ActionEvent(item, 1, action.name()); dispatchAction.actionPerformed(e); } Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/AbstractTabUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/AbstractTabUIHandler.java 2008-04-06 18:49:38 UTC (rev 430) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/AbstractTabUIHandler.java 2008-04-06 19:06:37 UTC (rev 431) @@ -52,7 +52,6 @@ public void doSelectLocation(VCSEntryLocation location) { log.info(location); getUi().getCardLayout().show(getUi().getPreview(), "tab" + location.name().toLowerCase()); - } } \ No newline at end of file Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/ConfirmUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/ConfirmUIHandler.java 2008-04-06 18:49:38 UTC (rev 430) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/ConfirmUIHandler.java 2008-04-06 19:06:37 UTC (rev 431) @@ -16,9 +16,9 @@ import org.codelutin.vcs.VCSEntry; import org.codelutin.vcs.type.VCSAction; +import org.codelutin.vcs.ui.AbstractConfirmUI; import org.codelutin.vcs.ui.model.AbstractVCSEntriesTableModel; import org.codelutin.vcs.ui.model.ConfirmUIModel; -import org.codelutin.vcs.ui.AbstractConfirmUI; import javax.swing.ListSelectionModel; import java.beans.PropertyChangeEvent; @@ -27,21 +27,6 @@ /** @author chemit */ public class ConfirmUIHandler extends org.codelutin.vcs.ui.handler.AbstractUIHandler<ConfirmUIModel, AbstractConfirmUI> { - - public ConfirmUIHandler() { - super(); - //this.ui = new JConfirmUI(this); - } - - /*public void setUi(AbstractConfirmUI ui) { - this.ui = ui; - }*/ - - /*public ConfirmUIModel getModel() { - return getUi().getModel(); - }*/ - - public Class<AbstractConfirmUI> getUiClass() { return AbstractConfirmUI.class; } Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java 2008-04-06 18:49:38 UTC (rev 430) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java 2008-04-06 19:06:37 UTC (rev 431) @@ -17,32 +17,15 @@ import org.codelutin.vcs.VCSEntry; import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSEntryLocation; -import org.codelutin.vcs.ui.model.DiffUIModel; import org.codelutin.vcs.ui.AbstractDiffUI; +import org.codelutin.vcs.ui.model.DiffUIModel; import java.beans.PropertyChangeEvent; /** @author chemit */ public class DiffUIHandler extends org.codelutin.vcs.ui.handler.AbstractTabUIHandler<DiffUIModel, AbstractDiffUI> { - //protected AbstractDiffUI ui; - public DiffUIHandler() { - //this.ui = new JDiffUI(this); - } - - /*public AbstractDiffUI getUi() { - return ui; - }*/ - - /*public void setUi(AbstractDiffUI ui) { - this.ui = ui; - } - - public DiffUIModel getModel() { - return ui.getModel(); - }*/ - public Class<AbstractDiffUI> getUiClass() { return AbstractDiffUI.class; } Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java 2008-04-06 18:49:38 UTC (rev 430) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java 2008-04-06 19:06:37 UTC (rev 431) @@ -12,6 +12,7 @@ import javax.swing.JTable; import javax.swing.ListSelectionModel; +import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -21,12 +22,6 @@ /** @author chemit */ public class SynchUIHandler extends org.codelutin.vcs.ui.handler.AbstractTabUIHandler<SynchUIModel, AbstractSynchUI> { - //protected AbstractSynchUI ui; - - public SynchUIHandler() { - //this.ui = new JSynchUI(this); - } - public Class<AbstractSynchUI> getUiClass() { return AbstractSynchUI.class; } @@ -35,26 +30,6 @@ return SynchUIModel.class; } - /*public void setUi(AbstractSynchUI ui) { - this.ui = ui; - } - - public AbstractSynchUI getUi() { - return ui; - }*/ - - /*public SynchUIModel getModel() { - return ui.getModel(); - }*/ - - /*public void doAllAction(VCSAction action) { - doAction(action, false); - } - - public void doSelectAction(VCSAction action) { - doAction(action, true); - }*/ - @Override public void doSelectLocation(VCSEntryLocation location) { @@ -112,12 +87,14 @@ table.addMouseListener(new ListMouseListener(getUi(), fileStatesModel, location)); AbstractVCSPopup popup = getUi().getPopup(location); - popup.setDispatchAction(new VCSAbsractAction() { + popup.setDispatchAction(new AbstractAction() { + private static final long serialVersionUID = 8622118724992019898L; public void actionPerformed(ActionEvent e) { - doAction(action, false); + doAction(VCSAction.valueOf(e.getActionCommand()), true); } + }); } Deleted: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/VCSAbsractAction.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/VCSAbsractAction.java 2008-04-06 18:49:38 UTC (rev 430) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/VCSAbsractAction.java 2008-04-06 19:06:37 UTC (rev 431) @@ -1,39 +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.handler; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.vcs.type.VCSAction; - -import javax.swing.AbstractAction; - -/** @author chemit */ -public abstract class VCSAbsractAction extends AbstractAction { - - protected static Log log = LogFactory.getLog(VCSAbsractAction.class); - - protected VCSAction action; - - private static final long serialVersionUID = 1074145285171920255L; - - public VCSAbsractAction() { - } - - public void setAction(VCSAction action) { - this.action = action; - } - -}