Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-09-12 14:25:26 -0400
committerMichael Valenta2003-09-12 14:25:26 -0400
commit1930392bc918e30f5ed2c8f96fa0024d69d006db (patch)
treeca2ddd02aa645f3b860d0c6bf5f05364bdd1e990
parent5e6ece1660b68f5f2c16d122a2509285d8ef8d07 (diff)
downloadeclipse.platform.team-1930392bc918e30f5ed2c8f96fa0024d69d006db.tar.gz
eclipse.platform.team-1930392bc918e30f5ed2c8f96fa0024d69d006db.tar.xz
eclipse.platform.team-1930392bc918e30f5ed2c8f96fa0024d69d006db.zip
NLSed message for CRLF in text file on server
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CRLFDetectInputStream.java3
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties1
3 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CRLFDetectInputStream.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CRLFDetectInputStream.java
index ccbd50c89..257a54df6 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CRLFDetectInputStream.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CRLFDetectInputStream.java
@@ -16,6 +16,7 @@ import java.io.InputStream;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
+import org.eclipse.team.internal.ccvs.core.Policy;
/**
* Stream which detects CRLF in text file contents recieved from the server
@@ -65,7 +66,7 @@ public class CRLFDetectInputStream extends FilterInputStream {
*/
private void testForCRLF(byte next) {
if (previousCR && next == '\n') {
- CVSProviderPlugin.log(IStatus.WARNING, "Server file " + filename + " contains invalid line endings for a text file (CR/LF instead of just LF) or is a binary file that is not properly marked as such.", null);
+ CVSProviderPlugin.log(IStatus.WARNING, Policy.bind("CRLFDetectInputStream.0", filename), null); //$NON-NLS-1$
}
previousCR = (next == '\r');
}
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 88bbc3fb2..fc3ca90ed 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
@@ -954,7 +954,7 @@ public class Session {
in = new LFtoCRLFInputStream(in);
} else {
// be nice and warn about text files that contain CRLF
- in = new CRLFDetectInputStream(in, file.getName());
+ in = new CRLFDetectInputStream(in, file.getIResource().getFullPath().toString());
}
}
// write the file locally
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
index 66a55176e..aefd8b0ab 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
@@ -329,3 +329,4 @@ CVSSyncTreeSubscriber.0={0} is not a valid comparison criteria for subscriber {1
CVSRevisionNumberCompareCriteria.1=Revision number comparison
RemoteTagSynchronizer.0=Refreshing {0}
ReentrantLock.9=An error occurred writting CVS synchronization information to disk. Some information may be lost.
+CRLFDetectInputStream.0=CVS file {0} either contains invalid line endings on the server (CR/LF instead of just LF) or is a binary file that is not marked as -kb.

Back to the top