Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2008-02-19 21:14:49 +0000
committerJohn Arthorne2008-02-19 21:14:49 +0000
commitacff703dd340945d7816b1089ec74a57d011543d (patch)
treea5a70aa1a327e677addbcf451994b56ce21e1bae /bundles/org.eclipse.equinox.p2.artifact.repository/src
parent0242651805ccc033efb8cf314d7a00ddfd8a68cc (diff)
downloadrt.equinox.p2-acff703dd340945d7816b1089ec74a57d011543d.tar.gz
rt.equinox.p2-acff703dd340945d7816b1089ec74a57d011543d.tar.xz
rt.equinox.p2-acff703dd340945d7816b1089ec74a57d011543d.zip
Externalize strings
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.artifact.repository/src')
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java5
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties6
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java20
3 files changed, 20 insertions, 11 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 14dbc8b3b..b6b2fea15 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
@@ -33,6 +33,11 @@ public class Messages extends NLS {
public static String repoFailedWrite;
public static String repoReadOnly;
+ public static String sar_downloading;
+ public static String sar_downloadJobName;
+ public static String sar_failedMkdir;
+ public static String sar_reportStatus;
+
static {
// initialize resource bundles
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
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 91fed5e49..c21aad3a8 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
@@ -30,4 +30,8 @@ repoMan_failedRead=The repository could not be read: {0}.
repoMan_internalError=Internal error.
repoMan_notExists=No repository found at {0}.
repoMan_unknownType=Unknown repository type at {0}.
- \ No newline at end of file
+
+sar_downloading=Download {0} artifacts
+sar_downloadJobName=Install download
+sar_failedMkdir=Failed to create directory {0}.
+sar_reportStatus=Problems downloading artifact: {0}.
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
index 4593b3c6f..a69b75c75 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
@@ -487,11 +487,11 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
}
} else {
// initialize the various jobs needed to process the get artifact requests
- monitor.beginTask(NLS.bind("Download {0} artifacts", Integer.toString(requests.length)), requests.length);
+ monitor.beginTask(NLS.bind(Messages.sar_downloading, Integer.toString(requests.length)), requests.length);
try {
DownloadJob jobs[] = new DownloadJob[numberOfJobs];
for (int i = 0; i < numberOfJobs; i++) {
- jobs[i] = new DownloadJob("Install download " + i);
+ jobs[i] = new DownloadJob(Messages.sar_downloadJobName + i);
jobs[i].initialize(this, requestsPending, monitor, overallStatus);
jobs[i].schedule();
}
@@ -630,13 +630,13 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
if (isFolderBased(newDescriptor)) {
outputFile.mkdirs();
if (!outputFile.exists())
- throw failedWrite(null);
-
+ throw failedWrite(new IOException(NLS.bind(Messages.sar_failedMkdir, outputFile.toString())));
target = new ZippedFolderOutputStream(outputFile);
} else {
- // file based
- if (!outputFile.getParentFile().exists() && !outputFile.getParentFile().mkdirs())
- throw failedWrite(null);
+ // file based0
+ File parent = outputFile.getParentFile();
+ if (!parent.exists() && !parent.mkdirs())
+ throw failedWrite(new IOException(NLS.bind(Messages.sar_failedMkdir, parent.toString()))); //$NON-NLS-1$
target = new FileOutputStream(file);
}
@@ -740,15 +740,15 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
try {
destination.close();
} catch (IOException e) {
- return new Status(IStatus.ERROR, Activator.ID, "Error closing processing steps", e);
+ return new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.sar_reportStatus, descriptor.getArtifactKey().toExternalForm()), e);
}
IStatus stepStatus = ((ProcessingStep) destination).getStatus(true);
// if the steps all ran ok and there is no interesting information, return the status from this method
if (!stepStatus.isMultiStatus() && stepStatus.isOK())
return status;
- // else gather up the status from the
- MultiStatus result = new MultiStatus(Activator.ID, IStatus.OK, new IStatus[0], "Status of getting artifact " + descriptor.getArtifactKey(), null);
+ // else gather up the status from the steps
+ MultiStatus result = new MultiStatus(Activator.ID, IStatus.OK, new IStatus[0], NLS.bind(Messages.sar_reportStatus, descriptor.getArtifactKey().toExternalForm()), null);
result.merge(status);
result.merge(stepStatus);
return result;

Back to the top