gCubeSystem
/
tabular-data-column-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Updated 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@113856 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-04-01 10:56:23 +00:00
parent f6022594e7
commit 859af7b4e8
13 changed files with 107 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java
View File

@ -520,7 +520,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements
change = new TextButton("Change");
change.setIcon(ResourceBundle.INSTANCE.columnType());
change.setIconAlign(IconAlign.RIGHT);
change.setTitle("Change Column Type");
change.setToolTip("Change Column Type");
SelectHandler changeHandler = new SelectHandler() {

2
src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnPanel.java
View File

@ -182,7 +182,7 @@ public class DeleteColumnPanel extends FramedPanel implements
delete = new TextButton("Delete");
delete.setIcon(ResourceBundle.INSTANCE.columnDelete());
delete.setIconAlign(IconAlign.RIGHT);
delete.setTitle("Delete Column");
delete.setToolTip("Delete Column");
SelectHandler deleteHandler = new SelectHandler() {

2
src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnPanel.java
View File

@ -152,7 +152,7 @@ public class LabelColumnPanel extends FramedPanel implements
change = new TextButton("Change");
change.setIcon(ResourceBundle.INSTANCE.columnLabel());
change.setIconAlign(IconAlign.RIGHT);
change.setTitle("Change Column Label");
change.setToolTip("Change Column Label");
change.addSelectHandler(new SelectHandler() {

2
src/main/java/org/gcube/portlets/user/td/columnwidget/client/PositionColumnPanel.java
View File

@ -194,7 +194,7 @@ public class PositionColumnPanel extends FramedPanel {
reorder = new TextButton("Apply");
reorder.setIcon(ResourceBundle.INSTANCE.columnReorder());
reorder.setIconAlign(IconAlign.RIGHT);
reorder.setTitle("Apply Position Columns");
reorder.setToolTip("Apply Position Columns");
SelectHandler deleteHandler = new SelectHandler() {

8
src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchPanel.java
View File

@ -270,7 +270,7 @@ public class ReplaceBatchPanel extends FramedPanel implements
btnConnect = new TextButton();
btnConnect.setIcon(ResourceBundle.INSTANCE.codelistLink24());
btnConnect.setIconAlign(IconAlign.TOP);
btnConnect.setTitle("Connect");
btnConnect.setToolTip("Connect");
btnConnect.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@ -290,7 +290,7 @@ public class ReplaceBatchPanel extends FramedPanel implements
btnDisconnect
.setIcon(ResourceBundle.INSTANCE.codelistLinkBreak24());
btnDisconnect.setIconAlign(IconAlign.TOP);
btnDisconnect.setTitle("Disconnect");
btnDisconnect.setToolTip("Disconnect");
btnDisconnect.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@ -465,7 +465,7 @@ public class ReplaceBatchPanel extends FramedPanel implements
btnSave = new TextButton("Save");
btnSave.setIcon(ResourceBundle.INSTANCE.save());
btnSave.setIconAlign(IconAlign.RIGHT);
btnSave.setTitle("Save");
btnSave.setToolTip("Save");
btnSave.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@ -479,7 +479,7 @@ public class ReplaceBatchPanel extends FramedPanel implements
btnClose = new TextButton("Close");
btnClose.setIcon(ResourceBundle.INSTANCE.close());
btnClose.setIconAlign(IconAlign.RIGHT);
btnClose.setTitle("Close");
btnClose.setToolTip("Close");
btnClose.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {

4
src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/SingleValueReplacePanel.java
View File

@ -89,7 +89,7 @@ public class SingleValueReplacePanel extends FramedPanel {
btnApply = new TextButton("Replace");
btnApply.setIcon(ResourceBundle.INSTANCE.replace());
btnApply.setIconAlign(IconAlign.RIGHT);
btnApply.setTitle("Replace Value");
btnApply.setToolTip("Replace Value");
btnApply.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@ -102,7 +102,7 @@ public class SingleValueReplacePanel extends FramedPanel {
btnClose = new TextButton("Close");
btnClose.setIcon(ResourceBundle.INSTANCE.close());
btnClose.setIconAlign(IconAlign.RIGHT);
btnClose.setTitle("Close");
btnClose.setToolTip("Close");
btnClose.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {

133
src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnPanel.java
View File

@ -85,8 +85,10 @@ import com.sencha.gxt.widget.core.client.info.Info;
*/
public class AddColumnPanel extends FramedPanel implements
CodelistSelectionListener, MonitorDialogListener {
//private static final String GEOMETRY_REGEXPR = "(\\s*POINT\\s*\\(\\s*(-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*\\)\\s*$)"
// + "|(\\s*LINESTRING\\s*\\((\\s*(-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*,)+\\s*((-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*)\\)\\s*$)";
// private static final String GEOMETRY_REGEXPR =
// "(\\s*POINT\\s*\\(\\s*(-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*\\)\\s*$)"
// +
// "|(\\s*LINESTRING\\s*\\((\\s*(-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*,)+\\s*((-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*)\\)\\s*$)";
private static final String WIDTH = "640px";
private static final String HEIGHT = "520px";
@ -131,6 +133,7 @@ public class AddColumnPanel extends FramedPanel implements
private ExpressionWrapper exWrapper;
private TextButton btnRemoveExpression;
private TextButton btnAddExpression;
// private DateTimeFormat sdf = DateTimeFormat.getFormat("yyyy-MM-dd");
@ -176,16 +179,16 @@ public class AddColumnPanel extends FramedPanel implements
// Label
label = new TextField();
//Flow Expression
// Flow Expression
HBoxLayoutContainer flowExpression = new HBoxLayoutContainer();
flowExpression.setHBoxLayoutAlign(HBoxLayoutAlign.MIDDLE);
flowExpression.setPack(BoxLayoutPack.START);
flowExpression.setAdjustForFlexRemainder(true);
// Default Value
defaultValueString = new TextField();
//defaultValueString.setWidth("166px");
defaultValueString.setReadOnly(true);
// defaultValueString.setWidth("166px");
defaultValueString.addDomHandler(new ClickHandler() {
@Override
@ -194,10 +197,24 @@ public class AddColumnPanel extends FramedPanel implements
}
}, ClickEvent.getType());
btnAddExpression = new TextButton();
btnAddExpression.setIcon(ExpressionResources.INSTANCE.add());
btnAddExpression.setToolTip("Add expression");
btnAddExpression.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
Log.debug("Pressed Add Expression");
openReplaceExpressionDialog();
}
});
btnAddExpression.setVisible(true);
btnRemoveExpression = new TextButton();
btnRemoveExpression.setIcon(ExpressionResources.INSTANCE.delete());
btnRemoveExpression.setTitle("Remove expression");
btnRemoveExpression.setToolTip("Remove expression");
btnRemoveExpression.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@ -206,22 +223,19 @@ public class AddColumnPanel extends FramedPanel implements
}
});
btnRemoveExpression.setVisible(false);
BoxLayoutData flex1 = new BoxLayoutData(new Margins(0));
flex1.setFlex(0);
BoxLayoutData flex2 = new BoxLayoutData(new Margins(0));
flex2.setFlex(1);
BoxLayoutData flex1 = new BoxLayoutData(new Margins(0));
flex1.setFlex(0);
BoxLayoutData flex2 = new BoxLayoutData(new Margins(0));
flex2.setFlex(1);
flowExpression.add(btnAddExpression, flex1);
flowExpression.add(btnRemoveExpression, flex1);
flowExpression.add(defaultValueString, flex2);
defaultStringLabel = new FieldLabel(flowExpression, "Expression");
// comboColumnTypeCode
ColumnTypeCodeProperties propsColumnTypeCode = GWT
.create(ColumnTypeCodeProperties.class);
@ -383,7 +397,7 @@ public class AddColumnPanel extends FramedPanel implements
btnAddColumn = new TextButton("Add");
btnAddColumn.setIcon(ResourceBundle.INSTANCE.columnAdd());
btnAddColumn.setIconAlign(IconAlign.RIGHT);
btnAddColumn.setTitle("Add Column");
btnAddColumn.setToolTip("Add Column");
SelectHandler changeHandler = new SelectHandler() {
@ -429,9 +443,11 @@ public class AddColumnPanel extends FramedPanel implements
}
protected void removeExpression() {
exWrapper=null;
exWrapper = null;
defaultValueString.reset();
defaultValueString.removeToolTip();
btnRemoveExpression.setVisible(false);
btnAddExpression.setVisible(true);
forceLayout();
}
@ -451,11 +467,17 @@ public class AddColumnPanel extends FramedPanel implements
if (exWrapper.isReplaceByValue()) {
defaultValueString.setValue(exWrapper
.getReplaceValue());
defaultValueString.setToolTip(exWrapper
.getReplaceValue());
} else {
defaultValueString.setValue(exWrapper
.getReplaceExpressionContainer()
.getReadableExpression());
defaultValueString.setToolTip(exWrapper
.getReplaceExpressionContainer()
.getReadableExpression());
}
btnAddExpression.setVisible(false);
btnRemoveExpression.setVisible(true);
forceLayout();
@ -465,8 +487,7 @@ public class AddColumnPanel extends FramedPanel implements
public void failed(Throwable throwable) {
Log.error("Error in AddColumn during expression creation:"
+ throwable.getLocalizedMessage());
}
@Override
@ -643,11 +664,12 @@ public class AddColumnPanel extends FramedPanel implements
comboDimensionTypeLabel.setVisible(false);
comboColumnReferenceTypeLabel.setVisible(false);
comboTimeDimensionTypeLabel.setVisible(false);
exWrapper=null;
exWrapper = null;
defaultValueString.reset();
btnRemoveExpression.setVisible(false);
btnAddExpression.setVisible(true);
defaultValueString.removeToolTip();
defaultStringLabel.setVisible(true);
break;
case ATTRIBUTE:
comboLocaleTypeLabel.setVisible(false);
@ -694,9 +716,11 @@ public class AddColumnPanel extends FramedPanel implements
comboDimensionTypeLabel.setVisible(false);
comboColumnReferenceTypeLabel.setVisible(false);
comboTimeDimensionTypeLabel.setVisible(false);
exWrapper=null;
exWrapper = null;
defaultValueString.reset();
btnRemoveExpression.setVisible(false);
btnAddExpression.setVisible(true);
defaultValueString.removeToolTip();
defaultStringLabel.setVisible(true);
break;
}
@ -706,18 +730,22 @@ public class AddColumnPanel extends FramedPanel implements
protected void updateMeasureType(ColumnDataType type) {
Log.debug("Update ColumnTypeCode " + type);
exWrapper=null;
exWrapper = null;
defaultValueString.reset();
btnRemoveExpression.setVisible(false);
btnAddExpression.setVisible(true);
defaultValueString.removeToolTip();
defaultStringLabel.setVisible(true);
forceLayout();
}
protected void updateAttributeType(ColumnDataType type) {
Log.debug("Update ColumnTypeCode " + type);
exWrapper=null;
exWrapper = null;
defaultValueString.reset();
btnRemoveExpression.setVisible(false);
btnAddExpression.setVisible(true);
defaultValueString.removeToolTip();
defaultStringLabel.setVisible(true);
forceLayout();
@ -865,12 +893,14 @@ public class AddColumnPanel extends FramedPanel implements
} else {
if (defaultV == null || defaultV.isEmpty()) {
columnMockUp = new ColumnMockUp(null, null,
labelS, type, dataType, defaultV);
columnMockUp = new ColumnMockUp(null,
null, labelS, type, dataType,
defaultV);
} else {
if (exWrapper.isReplaceByValue()) {
columnMockUp = new ColumnMockUp(null, null,
labelS, type, dataType,
columnMockUp = new ColumnMockUp(
null, null, labelS, type,
dataType,
exWrapper.getReplaceValue());
} else {
columnMockUp = new ColumnMockUp(
@ -885,8 +915,8 @@ public class AddColumnPanel extends FramedPanel implements
}
}
addColumnSession = new AddColumnSession(trId,
columnMockUp);
addColumnSession = new AddColumnSession(
trId, columnMockUp);
callAddColumm();
}
@ -903,29 +933,23 @@ public class AddColumnPanel extends FramedPanel implements
break;
case CODE:
case CODEDESCRIPTION:
case ANNOTATION:
case ANNOTATION:
if (defaultV == null || defaultV.isEmpty()) {
columnMockUp = new ColumnMockUp(null, null,
labelS, type, defaultV);
columnMockUp = new ColumnMockUp(null, null, labelS,
type, defaultV);
} else {
if (exWrapper.isReplaceByValue()) {
columnMockUp = new ColumnMockUp(null, null,
labelS, type,
exWrapper.getReplaceValue());
columnMockUp = new ColumnMockUp(null, null, labelS,
type, exWrapper.getReplaceValue());
} else {
columnMockUp = new ColumnMockUp(
null,
null,
labelS,
type,
exWrapper
columnMockUp = new ColumnMockUp(null, null, labelS,
type, exWrapper
.getReplaceExpressionContainer()
.getExp());
}
}
addColumnSession = new AddColumnSession(trId,
columnMockUp);
addColumnSession = new AddColumnSession(trId, columnMockUp);
callAddColumm();
break;
case CODENAME:
@ -933,8 +957,8 @@ public class AddColumnPanel extends FramedPanel implements
.getCurrentValue();
if (locale != null) {
if (defaultV == null || defaultV.isEmpty()) {
columnMockUp = new ColumnMockUp(null, null,
labelS, type,locale.getLocaleName(), defaultV);
columnMockUp = new ColumnMockUp(null, null, labelS,
type, locale.getLocaleName(), defaultV);
} else {
if (exWrapper.isReplaceByValue()) {
columnMockUp = new ColumnMockUp(null, null,
@ -945,7 +969,8 @@ public class AddColumnPanel extends FramedPanel implements
null,
null,
labelS,
type,locale.getLocaleName(),
type,
locale.getLocaleName(),
exWrapper
.getReplaceExpressionContainer()
.getExp());
@ -959,7 +984,7 @@ public class AddColumnPanel extends FramedPanel implements
UtilsGXT3.alert("Attention", "No locale selected!");
}
break;
case DIMENSION:
ColumnData columnReference = comboColumnReferenceType
.getCurrentValue();
@ -1054,7 +1079,7 @@ public class AddColumnPanel extends FramedPanel implements
break;
case CODE:
case CODEDESCRIPTION:
case ANNOTATION:
case ANNOTATION:
columnMockUp = new ColumnMockUp(null, null, labelS, type,
"");
break;

4
src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnPanel.java
View File

@ -212,7 +212,7 @@ public class CreateDefColumnPanel extends FramedPanel {
btnSave = new TextButton("Save");
btnSave.setIcon(ResourceBundle.INSTANCE.save());
btnSave.setIconAlign(IconAlign.RIGHT);
btnSave.setTitle("Save");
btnSave.setToolTip("Save");
btnSave.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@ -226,7 +226,7 @@ public class CreateDefColumnPanel extends FramedPanel {
btnClose = new TextButton("Close");
btnClose.setIcon(ResourceBundle.INSTANCE.close());
btnClose.setIconAlign(IconAlign.RIGHT);
btnClose.setTitle("Close");
btnClose.setToolTip("Close");
btnClose.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {

9
src/main/java/org/gcube/portlets/user/td/columnwidget/client/custom/ActionButtonCell.java
View File

@ -25,6 +25,9 @@ public class ActionButtonCell extends ResizeCell<String> implements HasSelectHan
private final ActionButtonCellAppearance appearance;
private ImageResource icon;
private String title;
public ActionButtonCell() {
this(GWT.<ActionButtonCellAppearance> create(ActionButtonCellAppearance.class));
@ -33,6 +36,7 @@ public class ActionButtonCell extends ResizeCell<String> implements HasSelectHan
public ActionButtonCell(ActionButtonCellAppearance appearance) {
super("click");
this.appearance = appearance;
}
public void setIcon(ImageResource icon) {
@ -43,6 +47,8 @@ public class ActionButtonCell extends ResizeCell<String> implements HasSelectHan
this.title = title;
}
@Override
public HandlerRegistration addSelectHandler(SelectHandler handler) {
return addHandler(handler, SelectEvent.getType());
@ -79,6 +85,7 @@ public class ActionButtonCell extends ResizeCell<String> implements HasSelectHan
fireEvent(context, new SelectEvent(context));
}
}
}

1
src/main/java/org/gcube/portlets/user/td/columnwidget/client/custom/ActionButtonCellAppearance.java
View File

@ -36,6 +36,7 @@ public class ActionButtonCellAppearance {
public ImageResource icon;
public String title;
public String toolTip;
public ActionButtonCellAppearance(){
this((Resources) GWT.create(Resources.class));

4
src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/ConnectCodelistDialog.java
View File

@ -124,7 +124,7 @@ public class ConnectCodelistDialog extends Window implements
btnApply = new TextButton("Connect");
btnApply.setIcon(ResourceBundle.INSTANCE.codelistLink());
btnApply.setIconAlign(IconAlign.RIGHT);
btnApply.setTitle("Connect");
btnApply.setToolTip("Connect");
btnApply.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@ -138,7 +138,7 @@ public class ConnectCodelistDialog extends Window implements
btnClose = new TextButton("Close");
btnClose.setIcon(ResourceBundle.INSTANCE.close());
btnClose.setIconAlign(IconAlign.RIGHT);
btnClose.setTitle("Close");
btnClose.setToolTip("Close");
btnClose.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {

4
src/main/java/org/gcube/portlets/user/td/columnwidget/client/mapping/ColumnMappingPanel.java
View File

@ -123,7 +123,7 @@ public class ColumnMappingPanel extends FramedPanel {
btnSave = new TextButton("Save");
btnSave.setIcon(ResourceBundle.INSTANCE.save());
btnSave.setIconAlign(IconAlign.RIGHT);
btnSave.setTitle("Save");
btnSave.setToolTip("Save");
btnSave.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@ -137,7 +137,7 @@ public class ColumnMappingPanel extends FramedPanel {
btnClose = new TextButton("Close");
btnClose.setIcon(ResourceBundle.INSTANCE.close());
btnClose.setIconAlign(IconAlign.RIGHT);
btnClose.setTitle("Close");
btnClose.setToolTip("Close");
btnClose.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {

6
src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceAllPanel.java
View File

@ -180,7 +180,7 @@ public class ReplaceAllPanel extends FramedPanel implements
btnApply = new TextButton("Replace");
btnApply.setIcon(ResourceBundle.INSTANCE.replaceAll());
btnApply.setIconAlign(IconAlign.RIGHT);
btnApply.setTitle("Replace Value");
btnApply.setToolTip("Replace Value");
btnApply.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@ -193,7 +193,7 @@ public class ReplaceAllPanel extends FramedPanel implements
btnClose = new TextButton("Close");
btnClose.setIcon(ResourceBundle.INSTANCE.close());
btnClose.setIconAlign(IconAlign.RIGHT);
btnClose.setTitle("Close");
btnClose.setToolTip("Close");
btnClose.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@ -258,7 +258,7 @@ public class ReplaceAllPanel extends FramedPanel implements
btnApply = new TextButton("Replace");
btnApply.setIcon(ResourceBundle.INSTANCE.replace());
btnApply.setIconAlign(IconAlign.RIGHT);
btnApply.setTitle("Replace Value");
btnApply.setToolTip("Replace Value");
btnApply.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {