Updated Mapping
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@98237 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
a2f2854dfd
commit
84343a0b74
|
@ -4794,3 +4794,99 @@ 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...
|
||||
60% complete (ETR: 3 seconds)
|
||||
60% complete (ETR: 3 seconds)
|
||||
60% complete (ETR: 3 seconds)
|
||||
60% complete (ETR: 3 seconds)
|
||||
60% complete (ETR: 3 seconds)
|
||||
60% complete (ETR: 3 seconds)
|
||||
60% complete (ETR: 3 seconds)
|
||||
70% complete (ETR: 2 seconds)
|
||||
80% complete (ETR: 1 seconds)
|
||||
90% complete (ETR: 1 seconds)
|
||||
100% complete (ETR: 0 seconds)
|
||||
Compilation completed in 9.10 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
|
||||
Public resources found in...
|
||||
Translatable source found in...
|
||||
Found 0 cached/archived units. Used 0 / 2719 units from cache.
|
||||
Compiling...
|
||||
20% complete (ETR: 13 seconds)
|
||||
20% complete (ETR: 13 seconds)
|
||||
20% complete (ETR: 13 seconds)
|
||||
30% complete (ETR: 12 seconds)
|
||||
40% complete (ETR: 10 seconds)
|
||||
50% complete (ETR: 9 seconds)
|
||||
60% complete (ETR: 7 seconds)
|
||||
70% complete (ETR: 5 seconds)
|
||||
80% complete (ETR: 3 seconds)
|
||||
90% complete (ETR: 1 seconds)
|
||||
100% complete (ETR: 0 seconds)
|
||||
Compilation completed in 20.45 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
|
||||
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 11.84 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
|
||||
|
|
|
@ -41,6 +41,8 @@ public class DimensionRowSelectionDialog extends Window {
|
|||
protected DimensionRow dimRow;
|
||||
protected CellData cellData;
|
||||
protected boolean workOnTable;
|
||||
protected boolean showValue;
|
||||
protected boolean errorNotColored;
|
||||
|
||||
protected ArrayList<DimensionRowSelectionListener> listeners;
|
||||
|
||||
|
@ -52,12 +54,34 @@ public class DimensionRowSelectionDialog extends Window {
|
|||
public DimensionRowSelectionDialog(ColumnData column, CellData cellData,
|
||||
EventBus eventBus) {
|
||||
this.workOnTable = false;
|
||||
this.showValue = true;
|
||||
this.errorNotColored=false;
|
||||
config(column, cellData, eventBus);
|
||||
}
|
||||
|
||||
public DimensionRowSelectionDialog(ColumnData column, CellData cellData,
|
||||
boolean workOnTable, EventBus eventBus) {
|
||||
this.workOnTable = workOnTable;
|
||||
this.showValue = true;
|
||||
this.errorNotColored=false;
|
||||
config(column, cellData, eventBus);
|
||||
|
||||
}
|
||||
|
||||
public DimensionRowSelectionDialog(ColumnData column, CellData cellData,
|
||||
boolean workOnTable, boolean showValue, EventBus eventBus) {
|
||||
this.workOnTable = workOnTable;
|
||||
this.showValue = showValue;
|
||||
this.errorNotColored=false;
|
||||
config(column, cellData, eventBus);
|
||||
|
||||
}
|
||||
|
||||
public DimensionRowSelectionDialog(ColumnData column, CellData cellData,
|
||||
boolean workOnTable, boolean showValue, boolean errorNotColored, EventBus eventBus) {
|
||||
this.workOnTable = workOnTable;
|
||||
this.showValue = showValue;
|
||||
this.errorNotColored = errorNotColored;
|
||||
config(column, cellData, eventBus);
|
||||
|
||||
}
|
||||
|
@ -82,11 +106,13 @@ public class DimensionRowSelectionDialog extends Window {
|
|||
|
||||
VerticalLayoutContainer v = new VerticalLayoutContainer();
|
||||
|
||||
if (showValue) {
|
||||
value = new TextField();
|
||||
if (cellData.getValue() != null) {
|
||||
value.setValue(cellData.getValue());
|
||||
}
|
||||
value.setReadOnly(true);
|
||||
}
|
||||
|
||||
// Grid
|
||||
tabularData = new TabularDataX(Constants.TDX_DATASOURCE_FACTORY_ID);
|
||||
|
@ -101,6 +127,7 @@ public class DimensionRowSelectionDialog extends Window {
|
|||
|
||||
gridPanel = tabularData.getGridPanel();
|
||||
gridPanel.setHeaderVisible(false);
|
||||
gridPanel.setErrorNotColored(errorNotColored);
|
||||
gridPanel.setSelectionModel(SelectionMode.SINGLE);
|
||||
Log.debug("SetVisibleOnlyColumn: " + column);
|
||||
if (workOnTable) {
|
||||
|
@ -124,7 +151,9 @@ public class DimensionRowSelectionDialog extends Window {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (showValue) {
|
||||
v.add(new FieldLabel(value, "Value"), new VerticalLayoutData(1, -1));
|
||||
}
|
||||
v.add(gridPanel, new VerticalLayoutData(1, 1));
|
||||
|
||||
panel.add(v);
|
||||
|
|
|
@ -153,7 +153,6 @@ public class ColumnMappingPanel extends FramedPanel {
|
|||
flowButton.add(btnSave, new BoxLayoutData(new Margins(10, 4, 10, 4)));
|
||||
flowButton.add(btnClose, new BoxLayoutData(new Margins(10, 4, 10, 4)));
|
||||
|
||||
|
||||
vert = new VerticalLayoutContainer();
|
||||
vert.setScrollMode(ScrollMode.AUTO);
|
||||
vert.setAdjustForScroll(true);
|
||||
|
@ -182,14 +181,17 @@ public class ColumnMappingPanel extends FramedPanel {
|
|||
HBoxLayoutContainer h = (HBoxLayoutContainer) vert.getWidget(i);
|
||||
if (h != null) {
|
||||
@SuppressWarnings("unchecked")
|
||||
ComboBox<DimensionRow> comboSourceValue=(ComboBox<DimensionRow>) h.getItemByItemId(itemIdSourceValueArg);
|
||||
ComboBox<DimensionRow> comboSourceValue = (ComboBox<DimensionRow>) h
|
||||
.getItemByItemId(itemIdSourceValueArg);
|
||||
DimensionRow sourceValue = comboSourceValue.getValue();
|
||||
if (sourceValue != null) {
|
||||
@SuppressWarnings("unchecked")
|
||||
ComboBox<DimensionRow> comboTargetValue=(ComboBox<DimensionRow>) h.getItemByItemId(itemIdTargetValueArg);
|
||||
ComboBox<DimensionRow> comboTargetValue = (ComboBox<DimensionRow>) h
|
||||
.getItemByItemId(itemIdTargetValueArg);
|
||||
DimensionRow targetValue = comboTargetValue.getValue();
|
||||
if (targetValue != null) {
|
||||
ColumnMappingData columnMappingData=new ColumnMappingData(sourceValue,targetValue);
|
||||
ColumnMappingData columnMappingData = new ColumnMappingData(
|
||||
sourceValue, targetValue);
|
||||
mapping.add(columnMappingData);
|
||||
}
|
||||
}
|
||||
|
@ -267,7 +269,7 @@ public class ColumnMappingPanel extends FramedPanel {
|
|||
selectedColumn.getLabel(), null, 0, 0);
|
||||
|
||||
DimensionRowSelectionDialog dimensionRowSelectionDialog = new DimensionRowSelectionDialog(
|
||||
selectedColumn, cellData, true, eventBus);
|
||||
selectedColumn, cellData, true, false, true, eventBus);
|
||||
dimensionRowSelectionDialog
|
||||
.addListener(sourceValueSelectedListener);
|
||||
dimensionRowSelectionDialog.show();
|
||||
|
@ -324,11 +326,11 @@ public class ColumnMappingPanel extends FramedPanel {
|
|||
comboTargetValue.collapse();
|
||||
|
||||
CellData cellData = new CellData("", referenceColumn.getName(),
|
||||
referenceColumn.getColumnId(),
|
||||
referenceColumn.getLabel(), null, 0, 0);
|
||||
referenceColumn.getColumnId(), referenceColumn
|
||||
.getLabel(), null, 0, 0);
|
||||
|
||||
DimensionRowSelectionDialog dimensionRowSelectionDialog = new DimensionRowSelectionDialog(
|
||||
referenceColumn, cellData, true, eventBus);
|
||||
referenceColumn, cellData, true, false, true, eventBus);
|
||||
dimensionRowSelectionDialog
|
||||
.addListener(targetValueSelectedListener);
|
||||
dimensionRowSelectionDialog.show();
|
||||
|
@ -342,9 +344,6 @@ public class ColumnMappingPanel extends FramedPanel {
|
|||
comboTargetValue.setEditable(false);
|
||||
comboTargetValue.setTriggerAction(TriggerAction.ALL);
|
||||
|
||||
|
||||
|
||||
|
||||
final IconButton btnAdd = new IconButton();
|
||||
btnAdd.setItemId(itemIdBtnAdd);
|
||||
btnAdd.setIcon(ResourceBundle.INSTANCE.add());
|
||||
|
@ -441,7 +440,7 @@ public class ColumnMappingPanel extends FramedPanel {
|
|||
selectedColumn.getLabel(), null, 0, 0);
|
||||
|
||||
DimensionRowSelectionDialog dimensionRowSelectionDialog = new DimensionRowSelectionDialog(
|
||||
selectedColumn, cellData, true, eventBus);
|
||||
selectedColumn, cellData, true, false, true, eventBus);
|
||||
dimensionRowSelectionDialog
|
||||
.addListener(sourceValueSelectedListener);
|
||||
dimensionRowSelectionDialog.show();
|
||||
|
@ -498,11 +497,11 @@ public class ColumnMappingPanel extends FramedPanel {
|
|||
comboTargetValue.collapse();
|
||||
|
||||
CellData cellData = new CellData("", referenceColumn.getName(),
|
||||
referenceColumn.getColumnId(),
|
||||
referenceColumn.getLabel(), null, 0, 0);
|
||||
referenceColumn.getColumnId(), referenceColumn
|
||||
.getLabel(), null, 0, 0);
|
||||
|
||||
DimensionRowSelectionDialog dimensionRowSelectionDialog = new DimensionRowSelectionDialog(
|
||||
referenceColumn, cellData, true, eventBus);
|
||||
referenceColumn, cellData, true, false, true, eventBus);
|
||||
dimensionRowSelectionDialog
|
||||
.addListener(targetValueSelectedListener);
|
||||
dimensionRowSelectionDialog.show();
|
||||
|
@ -516,9 +515,6 @@ public class ColumnMappingPanel extends FramedPanel {
|
|||
comboTargetValue.setEditable(false);
|
||||
comboTargetValue.setTriggerAction(TriggerAction.ALL);
|
||||
|
||||
|
||||
|
||||
|
||||
final IconButton btnAdd = new IconButton();
|
||||
btnAdd.setItemId(itemIdBtnAdd);
|
||||
btnAdd.setIcon(ResourceBundle.INSTANCE.add());
|
||||
|
|
Loading…
Reference in New Issue