github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge branch 'stable-0.7' 

* stable-0.7:
  Fix NLS to build under Java 5
stable-0.8
Shawn O. Pearce 15 years ago
parent
2c14e78a22 24875de6bd
commit
ab51665336
3 changed files with 18 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/TestNLS.java
  2. 20
      org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/TestTranslationBundle.java
  3. 1
      org.eclipse.jgit/src/org/eclipse/jgit/nls/NLS.java

14
org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/TestNLS.java
Unescape View File

@ -53,9 +53,9 @@ import junit.framework.TestCase;
public class TestNLS extends TestCase { public class TestNLS extends TestCase {
public void testNLSLocale() { public void testNLSLocale() {
NLS.setLocale(Locale.ROOT); NLS.setLocale(NLS.ROOT_LOCALE);
GermanTranslatedBundle bundle = GermanTranslatedBundle.get(); GermanTranslatedBundle bundle = GermanTranslatedBundle.get();
assertEquals(Locale.ROOT, bundle.getEffectiveLocale()); assertEquals(NLS.ROOT_LOCALE, bundle.getEffectiveLocale());
NLS.setLocale(Locale.GERMAN); NLS.setLocale(Locale.GERMAN);
bundle = GermanTranslatedBundle.get(); bundle = GermanTranslatedBundle.get();
@ -63,10 +63,10 @@ public class TestNLS extends TestCase {
} }
public void testJVMDefaultLocale() { public void testJVMDefaultLocale() {
Locale.setDefault(Locale.ROOT); Locale.setDefault(NLS.ROOT_LOCALE);
NLS.useJVMDefaultLocale(); NLS.useJVMDefaultLocale();
GermanTranslatedBundle bundle = GermanTranslatedBundle.get(); GermanTranslatedBundle bundle = GermanTranslatedBundle.get();
assertEquals(Locale.ROOT, bundle.getEffectiveLocale()); assertEquals(NLS.ROOT_LOCALE, bundle.getEffectiveLocale());
Locale.setDefault(Locale.GERMAN); Locale.setDefault(Locale.GERMAN);
NLS.useJVMDefaultLocale(); NLS.useJVMDefaultLocale();
@ -84,7 +84,7 @@ public class TestNLS extends TestCase {
} }
} }
NLS.setLocale(Locale.ROOT); NLS.setLocale(NLS.ROOT_LOCALE);
GermanTranslatedBundle mainThreadsBundle = GermanTranslatedBundle.get(); GermanTranslatedBundle mainThreadsBundle = GermanTranslatedBundle.get();
T t = new T(); T t = new T();
t.start(); t.start();
@ -126,7 +126,7 @@ public class TestNLS extends TestCase {
} }
} }
T t1 = new T(Locale.ROOT); T t1 = new T(NLS.ROOT_LOCALE);
T t2 = new T(Locale.GERMAN); T t2 = new T(Locale.GERMAN);
t1.start(); t1.start();
t2.start(); t2.start();
@ -135,7 +135,7 @@ public class TestNLS extends TestCase {
assertNull("t1 was interrupted or barrier was broken", t1.e); assertNull("t1 was interrupted or barrier was broken", t1.e);
assertNull("t2 was interrupted or barrier was broken", t2.e); assertNull("t2 was interrupted or barrier was broken", t2.e);
assertEquals(Locale.ROOT, t1.bundle.getEffectiveLocale()); assertEquals(NLS.ROOT_LOCALE, t1.bundle.getEffectiveLocale());
assertEquals(Locale.GERMAN, t2.bundle.getEffectiveLocale()); assertEquals(Locale.GERMAN, t2.bundle.getEffectiveLocale());
} }
} }

20
org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/TestTranslationBundle.java
Unescape View File

@ -54,23 +54,23 @@ public class TestTranslationBundle extends TestCase {
public void testMissingPropertiesFile() { public void testMissingPropertiesFile() {
try { try {
new NoPropertiesBundle().load(Locale.ROOT); new NoPropertiesBundle().load(NLS.ROOT_LOCALE);
fail("Expected TranslationBundleLoadingException"); fail("Expected TranslationBundleLoadingException");
} catch (TranslationBundleLoadingException e) { } catch (TranslationBundleLoadingException e) {
assertEquals(NoPropertiesBundle.class, e.getBundleClass()); assertEquals(NoPropertiesBundle.class, e.getBundleClass());
assertEquals(Locale.ROOT, e.getLocale()); assertEquals(NLS.ROOT_LOCALE, e.getLocale());
// pass // pass
} }
} }
public void testMissingString() { public void testMissingString() {
try { try {
new MissingPropertyBundle().load(Locale.ROOT); new MissingPropertyBundle().load(NLS.ROOT_LOCALE);
fail("Expected TranslationStringMissingException"); fail("Expected TranslationStringMissingException");
} catch (TranslationStringMissingException e) { } catch (TranslationStringMissingException e) {
assertEquals("nonTranslatedKey", e.getKey()); assertEquals("nonTranslatedKey", e.getKey());
assertEquals(MissingPropertyBundle.class, e.getBundleClass()); assertEquals(MissingPropertyBundle.class, e.getBundleClass());
assertEquals(Locale.ROOT, e.getLocale()); assertEquals(NLS.ROOT_LOCALE, e.getLocale());
// pass // pass
} }
} }
@ -78,24 +78,24 @@ public class TestTranslationBundle extends TestCase {
public void testNonTranslatedBundle() { public void testNonTranslatedBundle() {
NonTranslatedBundle bundle = new NonTranslatedBundle(); NonTranslatedBundle bundle = new NonTranslatedBundle();
bundle.load(Locale.ROOT); bundle.load(NLS.ROOT_LOCALE);
assertEquals(Locale.ROOT, bundle.getEffectiveLocale()); assertEquals(NLS.ROOT_LOCALE, bundle.getEffectiveLocale());
assertEquals("Good morning {0}", bundle.goodMorning); assertEquals("Good morning {0}", bundle.goodMorning);
bundle.load(Locale.ENGLISH); bundle.load(Locale.ENGLISH);
assertEquals(Locale.ROOT, bundle.getEffectiveLocale()); assertEquals(NLS.ROOT_LOCALE, bundle.getEffectiveLocale());
assertEquals("Good morning {0}", bundle.goodMorning); assertEquals("Good morning {0}", bundle.goodMorning);
bundle.load(Locale.GERMAN); bundle.load(Locale.GERMAN);
assertEquals(Locale.ROOT, bundle.getEffectiveLocale()); assertEquals(NLS.ROOT_LOCALE, bundle.getEffectiveLocale());
assertEquals("Good morning {0}", bundle.goodMorning); assertEquals("Good morning {0}", bundle.goodMorning);
} }
public void testGermanTranslation() { public void testGermanTranslation() {
GermanTranslatedBundle bundle = new GermanTranslatedBundle(); GermanTranslatedBundle bundle = new GermanTranslatedBundle();
bundle.load(Locale.ROOT); bundle.load(NLS.ROOT_LOCALE);
assertEquals(Locale.ROOT, bundle.getEffectiveLocale()); assertEquals(NLS.ROOT_LOCALE, bundle.getEffectiveLocale());
assertEquals("Good morning {0}", bundle.goodMorning); assertEquals("Good morning {0}", bundle.goodMorning);
bundle.load(Locale.GERMAN); bundle.load(Locale.GERMAN);

1
org.eclipse.jgit/src/org/eclipse/jgit/nls/NLS.java
Unescape View File

@ -68,6 +68,7 @@ import org.eclipse.jgit.errors.TranslationStringMissingException;
* </pre> * </pre>
*/ */
public class NLS { public class NLS {
static final Locale ROOT_LOCALE = new Locale("", "", "");
private static final InheritableThreadLocal<NLS> local = new InheritableThreadLocal<NLS>() { private static final InheritableThreadLocal<NLS> local = new InheritableThreadLocal<NLS>() {
protected NLS initialValue() { protected NLS initialValue() {

Write Preview
Loading…
Cancel
Save