fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0

master
plough 7 years ago
parent
643a6bb051 dcdb04cebd
commit
5898023860
2 changed files with 148 additions and 127 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      designer-base/src/com/fr/design/gui/itree/filetree/TemplateFileTree.java
  2. 264
      designer-realize/src/com/fr/start/module/DesignerEnvProvider.java

11
designer-base/src/com/fr/design/gui/itree/filetree/TemplateFileTree.java
Unescape View File

@ -1,11 +1,9 @@
package com.fr.design.gui.itree.filetree; package com.fr.design.gui.itree.filetree;
import com.fr.base.Env; 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.proxy.EnvProxy;
import com.fr.core.env.resource.EnvConfigUtils;
import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.env.operator.file.TplFileOperator;
import com.fr.file.filetree.FileNode; import com.fr.file.filetree.FileNode;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
@ -103,10 +101,9 @@ public class TemplateFileTree extends EnvFileTree {
return null; return null;
} }
public FileNode[] listFile(String path) { public FileNode[] listFile(String path) throws Exception {
String username = EnvConfigUtils.getUsername(EnvContext.currentEnv()); String extra = EnvProxy.get(FileOperator.class).readExtraResourcePath(path);
String extra = EnvProxy.get(TplFileOperator.class).readExtraResourcePath(path); return EnvProxy.get(FileOperator.class).list(extra, path);
return EnvProxy.get(TplFileOperator.class).list(username, extra, path);
} }
/* /*

264
designer-realize/src/com/fr/start/module/DesignerEnvProvider.java
Unescape View File

@ -6,14 +6,7 @@ import com.fr.base.StoreProcedureParameter;
import com.fr.base.TableData; import com.fr.base.TableData;
import com.fr.base.env.serializer.OldSerializerAdapter; import com.fr.base.env.serializer.OldSerializerAdapter;
import com.fr.base.env.serializer.ProcedureDataModelSerializer; 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.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.operator.user.UserCenter;
import com.fr.core.env.proxy.EnvProxy; import com.fr.core.env.proxy.EnvProxy;
import com.fr.data.core.db.TableProcedure; import com.fr.data.core.db.TableProcedure;
@ -50,151 +43,182 @@ public class DesignerEnvProvider extends Activator {
} }
} }
} }
initDesignerEnv();
getRoot().setSingleton(EnvSwitcher.class, new EnvSwitcher()); getRoot().setSingleton(EnvSwitcher.class, new EnvSwitcher());
initEnvOperators();
//设置好环境即可，具体跟环境有关的模块会自动调用 //设置好环境即可，具体跟环境有关的模块会自动调用
getRoot().getSingleton(EnvSwitcher.class).switch2LastEnv(); getRoot().getSingleton(EnvSwitcher.class).switch2LastEnv();
} }
@Override private void initDesignerEnv() {
public void stop() {
//清空模块
getRoot().removeSingleton(EnvSwitcher.class);
}
private void initEnvOperators() {
addSerializers(); 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.addRemoteService(UserCenter.class, new RemoteUserCenter());
} }
private void addSerializers() { private void addSerializers() {
EnvProxy.addSerializer(ProcedureDataModel[].class, new ProcedureDataModelSerializer()); EnvProxy.addSerializer(ProcedureDataModel[].class, new ProcedureDataModelSerializer());
EnvProxy.addSerializer(ModifiedTable.class, new OldSerializerAdapter<ModifiedTable>( EnvProxy.addSerializer(ModifiedTable.class, new OldSerializerAdapter<ModifiedTable>(
new OldSerializerAdapter.OldSerializer<ModifiedTable>() { new OldSerializerAdapter.OldSerializer<ModifiedTable>() {
@Override
public void serializer(ModifiedTable obj, OutputStream out) throws Exception { @Override
DavXMLUtils.writeXMLModifiedTables(obj, out); public void serializer(ModifiedTable obj, OutputStream out) throws Exception {
}
}, DavXMLUtils.writeXMLModifiedTables(obj, out);
new OldSerializerAdapter.OldDeserializer<ModifiedTable>() { }
@Override },
public ModifiedTable desializer(InputStream in) throws Exception { new OldSerializerAdapter.OldDeserializer<ModifiedTable>() {
return DavXMLUtils.readXMLModifiedTables(in);
} @Override
public ModifiedTable deserializer(InputStream in) throws Exception {
return DavXMLUtils.readXMLModifiedTables(in);
} }
}
)); ));
EnvProxy.addSerializer(com.fr.data.impl.Connection.class, new OldSerializerAdapter<com.fr.data.impl.Connection>( EnvProxy.addSerializer(com.fr.data.impl.Connection.class, new OldSerializerAdapter<com.fr.data.impl.Connection>(
new OldSerializerAdapter.OldSerializer<Connection>() { new OldSerializerAdapter.OldSerializer<Connection>() {
@Override
public void serializer(Connection obj, OutputStream out) { @Override
DavXMLUtils.writeXMLFileDatabaseConnection(obj, out); public void serializer(Connection obj, OutputStream out) {
}
}, DavXMLUtils.writeXMLFileDatabaseConnection(obj, out);
new OldSerializerAdapter.OldDeserializer<Connection>() { }
@Override },
public Connection desializer(InputStream in) throws Exception { new OldSerializerAdapter.OldDeserializer<Connection>() {
return DavXMLUtils.readXMLDatabaseConnection(in);
} @Override
public Connection deserializer(InputStream in) throws Exception {
return DavXMLUtils.readXMLDatabaseConnection(in);
} }
}
)); ));
EnvProxy.addSerializer(FileNode[].class, new OldSerializerAdapter<FileNode[]>( EnvProxy.addSerializer(FileNode[].class, new OldSerializerAdapter<FileNode[]>(
new OldSerializerAdapter.OldSerializer<FileNode[]>() { new OldSerializerAdapter.OldSerializer<FileNode[]>() {
@Override
public void serializer(FileNode[] obj, OutputStream out) { @Override
DavXMLUtils.writeXMLFileNodes(obj, out); public void serializer(FileNode[] obj, OutputStream out) {
}
}, DavXMLUtils.writeXMLFileNodes(obj, out);
new OldSerializerAdapter.OldDeserializer<FileNode[]>() { }
@Override },
public FileNode[] desializer(InputStream in) { new OldSerializerAdapter.OldDeserializer<FileNode[]>() {
return DavXMLUtils.readXMLFileNodes(in);
} @Override
public FileNode[] deserializer(InputStream in) {
return DavXMLUtils.readXMLFileNodes(in);
} }
}
)); ));
EnvProxy.addSerializer(TableProcedure[].class, new OldSerializerAdapter<TableProcedure[]>( EnvProxy.addSerializer(TableProcedure[].class, new OldSerializerAdapter<TableProcedure[]>(
new OldSerializerAdapter.OldSerializer<TableProcedure[]>() { new OldSerializerAdapter.OldSerializer<TableProcedure[]>() {
@Override
public void serializer(TableProcedure[] obj, OutputStream out) { @Override
DavXMLUtils.writeXMLFileSQLTable(obj, out); public void serializer(TableProcedure[] obj, OutputStream out) {
}
}, DavXMLUtils.writeXMLFileSQLTable(obj, out);
new OldSerializerAdapter.OldDeserializer<TableProcedure[]>() {
@Override
public TableProcedure[] desializer(InputStream in) throws Exception {
return DavXMLUtils.readXMLSQLTables(in);
}
} }
},
new OldSerializerAdapter.OldDeserializer<TableProcedure[]>() {
@Override
public TableProcedure[] deserializer(InputStream in) throws Exception {
return DavXMLUtils.readXMLSQLTables(in);
}
}
)); ));
EnvProxy.addSerializer(TableData.class, new OldSerializerAdapter<TableData>( EnvProxy.addSerializer(TableData.class, new OldSerializerAdapter<TableData>(
new OldSerializerAdapter.OldSerializer<TableData>() { new OldSerializerAdapter.OldSerializer<TableData>() {
@Override
public void serializer(TableData obj, OutputStream out) { @Override
DavXMLUtils.writeXMLFileTableData(obj, out); public void serializer(TableData obj, OutputStream out) {
}
}, DavXMLUtils.writeXMLFileTableData(obj, out);
new OldSerializerAdapter.OldDeserializer<TableData>() {
@Override
public TableData desializer(InputStream in) throws Exception {
return DavXMLUtils.readXMLTableData(in);
}
} }
},
new OldSerializerAdapter.OldDeserializer<TableData>() {
@Override
public TableData deserializer(InputStream in) throws Exception {
return DavXMLUtils.readXMLTableData(in);
}
}
)); ));
EnvProxy.addSerializer(Parameter[].class, new OldSerializerAdapter<Parameter[]>( EnvProxy.addSerializer(Parameter[].class, new OldSerializerAdapter<Parameter[]>(
new OldSerializerAdapter.OldSerializer<Parameter[]>() { new OldSerializerAdapter.OldSerializer<Parameter[]>() {
@Override
public void serializer(Parameter[] obj, OutputStream out) { @Override
DavXMLUtils.writeXMLFileParameters(obj, out); public void serializer(Parameter[] obj, OutputStream out) {
}
}, DavXMLUtils.writeXMLFileParameters(obj, out);
new OldSerializerAdapter.OldDeserializer<Parameter[]>() { }
@Override },
public Parameter[] desializer(InputStream in) throws Exception { new OldSerializerAdapter.OldDeserializer<Parameter[]>() {
return DavXMLUtils.readXMLParameters(in);
} @Override
public Parameter[] deserializer(InputStream in) throws Exception {
return DavXMLUtils.readXMLParameters(in);
} }
}
)); ));
EnvProxy.addSerializer(StoreProcedure.class, new OldSerializerAdapter<StoreProcedure>( EnvProxy.addSerializer(StoreProcedure.class, new OldSerializerAdapter<StoreProcedure>(
new OldSerializerAdapter.OldSerializer<StoreProcedure>() { new OldSerializerAdapter.OldSerializer<StoreProcedure>() {
@Override
public void serializer(StoreProcedure obj, OutputStream out) { @Override
DavXMLUtils.writeXMLFileStoreProcedure(obj, out); public void serializer(StoreProcedure obj, OutputStream out) {
}
}, DavXMLUtils.writeXMLFileStoreProcedure(obj, out);
new OldSerializerAdapter.OldDeserializer<StoreProcedure>() { }
@Override },
public StoreProcedure desializer(InputStream in) throws Exception { new OldSerializerAdapter.OldDeserializer<StoreProcedure>() {
return DavXMLUtils.readXMLStoreProcedure(in);
} @Override
public StoreProcedure deserializer(InputStream in) throws Exception {
return DavXMLUtils.readXMLStoreProcedure(in);
} }
}
)); ));
EnvProxy.addSerializer(StoreProcedureParameter[].class, new OldSerializerAdapter<StoreProcedureParameter[]>( EnvProxy.addSerializer(StoreProcedureParameter[].class, new OldSerializerAdapter<StoreProcedureParameter[]>(
new OldSerializerAdapter.OldSerializer<StoreProcedureParameter[]>() { new OldSerializerAdapter.OldSerializer<StoreProcedureParameter[]>() {
@Override
public void serializer(StoreProcedureParameter[] obj, OutputStream out) { @Override
DavXMLUtils.writeXMLFileParameters(obj, out); public void serializer(StoreProcedureParameter[] obj, OutputStream out) {
}
}, DavXMLUtils.writeXMLFileParameters(obj, out);
new OldSerializerAdapter.OldDeserializer<StoreProcedureParameter[]>() { }
@Override },
public StoreProcedureParameter[] desializer(InputStream in) throws Exception { new OldSerializerAdapter.OldDeserializer<StoreProcedureParameter[]>() {
return DavXMLUtils.readXMLStoreProcedureParameters(in);
} @Override
public StoreProcedureParameter[] deserializer(InputStream in) throws Exception {
return DavXMLUtils.readXMLStoreProcedureParameters(in);
} }
}
)); ));
} }
@Override
public void stop() {
//清空模块
getRoot().removeSingleton(EnvSwitcher.class);
}
} }

Write Preview
Loading…
Cancel
Save