Author: tchemit Date: 2008-04-04 19:36:20 +0000 (Fri, 04 Apr 2008) New Revision: 339 Modified: trunk/lutinvcs/lutinvcs-provider-cvs/src/main/java/org/codelutin/vcs/CVSHandlerProvider.java trunk/lutinvcs/lutinvcs-provider-cvs/src/main/java/org/codelutin/vcs/impl/cvs/CVSHelper.java Log: init Config in CVSHelper from CVSHandlerProvider Modified: trunk/lutinvcs/lutinvcs-provider-cvs/src/main/java/org/codelutin/vcs/CVSHandlerProvider.java =================================================================== --- trunk/lutinvcs/lutinvcs-provider-cvs/src/main/java/org/codelutin/vcs/CVSHandlerProvider.java 2008-04-04 19:35:35 UTC (rev 338) +++ trunk/lutinvcs/lutinvcs-provider-cvs/src/main/java/org/codelutin/vcs/CVSHandlerProvider.java 2008-04-04 19:36:20 UTC (rev 339) @@ -15,6 +15,7 @@ package org.codelutin.vcs; import org.codelutin.vcs.impl.cvs.CVSHandler; +import org.codelutin.vcs.impl.cvs.CVSHelper; /** @author chemit */ public class CVSHandlerProvider implements VCSHandlerProvider<CVSHandler> { @@ -24,6 +25,7 @@ } public CVSHandler newInstance(VCSConfig config) { + CVSHelper.setConfig(config); return new CVSHandler(config); } } \ No newline at end of file Modified: trunk/lutinvcs/lutinvcs-provider-cvs/src/main/java/org/codelutin/vcs/impl/cvs/CVSHelper.java =================================================================== --- trunk/lutinvcs/lutinvcs-provider-cvs/src/main/java/org/codelutin/vcs/impl/cvs/CVSHelper.java 2008-04-04 19:35:35 UTC (rev 338) +++ trunk/lutinvcs/lutinvcs-provider-cvs/src/main/java/org/codelutin/vcs/impl/cvs/CVSHelper.java 2008-04-04 19:36:20 UTC (rev 339) @@ -36,7 +36,6 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.vcs.VCSConfig; import org.codelutin.vcs.VCSException; -import org.codelutin.vcs.VCSHandlerFactory; import org.codelutin.vcs.VCSRuntimeException; import org.codelutin.vcs.VCSType; import org.netbeans.lib.cvsclient.CVSRoot; @@ -94,7 +93,7 @@ String hostName = getConfig().getHostName(); // R�pertoire distant du CVS - String repository = config.getRemotePath(); + String repository = getConfig().getRemotePath(); String userName = getConfig().getUserName(); @@ -142,8 +141,9 @@ } private static VCSConfig getConfig() { - if (config == null) - config = VCSHandlerFactory.getConfig(); + if (config == null) { + throw new IllegalStateException("config is null, should use provider to init config, or setConfig method"); + } if (config.getType() != VCSType.CVS) { throw new VCSRuntimeException("can not execute CVS command with " + "a [" + config.getType() + "] handler"); @@ -524,6 +524,10 @@ return listener.getResult(); } + public static void setConfig(VCSConfig config) { + CVSHelper.config = config; + } + static protected class LogCVSListener implements CVSListener { protected CVSCommandResult result = new CVSCommandResult();