Merge pull request #61 from hiradimir/master

supports MultiBytes and use local jquery same version
SalesforceFoundation · Sep 22, 2016 · 8b869e1 · 8b869e1
2 parents d377798 + 8d480a0
commit 8b869e1
Show file tree

Hide file tree

Showing 4 changed files with 10,312 additions and 7,183 deletions.
diff --git a/src/org/salesforce/apexdoc/Constants.java b/src/org/salesforce/apexdoc/Constants.java
@@ -2,8 +2,8 @@
 
 public class Constants {
 
-    public static final String HEADER_OPEN = "<html><head>" + 
-        "<script type='text/javascript' src='https://code.jquery.com/jquery-1.11.1.js'></script>" +
+    public static final String HEADER_OPEN = "<html><head>" +
+        "<script type='text/javascript' src='jquery-1.11.1.js'></script>" +
         "<script type='text/javascript' src='CollapsibleList.js'></script>" +                                                                
         "<script type='text/javascript' src='ApexDoc.js'></script>" +                                                                
         "<link rel='stylesheet' type='text/css' href='ApexDoc.css' /> " + 

diff --git a/src/org/salesforce/apexdoc/FileManager.java b/src/org/salesforce/apexdoc/FileManager.java
@@ -66,7 +66,7 @@ private boolean createHTML(TreeMap<String, String> mapFNameToContent, IProgressM
                 File file = new File(fileName);
                 fos = new FileOutputStream(file);
                 dos = new DataOutputStream(fos);
-                dos.writeBytes(contents);
+                dos.write(contents.getBytes());
                 dos.close();
                 fos.close();
                 infoMessages.append(fileName + " Processed...\n");
@@ -405,7 +405,7 @@ private void copy(String toFileName) throws IOException, Exception {
         docopy("ApexDoc.css", toFileName);
         docopy("ApexDoc.js", toFileName);
         docopy("CollapsibleList.js", toFileName);
-        docopy("jquery-latest.js", toFileName);
+        docopy("jquery-1.11.1.js", toFileName);
         docopy("toggle_block_btm.gif", toFileName);
         docopy("toggle_block_stretch.gif", toFileName);