Author: tchemit Date: 2008-04-03 21:55:12 +0000 (Thu, 03 Apr 2008) New Revision: 325 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/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: no handler in model + clean confirm model 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 21:54:08 UTC (rev 324) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java 2008-04-03 21:55:12 UTC (rev 325) @@ -44,10 +44,13 @@ /** 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 */ + /** model name for diff remote tab ui */ + public static final String CONFIRM_MODEL_PROPERTY = "modelConfirm"; + public static final String ACTION_PROPERTY_CHANGED = "action"; - /** property to indicate change file (display a new DiffPanelUI) */ + public static final String MESSAGE_HISTORY_PROPERTY_CHANGED = "historyMessage"; + public static final String FILE_PROPERTY_CHANGED = "file"; public static final String NEXT_DIFF_PROPERTY_CHANGED = "nextDiff"; 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 21:54:08 UTC (rev 324) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java 2008-04-03 21:55:12 UTC (rev 325) @@ -16,10 +16,10 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; -import org.codelutin.vcs.VCSHandler; -import org.codelutin.vcs.ui.VCSUIConstants; +import static org.codelutin.vcs.ui.VCSUIConstants.ACTION_PROPERTY_CHANGED; +import static org.codelutin.vcs.ui.VCSUIConstants.CONFIRM_MODEL_PROPERTY; +import static org.codelutin.vcs.ui.VCSUIConstants.MESSAGE_HISTORY_PROPERTY_CHANGED; -import java.net.URL; import java.util.ArrayList; import java.util.List; @@ -30,41 +30,45 @@ */ public class ConfirmUIModel extends AbstractUIModel { - /** local root : wroking copy */ - protected URL localRoot; - - /** remote root : remote url */ - protected URL remoteRoot; - - /** model */ + /** list of states */ protected SimpleVCSFileStatesModel model; + /** history of commit messages */ + protected List<String> commitMessages; + /** current action to fired */ protected VCSAction action; - protected List<String> messageHistory; - - public ConfirmUIModel() { + public AbstractVCSFileStatesModel getModel() { + if (model == null) { + model = new SimpleVCSFileStatesModel(CONFIRM_MODEL_PROPERTY); + } + return model; } - public ConfirmUIModel(VCSHandler handler, URL leftRoot, URL rightRoot) { - this.handler = handler; - this.localRoot = leftRoot; - this.remoteRoot = rightRoot; + public VCSAction getAction() { + return action; } - public AbstractVCSFileStatesModel getModel() { - if (model == null) { - model = new SimpleVCSFileStatesModel(action + ""); + public List<String> getCommitMessages() { + if (commitMessages == null) { + commitMessages = new ArrayList<String>(); } - return model; + return commitMessages; } - public List<String> getMessageHistory() { - if (messageHistory == null) { - messageHistory = new ArrayList<String>(); + public void setAction(VCSAction action) { + VCSAction oldAction = this.action; + this.action = action; + firePropertyChange(ACTION_PROPERTY_CHANGED, oldAction, action); + } + + public void addCommitMessage(String commitMessage) { + if (commitMessage != null && !commitMessage.isEmpty() && !getCommitMessages().contains(commitMessage)) { + // add message in history + getCommitMessages().add(commitMessage); + firePropertyChange(MESSAGE_HISTORY_PROPERTY_CHANGED, null, commitMessage); } - return messageHistory; } public void setData(List<VCSFileState> states) { @@ -79,25 +83,4 @@ getModel().removeData(states.toArray(new VCSFileState[states.size()])); } - public void doAction(String commitMesssage) { - if (model == null || action == null) { - return; - } - if (commitMesssage != null && !getMessageHistory().contains(commitMesssage)) { - getMessageHistory().add(commitMesssage); - } - firePropertyChange(action.name().toLowerCase(), null, commitMesssage); - } - - public void setAction(VCSAction action) { - VCSAction oldAction = this.action; - this.action = action; - firePropertyChange(VCSUIConstants.ACTION_PROPERTY_CHANGED, oldAction, action); - } - - public VCSAction getAction() { - return action; - } - - } \ No newline at end of file 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 21:54:08 UTC (rev 324) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java 2008-04-03 21:55:12 UTC (rev 325) @@ -16,11 +16,10 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; -import org.codelutin.vcs.VCSHandler; +import org.codelutin.vcs.ui.VCSUIConstants; 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; @@ -54,8 +53,7 @@ public DiffUIModel() { } - public DiffUIModel(VCSHandler handler, URL leftRoot, URL rightRoot) { - this.handler = handler; + public DiffUIModel(URL leftRoot, URL rightRoot) { this.leftRoot = leftRoot; this.rightRoot = rightRoot; } 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 21:54:08 UTC (rev 324) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-04-03 21:55:12 UTC (rev 325) @@ -16,11 +16,10 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; -import org.codelutin.vcs.VCSHandler; +import org.codelutin.vcs.ui.VCSUIConstants; 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; @@ -52,16 +51,11 @@ public SynchUIModel() { } - public SynchUIModel(VCSHandler handler, File localRoot, URL remoteRoot) { - this.handler = handler; + public SynchUIModel(File localRoot, URL remoteRoot) { this.localRoot = localRoot; this.remoteRoot = remoteRoot; } - public VCSHandler getHandler() { - return handler; - } - public AbstractVCSFileStatesModel getTabModel() { return tabModel; }