7u83
/
OpenSeSim
1
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

LookAndFeels loaded by class_cache now

This commit is contained in:
7u83 2018-12-01 11:37:25 +01:00
parent 8b2d383aba
commit 9694a0a5a2
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/opensesim/gui/Globals.java
View File

@ -35,6 +35,7 @@ import java.net.URLClassLoader;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.logging.Level; import java.util.logging.Level;
@ -57,6 +58,7 @@ import opensesim.old_sesim.Indicator;
import opensesim.old_sesim.IndicatorLoader; import opensesim.old_sesim.IndicatorLoader;
import opensesim.sesim.interfaces.Asset; import opensesim.sesim.interfaces.Asset;
import opensesim.util.XClassLoader; import opensesim.util.XClassLoader;
import opensesim.util.XClassLoader.ClassCache;
/** /**
* *
@ -211,7 +213,7 @@ public class Globals {
static public ArrayList<Class<AbstractAsset>> getAvailableAssetsTypes(){ static public ArrayList<Class<AbstractAsset>> getAvailableAssetsTypes(){
ArrayList<Class<?>> asset_types_raw; ArrayList<Class> asset_types_raw;
ClassLoader old = setXClassLoader(); ClassLoader old = setXClassLoader();
asset_types_raw = opensesim.util.XClassLoader.getClassesList(urllist, AbstractAsset.class); asset_types_raw = opensesim.util.XClassLoader.getClassesList(urllist, AbstractAsset.class);
unsetXClassLoader(old); unsetXClassLoader(old);
@ -227,8 +229,9 @@ public class Globals {
} }
static public void installLookAndFeels() { static public void installLookAndFeels() {
ArrayList<Class<?>> lafs; Collection<Class> lafs;
lafs = opensesim.util.XClassLoader.getClassesList(urllist, LookAndFeel.class); // lafs = opensesim.util.XClassLoader.getClassesList(urllist, LookAndFeel.class);
lafs = class_cache.getClassCollection(LookAndFeel.class);
ClassLoader currentThreadClassLoader ClassLoader currentThreadClassLoader
= Thread.currentThread().getContextClassLoader(); = Thread.currentThread().getContextClassLoader();
@ -238,8 +241,8 @@ public class Globals {
Thread.currentThread().setContextClassLoader(cl); Thread.currentThread().setContextClassLoader(cl);
for (Class<?> cls : lafs) { for (Class<?> cls : lafs) {
System.out.println("Class:"); /* System.out.println("Class:");
System.out.println(cls.getName()); System.out.println(cls.getName());*/
Class<LookAndFeel> lafc; Class<LookAndFeel> lafc;
lafc = (Class<LookAndFeel>) cls; lafc = (Class<LookAndFeel>) cls;
@ -253,8 +256,8 @@ public class Globals {
System.out.println("LAF:"); /* System.out.println("LAF:");
System.out.println(laf.getName()); System.out.println(laf.getName());*/
UIManager.installLookAndFeel(laf.getName()+" - "+laf.getDescription(), lafc.getName()); UIManager.installLookAndFeel(laf.getName()+" - "+laf.getDescription(), lafc.getName());
} }
@ -263,6 +266,8 @@ public class Globals {
// UIManager.installLookAndFeel(laf.getName(), lafc.getName()); // UIManager.installLookAndFeel(laf.getName(), lafc.getName());
} }
static ClassCache class_cache;
static void initGlobals(Class<?> c) { static void initGlobals(Class<?> c) {
@ -273,8 +278,17 @@ public class Globals {
// initialize urllist used by class loader // initialize urllist used by class loader
updateUrlList(); updateUrlList();
installLookAndFeels();
class_cache = new ClassCache(urllist,new Class[]{
LookAndFeel.class,
AbstractAsset.class
});
installLookAndFeels();
/* /*
ArrayList<Class<LookAndFeelInfo>> res; ArrayList<Class<LookAndFeelInfo>> res;