From 2716f12bd47a4a2e454b8ffa86db54ebd4c26ccb Mon Sep 17 00:00:00 2001
From: Nicholas Ginther <GintherN@mccombs.utexas.edu>
Date: Fri, 2 Dec 2016 16:49:02 -0600
Subject: [PATCH 1/3] fix NPE related to MethodModel returning null from
 getMethodName

---
 src/org/salesforce/apexdoc/ApexDoc.java     | 2 +-
 src/org/salesforce/apexdoc/ClassModel.java  | 4 ++--
 src/org/salesforce/apexdoc/FileManager.java | 9 ++++++---
 src/org/salesforce/apexdoc/MethodModel.java | 7 ++++---
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/org/salesforce/apexdoc/ApexDoc.java b/src/org/salesforce/apexdoc/ApexDoc.java
index 8da4f97..ff07630 100644
--- a/src/org/salesforce/apexdoc/ApexDoc.java
+++ b/src/org/salesforce/apexdoc/ApexDoc.java
@@ -27,6 +27,7 @@ public ApexDoc() {
             PrintStream ps = new PrintStream(fos);
             System.setOut(ps);
         } catch (Exception ex) {
+            System.out.println("Error: " + ex.getMessage());
         }
     }
 
@@ -80,7 +81,6 @@ public static void RunApexDoc(String[] args, IProgressMonitor monitor) {
                 System.exit(-1);
             }
         }
-
         // default scope to global and public if not specified
         if (rgstrScope == null || rgstrScope.length == 0) {
             rgstrScope = new String[3];
diff --git a/src/org/salesforce/apexdoc/ClassModel.java b/src/org/salesforce/apexdoc/ClassModel.java
index bb81bd6..4034b61 100644
--- a/src/org/salesforce/apexdoc/ClassModel.java
+++ b/src/org/salesforce/apexdoc/ClassModel.java
@@ -52,9 +52,9 @@ public int compare(MethodModel o1, MethodModel o2) {
                 String methodName2 = o2.getMethodName();
                 String className = getClassName();
                 
-                if(methodName1.equals(className)){
+                if(methodName1 != null && methodName1.equals(className)){
                     return Integer.MIN_VALUE;
-                } else if(methodName2.equals(className)){
+                } else if(methodName2 != null && methodName2.equals(className)){
                     return Integer.MAX_VALUE;
                 }
                 return (methodName1.toLowerCase().compareTo(methodName2.toLowerCase()));
diff --git a/src/org/salesforce/apexdoc/FileManager.java b/src/org/salesforce/apexdoc/FileManager.java
index 86ed5ad..82242b1 100644
--- a/src/org/salesforce/apexdoc/FileManager.java
+++ b/src/org/salesforce/apexdoc/FileManager.java
@@ -302,7 +302,7 @@ private void createClassGroupContent(TreeMap<String, String> mapFNameToContent,
             ClassGroup cg = mapGroupNameToClassGroup.get(strGroup);
             if (cg.getContentSource() != null) {
                 String cgContent = parseHTMLFile(cg.getContentSource());
-                if (cgContent != "") {
+                if (!cgContent.equals("")) {
                     String strHtml = Constants.getHeader(projectDetail) + links + "<td class='contentTD'>" +
                             "<h2 class='section-title'>" +
                             escapeHTML(cg.getName()) + "</h2>" + cgContent + "</td>";
@@ -414,10 +414,11 @@ private void copy(String toFileName) throws IOException, Exception {
     public ArrayList<File> getFiles(String path) {
         File folder = new File(path);
         ArrayList<File> listOfFilesToCopy = new ArrayList<File>();
-        if (folder != null) {
+        try {
             File[] listOfFiles = folder.listFiles();
             if (listOfFiles != null && listOfFiles.length > 0) {
                 for (int i = 0; i < listOfFiles.length; i++) {
+                    System.out.print(listOfFiles[i].getName() + ", ");
                     if (listOfFiles[i].isFile()) {
                         listOfFilesToCopy.add(listOfFiles[i]);
                     }
@@ -425,6 +426,8 @@ public ArrayList<File> getFiles(String path) {
             } else {
                 System.out.println("WARNING: No files found in directory: " + path);
             }
+        } catch (SecurityException e) {
+            e.printStackTrace();
         }
         return listOfFilesToCopy;
     }
@@ -456,7 +459,7 @@ private String parseFile(String filePath) {
                 return contents;
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            System.out.println("Skipped " + filePath + ", doesn't exist.");
         }
 
         return "";
diff --git a/src/org/salesforce/apexdoc/MethodModel.java b/src/org/salesforce/apexdoc/MethodModel.java
index 0663391..39a72dc 100644
--- a/src/org/salesforce/apexdoc/MethodModel.java
+++ b/src/org/salesforce/apexdoc/MethodModel.java
@@ -35,12 +35,13 @@ public void setReturnType(String returnType) {
     }
 
     public String getMethodName() {
-        String nameLine = getNameLine().trim();
-        if (nameLine != null && nameLine.length() > 0) {
+        String nameLine = getNameLine();
+        if (nameLine != null && nameLine.trim().length() > 0) {
+            nameLine = nameLine.trim();
             int lastindex = nameLine.indexOf("(");
             if (lastindex >= 0) {
                 String methodName = ApexDoc.strPrevWord(nameLine, lastindex);
-                return methodName;
+                return methodName == null ? "" : methodName;
             }
         }
         return "";

From d4fa5ae53e330ebb556308049db89fcc78a103d7 Mon Sep 17 00:00:00 2001
From: Nicholas Ginther <GintherN@mccombs.utexas.edu>
Date: Wed, 7 Dec 2016 12:46:33 -0600
Subject: [PATCH 2/3] string concat performance updates to FileManager

---
 src/org/salesforce/apexdoc/ClassModel.java  |  1 -
 src/org/salesforce/apexdoc/FileManager.java | 41 ++++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/org/salesforce/apexdoc/ClassModel.java b/src/org/salesforce/apexdoc/ClassModel.java
index 4034b61..8a8068c 100644
--- a/src/org/salesforce/apexdoc/ClassModel.java
+++ b/src/org/salesforce/apexdoc/ClassModel.java
@@ -46,7 +46,6 @@ public ArrayList<MethodModel> getMethodsSorted() {
         @SuppressWarnings("unchecked")
 		List<MethodModel> sorted = (List<MethodModel>)methods.clone();
         Collections.sort(sorted, new Comparator<MethodModel>(){
-            @Override
             public int compare(MethodModel o1, MethodModel o2) {
                 String methodName1 = o1.getMethodName();
                 String methodName2 = o2.getMethodName();
diff --git a/src/org/salesforce/apexdoc/FileManager.java b/src/org/salesforce/apexdoc/FileManager.java
index 82242b1..8dc37da 100644
--- a/src/org/salesforce/apexdoc/FileManager.java
+++ b/src/org/salesforce/apexdoc/FileManager.java
@@ -337,9 +337,10 @@ private String getPageLinks(TreeMap<String, ClassGroup> mapGroupNameToClassGroup
         }
         cModels = new ArrayList<ClassModel>(tm.values());
 
-        String links = "<td width='20%' vertical-align='top' >";
-        links += "<div class='sidebar'><div class='navbar'><nav role='navigation'><ul id='mynavbar'>";
-        links += "<li id='idMenuindex'><a href='.' onclick=\"gotomenu('index.html', event);return false;\" class='nav-item'>Home</a></li>";
+        StringBuilder links = new StringBuilder();
+        links.append("<td width='20%' vertical-align='top' >");
+        links.append("<div class='sidebar'><div class='navbar'><nav role='navigation'><ul id='mynavbar'>");
+        links.append("<li id='idMenuindex'><a href='.' onclick=\"gotomenu('index.html', event);return false;\" class='nav-item'>Home</a></li>");
 
         // add a bucket ClassGroup for all Classes without a ClassGroup specified
         if (createMiscellaneousGroup)
@@ -350,12 +351,17 @@ private String getPageLinks(TreeMap<String, ClassGroup> mapGroupNameToClassGroup
         for (String strGroup : mapGroupNameToClassGroup.keySet()) {
             ClassGroup cg = mapGroupNameToClassGroup.get(strGroup);
             String strGoTo = "onclick=\"gotomenu(document.location.href, event);return false;\"";
-            if (cg.getContentFilename() != null)
+            if (cg.getContentFilename() != null) {
                 strGoTo = "onclick=\"gotomenu('" + cg.getContentFilename() + ".html" + "', event);return false;\"";
-            links += "<li class='header' id='idMenu" + cg.getContentFilename() +
-                    "'><a class='nav-item nav-section-title' href='.' " +
-                    strGoTo + " class='nav-item'>" + strGroup + "<span class='caret'></span></a></li>";
-            links += "<ul>";
+            }
+            links.append("<li class='header' id='idMenu");
+            links.append(cg.getContentFilename());
+            links.append("'><a class='nav-item nav-section-title' href='.' ");
+            links.append(strGoTo);
+            links.append(" class='nav-item'>");
+            links.append(strGroup);
+            links.append("<span class='caret'></span></a></li>");
+            links.append("<ul>");
 
             // even though this algorithm is O(n^2), it was timed at just 12
             // milliseconds, so not an issue!
@@ -364,21 +370,21 @@ private String getPageLinks(TreeMap<String, ClassGroup> mapGroupNameToClassGroup
                         || (cModel.getClassGroup() == null && strGroup == "Miscellaneous")) {
                     if (cModel.getNameLine() != null && cModel.getNameLine().trim().length() > 0) {
                         String fileName = cModel.getClassName();
-                        links += "<li class='subitem classscope" + cModel.getScope() + "' id='idMenu" + fileName +
+                        links.append("<li class='subitem classscope" + cModel.getScope() + "' id='idMenu" + fileName +
                                 "'><a href='.' onclick=\"gotomenu('" + fileName + ".html', event);return false;\" class='nav-item sub-nav-item scope" +
                                 cModel.getScope() + "'>" +
-                                fileName + "</a></li>";
+                                fileName + "</a></li>");
                     }
                 }
             }
 
-            links += "</ul>";
+            links.append("</ul>");
         }
 
-        links += "</ul></nav></div></div></div>";
+        links.append("</ul></nav></div></div></div>");
 
-        links += "</td>";
-        return links;
+        links.append("</td>");
+        return links.toString();
     }
 
     private void docopy(String source, String target) throws Exception {
@@ -444,19 +450,18 @@ private String parseFile(String filePath) {
                 // Get the object of DataInputStream
                 DataInputStream in = new DataInputStream(fstream);
                 BufferedReader br = new BufferedReader(new InputStreamReader(in));
-                String contents = "";
+                StringBuilder contents = new StringBuilder();
                 String strLine;
 
                 while ((strLine = br.readLine()) != null) {
                     // Print the content on the console
                     strLine = strLine.trim();
                     if (strLine != null && strLine.length() > 0) {
-                        contents += strLine;
+                        contents.append(strLine);
                     }
                 }
-                // System.out.println("Contents = " + contents);
                 br.close();
-                return contents;
+                return contents.toString();
             }
         } catch (Exception e) {
             System.out.println("Skipped " + filePath + ", doesn't exist.");

From 7a0f93e5800fc90d8addaa6f27dbf1c6ff18c75d Mon Sep 17 00:00:00 2001
From: Nicholas Ginther <GintherN@mccombs.utexas.edu>
Date: Wed, 7 Dec 2016 14:17:53 -0600
Subject: [PATCH 3/3] fix sidebar pointing to nonexistant file when
 @group-content is invalid

---
 src/org/salesforce/apexdoc/ApexDoc.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/org/salesforce/apexdoc/ApexDoc.java b/src/org/salesforce/apexdoc/ApexDoc.java
index ff07630..5213150 100644
--- a/src/org/salesforce/apexdoc/ApexDoc.java
+++ b/src/org/salesforce/apexdoc/ApexDoc.java
@@ -529,7 +529,11 @@ private static void fillClassModel(ClassModel cModelParent, ClassModel cModel, S
 
             idxStart = comment.toLowerCase().indexOf("@group-content");
             if (idxStart != -1) {
-                cModel.setClassGroupContent(comment.substring(idxStart + 14).trim());
+                String path = comment.substring(idxStart + 14).trim();
+                File f = new File(path);
+                if (f.exists()) {
+                    cModel.setClassGroupContent(path);
+                }
                 inDescription = false;
                 continue;
             }