diff --git a/nbproject/project.properties b/nbproject/project.properties index 2e33bd6..d7a0e90 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,4 +1,4 @@ -#Tue, 21 Nov 2017 11:54:07 +0100 +#Thu, 23 Nov 2017 21:55:11 +0100 annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= diff --git a/src/gui/Globals.java b/src/gui/Globals.java index 93b591a..9fd703d 100644 --- a/src/gui/Globals.java +++ b/src/gui/Globals.java @@ -152,7 +152,7 @@ public class Globals { SeSimClassLoader il = new SeSimClassLoader<>(Indicator.class); il.setDefaultPathList(default_pathlist); - ArrayList>ires = il.getInstalled(); + ArrayList>ires = il.getInstalledClasses(); } diff --git a/src/sesim/AutoTraderLoader.java b/src/sesim/AutoTraderLoader.java index ca81be6..199fcc1 100644 --- a/src/sesim/AutoTraderLoader.java +++ b/src/sesim/AutoTraderLoader.java @@ -72,19 +72,7 @@ public class AutoTraderLoader extends SeSimClassLoader { */ public ArrayList> getInstalledTraders() { - if (traders_cache != null) { - return traders_cache; - } - - ArrayList> trl; - ArrayList> result = new ArrayList<>(); - trl = getInstalledClasses(new ArrayList()); - for (Class c : trl) { - result.add((Class) c); - } - - traders_cache = result; - return traders_cache; + return getInstalledClasses(new ArrayList()); } diff --git a/src/sesim/IndicatorLoader.java b/src/sesim/IndicatorLoader.java index 649055b..cbd7aba 100644 --- a/src/sesim/IndicatorLoader.java +++ b/src/sesim/IndicatorLoader.java @@ -30,9 +30,14 @@ import java.util.ArrayList; /** * * @author 7u83 <7u83@mail.ru> + * @param */ public class IndicatorLoader extends SeSimClassLoader { + /** + * + * @param class_type + */ public IndicatorLoader(Class class_type) { super(class_type); } diff --git a/src/sesim/SeSimClassLoader.java b/src/sesim/SeSimClassLoader.java index 37df718..b759bc9 100644 --- a/src/sesim/SeSimClassLoader.java +++ b/src/sesim/SeSimClassLoader.java @@ -49,6 +49,7 @@ public class SeSimClassLoader { /** * Create a SeSimClassLoader object with an empty default path + * * @param class_type */ public SeSimClassLoader(Class class_type) { @@ -178,7 +179,7 @@ public class SeSimClassLoader { return null; } - return (Class)cls; + return (Class) cls; } catch (ClassNotFoundException ex) { return null; @@ -191,14 +192,9 @@ public class SeSimClassLoader { * @param additional_pathlist * @return */ - public ArrayList> getInstalledClasses(ArrayList additional_pathlist){ - + public ArrayList> getInstalledClasses0(ArrayList pathlist) { ArrayList> result = new ArrayList<>(); - ArrayList pathlist = new ArrayList<>(); - - pathlist.addAll(default_pathlist); - pathlist.addAll(additional_pathlist); for (String path : pathlist) { @@ -272,18 +268,28 @@ public class SeSimClassLoader { /** * Get a list of all traders found in class path * - * @return List of traders + * @param additional_pathlist + * @return List of installed Clases */ - public ArrayList> getInstalled() { + public ArrayList> getInstalledClasses(ArrayList additional_pathlist ) { if (cache != null) { return cache; } - - cache = getInstalledClasses(new ArrayList()); + + ArrayList pathlist; + pathlist = new ArrayList<>(); + + pathlist.addAll(default_pathlist); + pathlist.addAll(additional_pathlist); + + cache = getInstalledClasses0(pathlist); return cache; } - + + public ArrayList> getInstalledClasses(){ + return getInstalledClasses(new ArrayList<>()); + } }