refactoring, started to wok on remote control.

Author: JavaSaBr

build-native.xml

@@ -180,7 +180,7 @@
 
             <fx:platform>
                 <fx:jvmarg value="-XX:+UseParallelGC"/>
-                <!--<fx:jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,address=192.168.94.210:6005,suspend=y"/>-->
+                <fx:jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,address=127.0.0.1:6005,suspend=y"/>
             </fx:platform>
 
             <preferences shortcut="true" menu="true" install="false"/>

build.gradle

@@ -61,7 +61,7 @@ dependencies {
     compile 'org.controlsfx:controlsfx:8.40.13'
 
     compile 'com.github.JavaSaBr:RlibFX:4.1.3'
-    compile 'com.github.JavaSaBr:RLib:6.7.0'
+    compile 'com.github.JavaSaBr:RLib:6.7.1'
     compile 'com.github.JavaSaBr:JME3-JFX:1.7.1'
 
     // https://mvnrepository.com/artifact/org.apache.commons/commons-lang3

src/main/java/com/ss/editor/JFXApplication.java

@@ -153,6 +153,7 @@ public static void main(final String[] args) {
         InitializeManager.register(FileIconManager.class);
         InitializeManager.register(WorkspaceManager.class);
         InitializeManager.register(PluginManager.class);
+        InitializeManager.register(RemoteControlManager.class);
         InitializeManager.initialize();
 
         new EditorThread(new ThreadGroup("LWJGL"),

src/main/java/com/ss/editor/config/CommandLineConfig.java

@@ -41,12 +41,13 @@ public static void args(final String[] args) {
                 Config.DEV_DEBUG_JFX = Boolean.parseBoolean(value);
             } else if ("Graphics.enablePBR".equals(name)) {
                 Config.ENABLE_PBR = Boolean.parseBoolean(value);
+            } else if ("Server.api.port".equals(name)) {
+                Config.REMOTE_CONTROL_PORT = Integer.parseInt(value);
             }
         }
 
-        System.out.println(System.getenv());
-
         final Map<String, String> env = System.getenv();
+
         if (env.containsKey("Server.api.version")) {
             final int version = Integer.parseInt(env.get("Server.api.version"));
             if (version == Config.SERVER_API_VERSION) {
@@ -55,5 +56,9 @@ public static void args(final String[] args) {
                 System.exit(-1);
             }
         }
+
+        if (env.containsKey("Server.api.port")) {
+            Config.REMOTE_CONTROL_PORT = Integer.parseInt(env.get("Server.api.port"));
+        }
     }
 }

src/main/java/com/ss/editor/config/EditorConfig.java

@@ -934,7 +934,7 @@ private void init() {
             for (Iterator<String> iterator = lastOpenedAssets.iterator(); iterator.hasNext(); ) {
 
                 final String assetUrl = iterator.next();
-                final Path assetPath = get(assetUrl, uri -> Paths.get(new URI(uri)));
+                final Path assetPath = get(assetUrl, uri -> Paths.get(uri));
 
                 if (!Files.exists(assetPath)) {
                     iterator.remove();

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

@@ -23,6 +23,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.EnumSet;
+import java.util.Set;
 
 /**
  * The class to manage classpath.
@@ -31,6 +33,18 @@
  */
 public class ClasspathManager {
 
+    public enum Scope {
+        CORE,
+        CUSTOM,
+        PLUGINS,;
+
+        @NotNull
+        public static final Set<Scope> ONLY_CORE = EnumSet.of(CORE);
+
+        @NotNull
+        public static final Set<Scope> ALL = EnumSet.allOf(Scope.class);
+    }
+
     @NotNull
     private static final EditorConfig EDITOR_CONFIG = EditorConfig.getInstance();
 
@@ -40,7 +54,7 @@ public class ClasspathManager {
     @NotNull
     public static final Array<String> CORE_LIBRARIES_NAMES = ArrayFactory.asArray(
             "jme3-core", "jme3-terrain", "jme3-effects",
-            "jme3-testdata", "jme3-plugins", "tonegod"
+            "jme3-testdata", "jme3-plugins", "tonegod", "jmonkeybuilder"
     );
 
     @Nullable
@@ -88,7 +102,9 @@ private ClasspathManager() {
         coreScanner.setUseSystemClasspath(true);
         coreScanner.scan(path -> {
 
-            if (CORE_LIBRARIES_NAMES.search(path, (pattern, pth) -> pth.contains(pattern)) == null) {
+            if (Files.isDirectory(Paths.get(path))) {
+                return true;
+            } else if (CORE_LIBRARIES_NAMES.search(path, (pattern, pth) -> pth.contains(pattern)) == null) {
                 return false;
             } else if (path.contains("natives")) {
                 return false;
@@ -260,7 +276,6 @@ private void setClassesLoader(@Nullable final URLClassLoader classesLoader) {
     public @Nullable URLClassLoader getClassesLoader() {
         return classesLoader;
     }
-
     /**
      * Find all implementations of the interface class.
      *
@@ -269,17 +284,47 @@ private void setClassesLoader(@Nullable final URLClassLoader classesLoader) {
      * @return the list of all available implementations.
      */
     public @NotNull <T> Array<Class<T>> findImplements(@NotNull final Class<T> interfaceClass) {
+        return findImplements(interfaceClass, Scope.ONLY_CORE);
+    }
+
+    /**
+     * Get the custom scanner.
+     *
+     * @return the custom scanner.
+     */
+    private @Nullable ClassPathScanner getCustomScanner() {
+        return customScanner;
+    }
+
+    /**
+     * Find all implementations of the interface class.
+     *
+     * @param <T>            the type of an interface.
+     * @param interfaceClass the interface class.
+     * @param scope          the scope.
+     * @return the list of all available implementations.
+     */
+    public @NotNull <T> Array<Class<T>> findImplements(@NotNull final Class<T> interfaceClass,
+                                                       @NotNull final Set<Scope> scope) {
 
         final Array<Class<T>> result = ArrayFactory.newArray(Class.class);
 
-        coreScanner.findImplements(result, interfaceClass);
-        customScanner.findImplements(result, interfaceClass);
+        if (scope.contains(Scope.CORE)) {
+            coreScanner.findImplements(result, interfaceClass);
+        }
 
-        final PluginManager pluginManager = PluginManager.getInstance();
-        pluginManager.handlePlugins(plugin -> {
-            final PluginContainer container = plugin.getContainer();
-            container.getScanner().findImplements(result, interfaceClass);
-        });
+        final ClassPathScanner customScanner = getCustomScanner();
+        if (customScanner != null && scope.contains(Scope.CUSTOM)) {
+            customScanner.findImplements(result, interfaceClass);
+        }
+
+        if (scope.contains(Scope.PLUGINS)) {
+            final PluginManager pluginManager = PluginManager.getInstance();
+            pluginManager.handlePlugins(plugin -> {
+                final PluginContainer container = plugin.getContainer();
+                container.getScanner().findImplements(result, interfaceClass);
+            });
+        }
 
         return result;
     }

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

@@ -4,10 +4,15 @@
 import com.ss.rlib.logging.Logger;
 import com.ss.rlib.logging.LoggerManager;
 import com.ss.rlib.network.NetworkFactory;
+import com.ss.rlib.network.packet.ReadablePacket;
+import com.ss.rlib.network.packet.ReadablePacketRegistry;
 import com.ss.rlib.network.server.ServerNetwork;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.IOException;
+import java.net.InetSocketAddress;
+
 /**
  * The manager to process remote control.
  *
@@ -21,7 +26,7 @@ public class RemoteControlManager {
     @Nullable
     private static RemoteControlManager instance;
 
-    private static @NotNull RemoteControlManager getInstance() {
+    public static @NotNull RemoteControlManager getInstance() {
         if (instance == null) instance = new RemoteControlManager();
         return instance;
     }
@@ -34,6 +39,15 @@ private RemoteControlManager() {
             return;
         }
 
-        serverNetwork = NetworkFactory.newDefaultAsynchronousServerNetwork();
+        final ClasspathManager classpathManager = ClasspathManager.getInstance();
+        final Class<ReadablePacket>[] packets = classpathManager.findImplements(ReadablePacket.class, ClasspathManager.Scope.ONLY_CORE)
+                .toArray(Class.class);
+
+        serverNetwork = NetworkFactory.newDefaultAsyncServerNetwork(ReadablePacketRegistry.of(packets));
+        try {
+            serverNetwork.bind(new InetSocketAddress(Config.REMOTE_CONTROL_PORT));
+        } catch (final IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 }

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

@@ -0,0 +1,11 @@
+package com.ss.editor.remote.control.client;
+
+import com.ss.rlib.network.packet.impl.AbstractReadablePacket;
+
+/**
+ * The base implementation of a client packet.
+ *
+ * @author JavaSaBr
+ */
+public abstract class ClientPacket extends AbstractReadablePacket {
+}

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

@@ -0,0 +1,65 @@
+package com.ss.editor.remote.control.client;
+
+import com.ss.editor.config.EditorConfig;
+import com.ss.editor.manager.ExecutorManager;
+import com.ss.editor.ui.component.bar.action.OpenAssetAction;
+import com.ss.editor.ui.event.FXEventManager;
+import com.ss.editor.ui.event.impl.AssetComponentLoadedEvent;
+import com.ss.editor.ui.event.impl.RequestedOpenFileEvent;
+import com.ss.rlib.network.ConnectionOwner;
+import com.ss.rlib.network.annotation.PacketDescription;
+import javafx.event.Event;
+import javafx.event.EventHandler;
+import org.jetbrains.annotations.NotNull;
+
+import java.nio.ByteBuffer;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * The packet with request top open a file.
+ *
+ * @author JavaSaBr
+ */
+@PacketDescription(id = 1)
+public class OpenFileClientPacket extends ClientPacket {
+
+    @NotNull
+    private static final FXEventManager FX_EVENT_MANAGER = FXEventManager.getInstance();
+
+    @NotNull
+    private static final ExecutorManager EXECUTOR_MANAGER = ExecutorManager.getInstance();
+
+    @Override
+    protected void readImpl(@NotNull final ConnectionOwner owner, @NotNull final ByteBuffer buffer) {
+
+        final Path assetPath = Paths.get(readString(buffer));
+        final Path fileToOpen = Paths.get(readString(buffer));
+        final Path assetFile = assetPath.relativize(fileToOpen);
+
+        final EditorConfig editorConfig = EditorConfig.getInstance();
+        final Path currentAsset = editorConfig.getCurrentAsset();
+
+        if (currentAsset == null || !assetPath.equals(currentAsset)) {
+            EXECUTOR_MANAGER.addFXTask(() -> {
+
+                final OpenAssetAction action = new OpenAssetAction();
+                action.openAssetFolder(assetPath);
+
+                final EventHandler<Event> eventHandler = new EventHandler<Event>() {
+
+                    @Override
+                    public void handle(final Event event) {
+                        FX_EVENT_MANAGER.removeEventHandler(AssetComponentLoadedEvent.EVENT_TYPE, this);
+                        FX_EVENT_MANAGER.notify(new RequestedOpenFileEvent(assetFile));
+                    }
+                };
+
+                FX_EVENT_MANAGER.addEventHandler(AssetComponentLoadedEvent.EVENT_TYPE, eventHandler);
+            });
+
+        } else {
+            FX_EVENT_MANAGER.notify(new RequestedOpenFileEvent(assetFile));
+        }
+    }
+}

src/main/java/com/ss/editor/ui/component/asset/AssetComponent.java

@@ -204,7 +204,16 @@ private void handleTreeLoading(@NotNull final Boolean finished) {
         }
 
         if (finished) {
+
+            final EditorConfig editorConfig = EditorConfig.getInstance();
+            final Path currentAsset = editorConfig.getCurrentAsset();
+
             EXECUTOR_MANAGER.addFXTask(() -> setIgnoreExpanded(false));
+
+            if (currentAsset != null) {
+                FX_EVENT_MANAGER.notify(new AssetComponentLoadedEvent(currentAsset));
+            }
+
         } else {
             setIgnoreExpanded(true);
         }