Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-04-05 12:23:28 -0500
committerMichael Valenta2002-04-05 12:23:28 -0500
commit6c650ab5e53c5c11f3563bc2d26b0fa56ae44749 (patch)
tree8b5d126b99b4f46fcd0eb9d30e1b4bc2d215345e
parentbb5cf9edb27ceb36a9b22dfa361ff2330cc9c1ed (diff)
downloadeclipse.platform.team-6c650ab5e53c5c11f3563bc2d26b0fa56ae44749.tar.gz
eclipse.platform.team-6c650ab5e53c5c11f3563bc2d26b0fa56ae44749.tar.xz
eclipse.platform.team-6c650ab5e53c5c11f3563bc2d26b0fa56ae44749.zip
Refactoring CVSNT specialization
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java18
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java6
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java4
3 files changed, 9 insertions, 19 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
index 7de11ebf7..88a743057 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
@@ -65,7 +65,6 @@ public class CVSProviderPlugin extends Plugin {
private boolean promptOnFileDelete = true;
private boolean promptOnFolderDelete = true;
private boolean showTasksOnAddAndDelete = false;
- private boolean customizeForCVSNT = false;
private String cvsRshCommand = DEFAULT_CVS_RSH;
private String cvsServer = DEFAULT_CVS_SERVER;
private IConsoleListener consoleListener;
@@ -383,22 +382,5 @@ public class CVSProviderPlugin extends Plugin {
public void setShowTasksOnAddAndDelete(boolean showTasksOnAddAndDelete) {
this.showTasksOnAddAndDelete = showTasksOnAddAndDelete;
}
-
- /**
- * Gets the customizeForCVSNT.
- * @return Returns a boolean
- */
- public boolean isCustomizeForCVSNT() {
- return customizeForCVSNT;
- }
-
- /**
- * Sets the customizeForCVSNT.
- * @param customizeForCVSNT The customizeForCVSNT to set
- */
- public void setCustomizeForCVSNT(boolean customizeForCVSNT) {
- this.customizeForCVSNT = customizeForCVSNT;
- }
-
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java
index 139267ef8..a18ac9880 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java
@@ -97,7 +97,11 @@ public abstract class Request {
int currentIncrement = 4;
int nextProgress = currentIncrement;
int worked = 0;
- boolean isCVSNT = CVSProviderPlugin.getPlugin().isCustomizeForCVSNT();
+
+ // If the session is connected to a CVSNT server (1.11.1.1), we'll need to do some special handling for
+ // some errors. Unfortunately, CVSNT 1.11.1.1 will drop the connection after so some functionality is
+ // still effected
+ boolean isCVSNT = session.isCVSNT();
List accumulatedStatus = new ArrayList();
for (;;) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java
index 887b03f47..92a3116d7 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java
@@ -187,6 +187,10 @@ public class Session {
return (validRequests == null) ||
(validRequests.indexOf(" " + request + " ") != -1); //$NON-NLS-1$ //$NON-NLS-2$
}
+
+ public boolean isCVSNT() {
+ return location.getRootDirectory().indexOf(':') >= 0;
+ }
/**
* Returns the local root folder for this session.

Back to the top