Fix string externalization warnings in BaseFormat
Change-Id: Ie40aa1f889191e45e4d4a7a144c3176d521f6cfa
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
diff --git a/org.eclipse.jgit.archive/resources/org/eclipse/jgit/archive/internal/ArchiveText.properties b/org.eclipse.jgit.archive/resources/org/eclipse/jgit/archive/internal/ArchiveText.properties
index fecf99e..3b50bb4 100644
--- a/org.eclipse.jgit.archive/resources/org/eclipse/jgit/archive/internal/ArchiveText.properties
+++ b/org.eclipse.jgit.archive/resources/org/eclipse/jgit/archive/internal/ArchiveText.properties
@@ -1,2 +1,3 @@
+cannotSetOption=Cannot set option: {0}
pathDoesNotMatchMode=Path {0} does not match mode {1}
unsupportedMode=Unsupported mode {0}
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java
index f47fa12..e80d421 100644
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java
@@ -45,9 +45,11 @@
import java.beans.Statement;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.Map;
import org.apache.commons.compress.archivers.ArchiveOutputStream;
+import org.eclipse.jgit.archive.internal.ArchiveText;
import org.eclipse.jgit.util.StringUtils;
/**
@@ -71,11 +73,11 @@ protected ArchiveOutputStream applyFormatOptions(ArchiveOutputStream s,
Map<String, Object> o) throws IOException {
for (Map.Entry<String, Object> p : o.entrySet()) {
try {
- new Statement(s,
- "set" + StringUtils.capitalize(p.getKey()),
- new Object[]{p.getValue()}).execute();
+ new Statement(s, "set" + StringUtils.capitalize(p.getKey()), //$NON-NLS-1$
+ new Object[] { p.getValue() }).execute();
} catch (Exception e) {
- throw new IOException("cannot set option: " + p.getKey(), e);
+ throw new IOException(MessageFormat.format(
+ ArchiveText.get().cannotSetOption, p.getKey()), e);
}
}
return s;
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/internal/ArchiveText.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/internal/ArchiveText.java
index edadf1c..f631cf8 100644
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/internal/ArchiveText.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/internal/ArchiveText.java
@@ -58,6 +58,7 @@ public static ArchiveText get() {
}
// @formatter:off
+ /***/ public String cannotSetOption;
/***/ public String pathDoesNotMatchMode;
/***/ public String unsupportedMode;
}
