Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2008-01-11 21:09:46 +0000
committerJohn Arthorne2008-01-11 21:09:46 +0000
commitceba68b3905c5a904481f73634b2fd9443a053fc (patch)
tree249d92ec7e6967d545eb2f04b69fabd5bf06aaeb /bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox
parent84c3cbb5d002595285988f08e37a6353f3b1ebb3 (diff)
downloadrt.equinox.p2-ceba68b3905c5a904481f73634b2fd9443a053fc.tar.gz
rt.equinox.p2-ceba68b3905c5a904481f73634b2fd9443a053fc.tar.xz
rt.equinox.p2-ceba68b3905c5a904481f73634b2fd9443a053fc.zip
Shorter message keys
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox')
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties5
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java4
3 files changed, 6 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java
index 69d1b4ab5..fd1979b85 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java
@@ -32,7 +32,7 @@ public class Messages extends NLS {
public static String repoMan_unknownType;
public static String FileDownloadError;
- public static String SimpleArtifactRepositoryIO_Parser_Error_Parsing_Repository;
- public static String SimpleArtifactRepositoryIO_Parser_Has_Incompatible_Version;
+ public static String io_parseError;
+ public static String io_incompatibleVersion;
} \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties
index 968fdf167..7e7e9a54b 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties
@@ -10,11 +10,10 @@
###############################################################################
FileDownloadError=Error downloading {0} to {1}.
-SimpleArtifactRepositoryIO_Parser_Error_Parsing_Registry=\
+io_parseError=\
Error parsing simple artifact repository
-SimpleArtifactRepositoryIO_Parser_Has_Incompatible_Version=\
+io_incompatibleVersion=\
Simple artifact repository has incompatible version {0}; expected {1}
-
repoMan_exists=Repository already exists at {0}
repoMan_failedRead=The repository could not be read: {0}
repoMan_internalError=Internal error
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java
index 72f05f8ba..87beb50a5 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java
@@ -274,7 +274,7 @@ class SimpleArtifactRepositoryIO {
// TODO: version tolerance by extension
Version repositoryVersion = extractPIVersion(target, data);
if (!XML_TOLERANCE.isIncluded(repositoryVersion)) {
- throw new SAXException(NLS.bind(Messages.SimpleArtifactRepositoryIO_Parser_Has_Incompatible_Version, repositoryVersion, XML_TOLERANCE));
+ throw new SAXException(NLS.bind(Messages.io_incompatibleVersion, repositoryVersion, XML_TOLERANCE));
}
}
}
@@ -516,7 +516,7 @@ class SimpleArtifactRepositoryIO {
}
protected String getErrorMessage() {
- return Messages.SimpleArtifactRepositoryIO_Parser_Error_Parsing_Repository;
+ return Messages.io_parseError;
}
public String toString() {

Back to the top