blob: 6eb0a75db14e831128136328d988757ddf1d4709 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
# HG changeset patch
# User andrew
# Date 1371734829 18000
# Node ID 9aefba5680d55a2e3f718c03cd27cf027c7fc1f9
# Parent f422c843b477501acc2526c69609fd94204cdce1
Fix merge error
diff --git a/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java b/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
--- langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
+++ langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
@@ -36,7 +36,6 @@
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Position;
-import java.util.Locale;
/**
* This class holds the information from one run of javadoc.
@@ -362,11 +361,4 @@
public Locale getLocale() {
return env.doclocale.locale;
}
-
- /**
- * Return the locale provided by the user or the default locale value.
- */
- public Locale getLocale() {
- return env.doclocale.locale;
- }
}
|
