improved integration.

Author: JavaSaBr

src/main/java/com/ss/editor/manager/ClasspathManager.java

@@ -43,6 +43,9 @@ public enum Scope {
         @NotNull
         public static final Set<Scope> ONLY_CORE = EnumSet.of(CORE);
 
+        @NotNull
+        public static final Set<Scope> CORE_AND_CUSTOM_AND_LOCAL = EnumSet.of(CORE, CUSTOM, LOCAL_CLASSES, LOCAL_LIBRARIES);
+
         @NotNull
         public static final Set<Scope> ALL = EnumSet.allOf(Scope.class);
     }

src/main/java/com/ss/editor/remote/control/client/LoadLocalClassesClientCommand.java

@@ -1,7 +1,9 @@
 package com.ss.editor.remote.control.client;
 
+import com.ss.editor.Editor;
 import com.ss.editor.annotation.BackgroundThread;
 import com.ss.editor.manager.ClasspathManager;
+import com.ss.editor.manager.ExecutorManager;
 import com.ss.rlib.network.ConnectionOwner;
 import com.ss.rlib.network.annotation.PacketDescription;
 import com.ss.rlib.util.StringUtils;
@@ -19,12 +21,21 @@
 @PacketDescription(id = 3)
 public class LoadLocalClassesClientCommand extends ClientCommand {
 
+    @NotNull
+    private static final ExecutorManager EXECUTOR_MANAGER = ExecutorManager.getInstance();
+
+    @NotNull
+    private static final Editor EDITOR = Editor.getInstance();
+
     @Override
     @BackgroundThread
     protected void readImpl(@NotNull final ConnectionOwner owner, @NotNull final ByteBuffer buffer) {
+
         final String outputPath = readString(buffer);
         final Path output = StringUtils.isEmpty(outputPath) ? null : Paths.get(outputPath);
         final ClasspathManager classpathManager = ClasspathManager.getInstance();
         classpathManager.loadLocalClasses(output);
+
+        EXECUTOR_MANAGER.addJMETask(() -> EDITOR.getAssetManager().clearCache());
     }
 }

src/main/java/com/ss/editor/ui/control/model/tree/dialog/CreateCustomControlDialog.java

@@ -10,6 +10,7 @@
 import com.ss.editor.extension.scene.control.EditableControl;
 import com.ss.editor.extension.scene.control.impl.EditableBillboardControl;
 import com.ss.editor.manager.ClasspathManager;
+import com.ss.editor.manager.ClasspathManager.Scope;
 import com.ss.editor.model.undo.editor.ModelChangeConsumer;
 import com.ss.editor.ui.control.model.tree.action.operation.AddControlOperation;
 import com.ss.editor.ui.css.CSSClasses;
@@ -168,9 +169,10 @@ protected void createContent(@NotNull final GridPane root) {
 
         final ObservableList<Class<? extends Control>> items = customComboBox.getItems();
 
-        final Array<Class<Control>> implementations = CLASSPATH_MANAGER.findImplements(Control.class);
-        implementations.forEach(items, (cs, classes) -> ClassUtils.hasConstructor(cs),
-                (controlClass, classes) -> classes.add(controlClass));
+        CLASSPATH_MANAGER.findImplements(Control.class, Scope.CORE_AND_CUSTOM_AND_LOCAL)
+                .stream().filter(ClassUtils::hasConstructor)
+                .sorted((f, s) -> StringUtils.compareIgnoreCase(f.getSimpleName(), s.getSimpleName()))
+                .distinct().forEach(items::add);
 
         final GridPane settingsContainer = new GridPane();
         root.add(builtInLabel, 0, 0);