Author: tchemit Date: 2008-04-13 17:12:54 +0000 (Sun, 13 Apr 2008) New Revision: 514 Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSAction.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSState.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUI.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIAction.java Log: add changelog ui Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSAction.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSAction.java 2008-04-13 17:12:21 UTC (rev 513) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSAction.java 2008-04-13 17:12:54 UTC (rev 514) @@ -55,7 +55,7 @@ /** to acquire a file from repository */ CHECKOUT(n_("lutinvcs.action.checkout"), true, false, false, false), /** to obtain the changelog of a file */ - CHANGELOG(n_("lutinvcs.action.changeLog"), false, false, false, false), + CHANGELOG(n_("lutinvcs.action.changeLog"), true, false, false, false), /** to obtain diif */ DIFF(n_("lutinvcs.action.diff"), false, false, false, false); Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSState.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSState.java 2008-04-13 17:12:21 UTC (rev 513) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSState.java 2008-04-13 17:12:54 UTC (rev 514) @@ -10,6 +10,9 @@ import static org.codelutin.vcs.type.VCSAction.OVERWRITE_AND_UPDATE; import static org.codelutin.vcs.type.VCSAction.REVERT; import static org.codelutin.vcs.type.VCSAction.UPDATE; +import static org.codelutin.vcs.type.VCSEntryLocation.ALL; +import static org.codelutin.vcs.type.VCSEntryLocation.LOCAL; +import static org.codelutin.vcs.type.VCSEntryLocation.REMOTE; import java.util.ArrayList; import java.util.Arrays; @@ -30,7 +33,7 @@ * <br/> * The only action for this state is to delete the file, nothing else. */ - UP_TO_DATE("uptodate", n_("lutinvcs.state.uptodate"), VCSEntryLocation.ALL, DELETE), + UP_TO_DATE("uptodate", n_("lutinvcs.state.uptodate"), ALL, DELETE), /** * when a local file matches a remote copy but not the latest one. @@ -42,7 +45,7 @@ * <li>{@link VCSAction#CHANGELOG}</li> * </ul> */ - OUT_OF_DATE("outofdate", n_("lutinvcs.state.outofdate"), VCSEntryLocation.REMOTE, UPDATE, DIFF, CHANGELOG), + OUT_OF_DATE("outofdate", n_("lutinvcs.state.outofdate"), REMOTE, UPDATE, DIFF, CHANGELOG), /** * when a local file does not matches his remote latest copy, but is based @@ -55,7 +58,7 @@ * <li>{@link VCSAction#DIFF}</li> * </ul> */ - MODIFIED("modified", n_("lutinvcs.state.modified"), VCSEntryLocation.LOCAL, COMMIT, OVERWRITE_AND_UPDATE, REVERT, DIFF), + MODIFIED("modified", n_("lutinvcs.state.modified"), LOCAL, COMMIT, OVERWRITE_AND_UPDATE, REVERT, DIFF), /** * when a local file does not match the working version remote copy and @@ -69,7 +72,7 @@ * <li>{@link VCSAction#CHANGELOG}</li> * </ul> */ - OUT_OF_DATE_AND_MODIFIED("outofdateAndModified", n_("lutinvcs.state.outofdateAndModified"), VCSEntryLocation.ALL, OVERWRITE_AND_UPDATE, REVERT, DIFF, CHANGELOG), + OUT_OF_DATE_AND_MODIFIED("outofdateAndModified", n_("lutinvcs.state.outofdateAndModified"), ALL, OVERWRITE_AND_UPDATE, REVERT, DIFF, CHANGELOG), /** * when a local file does not exist on remote repository. @@ -78,7 +81,7 @@ * <li>{@link VCSAction#ADD}</li> * </ul> */ - UNVERSIONNED("unversionned", n_("lutinvcs.state.unversionned"), VCSEntryLocation.LOCAL, ADD, REVERT), + UNVERSIONNED("unversionned", n_("lutinvcs.state.unversionned"), LOCAL, ADD, REVERT), /** * when a file exists on remote repository but not locally. @@ -87,7 +90,7 @@ * <li>{@link VCSAction#UPDATE}</li> * </ul> */ - MISSING("missing", n_("lutinvcs.state.missing"), VCSEntryLocation.REMOTE, UPDATE), + MISSING("missing", n_("lutinvcs.state.missing"), REMOTE, UPDATE, CHANGELOG), /** * when a file is unversionned or missing : this special and durty state @@ -103,9 +106,17 @@ * <p/> * </ul> */ - UNVERSIONNED_OR_MISSING("unversionnedOrMissing", n_("lutinvcs.state.unversionnedOrMissing"), VCSEntryLocation.LOCAL, ADD, UPDATE), + UNVERSIONNED_OR_MISSING("unversionnedOrMissing", n_("lutinvcs.state.unversionnedOrMissing"), LOCAL, ADD, UPDATE), - REMOVED("removed", n_("lutinvcs.state.removed"), VCSEntryLocation.LOCAL, DELETE, REVERT), + /** + * when a file was removed locally, and still exists on remote repository. + * <p/> + * this state owns 1 action : + * <ul> + * <li> {@link VCSAction#DELETE}</li> + * </ul> + */ + REMOVED("removed", n_("lutinvcs.state.removed"), LOCAL, DELETE, REVERT), /** to deal with other cases (...) */ UNKNOWN("unknown", n_("lutinvcs.state.unknown"), null); @@ -150,11 +161,11 @@ } public boolean isLocal() { - return location != VCSEntryLocation.REMOTE; + return location != REMOTE; } public boolean isRemote() { - return location != VCSEntryLocation.LOCAL; + return location != LOCAL; } public boolean authorizeAction(VCSAction... actions) { Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUI.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUI.java 2008-04-13 17:12:21 UTC (rev 513) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUI.java 2008-04-13 17:12:54 UTC (rev 514) @@ -16,8 +16,6 @@ import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSEntryLocation; -import org.codelutin.vcs.ui.action.ChangeLocationAction; -import org.codelutin.vcs.ui.action.TabUIAction; import javax.swing.AbstractAction; import javax.swing.AbstractButton; @@ -38,7 +36,6 @@ public abstract AbstractButton getUpdate(); - public abstract AbstractButton getCommit(); public abstract AbstractButton getRevert(); @@ -57,11 +54,11 @@ } protected AbstractAction createLocationAction(VCSEntryLocation location) { - return ChangeLocationAction.createAction(location, this); + return org.codelutin.vcs.ui.action.ChangeLocationAction.createAction(location, this); } protected AbstractAction createAction(VCSAction action, boolean useSelection) { - return TabUIAction.createAction(action, useSelection, this); + return org.codelutin.vcs.ui.action.TabUIAction.createAction(action, useSelection, this); } } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUIHandler.java 2008-04-13 17:12:21 UTC (rev 513) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUIHandler.java 2008-04-13 17:12:54 UTC (rev 514) @@ -19,6 +19,7 @@ import org.codelutin.vcs.ui.ConfirmUI; import org.codelutin.vcs.ui.DiffUI; import org.codelutin.vcs.ui.VCSUIFactory; +import org.codelutin.vcs.ui.ChangelogUI; import javax.swing.AbstractButton; import javax.swing.ListSelectionModel; @@ -51,25 +52,37 @@ } public void showConfirmUI(VCSAction action, AbstractVCSEntriesTableModel model, List<VCSEntry> entries) { - ConfirmUI confirmUI = VCSUIFactory.newConfirmUI(); + ConfirmUI ui = VCSUIFactory.newConfirmUI(); log.info("nb files:" + entries.size()); - confirmUI.getHandler().getModel().init(action, model.getLocation(), entries.toArray(new VCSEntry[entries.size()])); - confirmUI.getContentScroll().setEnabled(entries.size() > 1); - confirmUI.setVisible(true); + ui.getHandler().getModel().init(action, model.getLocation(), entries.toArray(new VCSEntry[entries.size()])); + ui.getContentScroll().setEnabled(entries.size() > 1); + ui.setVisible(true); } public void showDiffUI(boolean useSelection, AbstractVCSEntriesTableModel model, List<VCSEntry> entries) { - DiffUI diffUI = VCSUIFactory.newDiffUI(); + DiffUI ui = VCSUIFactory.newDiffUI(); if (!useSelection) { // take all entries entries = model.filter(VCSAction.DIFF, model.getEntries()); } log.info("nb entries:" + entries.size()); - diffUI.getHandler().getModel().init(model.getLocation(), entries.toArray(new VCSEntry[entries.size()])); - diffUI.getContentScroll().setEnabled(entries.size() > 1); - diffUI.setVisible(true); + ui.getHandler().getModel().init(model.getLocation(), entries.toArray(new VCSEntry[entries.size()])); + ui.getContentScroll().setEnabled(entries.size() > 1); + ui.setVisible(true); } + public void showChangelogUI(boolean useSelection, AbstractVCSEntriesTableModel model, List<VCSEntry> entries) { + ChangelogUI ui = VCSUIFactory.newChangelogUI(); + if (!useSelection) { + // take all entries + entries = model.filter(VCSAction.CHANGELOG, model.getEntries()); + } + log.info("nb entries:" + entries.size()); + ui.getHandler().getModel().init(model.getLocation(), entries.toArray(new VCSEntry[entries.size()])); + ui.getContentScroll().setEnabled(entries.size() > 1); + ui.setVisible(true); + } + public void doRefresh(AbstractVCSEntriesTableModel model, List<VCSEntry> entries, ListSelectionModel selectionModel) { log.info(selectionModel); selectionModel.clearSelection(); Modified: 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-13 17:12:21 UTC (rev 513) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIAction.java 2008-04-13 17:12:54 UTC (rev 514) @@ -31,6 +31,9 @@ super(name, icon); } + public AbstractUIAction() { + } + protected H getHandler() { checkInit(); if (handler == null) {