diff options
4 files changed, 10 insertions, 22 deletions
diff --git a/org.jacoco.ant/src/org/jacoco/ant/DumpTask.java b/org.jacoco.ant/src/org/jacoco/ant/DumpTask.java index 9024cd73..c6beeeca 100644 --- a/org.jacoco.ant/src/org/jacoco/ant/DumpTask.java +++ b/org.jacoco.ant/src/org/jacoco/ant/DumpTask.java @@ -34,7 +34,7 @@ import org.jacoco.core.runtime.RemoteControlWriter; */
public class DumpTask extends Task {
- private static OutputStream NUL = new OutputStream() {
+ private static final OutputStream NUL = new OutputStream() {
@Override
public void write(final int b) throws IOException {
// nothing to do
diff --git a/org.jacoco.core/src/org/jacoco/core/JaCoCo.java b/org.jacoco.core/src/org/jacoco/core/JaCoCo.java index e02a2b5a..83d8769b 100644 --- a/org.jacoco.core/src/org/jacoco/core/JaCoCo.java +++ b/org.jacoco.core/src/org/jacoco/core/JaCoCo.java @@ -11,9 +11,7 @@ *******************************************************************************/
package org.jacoco.core;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
+import java.util.ResourceBundle;
/**
* Static Meta information about JaCoCo.
@@ -27,20 +25,10 @@ public final class JaCoCo { public static final String HOMEURL;
static {
- final Properties properties = new Properties();
- try {
- final InputStream in = JaCoCo.class
- .getResourceAsStream("jacoco.properties");
- try {
- properties.load(in);
- } finally {
- in.close();
- }
- } catch (final IOException e) {
- throw new AssertionError(e);
- }
- VERSION = properties.getProperty("VERSION");
- HOMEURL = properties.getProperty("HOMEURL");
+ final ResourceBundle bundle = ResourceBundle
+ .getBundle("org.jacoco.core.jacoco");
+ VERSION = bundle.getString("VERSION");
+ HOMEURL = bundle.getString("HOMEURL");
}
private JaCoCo() {
diff --git a/org.jacoco.report/src/org/jacoco/report/internal/NormalizedFileNames.java b/org.jacoco.report/src/org/jacoco/report/internal/NormalizedFileNames.java index 3f95167c..4afe9ecc 100644 --- a/org.jacoco.report/src/org/jacoco/report/internal/NormalizedFileNames.java +++ b/org.jacoco.report/src/org/jacoco/report/internal/NormalizedFileNames.java @@ -14,6 +14,7 @@ package org.jacoco.report.internal; import java.util.BitSet;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -76,11 +77,11 @@ class NormalizedFileNames { private String ensureUniqueness(final String s) {
String unique = s;
- String lower = unique.toLowerCase();
+ String lower = unique.toLowerCase(Locale.ENGLISH);
int idx = 1;
while (usedNames.contains(lower)) {
unique = s + '~' + idx++;
- lower = unique.toLowerCase();
+ lower = unique.toLowerCase(Locale.ENGLISH);
}
usedNames.add(lower);
return unique;
diff --git a/org.jacoco.report/src/org/jacoco/report/internal/html/table/LabelColumn.java b/org.jacoco.report/src/org/jacoco/report/internal/html/table/LabelColumn.java index c726ae8c..13a884d1 100644 --- a/org.jacoco.report/src/org/jacoco/report/internal/html/table/LabelColumn.java +++ b/org.jacoco.report/src/org/jacoco/report/internal/html/table/LabelColumn.java @@ -28,8 +28,7 @@ public class LabelColumn implements IColumnRenderer { private static final Comparator<ITableItem> COMPARATOR = new Comparator<ITableItem>() {
public int compare(final ITableItem i1, final ITableItem i2) {
- return i1.getLinkLabel().toLowerCase()
- .compareTo(i2.getLinkLabel().toLowerCase());
+ return i1.getLinkLabel().compareToIgnoreCase(i2.getLinkLabel());
}
};
|