From 9c81cd7d35e92500b005d0665c3d98078b34e686 Mon Sep 17 00:00:00 2001 From: hzzz Date: Tue, 5 Jun 2018 14:42:49 +0800 Subject: [PATCH] merge --- .../gui/itree/filetree/TemplateFileTree.java | 7 +++---- .../RemoteDesignAuthorityManagerAction.java | 5 +++-- .../fr/design/remote/ui/UserManagerPane.java | 3 ++- .../fr/start/module/DesignerEnvProvider.java | 20 +++++++++---------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/designer-base/src/com/fr/design/gui/itree/filetree/TemplateFileTree.java b/designer-base/src/com/fr/design/gui/itree/filetree/TemplateFileTree.java index 650712bb0..3da64b80d 100644 --- a/designer-base/src/com/fr/design/gui/itree/filetree/TemplateFileTree.java +++ b/designer-base/src/com/fr/design/gui/itree/filetree/TemplateFileTree.java @@ -1,8 +1,7 @@ package com.fr.design.gui.itree.filetree; import com.fr.base.Env; -import com.fr.base.operator.file.FileOperator; -import com.fr.core.env.proxy.EnvProxy; +import com.fr.base.operator.file.DefaultFileOperator; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.file.filetree.FileNode; import com.fr.log.FineLoggerFactory; @@ -102,8 +101,8 @@ public class TemplateFileTree extends EnvFileTree { } public FileNode[] listFile(String path) throws Exception { - String extra = EnvProxy.get(FileOperator.class).readExtraResourcePath(path); - return EnvProxy.get(FileOperator.class).list(extra, path); + String extra = DefaultFileOperator.getInstance().readExtraResourcePath(path); + return DefaultFileOperator.getInstance().list(extra, path); } /* diff --git a/designer-base/src/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java b/designer-base/src/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java index 8d22b77a4..4967a18a1 100644 --- a/designer-base/src/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java +++ b/designer-base/src/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java @@ -9,6 +9,7 @@ import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.DesignerContext; import com.fr.design.remote.ui.AuthorityManagerPane; import com.fr.env.operator.authority.AuthorityOperator; +import com.fr.env.operator.authority.DefaultAuthorityOperator; import com.fr.general.Inter; import com.fr.log.FineLoggerFactory; import com.fr.report.DesignAuthority; @@ -37,7 +38,7 @@ public class RemoteDesignAuthorityManagerAction extends UpdateAction { if (!FRContext.getCurrentEnv().isLocalEnv()) { try { // 远程设计获取全部设计成员的权限列表 - DesignAuthority[] authorities = EnvProxy.get(AuthorityOperator.class).getAuthorities(); + DesignAuthority[] authorities = DefaultAuthorityOperator.getInstance().getAuthorities(); if (authorities != null && authorities.length != 0) { managerPane.populate(authorities); } @@ -53,7 +54,7 @@ public class RemoteDesignAuthorityManagerAction extends UpdateAction { if (!FRContext.getCurrentEnv().isLocalEnv()) { boolean success = false; try { - success = EnvProxy.get(AuthorityOperator.class).updateAuthorities(authorities); + success = DefaultAuthorityOperator.getInstance().updateAuthorities(authorities); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } diff --git a/designer-base/src/com/fr/design/remote/ui/UserManagerPane.java b/designer-base/src/com/fr/design/remote/ui/UserManagerPane.java index 2c568583a..76893c18e 100644 --- a/designer-base/src/com/fr/design/remote/ui/UserManagerPane.java +++ b/designer-base/src/com/fr/design/remote/ui/UserManagerPane.java @@ -18,6 +18,7 @@ import com.fr.design.remote.ui.list.AddingMemberListCellRender; import com.fr.design.remote.ui.list.MemberListSelectedChangeListener; import com.fr.env.RemoteDesignMember; import com.fr.env.operator.decision.DecisionOperator; +import com.fr.env.operator.decision.DefaultDecisionOperator; import com.fr.general.Inter; import com.fr.stable.StringUtils; import com.fr.third.guava.collect.ImmutableList; @@ -282,7 +283,7 @@ public class UserManagerPane extends BasicPane { protected List doInBackground() { addingMembers.clear(); String username = EnvConfigUtils.getUsername(EnvContext.currentEnv()); - addingMembers.addAll(EnvProxy.get(DecisionOperator.class).getMembers(username, keyword)); + addingMembers.addAll(DefaultDecisionOperator.getInstance().getMembers(username, keyword)); return addingMembers; } diff --git a/designer-realize/src/com/fr/start/module/DesignerEnvProvider.java b/designer-realize/src/com/fr/start/module/DesignerEnvProvider.java index 65d37eca6..e67fdf298 100644 --- a/designer-realize/src/com/fr/start/module/DesignerEnvProvider.java +++ b/designer-realize/src/com/fr/start/module/DesignerEnvProvider.java @@ -6,13 +6,13 @@ import com.fr.base.StoreProcedureParameter; import com.fr.base.TableData; import com.fr.base.env.serializer.OldSerializerAdapter; import com.fr.base.env.serializer.ProcedureDataModelSerializer; -import com.fr.base.env.user.RemoteUserCenter; +import com.fr.base.env.user.RemoteUserCenterProvider; import com.fr.base.operator.connection.DataConnectionOperator; -import com.fr.base.operator.connection.LocalDataConnectionOperator; +import com.fr.base.operator.connection.DefaultDataConnectionOperator; import com.fr.base.operator.file.FileOperator; -import com.fr.base.operator.file.LocalFileOperator; +import com.fr.base.operator.file.DefaultFileOperator; import com.fr.core.env.operator.envinfo.EnvInfoOperator; -import com.fr.core.env.operator.envinfo.LocalEnvInfoOperator; +import com.fr.core.env.operator.envinfo.DefaultEnvInfoOperator; import com.fr.core.env.operator.user.UserCenter; import com.fr.core.env.proxy.EnvProxy; import com.fr.data.core.db.TableProcedure; @@ -26,7 +26,7 @@ import com.fr.general.ComparatorUtils; import com.fr.module.Activator; import com.fr.start.EnvSwitcher; import com.fr.start.StartServer; -import com.fr.startup.opeartors.LocalUserCenter; +import com.fr.startup.opeartors.UserCenterProvider; import java.io.InputStream; import java.io.OutputStream; @@ -66,11 +66,11 @@ public class DesignerEnvProvider extends Activator { private void initEnvOperators() { addSerializers(); - EnvProxy.addLocalService(FileOperator.class, new LocalFileOperator()); - EnvProxy.addLocalService(DataConnectionOperator.class, new LocalDataConnectionOperator()); - EnvProxy.addLocalService(EnvInfoOperator.class, new LocalEnvInfoOperator()); - EnvProxy.addLocalService(UserCenter.class, new LocalUserCenter()); - EnvProxy.addRemoteService(UserCenter.class, new RemoteUserCenter()); + EnvProxy.addLocalService(FileOperator.class, new DefaultFileOperator()); + EnvProxy.addLocalService(DataConnectionOperator.class, new DefaultDataConnectionOperator()); + EnvProxy.addLocalService(EnvInfoOperator.class, new DefaultEnvInfoOperator()); + EnvProxy.addLocalService(UserCenter.class, new UserCenterProvider()); + EnvProxy.addRemoteService(UserCenter.class, new RemoteUserCenterProvider()); } private void addSerializers() {