REPORT-135233 调整DecisionOperator

designer-base/src/main/java/com/fr/design/remote/ui/CustomRoleManagerPane.java

@@ -1,21 +1,15 @@
 package com.fr.design.remote.ui;
 
-import com.fine.theme.utils.FineUIUtils;
-import com.fr.design.border.UITitledBorder;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.remote.ui.list.AddedMemberListCellRender;
 import com.fr.design.remote.ui.list.AddingMemberListCellRender;
 import com.fr.design.remote.ui.list.cell.AddedCustomRoleListCellRender;
 import com.fr.design.remote.ui.list.cell.AddingCustomRoleListCellRender;
-import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.authority.RemoteDesignMember;
-import com.fr.workspace.server.authority.decision.DecisionOperator;
+import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.border.EmptyBorder;
-import java.awt.BorderLayout;
+import javax.swing.*;
 import java.util.Collection;
 
 
@@ -64,11 +58,11 @@ public class CustomRoleManagerPane extends AbstractManagerPane {
 
     @Override
     protected Collection<RemoteDesignMember> getMembers(String userName, String keyWord){
-        return WorkContext.getCurrent().get(DecisionOperator.class).getCustoms(userName, keyWord);
+        return RemoteAuthorityRepository.getInstance().getCustoms(userName, keyWord, 1, 50);
     }
 
     @Override
     protected Collection<RemoteDesignMember> getMembers(String userName, String keyWord, int pageNum, int count){
-        return WorkContext.getCurrent().get(DecisionOperator.class).getCustoms(userName, keyWord, pageNum, count);
+        return RemoteAuthorityRepository.getInstance().getCustoms(userName, keyWord, pageNum, count);
     }
 }

designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java

@@ -1,20 +1,15 @@
 package com.fr.design.remote.ui;
 
-import com.fr.design.border.UITitledBorder;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.remote.ui.list.AddedMemberListCellRender;
 import com.fr.design.remote.ui.list.AddingMemberListCellRender;
 import com.fr.design.remote.ui.list.cell.AddedUserListCellRender;
 import com.fr.design.remote.ui.list.cell.AddingUserListCellRender;
-import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.authority.RemoteDesignMember;
-import com.fr.workspace.server.authority.decision.DecisionOperator;
+import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.border.EmptyBorder;
-import java.awt.BorderLayout;
+import javax.swing.*;
 import java.util.Collection;
 
 
@@ -63,11 +58,11 @@ public class UserManagerPane extends AbstractManagerPane {
 
     @Override
     protected Collection<RemoteDesignMember> getMembers(String userName, String keyWord){
-        return WorkContext.getCurrent().get(DecisionOperator.class).getMembers(userName, keyWord);
+        return RemoteAuthorityRepository.getInstance().getMembers(userName, keyWord, 1, 50);
     }
 
     @Override
     protected Collection<RemoteDesignMember> getMembers(String userName, String keyWord, int pageNum, int count){
-        return WorkContext.getCurrent().get(DecisionOperator.class).getMembers(userName, keyWord, pageNum, count);
+        return RemoteAuthorityRepository.getInstance().getMembers(userName, keyWord, pageNum, count);
     }
 }