option to have completions.json as external file

Paul Verest &#39118;&#34892;&#21326;&#20013; · Paul Verest &#39118;&#34892;&#21326;&#20013; · commit 2f91eb9ddbb6 · 2013-04-24T13:31:01.000+08:00
diff --git a/org.nodeclipse.ui/src/org/nodeclipse/ui/contentassist/ContentProvider.java b/org.nodeclipse.ui/src/org/nodeclipse/ui/contentassist/ContentProvider.java
@@ -8,15 +8,24 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.nodeclipse.ui.util.Constants;
+import org.nodeclipse.ui.util.ProcessUtils;
 
+/**
+ * @author LambGao
+ * @author Paul Verest
+ */
 public class ContentProvider {
 
     public static JSONArray COMPLETIONS;
 
     static {
         try {
-        	//TODO option to have this as external file
-            InputStream is = ContentProvider.class.getClassLoader().getResourceAsStream(Constants.COMPLETIONS_JSON);
+        	// option to have completions.json as external file
+        	String completionJsonPath = ProcessUtils.getCompletionsJsonPath();
+        	if (completionJsonPath == null || completionJsonPath.equals("")) {
+        		completionJsonPath = Constants.COMPLETIONS_JSON;
+        	}
+            InputStream is = ContentProvider.class.getClassLoader().getResourceAsStream(completionJsonPath);
             JSONObject object = new JSONObject(inputStream2String(is));
             COMPLETIONS = object.getJSONArray(Constants.COMPLETIONS_KEY);
         } catch (JSONException e) {
diff --git a/org.nodeclipse.ui/src/org/nodeclipse/ui/preferences/NodePreferencePage.java b/org.nodeclipse.ui/src/org/nodeclipse/ui/preferences/NodePreferencePage.java
@@ -6,10 +6,15 @@
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.nodeclipse.ui.Activator;
 
+/**
+ * @author Tomoyuki Inagaki
+ * @author Paul Verest
+ */
 public class NodePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
 
     private FileFieldEditor fileFieldEditor;
     private FileFieldEditor expressPath;
+    private FileFieldEditor completionsPath;
     
     public NodePreferencePage() {
         super(GRID);
@@ -29,6 +34,9 @@ protected void createFieldEditors() {
         
         expressPath = new FileFieldEditor(PreferenceConstants.EXPRESS_PATH, "Express Path:", getFieldEditorParent());
         addField(expressPath);
+
+        completionsPath = new FileFieldEditor(PreferenceConstants.COMPLETIONS_JSON_PATH, "Completions.json Path:", getFieldEditorParent());
+        addField(completionsPath);
     }
 
     @Override
diff --git a/org.nodeclipse.ui/src/org/nodeclipse/ui/preferences/PreferenceConstants.java b/org.nodeclipse.ui/src/org/nodeclipse/ui/preferences/PreferenceConstants.java
@@ -2,11 +2,15 @@
 
 /**
  * Constant definitions for plug-in preferences
+ * 
+ * @author Tomoyuki Inagaki
+ * @author Paul Verest
  */
 public class PreferenceConstants {
 
 	public static final String NODE_PATH = "node_path";
 	public static final String EXPRESS_PATH = "express_pass";
 	public static final String EXPRESS_VERSION = "express_version";
+	public static final String COMPLETIONS_JSON_PATH = "completionsjson_path";
 	
 }
diff --git a/org.nodeclipse.ui/src/org/nodeclipse/ui/util/ProcessUtils.java b/org.nodeclipse.ui/src/org/nodeclipse/ui/util/ProcessUtils.java
@@ -10,6 +10,11 @@
 import org.nodeclipse.ui.Activator;
 import org.nodeclipse.ui.preferences.PreferenceConstants;
 
+/**
+ * @author ?
+ * @author Tomoyuki Inagaki
+ * @author Paul Verest
+ */
 public class ProcessUtils {
 	public static String getNodePath() {
 		return Activator.getDefault().getPreferenceStore()
@@ -42,6 +47,12 @@ public static String getExpressVersion() {
 		return Activator.getDefault().getPreferenceStore()
 				.getString(PreferenceConstants.EXPRESS_VERSION);
 	}
+	
+	public static String getCompletionsJsonPath() {
+		return Activator.getDefault().getPreferenceStore()
+				.getString(PreferenceConstants.COMPLETIONS_JSON_PATH);
+	}
+	
 
 	public static int getExpressMajorVersion() {
 		String ver = getExpressVersion();
