Merge commit 'c7700bf'

Author: atsushieno

AndroidDocScraper.java

@@ -60,16 +60,33 @@ public Java7DocScraper (File dir) throws IOException {
 	}
 }
 
+class Java8DocScraper extends AndroidDocScraper {
+	static final String pattern_head_javadoc = "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"[./]*"; // I'm not sure how path could be specified... (./ , ../ , or even /)
+	static final String reset_pattern_head_javadoc = "<td><code>";
+	static final String parameter_pair_splitter_javadoc = "&nbsp;";
+
+	public Java8DocScraper (File dir) throws IOException {
+		super (dir, pattern_head_javadoc, reset_pattern_head_javadoc, parameter_pair_splitter_javadoc, true, "-", "-", "-");
+	}
+}
+
 public abstract class AndroidDocScraper implements IDocScraper {
 
 	final String pattern_head;
 	final String reset_pattern_head;
 	final String parameter_pair_splitter;
+	final String open_method;
+	final String param_sep;
+	final String close_method;
 	final boolean continuous_param_lines;
 
 	File root;
 
 	protected AndroidDocScraper (File dir, String patternHead, String resetPatternHead, String parameterPairSplitter, boolean continuousParamLines) throws IOException {
+		this (dir, patternHead, resetPatternHead, parameterPairSplitter, continuousParamLines, "\\(\\Q", ", ", "\\E\\)");
+	}
+	
+	protected AndroidDocScraper (File dir, String patternHead, String resetPatternHead, String parameterPairSplitter, boolean continuousParamLines, String openMethod, String paramSep, String closeMethod) throws IOException {
 
 		if (dir == null)
 			throw new IllegalArgumentException ();
@@ -78,6 +95,9 @@ protected AndroidDocScraper (File dir, String patternHead, String resetPatternHe
 		reset_pattern_head = resetPatternHead;
 		parameter_pair_splitter = parameterPairSplitter != null ? parameterPairSplitter : "\\s+";
 		continuous_param_lines = continuousParamLines;
+		open_method = openMethod;
+		param_sep = paramSep;
+		close_method = closeMethod;
 
 		if (!dir.exists())
 			throw new FileNotFoundException (dir.getAbsolutePath());
@@ -106,10 +126,10 @@ public String[] getParameterNames (ClassNode asm, String name, Type[] ptypes, bo
 		buffer.append (path);
 		buffer.append ("#");
 		buffer.append (name);
-		buffer.append ("\\(\\Q");
+		buffer.append (open_method);
 		for (int i = 0; i < ptypes.length; i++) {
 			if (i != 0)
-				buffer.append (", ");
+				buffer.append (param_sep);
 			String type = JavaClass.getGenericTypeName (ptypes[i]);
 			if (isVarArgs && i == ptypes.length - 1)
 				type = type.replace ("[]", "...");
@@ -120,7 +140,8 @@ public String[] getParameterNames (ClassNode asm, String name, Type[] ptypes, bo
 			//	type = type.substring (0, type.indexOf ('<'));
 			buffer.append (type);
 		}
-		buffer.append("\\E\\)\".*\\((.*)\\)");
+		buffer.append(close_method);
+		buffer.append("\".*\\((.*)\\)");
 		Pattern pattern = Pattern.compile (buffer.toString());
 
 		try {
@@ -147,7 +168,7 @@ public String[] getParameterNames (ClassNode asm, String name, Type[] ptypes, bo
 						}
 						stream.close();
 						return result;
-					}
+					} else System.err.println ("NOT MATCHING '" + buffer.toString() + "', INPUT: " + text);
 					// sometimes we get incomplete tag, so cache it until it gets complete or matched.
 					// I *know* this is a hack.
 					if (reset_pattern_head == null || text.endsWith (">") || !continuous_param_lines && !text.startsWith (reset_pattern_head))

Start.java

@@ -48,11 +48,12 @@ public static void main (String[] args)
 		String droiddocs = null;
 		String javadocs = null;
 		String java7docs = null;
+		String java8docs = null;
 		String annots = null;
 		List<String> jar_paths = new ArrayList<String> ();
 		String out_path = null;
 		List<String> additional_jar_paths = new ArrayList<String> ();
-		String usage = "Usage: jar2xml --jar=<jarfile> [--ref=<jarfile>] --out=<file> [--javadocpath=<javadoc>] [--java7docpath=<java7doc>] [--droiddocpath=<droiddoc>] [--annotations=<xmlfile>]";
+		String usage = "Usage: jar2xml --jar=<jarfile> [--ref=<jarfile>] --out=<file> [--javadocpath=<javadoc>] [--java7docpath=<java7doc>] [--java8docpath=<java8doc>] [--droiddocpath=<droiddoc>] [--annotations=<xmlfile>]";
 
 		for (String arg : args) {
 			if (arg.startsWith ("--javadocpath=")) {
@@ -63,6 +64,10 @@ public static void main (String[] args)
 				java7docs = arg.substring (15);
 				if (!java7docs.endsWith ("/"))
 					java7docs += "/";
+			} else if (arg.startsWith ("--java8docpath=")) {
+				java8docs = arg.substring (15);
+				if (!java8docs.endsWith ("/"))
+					java8docs += "/";
 			} else if (arg.startsWith ("--droiddocpath=")) {
 				droiddocs = arg.substring (15);
 				if (!droiddocs.endsWith ("/"))
@@ -106,6 +111,8 @@ public static void main (String[] args)
 				JavaClass.addDocScraper (new JavaDocScraper (new File (javadocs)));
 			if (java7docs != null)
 				JavaClass.addDocScraper (new Java7DocScraper (new File (java7docs)));
+			if (java8docs != null)
+				JavaClass.addDocScraper (new Java8DocScraper (new File (java8docs)));
 		} catch (Exception e) {
 			e.printStackTrace ();
 			System.err.println ("warning J2X8001: Couldn't access javadocs at specified docpath.  Continuing without it...");