OSDN Git Service

2009-06-16 Matthias Klose <doko@ubuntu.com>
authordoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 16 Jun 2009 13:22:43 +0000 (13:22 +0000)
committerdoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 16 Jun 2009 13:22:43 +0000 (13:22 +0000)
        * 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148530 138bc75d-0d04-0410-961f-82ee72b054a4

33 files changed:
libjava/classpath/ChangeLog.gcj
libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class
libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class
libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$3.class
libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$1.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$2.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$3.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$4.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$7.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$8.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$9.class
libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class
libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java

index e4d7c2f..6398644 100644 (file)
@@ -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.
index 5bcba7c..4db03df 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
index cfecc2e..b2ef234 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
index 620bb15..83886a0 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
index 6e9981b..e76e4ad 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
index 93de99a..22adcc2 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
index 691c53c..2cba5c1 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
index e8bb15f..71d6e11 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
index 1479d58..070cc7c 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
index c47a836..6d12c7d 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
index 5bb6c72..211ef86 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
index 13f7e77..f758b36 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
index bee8820..b9e96b6 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
index da2e873..ae88b4f 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
index 9402410..4b417fa 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
index c2bfa2d..aa34966 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
index d294d3c..607d9b7 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
index 390bd1b..f0201ad 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
index 5977dc8..83dfc4b 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
index 46f194b..997fde1 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
index 1b14a41..4c3d30a 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
index d38eff9..b6531da 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
index a812e14..782a3a3 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
index 00817da..ccb4c5c 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
index a789799..7bd4d41 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
index 09dfcbb..8a1b9a0 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
index 634155f..f6f9ff8 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
index 91e10b2..8ff1acc 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
index f1118b6..d1a4f5f 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
index 2c84fff..8d14fc4 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
index 1ce24d1..e53a625 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
index 837333d..e49e1c5 100644 (file)
@@ -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;
    }
index d1316b3..cbbc8f4 100644 (file)
@@ -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;
   }