Author: tchemit Date: 2008-04-25 23:42:47 +0000 (Fri, 25 Apr 2008) New Revision: 614 Modified: trunk/lutinvcs/tools/src/test/java/org/codelutin/vcs/ConfigUITest.java trunk/lutinvcs/tools/src/test/java/org/codelutin/vcs/UITest.java Log: add generic show ui action Modified: trunk/lutinvcs/tools/src/test/java/org/codelutin/vcs/ConfigUITest.java =================================================================== --- trunk/lutinvcs/tools/src/test/java/org/codelutin/vcs/ConfigUITest.java 2008-04-25 23:39:52 UTC (rev 613) +++ trunk/lutinvcs/tools/src/test/java/org/codelutin/vcs/ConfigUITest.java 2008-04-25 23:42:47 UTC (rev 614) @@ -14,8 +14,7 @@ */ package org.codelutin.vcs; -import org.codelutin.vcs.ui.ConfigUI; -import org.codelutin.vcs.ui.VCSUIFactory; +import org.codelutin.vcs.ui.UIActionHelper; /** @author chemit */ public class ConfigUITest { @@ -26,12 +25,14 @@ VCSConnexion connexion = UITest.initMockVCS(generator, 0, 0, 0, 0); - ConfigUI ui = UITest.initUI(generator, connexion, VCSUIFactory.CONFIG_UI); - connexion.open(); - ui.getHandler().getModel().populate(connexion.getConfig(), true, "tony", "chemit", "chemit@codelutin.com"); + UITest.initUI(generator, connexion); - ui.setVisible(true); + UIActionHelper.showConfigUI(connexion.getConfig(), null); + + //ConfigUI ui = VCSUIFactory.getUI(VCSUIFactory.CONFIG_UI); + //ui.getHandler().getModel().populate(connexion.getConfig(), true, "tony", "chemit", "chemit@codelutin.com"); + //ui.setVisible(true); } } \ No newline at end of file Modified: trunk/lutinvcs/tools/src/test/java/org/codelutin/vcs/UITest.java =================================================================== --- trunk/lutinvcs/tools/src/test/java/org/codelutin/vcs/UITest.java 2008-04-25 23:39:52 UTC (rev 613) +++ trunk/lutinvcs/tools/src/test/java/org/codelutin/vcs/UITest.java 2008-04-25 23:42:47 UTC (rev 614) @@ -16,16 +16,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.ui.DialogUI; -import org.codelutin.ui.DialogUIDef; -import org.codelutin.ui.DialogUIHandler; -import org.codelutin.ui.DialogUIModel; -import org.codelutin.vcs.ui.SynchUI; +import org.codelutin.vcs.type.VCSEntryLocation; +import org.codelutin.vcs.ui.UIActionHelper; import org.codelutin.vcs.ui.VCSUIFactory; +import org.codelutin.vcs.ui.model.SynchUIModel; import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; +import java.util.List; /** @author chemit */ public class UITest { @@ -39,15 +38,23 @@ VCSConnexion connexion = initMockVCS(generator, 10, 5, 10, 1024); - connexion.open(); + VCSEntry[] entries = initModel(generator, connexion); - SynchUI ui = initUI(generator, connexion, VCSUIFactory.SYNCH_UI); + initUI(generator, connexion); - ui.getHandler().getModel().populate(connexion); + UIActionHelper.showSynchUI(connexion.getConfig(), null, VCSEntryLocation.ALL, entries); - generator.generateStates(ui.getHandler().getModel().getEntriesModel()); + } - ui.setVisible(true); + protected static VCSEntry[] initModel(RepositoryGenerator generator, VCSConnexion connexion) throws VCSException { + + connexion.open(); + + SynchUIModel model = new SynchUIModel(); + model.populate(connexion); + generator.generateStates(model.getEntriesModel()); + List<VCSEntry> entries = model.getEntriesModel().getEntries(); + return entries.toArray(new VCSEntry[entries.size()]); } public static VCSConnexion initMockVCS(final RepositoryGenerator generator, int i, int i1, int i2, int i3) throws IOException { @@ -66,8 +73,7 @@ return VCSFactory.newConnexion(config); } - protected static <M extends DialogUIModel, U extends DialogUI<H>, H extends DialogUIHandler<M, U>> U initUI( - final RepositoryGenerator generator, final VCSConnexion connexion, DialogUIDef<M, U, H> configUi) { + protected static void initUI(final RepositoryGenerator generator, final VCSConnexion connexion) { VCSUIFactory.initFactory(connexion.getConfig(), new org.codelutin.ui.FactoryWindowListener() { public void allWindowsClosed(WindowEvent e) { @@ -78,7 +84,5 @@ } }); - - return VCSUIFactory.getUI(configUi); } } \ No newline at end of file