add jdk8 support

.gitignore

@@ -1,10 +1,11 @@
-*.class
-
-# Package Files #
-*.war
-*.ear
-
-# Build Directorys #
-/.gradle
-/build
-/bin
+*.class
+
+# Package Files #
+*.war
+*.ear
+
+# Build Directorys #
+/.gradle
+/build
+/bin
+*.log

CHANGELOG.md

@@ -1,3 +1,9 @@
+Version 2.1.0 (2014-03-25)
+-----------------------------
+
+* javadoc 8 support
+
+
 Version 2.0.0 (2013-11-16)
 -----------------------------
 

NOTICE

@@ -1,7 +1,7 @@
 javadoc.chm
 http://subchen.github.io/javadoc.chm/
 
-Copyright 2010-2013 Guoqiang Chen. All rights reserved.
+Copyright 2010-2014 Guoqiang Chen. All rights reserved.
 Email: [email protected]
 
 Licensed under the Apache License, Version 2.0 (the "License");

README.md

@@ -3,7 +3,7 @@
 This software generates an Microsoft HTML Help(CHM) from generic javadoc style API documents.
 It's a easy way to search something from javadoc with pre-compiled full text index.
 
-Javadoc.chm can identify the new doc style for java 7.0+.
+Javadoc.chm can identify the new doc style for java 8.0+.
 
 # Requirements
 
@@ -14,7 +14,7 @@ Javadoc.chm can identify the new doc style for java 7.0+.
 
 Download binary jar
 
-https://github.com/subchen/javadoc.chm/raw/master/dist/javadoc.chm-2.0.0.jar
+https://github.com/subchen/javadoc.chm/raw/master/dist/javadoc.chm-2.1.0.jar
 
 Generates HTML Help project files
 

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'java'
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
-version = '2.0.0'
+version = '2.1.0'
 
 defaultTasks 'runtimejar'
 
@@ -36,7 +36,6 @@ task runtimejar(dependsOn: jar) {
             //zipgroupfileset(dir: 'lib', includes: '*.jar')
             zipgroupfileset(dir: 'build/libs', includes: '**/*.jar')
         }
-
     }
 }
 

build.properties

@@ -1,6 +1,6 @@
 maven.group.id = com.github.subchen
 maven.artifact.id = javadoc.chm
-maven.version = 2.0.0
+maven.version = 2.1.0
 
 product.name = ${maven.artifact.id}
 product.version = ${maven.version}

run.bat

@@ -0,0 +1,10 @@
+set classpath=%classpath%;lib/commons-collections-3.2.1.jar
+set classpath=%classpath%;lib/commons-io-2.4.jar
+set classpath=%classpath%;lib/commons-lang-2.6.jar
+set classpath=%classpath%;lib/commons-logging-1.1.1.jar
+set classpath=%classpath%;lib/log4j-1.2.17.jar
+set classpath=%classpath%;lib/velocity-1.7.jar
+set classpath=%classpath%;build/javadoc.chm-2.1.0.jar
+
+java -Xms512m -Xmx512m jerbrick.tools.chm.Application D:/Downloads/jdk-8-apidocs/docs/api utf-8
+

src/main/java/jerbrick/tools/chm/Application.java

@@ -2,7 +2,7 @@
  * javadoc.chm
  * http://subchen.github.io/javadoc.chm/
  * 
- * Copyright 2010-2013 Guoqiang Chen. All rights reserved.
+ * Copyright 2010-2014 Guoqiang Chen. All rights reserved.
  * Email: [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,53 +17,57 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package jerbrick.tools.chm;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-import jerbrick.tools.chm.reader.ApiReader;
-import jerbrick.tools.chm.style.Javadoc7Style;
-import org.apache.commons.io.FileUtils;
-
-public class Application {
-
-    public static void main(String[] args) throws Exception {
-        if (args.length > 0) {
-            Config.apiLocation = new File(args[0]);
-        }
-        if (args.length > 1) {
-            Config.encoding = args[1];
-        }
-
-        if (new File(Config.apiLocation, "resources/background.gif").exists()) {
-            Config.style = new Javadoc7Style();
-        }
-
-        clean();
-
-        ApiReader api = new ApiReader();
-        Map<String, Object> apiContext = api.getApiContext();
-
-        TemplateWriter writer = new TemplateWriter();
-        writer.apply(apiContext);
-    }
-
-    private static void clean() throws IOException {
-        File f = new File(Config.apiLocation, "htmlhelp.hhp");
-        if (f.exists()) f.delete();
-        f = new File(Config.apiLocation, "htmlhelp.hhc");
-        if (f.exists()) f.delete();
-        f = new File(Config.apiLocation, "htmlhelp.hhk");
-        if (f.exists()) f.delete();
-        f = new File(Config.apiLocation, "build.bat");
-        if (f.exists()) f.delete();
-        f = new File(Config.apiLocation, "hhc.exe");
-        if (f.exists()) f.delete();
-        f = new File(Config.apiLocation, "hha.dll");
-        if (f.exists()) f.delete();
-        f = new File(Config.apiLocation, "redirs/");
-        if (f.exists()) FileUtils.deleteDirectory(f);
-    }
-
+package jerbrick.tools.chm;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import jerbrick.tools.chm.reader.ApiReader;
+import jerbrick.tools.chm.style.*;
+import org.apache.commons.io.FileUtils;
+
+public class Application {
+
+    public static void main(String[] args) throws Exception {
+        if (args.length > 0) {
+            Config.apiLocation = new File(args[0]);
+        }
+        if (args.length > 1) {
+            Config.encoding = args[1];
+        }
+
+        if (new File(Config.apiLocation, "resources/fonts").exists()) {
+            Config.style = new Javadoc8Style();
+        } else if (new File(Config.apiLocation, "resources/background.gif").exists()) {
+            Config.style = new Javadoc7Style();
+        } else {
+            Config.style = new JavadocStyle();
+        }
+
+        clean();
+
+        ApiReader api = new ApiReader();
+        Map<String, Object> apiContext = api.getApiContext();
+
+        TemplateWriter writer = new TemplateWriter();
+        writer.apply(apiContext);
+    }
+
+    private static void clean() throws IOException {
+        File f = new File(Config.apiLocation, "htmlhelp.hhp");
+        if (f.exists()) f.delete();
+        f = new File(Config.apiLocation, "htmlhelp.hhc");
+        if (f.exists()) f.delete();
+        f = new File(Config.apiLocation, "htmlhelp.hhk");
+        if (f.exists()) f.delete();
+        f = new File(Config.apiLocation, "build.bat");
+        if (f.exists()) f.delete();
+        f = new File(Config.apiLocation, "hhc.exe");
+        if (f.exists()) f.delete();
+        f = new File(Config.apiLocation, "hha.dll");
+        if (f.exists()) f.delete();
+        f = new File(Config.apiLocation, "redirs/");
+        if (f.exists()) FileUtils.deleteDirectory(f);
+    }
+
 }

src/main/java/jerbrick/tools/chm/Config.java

@@ -2,7 +2,7 @@
  * javadoc.chm
  * http://subchen.github.io/javadoc.chm/
  * 
- * Copyright 2010-2013 Guoqiang Chen. All rights reserved.
+ * Copyright 2010-2014 Guoqiang Chen. All rights reserved.
  * Email: [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/jerbrick/tools/chm/TemplateWriter.java

@@ -2,7 +2,7 @@
  * javadoc.chm
  * http://subchen.github.io/javadoc.chm/
  * 
- * Copyright 2010-2013 Guoqiang Chen. All rights reserved.
+ * Copyright 2010-2014 Guoqiang Chen. All rights reserved.
  * Email: [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/jerbrick/tools/chm/model/ClassInfo.java

@@ -2,7 +2,7 @@
  * javadoc.chm
  * http://subchen.github.io/javadoc.chm/
  * 
- * Copyright 2010-2013 Guoqiang Chen. All rights reserved.
+ * Copyright 2010-2014 Guoqiang Chen. All rights reserved.
  * Email: [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/jerbrick/tools/chm/model/FieldInfo.java

@@ -2,7 +2,7 @@
  * javadoc.chm
  * http://subchen.github.io/javadoc.chm/
  * 
- * Copyright 2010-2013 Guoqiang Chen. All rights reserved.
+ * Copyright 2010-2014 Guoqiang Chen. All rights reserved.
  * Email: [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/jerbrick/tools/chm/model/MethodInfo.java

@@ -2,7 +2,7 @@
  * javadoc.chm
  * http://subchen.github.io/javadoc.chm/
  * 
- * Copyright 2010-2013 Guoqiang Chen. All rights reserved.
+ * Copyright 2010-2014 Guoqiang Chen. All rights reserved.
  * Email: [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/jerbrick/tools/chm/model/PackageInfo.java

@@ -2,7 +2,7 @@
  * javadoc.chm
  * http://subchen.github.io/javadoc.chm/
  * 
- * Copyright 2010-2013 Guoqiang Chen. All rights reserved.
+ * Copyright 2010-2014 Guoqiang Chen. All rights reserved.
  * Email: [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/jerbrick/tools/chm/reader/AnchorNameManager.java

@@ -2,7 +2,7 @@
  * javadoc.chm
  * http://subchen.github.io/javadoc.chm/
  * 
- * Copyright 2010-2013 Guoqiang Chen. All rights reserved.
+ * Copyright 2010-2014 Guoqiang Chen. All rights reserved.
  * Email: [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/jerbrick/tools/chm/reader/ApiReader.java

@@ -2,7 +2,7 @@
  * javadoc.chm
  * http://subchen.github.io/javadoc.chm/
  * 
- * Copyright 2010-2013 Guoqiang Chen. All rights reserved.
+ * Copyright 2010-2014 Guoqiang Chen. All rights reserved.
  * Email: [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/main/java/jerbrick/tools/chm/reader/IndexesReader.java

@@ -2,7 +2,7 @@
  * javadoc.chm
  * http://subchen.github.io/javadoc.chm/
  * 
- * Copyright 2010-2013 Guoqiang Chen. All rights reserved.
+ * Copyright 2010-2014 Guoqiang Chen. All rights reserved.
  * Email: [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,23 +19,23 @@
  */
 package jerbrick.tools.chm.reader;
 
-import java.io.*;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import jerbrick.tools.chm.Config;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import java.io.*;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import jerbrick.tools.chm.Config;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
 
 public class IndexesReader {
 
-    private Map<String, KeyManager> keyManagerMaps = new HashMap<String, KeyManager>();
+    private Map<String, KeyManager> keyManagerMaps = new HashMap<String, KeyManager>(256);
 
     public Map<String, String> getIndexes(File resource) throws IOException {
         Pattern p = Config.style.getIndexRegex();
         Matcher m = p.matcher(FileUtils.readFileToString(resource, Config.encoding));
 
-        Map<String, String> indexMaps = new HashMap<String, String>(512);
+        Map<String, String> indexMaps = new HashMap<String, String>(1024);
         while (m.find()) {
             addIndex(indexMaps, m.group(2), m.group(1));
         }
@@ -48,10 +48,13 @@ private void addIndex(Map<String, String> indexMaps, String text, String url) th
         urlToUse = StringUtils.remove(urlToUse, "../");
         urlToUse = StringUtils.remove(urlToUse, "./");
 
-        if (text.indexOf('(') < 0 && url.indexOf('#') < 0) {
+        if (url.indexOf('#') < 0) {
             key = text + " class";
-        } else {
+        } else {
             key = StringUtils.substringBefore(text, "(");
+            if (text.indexOf('(') != -1) {
+                key = key + "()";
+            }
 
             String textToUse = StringUtils.substringBefore(urlToUse, ".html");
             textToUse = textToUse.replace('/', '.') + "." + text;