Main.java (getGjdocVersion): Use gnu.classpath.Configuration.CLASSPATH_VERSION as version number.

2009-06-16  Matthias Klose  <doko@ubuntu.com>

        * tools/gnu/classpath/tools/gjdoc/Main.java (getGjdocVersion): Use
        gnu.classpath.Configuration.CLASSPATH_VERSION as version number.
        * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
        (getDocletVersion): Likewise.
        * tools/classes/gnu/classpath/tools/gjdoc/Main*.class: Regenerate.
        * tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet*.class:
        Regenerate.

From-SVN: r148530

libjava/classpath/ChangeLog.gcj

@@ -1,3 +1,13 @@
+2009-06-16  Matthias Klose  <doko@ubuntu.com>
+
+	* tools/gnu/classpath/tools/gjdoc/Main.java (getGjdocVersion): Use
+	gnu.classpath.Configuration.CLASSPATH_VERSION as version number.
+	* tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
+	(getDocletVersion): Likewise.
+	* tools/classes/gnu/classpath/tools/gjdoc/Main*.class: Regenerate.
+	* tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet*.class:
+ 	Regenerate.
+
 2009-03-16  Matthias Klose  <doko@ubuntu.com>
 
 	* configure.ac: Detect xulrunner-1.9.

libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java

@@ -3736,20 +3736,7 @@ public class HtmlDoclet
    protected String getDocletVersion()
    {
       if (null == docletVersion) {
-         try {
-            Properties versionProperties = new Properties();
-            InputStream in = getClass().getResourceAsStream("/version.properties");
-            if (in == null) {
-            	in = new FileInputStream("src/resources/version.properties");
-            }
-            versionProperties.load(in);
-            docletVersion = versionProperties.getProperty("gjdoc.version");
-         }
-         catch (IOException ignore) {
-         }
-         if (null == docletVersion) {
-            docletVersion = "unknown";
-         }
+         docletVersion = gnu.classpath.Configuration.CLASSPATH_VERSION;
       }
       return docletVersion;
    }

libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java

@@ -1825,16 +1825,7 @@ public final class Main
   public String getGjdocVersion()
   {
     if (null == gjdocVersion) {
-      try {
-        Properties versionProperties = new Properties();
-        versionProperties.load(getClass().getResourceAsStream("version.properties"));
-        gjdocVersion = versionProperties.getProperty("gjdoc.version");
-      }
-      catch (IOException ignore) {
-      }
-      if (null == gjdocVersion) {
-        gjdocVersion = "unknown";
-      }
+      gjdocVersion = gnu.classpath.Configuration.CLASSPATH_VERSION;
     }
     return gjdocVersion;
   }