April 2008 - Buix-commits - mailman.cloud.codelutin.com

r543 - trunk/lutinvcs/core/src/test/java/org/codelutin/vcs
by tchemit＠users.labs.libre-entreprise.org 18 Apr '08

18 Apr '08

Author: tchemit Date: 2008-04-18 14:24:26 +0000 (Fri, 18 Apr 2008) New Revision: 543 Added: trunk/lutinvcs/core/src/test/java/org/codelutin/vcs/RepositoryGenerator.java Log: repository generator in core module Added: trunk/lutinvcs/core/src/test/java/org/codelutin/vcs/RepositoryGenerator.java =================================================================== --- trunk/lutinvcs/core/src/test/java/org/codelutin/vcs/RepositoryGenerator.java (rev 0) +++ trunk/lutinvcs/core/src/test/java/org/codelutin/vcs/RepositoryGenerator.java 2008-04-18 14:24:26 UTC (rev 543) @@ -0,0 +1,168 @@ +/** + * # #% 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; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.i18n.I18n; +import org.codelutin.util.FileUtil; +import org.codelutin.vcs.type.VCSEntryLocation; +import static org.codelutin.vcs.type.VCSEntryLocation.LOCAL; +import static org.codelutin.vcs.type.VCSEntryLocation.REMOTE; +import org.codelutin.vcs.type.VCSState; +import static org.codelutin.vcs.type.VCSState.MISSING; +import static org.codelutin.vcs.type.VCSState.MODIFIED; +import static org.codelutin.vcs.type.VCSState.OUT_OF_DATE; +import static org.codelutin.vcs.type.VCSState.OUT_OF_DATE_AND_MODIFIED; +import static org.codelutin.vcs.type.VCSState.REMOVED; +import static org.codelutin.vcs.type.VCSState.UNKNOWN; +import static org.codelutin.vcs.type.VCSState.UNVERSIONNED; + +import java.io.File; +import java.io.IOException; +import java.util.Random; + +/** + * A generator of local VCSEntry + * + * @author chemit + */ +public class RepositoryGenerator { + + private static Log log = LogFactory.getLog(RepositoryGenerator.class); + + public static final VCSState[] localStates = new VCSState[]{MODIFIED, UNVERSIONNED, OUT_OF_DATE_AND_MODIFIED, REMOVED}; + + public static final VCSState[] remoteStates = new VCSState[]{MISSING, OUT_OF_DATE, OUT_OF_DATE_AND_MODIFIED}; + + /** The valid chars for a file content. */ + protected static final String validFileContentChars = "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\n\t\r.!:;,"; + + /** The valid chars for a filename. */ + protected static final String validFilenameChars = "abcdefghijklmnopqrstuvwxyz_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + + /** The r. */ + java.util.Random r; + + public RepositoryGenerator() { + this.r = new Random(); + I18n.init(); + } + + public void generateWorkingRepository(File root, int maxDir, int maxSubDir, int maxFile, int maxFileContent) throws IOException { + if (log.isInfoEnabled()) { + log.info(root); + } + root.mkdirs(); + + generateSubWorkingCopy(new File(root, "local"), maxDir, maxSubDir, maxFile, maxFileContent); + + generateSubWorkingCopy(new File(root, "remote"), maxDir, maxSubDir, maxFile, maxFileContent); + } + + public File generateWorkingRepositoryPath() { + File file = new File("/tmp/" + RepositoryGenerator.class.getSimpleName() + "_" + Math.abs(System.nanoTime())); + file.mkdirs(); + return file; + } + + public void deleteWorkingCopy(File root) { + if (log.isInfoEnabled()) { + log.info(root); + } + FileUtil.deleteRecursively(root); + } + + public void generateStates(VCSEntries entries) { + for (VCSEntry entry : entries.getEntries()) { + VCSState state; + state = entry.getRelativeLocalPath().startsWith("local") ? generateState(LOCAL) : generateState(REMOTE); + entry.setState(state); + } + } + + public VCSState generateState(VCSEntryLocation location) { + VCSState result = UNKNOWN; + switch (location) { + case LOCAL: + result = localStates[r.nextInt(localStates.length)]; + break; + case REMOTE: + result = remoteStates[r.nextInt(remoteStates.length)]; + break; + } + return result; + } + + /** + * @param root working copy root directory + * @param maxDir max directory to generate + * @param maxSubDir max subdirectory to generate + * @param maxFile max file to generate in dir + * @param maxFileContent max file contente size + * @throws java.io.IOException if io pb while writing files' content + */ + protected void generateSubWorkingCopy(File root, int maxDir, int maxSubDir, int maxFile, int maxFileContent) throws IOException { + if (log.isInfoEnabled()) { + log.info(root); + } + generateDirectory(root, maxDir, 0, maxFile, maxFileContent); + for (int i = 0, nbDirs = r.nextInt(maxDir); i < nbDirs; i++) { + int nbSubDirs = r.nextInt(maxSubDir); + generateDirectory(new File(root, "dir_" + i), maxDir, nbSubDirs, maxFile, maxFileContent); + } + } + + protected void generateDirectory(File file, int maxDir, int nbSubDirs, int maxFile, int maxFileContent) throws IOException { + if (log.isDebugEnabled()) { + log.debug(file); + } + file.mkdirs(); + String filePrefix = "file" + file.getName().substring(3); + for (int i = 0, j = r.nextInt(maxFile); i < j; i++) { + + generateFile(new File(file, filePrefix + generateFilename(5, i)), maxFileContent); + } + if (nbSubDirs > 0) { + for (int i = 0, nbDirs = r.nextInt(maxDir); i < nbDirs; i++) { + generateDirectory(new File(file, file.getName() + "_" + i), maxDir, nbSubDirs - 1, maxFile, maxFileContent); + } + } + } + + protected void generateFile(File file, int maxFileContent) throws IOException { + if (log.isDebugEnabled()) { + log.debug(file); + } + FileUtil.writeString(file, generateContent(10 + r.nextInt(maxFileContent))); + } + + protected String generateFilename(int length, int i) { + return i + "_" + generateString0(length, validFilenameChars); + } + + protected String generateContent(int length) { + return generateString0(length, validFileContentChars); + } + + protected String generateString0(int length, String validChars) { + StringBuffer result = new StringBuffer(); + for (int i = 0; i < length; i++) { + char c = validChars.charAt(r.nextInt(validChars.length())); + result.append(c); + } + return result.toString(); + } +} \ No newline at end of file

1 0

r542 - trunk/lutinvcs
by tchemit＠users.labs.libre-entreprise.org 18 Apr '08

18 Apr '08

Author: tchemit Date: 2008-04-18 13:00:29 +0000 (Fri, 18 Apr 2008) New Revision: 542 Modified: trunk/lutinvcs/pom.xml Log: suppress moduel all Modified: trunk/lutinvcs/pom.xml =================================================================== --- trunk/lutinvcs/pom.xml 2008-04-18 12:59:37 UTC (rev 541) +++ trunk/lutinvcs/pom.xml 2008-04-18 13:00:29 UTC (rev 542) @@ -22,7 +22,6 @@ <module>core</module> <module>ui</module> <module>provider</module> - <module>all</module> </modules> <dependencies>

1 0

r541 - trunk/lutinvcs
by tchemit＠users.labs.libre-entreprise.org 18 Apr '08

18 Apr '08

Author: tchemit Date: 2008-04-18 12:59:37 +0000 (Fri, 18 Apr 2008) New Revision: 541 Removed: trunk/lutinvcs/all/ Modified: trunk/lutinvcs/pom.xml Log: suppress moduel all Modified: trunk/lutinvcs/pom.xml =================================================================== --- trunk/lutinvcs/pom.xml 2008-04-18 12:57:43 UTC (rev 540) +++ trunk/lutinvcs/pom.xml 2008-04-18 12:59:37 UTC (rev 541) @@ -205,7 +205,7 @@ <dependency> <groupId>lutinlib</groupId> <artifactId>lutinutil</artifactId> - <version>0.30-SNAPSHOT</version> + <version>0.31-SNAPSHOT</version> </dependency> <dependency> @@ -220,14 +220,29 @@ </dependency> <dependency> <groupId>${ui.groupId}</groupId> - <artifactId>all</artifactId> + <artifactId>common</artifactId> <version>${current.version}</version> </dependency> <dependency> + <groupId>${ui.groupId}</groupId> + <artifactId>jaxx</artifactId> + <version>${current.version}</version> + </dependency> + <dependency> <groupId>${provider.groupId}</groupId> - <artifactId>all</artifactId> + <artifactId>mock</artifactId> <version>${current.version}</version> </dependency> + <dependency> + <groupId>${provider.groupId}</groupId> + <artifactId>cvs</artifactId> + <version>${current.version}</version> + </dependency> + <dependency> + <groupId>${provider.groupId}</groupId> + <artifactId>svn</artifactId> + <version>${current.version}</version> + </dependency>  <dependency>

1 0

r540 - trunk/lutinvcs/ui
by tchemit＠users.labs.libre-entreprise.org 18 Apr '08

18 Apr '08

Author: tchemit Date: 2008-04-18 12:57:43 +0000 (Fri, 18 Apr 2008) New Revision: 540 Removed: trunk/lutinvcs/ui/all/ Modified: trunk/lutinvcs/ui/pom.xml Log: suppress moduel all Modified: trunk/lutinvcs/ui/pom.xml =================================================================== --- trunk/lutinvcs/ui/pom.xml 2008-04-18 12:57:10 UTC (rev 539) +++ trunk/lutinvcs/ui/pom.xml 2008-04-18 12:57:43 UTC (rev 540) @@ -21,7 +21,6 @@ <modules> <module>common</module> <module>jaxx</module> - <module>all</module> </modules> <dependencies> @@ -54,11 +53,6 @@ <version>${current.version}</version> </dependency> <dependency> - <groupId>${ui.groupId}</groupId> - <artifactId>all</artifactId> - <version>${current.version}</version> - </dependency> - <dependency> <groupId>lutinlib</groupId> <artifactId>jaxx</artifactId> <version>1.0.4-SNAPSHOT</version>

1 0

r539 - trunk/lutinvcs/provider
by tchemit＠users.labs.libre-entreprise.org 18 Apr '08

18 Apr '08

Author: tchemit Date: 2008-04-18 12:57:10 +0000 (Fri, 18 Apr 2008) New Revision: 539 Removed: trunk/lutinvcs/provider/all/ Modified: trunk/lutinvcs/provider/pom.xml Log: suppress moduel all Modified: trunk/lutinvcs/provider/pom.xml =================================================================== --- trunk/lutinvcs/provider/pom.xml 2008-04-16 22:43:34 UTC (rev 538) +++ trunk/lutinvcs/provider/pom.xml 2008-04-18 12:57:10 UTC (rev 539) @@ -22,7 +22,6 @@ <module>mock</module> <module>cvs</module> <module>svn</module> - <module>all</module> </modules> <dependencies>

1 0

r538 - trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 16 Apr '08

16 Apr '08

Author: tchemit Date: 2008-04-16 22:43:34 +0000 (Wed, 16 Apr 2008) New Revision: 538 Modified: trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/ConfigUITest.java trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/RepositoryGenerator.java trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/UITest.java Log: add config in handler add generic window in VCSUIFactory to close vcs when no more ui are visible. refactor test Modified: trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/ConfigUITest.java =================================================================== --- trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/ConfigUITest.java 2008-04-16 22:43:18 UTC (rev 537) +++ trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/ConfigUITest.java 2008-04-16 22:43:34 UTC (rev 538) @@ -14,17 +14,10 @@ */ package org.codelutin.vcs.ui; -import org.codelutin.i18n.I18n; import org.codelutin.vcs.VCSConnexion; -import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.VCSException; -import org.codelutin.vcs.VCSFactory; -import org.codelutin.vcs.type.VCSConnexionMode; import org.codelutin.vcs.ui.model.ConfigUIModel; -import org.codelutin.vcs.util.VCSConnexionConfigImpl; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; @@ -33,18 +26,14 @@ public static void main(String[] args) throws IOException, VCSException { - I18n.init(); + RepositoryGenerator generator = new RepositoryGenerator(); - final RepositoryGenerator generator = new RepositoryGenerator(); + File root = generator.generateWorkingRepositoryPath(); - final File root = generator.generateWorkingRepositoryPath(); + VCSConnexion connexion = UITest.initMockVCS(root); - root.mkdirs(); + UITest.initUI(generator, connexion); - //generator.generateWorkingRepository(root, 5, 5, 10, 14); - - final VCSConnexion connexion = initMockVCS(root); - connexion.open(); ConfigUI ui = VCSUIFactory.newConfigUI(); @@ -54,33 +43,5 @@ model.populate(connexion.getConfig(), true, "tony", "chemit", "chemit(a)codelutin.com"); ui.setVisible(true); - ui.addWindowListener(new WindowAdapter() { - boolean wasClosed = false; - - @Override - public void windowClosed(WindowEvent e) { - if (wasClosed) { - return; - } - connexion.close(); - generator.deleteWorkingCopy(root); - wasClosed = true; - } - }); } - - public static VCSConnexion initMockVCS(File root) { - VCSConnexionConfig config = new VCSConnexionConfigImpl(); - config.setKeyFile(new File("/home/tony/.ssh/id_dsa")); - config.setUserName("tchemit"); - //config.setPassPhrase("pass"); - config.setNoPassPhrase(true); - config.setType("MOCK"); - config.setLocalDatabasePath(root); - config.setConnexionMode(VCSConnexionMode.SSH); - VCSConnexion connexion = VCSFactory.newConnexion(VCSConnexionMode.ANONYMOUS, config); - connexion.init(config); - return connexion; - } - } \ No newline at end of file Modified: trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/RepositoryGenerator.java =================================================================== --- trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/RepositoryGenerator.java 2008-04-16 22:43:18 UTC (rev 537) +++ trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/RepositoryGenerator.java 2008-04-16 22:43:34 UTC (rev 538) @@ -21,6 +21,7 @@ import static org.codelutin.vcs.type.VCSEntryLocation.LOCAL; import static org.codelutin.vcs.type.VCSEntryLocation.REMOTE; import org.codelutin.vcs.type.VCSState; +import org.codelutin.i18n.I18n; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -48,6 +49,7 @@ public RepositoryGenerator() { this.r = new Random(); + I18n.init(); } public void generateWorkingRepository(File root, int maxDir, int maxSubDir, int maxFile, int maxFileContent) throws IOException { @@ -62,7 +64,9 @@ } public File generateWorkingRepositoryPath() { - return new File("/tmp/" + UITest.class.getSimpleName() + "_" + Math.abs(System.nanoTime())); + File file = new File("/tmp/" + UITest.class.getSimpleName() + "_" + Math.abs(System.nanoTime())); + file.mkdirs(); + return file; } public void deleteWorkingCopy(File root) { Modified: trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/UITest.java =================================================================== --- trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/UITest.java 2008-04-16 22:43:18 UTC (rev 537) +++ trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/UITest.java 2008-04-16 22:43:34 UTC (rev 538) @@ -14,17 +14,15 @@ */ package org.codelutin.vcs.ui; -import org.codelutin.i18n.I18n; import org.codelutin.vcs.VCSConnexion; import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.VCSException; import org.codelutin.vcs.VCSFactory; import org.codelutin.vcs.type.VCSConnexionMode; import org.codelutin.vcs.ui.util.model.AbstractTabUIModel; +import org.codelutin.vcs.ui.VCSUIFactory.VCSWindowListener; import org.codelutin.vcs.util.VCSConnexionConfigImpl; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; @@ -33,16 +31,16 @@ public static void main(String[] args) throws IOException, VCSException { - I18n.init(); + RepositoryGenerator generator = new RepositoryGenerator(); - final RepositoryGenerator generator = new RepositoryGenerator(); + File root = generator.generateWorkingRepositoryPath(); - final File root = generator.generateWorkingRepositoryPath(); - generator.generateWorkingRepository(root, 10, 5, 10, 1024); - final VCSConnexion connexion = initMockVCS(root); + VCSConnexion connexion = initMockVCS(root); + initUI(generator, connexion); + connexion.open(); SynchUI ui = VCSUIFactory.newSynchUI(); @@ -54,28 +52,32 @@ generator.generateStates(model.getEntriesModel()); ui.setVisible(true); - ui.addWindowListener(new WindowAdapter() { - boolean wasClosed = false; - - @Override - public void windowClosed(WindowEvent e) { - if (wasClosed) { - return; - } - connexion.close(); - generator.deleteWorkingCopy(root); - wasClosed = true; - } - }); } - public static VCSConnexion initMockVCS(File root) { + public static VCSConnexion initMockVCS(final File root) { VCSConnexionConfig config = new VCSConnexionConfigImpl(); + config.setKeyFile(new File("/home/tony/.ssh/id_dsa")); + config.setUserName("tchemit"); + //config.setPassPhrase("pass"); + config.setNoPassPhrase(true); config.setType("MOCK"); config.setLocalDatabasePath(root); + config.setConnexionMode(VCSConnexionMode.SSH); VCSConnexion connexion = VCSFactory.newConnexion(VCSConnexionMode.ANONYMOUS, config); connexion.init(config); return connexion; } + protected static void initUI(final RepositoryGenerator generator, final VCSConnexion connexion) { + VCSUIFactory.initFactory(connexion.getConfig(), new VCSWindowListener() { + + protected void allWindowsClosed() { + generator.deleteWorkingCopy(connexion.getWorkingCopy()); + } + + protected void closeConnexion(VCSConnexion connexion) { + } + }); + } + }

1 0

r537 - in trunk/lutinvcs: core/src/main/java/org/codelutin/vcs ui/common/src/main/java/org/codelutin/vcs/ui ui/common/src/main/java/org/codelutin/vcs/ui/action ui/common/src/main/java/org/codelutin/vcs/ui/handler ui/common/src/main/java/org/codelutin/vcs/ui/util/handler
by tchemit＠users.labs.libre-entreprise.org 16 Apr '08

16 Apr '08

Author: tchemit Date: 2008-04-16 22:43:18 +0000 (Wed, 16 Apr 2008) New Revision: 537 Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSFactory.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ChangelogUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ConfigUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ConfirmUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractBasicUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractTabOneFileUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractTabUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java Log: add config in handler add generic window in VCSUIFactory to close vcs when no more ui are visible. Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSFactory.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSFactory.java 2008-04-16 21:30:00 UTC (rev 536) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSFactory.java 2008-04-16 22:43:18 UTC (rev 537) @@ -57,7 +57,7 @@ /** action manager */ protected VCSActionManager actionManager; - protected static VCSFactory getInstance() { + public static VCSFactory getInstance() { if (instance == null) { instance = new VCSFactory(); } @@ -139,8 +139,10 @@ providers.add(provider); } log.info("found " + providers.size() + " provider(s) " + providers.toString() + " in " + StringUtil.convertTime(t0, System.nanoTime())); - for (VCSProvider provider : providers) { - log.info(provider.getName() + " [" + provider + ']'); + if (log.isDebugEnabled()) { + for (VCSProvider provider : providers) { + log.debug(provider.getName() + " [" + provider + ']'); + } } actionManager = new VCSActionManager(); connexions = new ArrayList<VCSConnexion>(); Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java 2008-04-16 21:30:00 UTC (rev 536) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java 2008-04-16 22:43:18 UTC (rev 537) @@ -17,9 +17,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.util.StringUtil; +import org.codelutin.vcs.VCSConnexion; +import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.VCSFactory; import org.codelutin.vcs.ui.util.ui.AbstractUI; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.Map; @@ -40,6 +45,17 @@ protected ServiceLoader<VCSUIProvider> loader; + protected VCSConnexionConfig config; + + protected WindowListener defaultWindowListener; + + protected WindowListener windowListener; + + public static void initFactory(VCSConnexionConfig config, VCSWindowListener myWindowAdapter) { + getInstance().setConfig(config); + getInstance().setWindowListener(myWindowAdapter); + } + public static SynchUI newSynchUI() { return (SynchUI) getInstance().newUI(VCSUI.synch); } @@ -91,7 +107,6 @@ return cache; } - protected synchronized ServiceLoader<VCSUIProvider> getProviders() { if (loader == null) { long t0 = System.nanoTime(); @@ -112,10 +127,11 @@ AbstractUI result = getInstance().getCache().get(uiType); if (result == null) { try { - // instance of handler - result = newUI0(uiType); - - getCache().put(uiType, result); + getCache().put(uiType, result = newUI0(uiType)); + result.addWindowListener(defaultWindowListener); + if (windowListener != null) { + result.addWindowListener(windowListener); + } } catch (Exception e) { throw new IllegalStateException("could not instanciate ui handler " + uiType + " for reason : " + e.getMessage()); } @@ -128,8 +144,7 @@ AbstractUI ui = provider.newUI(uiType); if (ui != null) { - uiType.getHandlerClass().getConstructor(ui.getClass().getSuperclass()).newInstance(ui); - + uiType.getHandlerClass().getConstructor(ui.getClass().getSuperclass(), VCSConnexionConfig.class).newInstance(ui, config); ui.getHandler().init(); return ui; } @@ -138,5 +153,64 @@ } protected VCSUIFactory() { + defaultWindowListener = new VCSWindowListener() { + protected void allWindowsClosed() { + } + + protected void closeConnexion(VCSConnexion connexion) { + log.info(connexion); + connexion.close(); + } + }; } + + protected void setConfig(VCSConnexionConfig config) { + this.config = config; + } + + protected void setWindowListener(WindowListener windowListener) { + this.windowListener = windowListener; + } + + public static abstract class VCSWindowListener extends WindowAdapter { + + protected abstract void allWindowsClosed(); + + protected abstract void closeConnexion(VCSConnexion connexion); + + private boolean wasClosed; + + @Override + public void windowClosed(WindowEvent e) { + if (log.isDebugEnabled()) { + log.debug(e.getSource()); + } + if (e.getWindow().isVisible()) { + // only deal with real closed and none visible windows... + return; + } + for (AbstractUI vcsui : VCSUIFactory.getInstance().cache.values()) { + if (vcsui.isVisible()) { + // at least one ui visible, do not kill connexions + return; + } + } + if (wasClosed) { + // make sure to process once + return; + } + log.info("kill connexions... (last ui : " + e.getSource() + ")"); + synchronized (this) { + try { + // all ui are down, kill all connexions + for (VCSConnexion connexion : VCSFactory.getInstance().getConnexions()) { + closeConnexion(connexion); + } + allWindowsClosed(); + } finally { + wasClosed = true; + } + } + } + } } \ No newline at end of file Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java 2008-04-16 21:30:00 UTC (rev 536) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java 2008-04-16 22:43:18 UTC (rev 537) @@ -15,10 +15,11 @@ package org.codelutin.vcs.ui.action; import static org.codelutin.i18n.I18n._; +import org.codelutin.vcs.ui.ConfigUI; +import org.codelutin.vcs.ui.VCSUIFactory; +import static org.codelutin.vcs.ui.util.UIHelper.createActionIcon; +import org.codelutin.vcs.ui.util.handler.AbstractUIHandler; import org.codelutin.vcs.ui.util.ui.AbstractUI; -import org.codelutin.vcs.ui.util.handler.AbstractUIHandler; -import static org.codelutin.vcs.ui.util.UIHelper.createActionIcon; -import org.codelutin.vcs.ui.VCSUIFactory; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -36,8 +37,10 @@ public void actionPerformed(ActionEvent e) { checkInit(); - ui = VCSUIFactory.newConfigUI(); - ui.setVisible(true); + ConfigUI i = VCSUIFactory.newConfigUI(); + // populate with common config + i.getHandler().getModel().populate(i.getHandler().getConfig()); + i.setVisible(true); } protected ShowConfigAction() { Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ChangelogUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ChangelogUIHandler.java 2008-04-16 21:30:00 UTC (rev 536) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ChangelogUIHandler.java 2008-04-16 22:43:18 UTC (rev 537) @@ -15,6 +15,7 @@ package org.codelutin.vcs.ui.handler; import org.codelutin.vcs.VCSEntry; +import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.event.VCSActionThreadEvent; import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSState; @@ -32,8 +33,8 @@ /** @author chemit */ public class ChangelogUIHandler extends AbstractTabOneFileUIHandler<ChangelogUIModel, ChangelogUI> { - public ChangelogUIHandler(ChangelogUI ui) { - super(ui, new ChangelogUIModel(), true); + public ChangelogUIHandler(ChangelogUI ui, VCSConnexionConfig config) { + super(ui, new ChangelogUIModel(),config, true); ui.setHandler(this); } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ConfigUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ConfigUIHandler.java 2008-04-16 21:30:00 UTC (rev 536) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ConfigUIHandler.java 2008-04-16 22:43:18 UTC (rev 537) @@ -39,8 +39,8 @@ protected List<Element> errors; - public ConfigUIHandler(ConfigUI ui) { - super(ui, new ConfigUIModel()); + public ConfigUIHandler(ConfigUI ui,VCSConnexionConfig config) { + super(ui, new ConfigUIModel(),config); ui.setHandler(this); errors = new ArrayList<Element>(); } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ConfirmUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ConfirmUIHandler.java 2008-04-16 21:30:00 UTC (rev 536) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ConfirmUIHandler.java 2008-04-16 22:43:18 UTC (rev 537) @@ -16,6 +16,7 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.vcs.VCSEntry; +import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.event.VCSActionThreadEvent; import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.ui.ConfirmUI; @@ -41,8 +42,8 @@ public class ConfirmUIHandler extends AbstractBasicUIHandler<ConfirmUIModel, ConfirmUI> { - public ConfirmUIHandler(ConfirmUI ui) { - super(ui, new ConfirmUIModel(), false); + public ConfirmUIHandler(ConfirmUI ui, VCSConnexionConfig config) { + super(ui, new ConfirmUIModel(),config, false); ui.setHandler(this); } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java 2008-04-16 21:30:00 UTC (rev 536) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java 2008-04-16 22:43:18 UTC (rev 537) @@ -17,6 +17,7 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.util.FileUtil; import org.codelutin.vcs.VCSEntry; +import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.event.VCSActionThreadEvent; import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSState; @@ -35,8 +36,8 @@ /** @author chemit */ public class DiffUIHandler extends AbstractTabOneFileUIHandler<DiffUIModel, DiffUI> { - public DiffUIHandler(DiffUI ui) { - super(ui, new DiffUIModel(), true); + public DiffUIHandler(DiffUI ui, VCSConnexionConfig config) { + super(ui, new DiffUIModel(), config,true); ui.setHandler(this); } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java 2008-04-16 21:30:00 UTC (rev 536) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java 2008-04-16 22:43:18 UTC (rev 537) @@ -2,6 +2,7 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.vcs.VCSEntry; +import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.event.VCSActionThreadEvent; import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSState; @@ -23,8 +24,8 @@ /** @author chemit */ public class SynchUIHandler extends AbstractTabUIHandler<SynchUIModel, SynchUI> { - public SynchUIHandler(SynchUI ui) { - super(ui, new SynchUIModel(), true); + public SynchUIHandler(SynchUI ui,VCSConnexionConfig config) { + super(ui, new SynchUIModel(), config,true); ui.setHandler(this); } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractBasicUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractBasicUIHandler.java 2008-04-16 21:30:00 UTC (rev 536) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractBasicUIHandler.java 2008-04-16 22:43:18 UTC (rev 537) @@ -15,6 +15,7 @@ package org.codelutin.vcs.ui.util.handler; import org.codelutin.vcs.VCSFactory; +import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.ui.util.model.AbstractBasicUIModel; import org.codelutin.vcs.ui.util.ui.AbstractBasicUI; import org.codelutin.vcs.ui.util.UIHelper; @@ -34,8 +35,8 @@ protected abstract void afterSelectionChanged(); - protected AbstractBasicUIHandler(U ui, M model, boolean useThreadListener) { - super(ui, model); + protected AbstractBasicUIHandler(U ui, M model, VCSConnexionConfig config, boolean useThreadListener) { + super(ui, model,config); this.useThreadListener = useThreadListener; } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractTabOneFileUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractTabOneFileUIHandler.java 2008-04-16 21:30:00 UTC (rev 536) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractTabOneFileUIHandler.java 2008-04-16 22:43:18 UTC (rev 537) @@ -16,6 +16,7 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.vcs.VCSEntry; +import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSEntryLocation; import org.codelutin.vcs.ui.model.DiffUIModel; @@ -31,8 +32,8 @@ /** @author chemit */ public abstract class AbstractTabOneFileUIHandler<M extends AbstractTabOneFileUIModel, U extends AbstractTabOneFileUI<? extends AbstractTabUIHandler>> extends AbstractTabUIHandler<M, U> { - protected AbstractTabOneFileUIHandler(U ui, M model,boolean useThreadListener) { - super(ui, model,useThreadListener); + protected AbstractTabOneFileUIHandler(U ui, M model, VCSConnexionConfig config,boolean useThreadListener) { + super(ui, model,config,useThreadListener); } @Override Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractTabUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractTabUIHandler.java 2008-04-16 21:30:00 UTC (rev 536) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractTabUIHandler.java 2008-04-16 22:43:18 UTC (rev 537) @@ -16,6 +16,7 @@ import org.codelutin.vcs.VCSEntry; import org.codelutin.vcs.VCSException; +import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.ui.ChangelogUI; import org.codelutin.vcs.ui.ConfirmUI; @@ -35,8 +36,8 @@ /** @author chemit */ public abstract class AbstractTabUIHandler<M extends AbstractTabUIModel, U extends AbstractTabUI<? extends AbstractTabUIHandler>> extends AbstractBasicUIHandler<M, U> implements TableModelListener { - protected AbstractTabUIHandler(U ui, M model,boolean useThreadListener) { - super(ui, model,useThreadListener); + protected AbstractTabUIHandler(U ui, M model, VCSConnexionConfig config,boolean useThreadListener) { + super(ui, model,config, useThreadListener); } public void propertyChange(PropertyChangeEvent evt) { Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java 2008-04-16 21:30:00 UTC (rev 536) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java 2008-04-16 22:43:18 UTC (rev 537) @@ -16,6 +16,7 @@ import org.codelutin.vcs.ui.util.model.AbstractUIModel; import org.codelutin.vcs.ui.util.ui.AbstractUI; +import org.codelutin.vcs.VCSConnexionConfig; /** * TODO Move this classe in jaxx @@ -24,7 +25,18 @@ */ public abstract class AbstractUIHandler<M extends AbstractUIModel, U extends AbstractUI<? extends AbstractUIHandler>> extends jaxx.DialogUIHandler<M, U> { - protected AbstractUIHandler(U ui, M model) { + private VCSConnexionConfig config; + + protected AbstractUIHandler(U ui, M model,VCSConnexionConfig config) { super(ui, model); + this.config=config; } + + public VCSConnexionConfig getConfig() { + return config; + } + + public void setConfig(VCSConnexionConfig config) { + this.config = config; + } }

1 0

r536 - trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 16 Apr '08

16 Apr '08

Author: tchemit Date: 2008-04-16 21:30:00 +0000 (Wed, 16 Apr 2008) New Revision: 536 Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css Log: add vertical scrollbar Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css 2008-04-16 21:17:24 UTC (rev 535) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css 2008-04-16 21:30:00 UTC (rev 536) @@ -26,17 +26,12 @@ } JSeparator { - border: { null + border: { null}; +opaque:false; } -; -opaque:false - -; -} - .updateScroll, .diffScroll, .confirmScroll { - verticalScrollBarPolicy: 21; + verticalScrollBarPolicy: 20; horizontalScrollBarPolicy: 31; } @@ -46,6 +41,7 @@ rowSelectionAllowed: true; rowMargin: 0; } + #localEditorScroll,#remoteEditorScroll{ font-size:10; }

1 0

r535 - in trunk/lutinvcs/ui: common/src/main/java/org/codelutin/vcs/ui/util/handler common/src/main/java/org/codelutin/vcs/ui/util/model jaxx/src/main/uimodel/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 16 Apr '08

16 Apr '08

Author: tchemit Date: 2008-04-16 21:17:24 +0000 (Wed, 16 Apr 2008) New Revision: 535 Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractTabOneFileUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractTabOneFileUIModel.java trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx Log: refactor util package Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractTabOneFileUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractTabOneFileUIHandler.java 2008-04-16 21:11:34 UTC (rev 534) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractTabOneFileUIHandler.java 2008-04-16 21:17:24 UTC (rev 535) @@ -89,14 +89,14 @@ public void gotoPreviousFile() { Integer index = getModel().getFileIndex(); - if (index != null && getModel().hasPreviousFile) { + if (index != null && getModel().isHasPreviousFile()) { getSelectionModel().setSelectionInterval(index - 1, index - 1); } } public void gotoNextFile() { Integer index = getModel().getFileIndex(); - if (index != null && getModel().hasNextFile) { + if (index != null && getModel().isHasNextFile()) { getSelectionModel().setSelectionInterval(index + 1, index + 1); } } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractTabOneFileUIModel.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractTabOneFileUIModel.java 2008-04-16 21:11:34 UTC (rev 534) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractTabOneFileUIModel.java 2008-04-16 21:17:24 UTC (rev 535) @@ -73,4 +73,12 @@ public Integer getFileIndex() { return fileIndex; } + + public boolean isHasPreviousFile() { + return hasPreviousFile; + } + + public boolean isHasNextFile() { + return hasNextFile; + } } \ No newline at end of file Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx 2008-04-16 21:11:34 UTC (rev 534) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx 2008-04-16 21:17:24 UTC (rev 535) @@ -63,7 +63,7 @@ <JLabel id='sshLoginLabel'/> </cell> <cell> - <JTextField id='sshLogin' onKeyReleased="doCheck(Element.sshlogin)"/> + <JTextField id='sshLogin' onKeyReleased="doCheck(Element.sshLogin)"/> </cell> </row> <row fill='horizontal'> @@ -84,7 +84,7 @@ </cell> <cell> <JToolBar opaque='false' borderPainted='false' height="24"> - <JTextField id='privateKeyFile' onKeyReleased="doCheck(Element.privatekey)"/> + <JTextField id='privateKeyFile' onKeyReleased="doCheck(Element.privateKeyFile)"/> <JButton id='changePrivateKeyFile' icon='{createActionIcon("filechooser")}' onActionPerformed="changePrivateKeyFile()"/> </JToolBar>

1 0

r534 - trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 16 Apr '08

16 Apr '08

Author: tchemit Date: 2008-04-16 21:11:34 +0000 (Wed, 16 Apr 2008) New Revision: 534 Modified: trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/UITest.java Log: refactor util package Modified: trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/UITest.java =================================================================== --- trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/UITest.java 2008-04-16 21:11:27 UTC (rev 533) +++ trunk/lutinvcs/all/src/test/java/org/codelutin/vcs/ui/UITest.java 2008-04-16 21:11:34 UTC (rev 534) @@ -20,7 +20,7 @@ import org.codelutin.vcs.VCSException; import org.codelutin.vcs.VCSFactory; import org.codelutin.vcs.type.VCSConnexionMode; -import org.codelutin.vcs.ui.util.AbstractTabUIModel; +import org.codelutin.vcs.ui.util.model.AbstractTabUIModel; import org.codelutin.vcs.util.VCSConnexionConfigImpl; import java.awt.event.WindowAdapter;

1 0