From 66ab8a0d91ca444bf09e6f140ab2f4e9b8e4019e Mon Sep 17 00:00:00 2001
From: neil <459208047@qq.com>
Date: Fri, 31 Aug 2018 11:04:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E6=88=90FineEmbedServer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/roleAuthority/RoleTree.java | 31 ++++++-------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/roleAuthority/RoleTree.java b/designer-base/src/main/java/com/fr/design/roleAuthority/RoleTree.java
index 76fd45c41d..b52561c055 100644
--- a/designer-base/src/main/java/com/fr/design/roleAuthority/RoleTree.java
+++ b/designer-base/src/main/java/com/fr/design/roleAuthority/RoleTree.java
@@ -1,27 +1,23 @@
 package com.fr.design.roleAuthority;
 
-import com.fr.decision.DecisionActivator;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.itree.checkboxtree.CheckBoxTree;
 import com.fr.design.gui.itree.checkboxtree.CheckBoxTreeSelectionModel;
-import com.fr.general.NameObject;
-import com.fr.design.constants.UIConstants;
-import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.gui.itree.refreshabletree.UserObjectRefreshJTree;
 import com.fr.design.mainframe.AuthorityPropertyPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.general.ComparatorUtils;
-import com.fr.module.Module;
-import com.fr.module.ModuleContext;
-import com.fr.workspace.WorkContext;
-
+import com.fr.general.NameObject;
+import com.fr.start.server.FineEmbedServer;
 
-import javax.swing.SwingUtilities;
-import javax.swing.JTree;
 import javax.swing.JComponent;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -67,20 +63,11 @@ public class RoleTree extends UserObjectRefreshJTree<RoleSourceOP> {
 
     @Override
     protected ExpandMutableTreeNode[] loadChildTreeNodes(ExpandMutableTreeNode selectedTreeNode) {
-        // 启动平台模块加载角色列表
-        startDecisionActivator();
+        // 启动平台模块加载角色列表, server内部已经做了启动状态与Workspace判断.
+        FineEmbedServer.start();
         return super.loadChildTreeNodes(selectedTreeNode);
     }
 
-    private void startDecisionActivator() {
-        if (WorkContext.getCurrent().isLocal()) {
-            Module module = ModuleContext.getModule(DecisionActivator.class);
-            if (!module.isRunning()) {
-                module.start();
-            }
-        }
-    }
-
     /**
      * Creates the mouse listener and key listener used by RoleTree.
      *