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

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

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index e4d7c2fae3c5d4c2215e004404c10206849565a4..6398644ad7d6864f956b1c1b1993c1b15127188f 100644 (file)
--- a/libjava/classpath/ChangeLog.gcj
+++ b/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.

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class
index 5bcba7c4e0aff896856baa986e9d073c1b92e6ae..4db03df8d4136a69c3fc50465d7202aaa86c92b9 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class
index cfecc2eeb96f803583429fdd0fe39f7d99e8378e..b2ef23465e097ad2d8dce401e08f81535321bfa4 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$3.class
index 620bb15c3b69e27e182d005d564a965ca9f803a9..83886a0a3c62f4edd6e069e3548fe2bd339e115b 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$3.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$3.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.class
index 6e9981b5ee758144745da2d0cbdf869a0be34359..e76e4ad0885f2f866e7fa532a65eed5e49d8af34 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$1.class
index 93de99ad907c394a3bdf3fec298c1d44a9439e8d..22adcc22814564cee44d7fbdd09fbf0d0410dab8 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$1.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$1.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class
index 691c53ce0c20e9d7633c9f22c0c82b806775e7bf..2cba5c1eb78598e8bc9c52885a9acc3331b4ae6e 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class
index e8bb15f993e07fbceffed2ba99ea412256b7f4bb..71d6e115251be311e65aca506c2632fd6ff8f2d4 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class
index 1479d587a83d7977f0a1254fa46ac953a1bff750..070cc7c54b2326f511530271a54873934a6a1164 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class
index c47a836074b69b121064093a3bca3bccdcaa3a28..6d12c7db17d353cca1a01d7048eb02a8f79b66ce 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class
index 5bb6c725956f948beae904e4be0eaa5125126013..211ef8606c8ff015f9ba24a5d715a5d97aa1f58a 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class
index 13f7e77a530576d5f936fb0afc00c965568bf380..f758b36833d2e86d9022150767f49a1350bdfe5b 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class
index bee8820c2f8714b497885f90219e7f596d919765..b9e96b63fca953ad37d749bbb12494243ac2b3bd 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class
index da2e873908d6ec2e6fd0194b5e7da425fe45aabe..ae88b4f6695fbafa61be3155040426a7f799a4c0 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class
index 9402410a7d6df3778d95d1219f47594c5eea4407..4b417faab6d1311e5fb49a2211a61675e7c661c6 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class
index c2bfa2d442a709be5f740848fb2420aa6878a00b..aa349663be818128dd149cdd14dad014785aad44 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$2.class
index d294d3c25c5b5d7f6a304da88baa8875fd0aad3a..607d9b7a2a5c6e1d263d921f5e55b7d296ac5332 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$2.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$2.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class
index 390bd1b7929851546d119b0ddbe936e93ce31fab..f0201ad301117b60554228f5d254bc2b7d4e8ec6 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class
index 5977dc8d8e9a6d2f9b9c8d1ac3dc3673801300d5..83dfc4b56eb59f90e498f6c52bf20a0bd25e9e5e 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class
index 46f194b653e65b2be7169bd7f61447732abfb8dc..997fde10d05a2622f3fdcf688326e2b15b21415b 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class
index 1b14a4118b571a16716bd2c1bc132d2d6e4b5958..4c3d30a1c7ad553aceb60a4d46ed522f5f7185bc 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class
index d38eff9a626b230b822d5e135752a5ac5786f9cb..b6531dae73e4548c0e76eb6946f40f340ba106eb 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class
index a812e147cd57417bf33c6bad0373879297e9cb76..782a3a38764158a86daebdf3f592568149cd5e37 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$3.class
index 00817dab00b0a231ed108971d6dcea801e3b39e6..ccb4c5cdea755d64324e38a3f01a2acc98c0b447 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$3.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$3.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$4.class
index a789799d2313b3683d300c255c111a3e81181b06..7bd4d416eac779cb017679ac58c6b4fe8004629b 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$4.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$4.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class
index 09dfcbb61cb4d70feb475ac14bab6c0b9d159685..8a1b9a090714b4a63d510984d1de8b5051e678c8 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class
index 634155f58af10e24e16bbc01750b57478c4a0bf4..f6f9ff87bbcd4c4eabaddc78c16fb31cae1fd5bd 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$7.class
index 91e10b27c7a04dcf4b3b6b2ae510b7c08da207af..8ff1acc7f37fcf094f4a155d809f9aead29037b2 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$7.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$7.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$8.class
index f1118b613f71554ffdb68a1c3b0eabd2e5e800b8..d1a4f5f1ced48f91206c5d17d635359baf1b4b23 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$8.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$8.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$9.class
index 2c84fff5925e2c0d60c3df436afaf09e5dc7ad09..8d14fc4c97686d8e977e9eeff2fd3e182a8f4750 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$9.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$9.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class
index 1ce24d1d49ce9b642f443d5b7279fb9b40a3c3ab..e53a62553b3c81df0d4cf6c13952a9c9a4712a3c 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class differ

diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
index 837333ddf0f7812991e11e74547077d38a48ab6d..e49e1c573410f8595b500eca46ebaf9bc69da0ed 100644 (file)
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
+++ b/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;
    }

diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java
index d1316b3418318119d4c6b9eb49e54d348626753d..cbbc8f4f7ddf997e2ec49f05aae9473fb6fccee1 100644 (file)
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java
+++ b/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;
   }