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 d04992876..650712bb0 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,11 +1,9 @@ package com.fr.design.gui.itree.filetree; import com.fr.base.Env; -import com.fr.core.env.EnvContext; +import com.fr.base.operator.file.FileOperator; import com.fr.core.env.proxy.EnvProxy; -import com.fr.core.env.resource.EnvConfigUtils; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; -import com.fr.env.operator.file.TplFileOperator; import com.fr.file.filetree.FileNode; import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; @@ -103,10 +101,9 @@ public class TemplateFileTree extends EnvFileTree { return null; } - public FileNode[] listFile(String path) { - String username = EnvConfigUtils.getUsername(EnvContext.currentEnv()); - String extra = EnvProxy.get(TplFileOperator.class).readExtraResourcePath(path); - return EnvProxy.get(TplFileOperator.class).list(username, extra, path); + public FileNode[] listFile(String path) throws Exception { + String extra = EnvProxy.get(FileOperator.class).readExtraResourcePath(path); + return EnvProxy.get(FileOperator.class).list(extra, path); } /* diff --git a/designer-realize/src/com/fr/start/module/DesignerEnvProvider.java b/designer-realize/src/com/fr/start/module/DesignerEnvProvider.java index 20417b2fb..68e7a4c9a 100644 --- a/designer-realize/src/com/fr/start/module/DesignerEnvProvider.java +++ b/designer-realize/src/com/fr/start/module/DesignerEnvProvider.java @@ -6,14 +6,7 @@ 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.LocalUserCenter; import com.fr.base.env.user.RemoteUserCenter; -import com.fr.base.operator.connection.DataConnectionOperator; -import com.fr.base.operator.connection.LocalDataConnectionOperator; -import com.fr.base.operator.file.FileOperator; -import com.fr.base.operator.file.LocalFileOperator; -import com.fr.core.env.operator.envinfo.EnvInfoOperator; -import com.fr.core.env.operator.envinfo.LocalEnvInfoOperator; import com.fr.core.env.operator.user.UserCenter; import com.fr.core.env.proxy.EnvProxy; import com.fr.data.core.db.TableProcedure; @@ -50,151 +43,182 @@ public class DesignerEnvProvider extends Activator { } } } + initDesignerEnv(); + getRoot().setSingleton(EnvSwitcher.class, new EnvSwitcher()); - - initEnvOperators(); - //设置好环境即可,具体跟环境有关的模块会自动调用 getRoot().getSingleton(EnvSwitcher.class).switch2LastEnv(); } - - @Override - public void stop() { - //清空模块 - getRoot().removeSingleton(EnvSwitcher.class); - } - - private void initEnvOperators() { + + private void initDesignerEnv() { + 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()); } - + + private void addSerializers() { + EnvProxy.addSerializer(ProcedureDataModel[].class, new ProcedureDataModelSerializer()); - + EnvProxy.addSerializer(ModifiedTable.class, new OldSerializerAdapter( - new OldSerializerAdapter.OldSerializer() { - @Override - public void serializer(ModifiedTable obj, OutputStream out) throws Exception { - DavXMLUtils.writeXMLModifiedTables(obj, out); - } - }, - new OldSerializerAdapter.OldDeserializer() { - @Override - public ModifiedTable desializer(InputStream in) throws Exception { - return DavXMLUtils.readXMLModifiedTables(in); - } + new OldSerializerAdapter.OldSerializer() { + + @Override + public void serializer(ModifiedTable obj, OutputStream out) throws Exception { + + DavXMLUtils.writeXMLModifiedTables(obj, out); + } + }, + new OldSerializerAdapter.OldDeserializer() { + + @Override + public ModifiedTable deserializer(InputStream in) throws Exception { + + return DavXMLUtils.readXMLModifiedTables(in); } + } )); - + EnvProxy.addSerializer(com.fr.data.impl.Connection.class, new OldSerializerAdapter( - new OldSerializerAdapter.OldSerializer() { - @Override - public void serializer(Connection obj, OutputStream out) { - DavXMLUtils.writeXMLFileDatabaseConnection(obj, out); - } - }, - new OldSerializerAdapter.OldDeserializer() { - @Override - public Connection desializer(InputStream in) throws Exception { - return DavXMLUtils.readXMLDatabaseConnection(in); - } + new OldSerializerAdapter.OldSerializer() { + + @Override + public void serializer(Connection obj, OutputStream out) { + + DavXMLUtils.writeXMLFileDatabaseConnection(obj, out); + } + }, + new OldSerializerAdapter.OldDeserializer() { + + @Override + public Connection deserializer(InputStream in) throws Exception { + + return DavXMLUtils.readXMLDatabaseConnection(in); } + } )); - + EnvProxy.addSerializer(FileNode[].class, new OldSerializerAdapter( - new OldSerializerAdapter.OldSerializer() { - @Override - public void serializer(FileNode[] obj, OutputStream out) { - DavXMLUtils.writeXMLFileNodes(obj, out); - } - }, - new OldSerializerAdapter.OldDeserializer() { - @Override - public FileNode[] desializer(InputStream in) { - return DavXMLUtils.readXMLFileNodes(in); - } + new OldSerializerAdapter.OldSerializer() { + + @Override + public void serializer(FileNode[] obj, OutputStream out) { + + DavXMLUtils.writeXMLFileNodes(obj, out); + } + }, + new OldSerializerAdapter.OldDeserializer() { + + @Override + public FileNode[] deserializer(InputStream in) { + + return DavXMLUtils.readXMLFileNodes(in); } + } )); - + EnvProxy.addSerializer(TableProcedure[].class, new OldSerializerAdapter( - new OldSerializerAdapter.OldSerializer() { - @Override - public void serializer(TableProcedure[] obj, OutputStream out) { - DavXMLUtils.writeXMLFileSQLTable(obj, out); - } - }, - new OldSerializerAdapter.OldDeserializer() { - @Override - public TableProcedure[] desializer(InputStream in) throws Exception { - return DavXMLUtils.readXMLSQLTables(in); - } + new OldSerializerAdapter.OldSerializer() { + + @Override + public void serializer(TableProcedure[] obj, OutputStream out) { + + DavXMLUtils.writeXMLFileSQLTable(obj, out); } + }, + new OldSerializerAdapter.OldDeserializer() { + + @Override + public TableProcedure[] deserializer(InputStream in) throws Exception { + + return DavXMLUtils.readXMLSQLTables(in); + } + } )); - + EnvProxy.addSerializer(TableData.class, new OldSerializerAdapter( - new OldSerializerAdapter.OldSerializer() { - @Override - public void serializer(TableData obj, OutputStream out) { - DavXMLUtils.writeXMLFileTableData(obj, out); - } - }, - new OldSerializerAdapter.OldDeserializer() { - @Override - public TableData desializer(InputStream in) throws Exception { - return DavXMLUtils.readXMLTableData(in); - } + new OldSerializerAdapter.OldSerializer() { + + @Override + public void serializer(TableData obj, OutputStream out) { + + DavXMLUtils.writeXMLFileTableData(obj, out); } + }, + new OldSerializerAdapter.OldDeserializer() { + + @Override + public TableData deserializer(InputStream in) throws Exception { + + return DavXMLUtils.readXMLTableData(in); + } + } )); - + EnvProxy.addSerializer(Parameter[].class, new OldSerializerAdapter( - new OldSerializerAdapter.OldSerializer() { - @Override - public void serializer(Parameter[] obj, OutputStream out) { - DavXMLUtils.writeXMLFileParameters(obj, out); - } - }, - new OldSerializerAdapter.OldDeserializer() { - @Override - public Parameter[] desializer(InputStream in) throws Exception { - return DavXMLUtils.readXMLParameters(in); - } + new OldSerializerAdapter.OldSerializer() { + + @Override + public void serializer(Parameter[] obj, OutputStream out) { + + DavXMLUtils.writeXMLFileParameters(obj, out); + } + }, + new OldSerializerAdapter.OldDeserializer() { + + @Override + public Parameter[] deserializer(InputStream in) throws Exception { + + return DavXMLUtils.readXMLParameters(in); } + } )); - + EnvProxy.addSerializer(StoreProcedure.class, new OldSerializerAdapter( - new OldSerializerAdapter.OldSerializer() { - @Override - public void serializer(StoreProcedure obj, OutputStream out) { - DavXMLUtils.writeXMLFileStoreProcedure(obj, out); - } - }, - new OldSerializerAdapter.OldDeserializer() { - @Override - public StoreProcedure desializer(InputStream in) throws Exception { - return DavXMLUtils.readXMLStoreProcedure(in); - } + new OldSerializerAdapter.OldSerializer() { + + @Override + public void serializer(StoreProcedure obj, OutputStream out) { + + DavXMLUtils.writeXMLFileStoreProcedure(obj, out); + } + }, + new OldSerializerAdapter.OldDeserializer() { + + @Override + public StoreProcedure deserializer(InputStream in) throws Exception { + + return DavXMLUtils.readXMLStoreProcedure(in); } + } )); - + EnvProxy.addSerializer(StoreProcedureParameter[].class, new OldSerializerAdapter( - new OldSerializerAdapter.OldSerializer() { - @Override - public void serializer(StoreProcedureParameter[] obj, OutputStream out) { - DavXMLUtils.writeXMLFileParameters(obj, out); - } - }, - new OldSerializerAdapter.OldDeserializer() { - @Override - public StoreProcedureParameter[] desializer(InputStream in) throws Exception { - return DavXMLUtils.readXMLStoreProcedureParameters(in); - } + new OldSerializerAdapter.OldSerializer() { + + @Override + public void serializer(StoreProcedureParameter[] obj, OutputStream out) { + + DavXMLUtils.writeXMLFileParameters(obj, out); + } + }, + new OldSerializerAdapter.OldDeserializer() { + + @Override + public StoreProcedureParameter[] deserializer(InputStream in) throws Exception { + + return DavXMLUtils.readXMLStoreProcedureParameters(in); } + } )); } - + + @Override + public void stop() { + //清空模块 + getRoot().removeSingleton(EnvSwitcher.class); + } + + }