|
|
|
@ -27,16 +27,19 @@ public class CellDSColumnSortGroupPane extends AbstractSortGroupPane {
|
|
|
|
|
java.util.Map<String, TableDataWrapper> tableDataWrapperMap = |
|
|
|
|
DesignTableDataManager.getAllEditingDataSet(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget()); |
|
|
|
|
Map<String, TableDataWrapper> allDataSetIncludingProcedure = DesignTableDataManager.getAllDataSetIncludingProcedure(tableDataWrapperMap); |
|
|
|
|
TableDataWrapper tableDataWrapper = allDataSetIncludingProcedure.get(dsColumn.getDSName()); |
|
|
|
|
if (tableDataWrapper != null) { |
|
|
|
|
java.util.List<String> columnNameList = tableDataWrapper.calculateColumnNameList(); |
|
|
|
|
String[] columnNames = new String[columnNameList.size()]; |
|
|
|
|
columnNameList.toArray(columnNames); |
|
|
|
|
cellDSColumnSortItemPane.sortAreaUiComboBox.removeAllItems(); |
|
|
|
|
for (String columnName : columnNames) { |
|
|
|
|
cellDSColumnSortItemPane.sortAreaUiComboBox.addItem(columnName); |
|
|
|
|
if (dsColumn != null) { |
|
|
|
|
TableDataWrapper tableDataWrapper = allDataSetIncludingProcedure.get(dsColumn.getDSName()); |
|
|
|
|
if (tableDataWrapper != null) { |
|
|
|
|
java.util.List<String> columnNameList = tableDataWrapper.calculateColumnNameList(); |
|
|
|
|
String[] columnNames = new String[columnNameList.size()]; |
|
|
|
|
columnNameList.toArray(columnNames); |
|
|
|
|
cellDSColumnSortItemPane.sortAreaUiComboBox.removeAllItems(); |
|
|
|
|
for (String columnName : columnNames) { |
|
|
|
|
cellDSColumnSortItemPane.sortAreaUiComboBox.addItem(columnName); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
cellDSColumnSortItemPane.populateBean(sortExpression); |
|
|
|
|
return cellDSColumnSortItemPane; |
|
|
|
|
} |
|
|
|
|