Browse Source

Merge pull request #1749 in BA/design from ~ABEL.CHEN/design:feature/10.0 to feature/10.0

* commit 'f98c49de2e05f9b69de5160ae9d726472feb3bb4':
  不可变的list不能强转成ArrayList
master
superman 7 years ago
parent
commit
9cb07be350
  1. 2
      designer_base/src/com/fr/design/data/DesignTableDataManager.java
  2. 2
      designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java

2
designer_base/src/com/fr/design/data/DesignTableDataManager.java

@ -241,7 +241,7 @@ public abstract class DesignTableDataManager {
boolean hasSchemaOrResult = false;
StoreProcedureParameter[] parameters = StoreProcedure.getSortPara(storeProcedure.getParameters());
String name = tableDataWrapper.getTableDataName();
ArrayList<String> resultNames = storeProcedure.getResultNames();
List<String> resultNames = storeProcedure.getResultNames();
TableDataWrapper tdw = new StoreProcedureNameWrapper(name + "_Table", storeProcedure);
for (StoreProcedureParameter parameter : parameters) {

2
designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java

@ -186,7 +186,7 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
StoreProcedure storeProcedure = (StoreProcedure) tableData;
String name = ((NameObject) tmpNode.getUserObject()).getName();
StoreProcedureParameter[] parameters = StoreProcedure.getSortPara(storeProcedure.getParameters());
ArrayList<String> resultNames = storeProcedure.getResultNames();
List<String> resultNames = storeProcedure.getResultNames();
boolean hasChild = false;
tmpNode.remove(0);
TableDataWrapper tdw = new StoreProcedureNameWrapper(name + "_Table1", storeProcedure);

Loading…
Cancel
Save