diff options
author | Robert Ly <robertly@google.com> | 2013-02-11 18:14:38 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-11 18:14:38 -0800 |
commit | f97d22e39370d9dec603b74398024bca1e23b4b2 (patch) | |
tree | ed7fd4cb239912e93f9197de496c1ce08403e459 | |
parent | b3dcaae04bb1bcdffa879553df8c7bdda8cd6079 (diff) | |
parent | 88c435bb4d6c81c41107e23503b59af2e08acd8d (diff) | |
download | android_external_doclava-f97d22e39370d9dec603b74398024bca1e23b4b2.tar.gz android_external_doclava-f97d22e39370d9dec603b74398024bca1e23b4b2.tar.bz2 android_external_doclava-f97d22e39370d9dec603b74398024bca1e23b4b2.zip |
am 88c435bb: update doclava for s.a.c redesign
# Via Robert Ly
* commit '88c435bb4d6c81c41107e23503b59af2e08acd8d':
update doclava for s.a.c redesign
-rw-r--r-- | src/com/google/doclava/ClearPage.java | 15 | ||||
-rw-r--r-- | src/com/google/doclava/DocFile.java | 8 | ||||
-rw-r--r-- | src/com/google/doclava/Doclava.java | 8 | ||||
-rw-r--r-- | src/com/google/doclava/SampleCode.java | 4 |
4 files changed, 27 insertions, 8 deletions
diff --git a/src/com/google/doclava/ClearPage.java b/src/com/google/doclava/ClearPage.java index 9c512c9..4a6d39a 100644 --- a/src/com/google/doclava/ClearPage.java +++ b/src/com/google/doclava/ClearPage.java @@ -28,6 +28,7 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.util.ArrayList; import java.util.List; +import java.util.Arrays; public class ClearPage { /* @@ -156,7 +157,7 @@ public class ClearPage { } } - public static void copyFile(File from, String toPath) { + public static void copyFile(boolean allowExcepted, File from, String toPath) { File to = new File(outputDir + "/" + toPath); FileInputStream in; FileOutputStream out; @@ -176,7 +177,7 @@ public class ClearPage { System.err.println(from.getAbsolutePath() + ": Error opening file"); return; } - if (!isValidContentType(toPath, DROIDDOC_VALID_CONTENT_TYPES)) { + if (!isValidContentType(allowExcepted, toPath, DROIDDOC_VALID_CONTENT_TYPES)) { Errors.error(Errors.INVALID_CONTENT_TYPE, null, "Failed to process " + from + ": Invalid file type. Please move the file to frameworks/base/docs/image_sources/... or docs/downloads/..."); return; @@ -220,9 +221,15 @@ public class ClearPage { } } - public static String[] DROIDDOC_VALID_CONTENT_TYPES = {".txt", ".css", ".js", ".html", ".ico", ".png", ".jpg", ".gif", ".svg", ".webm", ".ogv","mp4", ".java", ".xml", ".aidl", ".rs",".zip", ".yaml", ".pdf"}; + public static ArrayList<String> DROIDDOC_VALID_CONTENT_TYPES = new ArrayList<String>(Arrays.asList(".txt", ".css", + ".js", ".html", ".ico", ".png", ".jpg", ".gif", ".svg", ".webm", ".ogv","mp4", ".java", ".xml", ".aidl", ".rs",".zip", ".yaml")); - public static boolean isValidContentType(String s, String[] list) { + public static ArrayList<String> DROIDDOC_EXCEPTED_CONTENT_TYPES = new ArrayList<String>(Arrays.asList(".pdf")); + + public static boolean isValidContentType(boolean allowExcepted, String s, ArrayList<String> list) { + if(allowExcepted){ + list.addAll(DROIDDOC_EXCEPTED_CONTENT_TYPES); + } for (String t : list) { if (s.endsWith(t)) { return true; diff --git a/src/com/google/doclava/DocFile.java b/src/com/google/doclava/DocFile.java index da829a4..dd0a6bc 100644 --- a/src/com/google/doclava/DocFile.java +++ b/src/com/google/doclava/DocFile.java @@ -164,6 +164,14 @@ public class DocFile { } else if ((filename.indexOf("tools") == 0) || (filename.indexOf("sdk") == 0)) { hdf.setValue("tools", "true"); fromTemplate = hdf.getValue("page.template", ""); + } else if (filename.indexOf("devices") == 0) { + hdf.setValue("devices", "true"); + } else if (filename.indexOf("source") == 0) { + hdf.setValue("source", "true"); + } else if (filename.indexOf("accessories") == 0) { + hdf.setValue("accessories", "true"); + } else if (filename.indexOf("compatibility") == 0) { + hdf.setValue("compatibility", "true"); } if (fromTemplate.equals("sdk")) { ClearPage.write(hdf, "sdkpage.cs", outfile); diff --git a/src/com/google/doclava/Doclava.java b/src/com/google/doclava/Doclava.java index 4435018..a239210 100644 --- a/src/com/google/doclava/Doclava.java +++ b/src/com/google/doclava/Doclava.java @@ -90,6 +90,7 @@ public class Doclava { private static boolean gmsRef = false; private static boolean gcmRef = false; + private static boolean sac = false; public static boolean checkLevel(int level) { return (showLevel & level) == level; @@ -735,8 +736,11 @@ public class Doclava { } else if (len > 3 && ".jd".equals(templ.substring(len - 3))) { String filename = templ.substring(0, len - 3) + htmlExtension; DocFile.writePage(f.getAbsolutePath(), relative, filename); - } else { - ClearPage.copyFile(f, templ); + } else if(!f.getName().equals(".DS_Store")){ + Data data = makeHDF(); + String hdfValue = data.getValue("sac") == null ? "" : data.getValue("sac"); + boolean allowExcepted = hdfValue.equals("true") ? true : false; + ClearPage.copyFile(allowExcepted, f, templ); } } else if (f.isDirectory()) { writeDirectory(f, relative + f.getName() + "/", js); diff --git a/src/com/google/doclava/SampleCode.java b/src/com/google/doclava/SampleCode.java index 0776af1..65d44b5 100644 --- a/src/com/google/doclava/SampleCode.java +++ b/src/com/google/doclava/SampleCode.java @@ -84,13 +84,13 @@ public class SampleCode { if (inList(out, IMAGES)) { // copied directly - ClearPage.copyFile(f, out); + ClearPage.copyFile(false, f, out); writeImagePage(f, convertExtension(out, Doclava.htmlExtension), subdir); files.add(name); } if (inList(out, TEMPLATED)) { // copied and goes through the template - ClearPage.copyFile(f, out); + ClearPage.copyFile(false, f, out); writePage(f, convertExtension(out, Doclava.htmlExtension), subdir); files.add(name); } |