Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@96369 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-06-03 10:28:01 +00:00
parent 804a112804
commit 4a5f68ea2f
3 changed files with 65 additions and 1 deletions

View File

@ -3994,3 +3994,35 @@ Compiling...
Compilation completed in 0.00 seconds
Removing invalidated units
Finding entry point classes
Public resources found in...
Translatable source found in...
Found 0 cached/archived units. Used 0 / 2719 units from cache.
Compiling...
40% complete (ETR: 6 seconds)
40% complete (ETR: 6 seconds)
40% complete (ETR: 6 seconds)
40% complete (ETR: 6 seconds)
40% complete (ETR: 6 seconds)
50% complete (ETR: 5 seconds)
60% complete (ETR: 4 seconds)
70% complete (ETR: 3 seconds)
80% complete (ETR: 2 seconds)
90% complete (ETR: 1 seconds)
100% complete (ETR: 0 seconds)
Compilation completed in 12.54 seconds
Removing invalidated units
Finding entry point classes
Public resources found in...
Translatable source found in...
Found 2719 cached/archived units. Used 2719 / 2719 units from cache.
Compiling...
Compilation completed in 0.00 seconds
Removing invalidated units
Finding entry point classes
Public resources found in...
Translatable source found in...
Found 2719 cached/archived units. Used 2719 / 2719 units from cache.
Compiling...
Compilation completed in 0.00 seconds
Removing invalidated units
Finding entry point classes

View File

@ -161,7 +161,7 @@ public class AddColumnPanel extends FramedPanel implements
.create(ColumnTypeCodeProperties.class);
ListStore<ColumnTypeCodeElement> storeComboTypeCode = new ListStore<ColumnTypeCodeElement>(
propsColumnTypeCode.id());
storeComboTypeCode.addAll(ColumnTypeCodeStore.getColumnTypeCodes(trId));
storeComboTypeCode.addAll(ColumnTypeCodeStore.getColumnTypeCodesForAddColumn(trId));
comboColumnTypeCode = new ComboBox<ColumnTypeCodeElement>(
storeComboTypeCode, propsColumnTypeCode.label());

View File

@ -69,6 +69,38 @@ public class ColumnTypeCodeStore implements Serializable {
return store;
}
public static ArrayList<ColumnTypeCodeElement> getColumnTypeCodesForAddColumn(TRId trId) {
store = new ArrayList<ColumnTypeCodeElement>();
if (trId.getTabularResourceType().compareTo("Generic") == 0) {
store.add(annotation);
store.add(attribute);
store.add(measure);
store.add(code);
store.add(codeName);
store.add(codeDescription);
} else {
if (trId.getTabularResourceType().compareTo("Codelist") == 0) {
store.add(annotation);
store.add(code);
store.add(codeName);
store.add(codeDescription);
} else {
if (trId.getTabularResourceType().compareTo("Dataset") == 0) {
store.add(attribute);
store.add(measure);
} else {
store.add(annotation);
}
}
}
return store;
}
/**
*
* @return