Author: tchemit Date: 2008-04-03 17:20:14 +0000 (Thu, 03 Apr 2008) New Revision: 318 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractConfirmUIHandler.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractDiffUIHandler.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractSynchUIHandler.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java Log: all ui constants in VCSUIConstants Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java 2008-04-03 17:15:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java 2008-04-03 17:20:14 UTC (rev 318) @@ -44,4 +44,33 @@ /** model name for diff remote tab ui */ public static final String DIFF_REMOTE_MODEL_PROPERTY = "modelDiffRemote"; + /** la propri�t� pour indiquer un changement de racine d'arbre */ + public static final String ACTION_PROPERTY_CHANGED = "action"; + + /** property to indicate change file (display a new DiffPanelUI) */ + public static final String FILE_PROPERTY_CHANGED = "file"; + + public static final String NEXT_DIFF_PROPERTY_CHANGED = "nextDiff"; + + public static final String PREVIOUS_DIFF_PROPERTY_CHANGED = "previousDiff"; + + public static final String REFRESH_PROPERTY_CHANGED = "refresh"; + + public static final String TAB_PROPERTY_CHANGED = "tab"; + + public static final String DIFF_ALL_PROPERTY_CHANGED = "diffAll"; + + public static final String COMMIT_ALL_PROPERTY_CHANGED = "commitAll"; + + public static final String UPDATE_ALL_PROPERTY_CHANGED = "updateAll"; + + public static final String REVERT_ALL_PROPERTY_CHANGED = "revertAll"; + + public static final String DIFF_PROPERTY_CHANGED = "diff"; + + public static final String COMMIT_PROPERTY_CHANGED = "commit"; + + public static final String UPDATE_PROPERTY_CHANGED = "update"; + + public static final String REVERT_PROPERTY_CHANGED = "revert"; } Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractConfirmUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractConfirmUIHandler.java 2008-04-03 17:15:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractConfirmUIHandler.java 2008-04-03 17:20:14 UTC (rev 318) @@ -18,6 +18,7 @@ import org.codelutin.vcs.VCSFileState; import org.codelutin.vcs.ui.model.AbstractVCSFileStatesModel; import org.codelutin.vcs.ui.model.ConfirmUIModel; +import org.codelutin.vcs.ui.VCSUIConstants; import javax.swing.ListSelectionModel; import java.beans.PropertyChangeEvent; @@ -33,7 +34,7 @@ //} String action = evt.getPropertyName(); - if (ConfirmUIModel.ACTION_PROPERTY_CHANGED.equals(action)) { + if (VCSUIConstants.ACTION_PROPERTY_CHANGED.equals(action)) { updateUI(); return; } Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractDiffUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractDiffUIHandler.java 2008-04-03 17:15:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractDiffUIHandler.java 2008-04-03 17:20:14 UTC (rev 318) @@ -18,6 +18,7 @@ import org.codelutin.vcs.VCSFileState; import org.codelutin.vcs.ui.model.DiffUIModel; import org.codelutin.vcs.ui.model.SimpleVCSFileStatesModel; +import org.codelutin.vcs.ui.VCSUIConstants; import java.beans.PropertyChangeEvent; @@ -30,10 +31,10 @@ //} String action = evt.getPropertyName(); - if (DiffUIModel.TAB_PROPERTY_CHANGED.equals(action)) { + if (VCSUIConstants.TAB_PROPERTY_CHANGED.equals(action)) { doSelectTab((SimpleVCSFileStatesModel) evt.getNewValue()); } else { - if (DiffUIModel.FILE_PROPERTY_CHANGED.equals(action)) { + if (VCSUIConstants.FILE_PROPERTY_CHANGED.equals(action)) { doSelectFile((VCSFileState) evt.getNewValue()); } else { try { Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractSynchUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractSynchUIHandler.java 2008-04-03 17:15:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractSynchUIHandler.java 2008-04-03 17:20:14 UTC (rev 318) @@ -17,6 +17,7 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.ui.model.SimpleVCSFileStatesModel; import org.codelutin.vcs.ui.model.SynchUIModel; +import org.codelutin.vcs.ui.VCSUIConstants; import java.beans.PropertyChangeEvent; @@ -29,7 +30,7 @@ //} String action = evt.getPropertyName(); SimpleVCSFileStatesModel model = (SimpleVCSFileStatesModel) evt.getNewValue(); - if (SynchUIModel.TAB_PROPERTY_CHANGED.equals(action)) { + if (VCSUIConstants.TAB_PROPERTY_CHANGED.equals(action)) { doSelectTabAction(model); } else if (action.endsWith("All")) { try { Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java 2008-04-03 17:15:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java 2008-04-03 17:20:14 UTC (rev 318) @@ -17,6 +17,7 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; import org.codelutin.vcs.VCSHandler; +import org.codelutin.vcs.ui.VCSUIConstants; import java.net.URL; import java.util.ArrayList; @@ -29,10 +30,6 @@ */ public class ConfirmUIModel extends AbstractUIModel { - - /** la propri�t� pour indiquer un changement de racine d'arbre */ - public static final String ACTION_PROPERTY_CHANGED = "tab"; - /** local root : wroking copy */ protected URL localRoot; @@ -95,7 +92,7 @@ public void setAction(VCSAction action) { VCSAction oldAction = this.action; this.action = action; - firePropertyChange(ACTION_PROPERTY_CHANGED, oldAction, action); + firePropertyChange(VCSUIConstants.ACTION_PROPERTY_CHANGED, oldAction, action); } public VCSAction getAction() { Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java 2008-04-03 17:15:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java 2008-04-03 17:20:14 UTC (rev 318) @@ -20,6 +20,7 @@ import static org.codelutin.vcs.ui.VCSUIConstants.SYNCH_ALL_MODEL_PROPERTY; import static org.codelutin.vcs.ui.VCSUIConstants.SYNCH_LOCAL_MODEL_PROPERTY; import static org.codelutin.vcs.ui.VCSUIConstants.SYNCH_REMOTE_MODEL_PROPERTY; +import org.codelutin.vcs.ui.VCSUIConstants; import java.net.URL; import java.util.ArrayList; @@ -32,24 +33,6 @@ */ public class DiffUIModel extends AbstractUIModel { - /** property to indicate change tab */ - public static final String TAB_PROPERTY_CHANGED = "tab"; - - /** property to indicate change file (display a new DiffPanelUI) */ - public static final String FILE_PROPERTY_CHANGED = "file"; - - public static final String NEXT_DIFF_PROPERTY_CHANGED = "nextDiff"; - - public static final String PREVIOUS_DIFF_PROPERTY_CHANGED = "previousDiff"; - - public static final String REFRESH_PROPERTY_CHANGED = "refresh"; - - public static final String COMMIT_PROPERTY_CHANGED = "commit"; - - public static final String UPDATE_PROPERTY_CHANGED = "update"; - - public static final String REVERT_PROPERTY_CHANGED = "revert"; - /** local root : wroking copy */ protected URL leftRoot; @@ -84,13 +67,13 @@ public void setTabModel(AbstractVCSFileStatesModel tabModel) { AbstractVCSFileStatesModel oldTabModel = this.tabModel; this.tabModel = tabModel; - firePropertyChange(TAB_PROPERTY_CHANGED, oldTabModel, tabModel); + firePropertyChange(VCSUIConstants.TAB_PROPERTY_CHANGED, oldTabModel, tabModel); } public void setFileModel(VCSFileState fileModel) { VCSFileState oldFileModel = this.fileModel; this.fileModel = fileModel; - firePropertyChange(TAB_PROPERTY_CHANGED, oldFileModel, tabModel); + firePropertyChange(VCSUIConstants.TAB_PROPERTY_CHANGED, oldFileModel, tabModel); } public AbstractVCSFileStatesModel getTabModel(String tabModel) { Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-04-03 17:15:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-04-03 17:20:14 UTC (rev 318) @@ -20,6 +20,7 @@ import static org.codelutin.vcs.ui.VCSUIConstants.SYNCH_ALL_MODEL_PROPERTY; import static org.codelutin.vcs.ui.VCSUIConstants.SYNCH_LOCAL_MODEL_PROPERTY; import static org.codelutin.vcs.ui.VCSUIConstants.SYNCH_REMOTE_MODEL_PROPERTY; +import org.codelutin.vcs.ui.VCSUIConstants; import java.io.File; import java.net.URL; @@ -33,25 +34,6 @@ */ public class SynchUIModel extends AbstractUIModel { - /** la propri�t� pour indiquer un changement de racine d'arbre */ - public static final String TAB_PROPERTY_CHANGED = "tab"; - - public static final String DIFF_ALL_PROPERTY_CHANGED = "diffAll"; - - public static final String COMMIT_ALL_PROPERTY_CHANGED = "commitAll"; - - public static final String UPDATE_ALL_PROPERTY_CHANGED = "updateAll"; - - public static final String REVERT_ALL_PROPERTY_CHANGED = "revertAll"; - - public static final String DIFF_PROPERTY_CHANGED = "diff"; - - public static final String COMMIT_PROPERTY_CHANGED = "commit"; - - public static final String UPDATE_PROPERTY_CHANGED = "update"; - - public static final String REVERT_PROPERTY_CHANGED = "revert"; - /** local root : wroking copy */ protected File localRoot; @@ -87,7 +69,7 @@ public void setTabModel(AbstractVCSFileStatesModel tabModel) { AbstractVCSFileStatesModel oldTabModel = this.tabModel; this.tabModel = tabModel; - firePropertyChange(TAB_PROPERTY_CHANGED, oldTabModel, tabModel); + firePropertyChange(VCSUIConstants.TAB_PROPERTY_CHANGED, oldTabModel, tabModel); } public AbstractVCSFileStatesModel getTabModel(String tabModel) {