Added position attribute

Author: pborissow

src/javaxt/utils/src/Class.java

@@ -14,6 +14,7 @@ public class Class implements Member, Comparable {
     private ArrayList<String> extensions;
     private ArrayList<String> interfaces;
     private ArrayList<Config> config;
+    private Integer position;
 
 
     public Class(String name){
@@ -149,6 +150,14 @@ public Class getParent(){
         return parent;
     }
 
+    public void setPosition(Integer position){
+        this.position = position;
+    }
+
+    public Integer getPosition(){
+        return position;
+    }
+
     public JSONObject toJson(){
         JSONObject json = new JSONObject();
         json.set("name", name);

src/javaxt/utils/src/Config.java

@@ -1,12 +1,13 @@
 package javaxt.utils.src;
 import java.util.*;
 
-public class Config {
+public class Config implements Member {
 
     private String name;
     private String description;
     private String defaultValue;
     private ArrayList<Config> config;
+    private Integer position;
 
     public Config(String name){
         this.name = name;
@@ -44,4 +45,12 @@ public void addConfig(Config config){
     public ArrayList<Config> getConfig(){
         return config;
     }
+
+    public void setPosition(Integer position){
+        this.position = position;
+    }
+
+    public Integer getPosition(){
+        return position;
+    }
 }

src/javaxt/utils/src/Member.java

@@ -2,4 +2,6 @@
 
 public interface Member {
     public String getName();
+    public void setPosition(Integer position);
+    public Integer getPosition();
 }

src/javaxt/utils/src/Method.java

@@ -11,6 +11,7 @@ public class Method implements Member {
     private ArrayList<Parameter> parameters;
     private boolean isDeprecated = false;
     private String deprecationMessage;
+    private Integer position;
 
     public Method(String name){
         this.name = name;
@@ -70,6 +71,14 @@ public ArrayList<Parameter> getParameters(){
         return parameters;
     }
 
+    public void setPosition(Integer position){
+        this.position = position;
+    }
+
+    public Integer getPosition(){
+        return position;
+    }
+
     public String toString(){
         return name;
     }

src/javaxt/utils/src/Parser.java

@@ -119,6 +119,7 @@ else if (str.endsWith("class") || str.endsWith("interface")){
                     boolean isInterface = str.contains("interface");
                     cls.setInterface(isInterface);
                     addMembers(cls, s.substring(start, end));
+                    cls.setPosition(i);
                     classes.add(cls);
 
 
@@ -218,7 +219,7 @@ private static void addMembers(Class cls, String s){
                         boolean isInterface = word.toString().equals("interface");
                         innerClass.setInterface(isInterface);
                         addMembers(innerClass, s.substring(start, end));
-
+                        innerClass.setPosition(nextWord.end);
                         cls.addMember(innerClass);
                     }
 
@@ -283,6 +284,7 @@ private static void addMembers(Class cls, String s){
                         }
                         method.setPublic(isPublic);
                         method.setDescription(comment.getDescription());
+                        method.setPosition(word.end);
                         cls.addMember(method);
 
 
@@ -386,6 +388,7 @@ else if (b<a || d<a){ //found property or class
                             property.setType(type);
                             property.setStatic(isStatic);
                             property.setDefaultValue(defaultValue);
+                            property.setPosition(word.end);
                             cls.addMember(property);
 
 
@@ -922,11 +925,13 @@ private static ArrayList<Class> getClasses(String s){
                         cls.setNamespace(namespace);
                         Comment comment = parseComment(fn.get("comment").toString());
                         cls.setDescription(comment.getDescription());
+                        cls.setPosition(i);
                         classes.add(cls);
 
 
                       //Add constructor
                         Constructor contructor = new Constructor(functionName);
+                        contructor.setPosition(start);
                         for (Parameter parameter : getParameters(params, comment.getAnnotations())){
                             contructor.addParameter(parameter);
                         }
@@ -986,6 +991,7 @@ private static ArrayList<Method> getFunctions(String s){
                 Method function = new Method(functionName);
                 function.setDescription(comment.getDescription());
                 function.setPublic(fn.get("isPublic").toBoolean());
+                function.setPosition(word.end);
                 functions.add(function);
 
 
@@ -1269,6 +1275,7 @@ private static ArrayList<Config> parseConfig(String defaultConfig){
                 String key = prevWord.toString().trim();
                 Config config = new Config(key);
                 config.setDescription(parseComment(prevWord.lastComment).getDescription());
+                config.setPosition(prevWord.end);
                 arr.add(config);
 
               //Get config value and update i
@@ -1286,6 +1293,7 @@ else if (str.endsWith(":")){
                 String key = str.substring(0, str.length()-1);
                 Config config = new Config(key);
                 config.setDescription(parseComment(word.lastComment).getDescription());
+                config.setPosition(word.end);
                 arr.add(config);
 
 
@@ -1299,6 +1307,7 @@ else if (str.startsWith(":")){
                 String key = prevWord.toString().trim();
                 Config config = new Config(key);
                 config.setDescription(parseComment(prevWord.lastComment).getDescription());
+                config.setPosition(prevWord.end);
                 arr.add(config);
 
 
@@ -1328,6 +1337,7 @@ else if (str.contains(":")){
 
                 Config config = new Config(key);
                 config.setDescription(parseComment(word.lastComment).getDescription());
+                config.setPosition(word.end);
                 arr.add(config);
 
               //Get config value and update i

src/javaxt/utils/src/Property.java

@@ -8,6 +8,7 @@ public class Property implements Member {
     private String defaultValue;
     private boolean isStatic = false;
     private boolean isPublic = true;
+    private Integer position;
 
     public Property(String name){
         this.name = name;
@@ -57,6 +58,14 @@ public String getDefaultValue(){
         return defaultValue;
     }
 
+    public void setPosition(Integer position){
+        this.position = position;
+    }
+
+    public Integer getPosition(){
+        return position;
+    }
+
     public JSONObject toJson(){
         JSONObject json = new JSONObject();
         json.set("name", name);