915: TDM - Support the Spanish language
Task-Url: https://support.d4science.org/issues/915 Updated Spanish Support git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-table-widget@120269 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
5853c4c945
commit
93e46eaf41
|
@ -2,6 +2,7 @@
|
|||
<module rename-to='TableWidget'>
|
||||
<!-- Inherit the core Web Toolkit stuff. -->
|
||||
<inherits name='com.google.gwt.user.User' />
|
||||
<!-- <inherits name="com.google.gwt.i18n.I18N" /> -->
|
||||
|
||||
<!-- We need the JUnit module in the main module, -->
|
||||
<!-- otherwise eclipse complains (Google plugin bug?) -->
|
||||
|
@ -10,7 +11,7 @@
|
|||
<!-- Inherit the default GWT style sheet. You can change -->
|
||||
<!-- the theme of your GWT application by uncommenting -->
|
||||
<!-- any one of the following lines. -->
|
||||
<inherits name='com.google.gwt.user.theme.standard.Standard' />
|
||||
<!-- <inherits name='com.google.gwt.user.theme.standard.Standard' /> -->
|
||||
<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
|
||||
<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
|
||||
|
||||
|
@ -26,6 +27,26 @@
|
|||
<!-- Specify the app entry point class. -->
|
||||
<!-- <entry-point class='org.gcube.portlets.user.td.tablewidget.client.TableWidgetEntry' /> -->
|
||||
|
||||
<!--
|
||||
<set-configuration-property name="locale.cookie"
|
||||
value="TDLangCookie" />
|
||||
<set-configuration-property name="locale.queryparam"
|
||||
value="TDLang" />
|
||||
<set-configuration-property name="locale.usemeta"
|
||||
value="Y" />
|
||||
<set-configuration-property name="locale.useragent"
|
||||
value="Y" />
|
||||
|
||||
<set-configuration-property name="locale.searchorder"
|
||||
value="cookie,queryparam,meta,useragent" />
|
||||
|
||||
<extend-property name="locale" values="en" />
|
||||
<extend-property name="locale" values="it" />
|
||||
<extend-property name="locale" values="es" />
|
||||
<set-property name="locale" value="en, it, es" />
|
||||
<set-property-fallback name="locale" value="en" />
|
||||
-->
|
||||
|
||||
<!-- Specify the paths for translatable code -->
|
||||
<source path='client' />
|
||||
<source path='shared' />
|
||||
|
|
|
@ -13,6 +13,7 @@ import org.gcube.portlets.user.td.tablewidget.client.type.TableTypeElement;
|
|||
import org.gcube.portlets.user.td.tablewidget.client.type.TableTypeProperties;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.type.TableTypeStore;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.CommonMessages;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType;
|
||||
|
@ -57,16 +58,25 @@ public class ChangeTableTypePanel extends FramedPanel implements
|
|||
private ChangeTableTypeSession changeTableTypeSession;
|
||||
|
||||
private ComboBox<TableTypeElement> comboTableType;
|
||||
private TextButton change;
|
||||
private TextButton btnApply;
|
||||
private CommonMessages msgsCommon;
|
||||
private TableWidgetMessages msgs;
|
||||
|
||||
public ChangeTableTypePanel(TRId trId, EventBus eventBus) {
|
||||
super();
|
||||
this.trId = trId;
|
||||
this.eventBus = eventBus;
|
||||
forceLayoutOnResize = true;
|
||||
initMessages();
|
||||
create();
|
||||
}
|
||||
|
||||
protected void initMessages() {
|
||||
msgsCommon = GWT.create(CommonMessages.class);
|
||||
msgs = GWT.create(TableWidgetMessages.class);
|
||||
|
||||
}
|
||||
|
||||
protected void create() {
|
||||
setWidth(WIDTH);
|
||||
setHeight(HEIGHT);
|
||||
|
@ -86,18 +96,21 @@ public class ChangeTableTypePanel extends FramedPanel implements
|
|||
|
||||
Log.trace("ComboTableType created");
|
||||
|
||||
comboTableType.setEmptyText("Select a Table Type...");
|
||||
comboTableType.setEmptyText(msgs.comboTableTypeEmptyText());
|
||||
comboTableType.setItemId("ComboTableType");
|
||||
comboTableType.setWidth("200px");
|
||||
comboTableType.setEditable(false);
|
||||
comboTableType.setTriggerAction(TriggerAction.ALL);
|
||||
|
||||
change = new TextButton("Apply");
|
||||
change.setIcon(ResourceBundle.INSTANCE.tableType());
|
||||
change.setIconAlign(IconAlign.RIGHT);
|
||||
change.setTitle("Apply Table Type");
|
||||
FieldLabel comboTableTypeLabel = new FieldLabel(comboTableType,
|
||||
msgs.comboTableTypeLabel());
|
||||
|
||||
change.addSelectHandler(new SelectHandler() {
|
||||
btnApply = new TextButton(msgs.btnApplyText());
|
||||
btnApply.setIcon(ResourceBundle.INSTANCE.tableType());
|
||||
btnApply.setIconAlign(IconAlign.RIGHT);
|
||||
btnApply.setToolTip(msgs.btnApplyToolTip());
|
||||
|
||||
btnApply.addSelectHandler(new SelectHandler() {
|
||||
|
||||
public void onSelect(SelectEvent event) {
|
||||
onChangeTableType();
|
||||
|
@ -109,10 +122,9 @@ public class ChangeTableTypePanel extends FramedPanel implements
|
|||
vl.setScrollMode(ScrollMode.AUTO);
|
||||
vl.setAdjustForScroll(true);
|
||||
|
||||
vl.add(new FieldLabel(comboTableType, "Table Type"),
|
||||
new VerticalLayoutData(1, -1));
|
||||
vl.add(change,
|
||||
new VerticalLayoutData(-1, -1, new Margins(10, 0, 10, 0)));
|
||||
vl.add(comboTableTypeLabel, new VerticalLayoutData(1, -1));
|
||||
vl.add(btnApply, new VerticalLayoutData(-1, -1, new Margins(10, 0, 10,
|
||||
0)));
|
||||
|
||||
add(vl);
|
||||
show();
|
||||
|
@ -128,10 +140,12 @@ public class ChangeTableTypePanel extends FramedPanel implements
|
|||
tableTypeElement.getTableType());
|
||||
callChangeTableType();
|
||||
} else {
|
||||
UtilsGXT3.alert("Error", "Invalid table type!");
|
||||
UtilsGXT3.alert(msgsCommon.error(),
|
||||
msgs.errorInvalidTableType());
|
||||
}
|
||||
} else {
|
||||
UtilsGXT3.alert("Attention", "Select a table type!");
|
||||
UtilsGXT3.alert(msgsCommon.attention(),
|
||||
msgs.attentionSelectATableType());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -146,19 +160,20 @@ public class ChangeTableTypePanel extends FramedPanel implements
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
if (caught instanceof TDGWTIsFinalException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Final",
|
||||
UtilsGXT3.alert(msgsCommon.errorFinal(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.debug("Change The Table Type Error: "
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3
|
||||
.alert("Error Changing The Table Type",
|
||||
"Error in invocation of Change Table Type operation! "+caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert(
|
||||
msgsCommon.error(),
|
||||
msgs.errorInChangeTableTypeOperationFixed()
|
||||
+ caught.getLocalizedMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -191,12 +206,12 @@ public class ChangeTableTypePanel extends FramedPanel implements
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.error("Error retrieving table: "
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error retrieving table",
|
||||
UtilsGXT3.alert(msgsCommon.error(),
|
||||
caught.getLocalizedMessage());
|
||||
}
|
||||
}
|
||||
|
@ -235,7 +250,8 @@ public class ChangeTableTypePanel extends FramedPanel implements
|
|||
public void operationComplete(OperationResult operationResult) {
|
||||
ChangeTableWhy why = ChangeTableWhy.TABLEUPDATED;
|
||||
ChangeTableRequestEvent changeTableRequestEvent = new ChangeTableRequestEvent(
|
||||
ChangeTableRequestType.CHANGETABLETYPE, operationResult.getTrId(), why);
|
||||
ChangeTableRequestType.CHANGETABLETYPE,
|
||||
operationResult.getTrId(), why);
|
||||
eventBus.fireEvent(changeTableRequestEvent);
|
||||
close();
|
||||
}
|
||||
|
@ -248,10 +264,12 @@ public class ChangeTableTypePanel extends FramedPanel implements
|
|||
}
|
||||
|
||||
@Override
|
||||
public void operationStopped(OperationResult operationResult, String reason, String details) {
|
||||
public void operationStopped(OperationResult operationResult,
|
||||
String reason, String details) {
|
||||
ChangeTableWhy why = ChangeTableWhy.TABLECURATION;
|
||||
ChangeTableRequestEvent changeTableRequestEvent = new ChangeTableRequestEvent(
|
||||
ChangeTableRequestType.CHANGETABLETYPE, operationResult.getTrId(), why);
|
||||
ChangeTableRequestType.CHANGETABLETYPE,
|
||||
operationResult.getTrId(), why);
|
||||
eventBus.fireEvent(changeTableRequestEvent);
|
||||
close();
|
||||
|
||||
|
|
|
@ -7,6 +7,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.clone.CloneTabularResourc
|
|||
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog;
|
||||
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.CommonMessages;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType;
|
||||
|
@ -16,18 +17,35 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.OperationResult;
|
|||
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
|
||||
|
||||
import com.allen_sauer.gwt.log.client.Log;
|
||||
import com.google.gwt.core.client.GWT;
|
||||
import com.google.gwt.user.client.rpc.AsyncCallback;
|
||||
import com.google.web.bindery.event.shared.EventBus;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author giancarlo
|
||||
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
|
||||
*
|
||||
*/
|
||||
public class CloneTabularResource implements MonitorDialogListener {
|
||||
private TRId trId;
|
||||
private EventBus eventBus;
|
||||
|
||||
private CloneTabularResourceSession cloneTabularResourceSession;
|
||||
|
||||
private TableWidgetMessages msgs;
|
||||
private CommonMessages msgsCommon;
|
||||
|
||||
public CloneTabularResource(TRId trId, EventBus eventBus) {
|
||||
this.trId = trId;
|
||||
this.eventBus = eventBus;
|
||||
initMessages();
|
||||
|
||||
}
|
||||
|
||||
protected void initMessages(){
|
||||
msgsCommon = GWT.create(CommonMessages.class);
|
||||
msgs = GWT.create(TableWidgetMessages.class);
|
||||
|
||||
}
|
||||
|
||||
public void cloneTR() {
|
||||
|
@ -47,14 +65,14 @@ public class CloneTabularResource implements MonitorDialogListener {
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.debug("Clone Error: "
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert(
|
||||
"Error Cloning Tabular Resource",
|
||||
"Error in clone operation! "+caught.getLocalizedMessage());
|
||||
msgsCommon.error(),
|
||||
msgs.errorInCloneFixed()+caught.getLocalizedMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,14 +2,31 @@ package org.gcube.portlets.user.td.tablewidget.client;
|
|||
|
||||
|
||||
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
|
||||
|
||||
import com.allen_sauer.gwt.log.client.Log;
|
||||
import com.google.gwt.core.client.EntryPoint;
|
||||
import com.google.gwt.event.shared.EventBus;
|
||||
import com.google.gwt.event.shared.SimpleEventBus;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author giancarlo
|
||||
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
|
||||
*
|
||||
*/
|
||||
public class TableWidgetEntry implements EntryPoint {
|
||||
|
||||
|
||||
public void onModuleLoad() {
|
||||
|
||||
Log.info("Hello!");
|
||||
EventBus eventBus= new SimpleEventBus();
|
||||
TRId trId=new TRId("1");
|
||||
|
||||
|
||||
CloneTabularResource cloneTabularResource= new CloneTabularResource(trId, eventBus);
|
||||
cloneTabularResource.cloneTR();
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,191 @@
|
|||
package org.gcube.portlets.user.td.tablewidget.client;
|
||||
|
||||
import com.google.gwt.i18n.client.Messages;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author giancarlo
|
||||
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
|
||||
*
|
||||
*/
|
||||
public interface TableWidgetMessages extends Messages {
|
||||
|
||||
@DefaultMessage("Error in clone operation! ")
|
||||
String errorInCloneFixed();
|
||||
|
||||
@DefaultMessage("Select a Table Type...")
|
||||
String comboTableTypeEmptyText();
|
||||
|
||||
@DefaultMessage("Apply")
|
||||
String btnApplyText();
|
||||
|
||||
@DefaultMessage("Apply Table Type")
|
||||
String btnApplyToolTip();
|
||||
|
||||
@DefaultMessage("Table Type")
|
||||
String comboTableTypeLabel();
|
||||
|
||||
@DefaultMessage("Invalid table type!")
|
||||
String errorInvalidTableType();
|
||||
|
||||
@DefaultMessage("Select a table type!")
|
||||
String attentionSelectATableType();
|
||||
|
||||
@DefaultMessage("Error in invocation of Change Table Type operation.")
|
||||
String errorInChangeTableTypeOperationFixed();
|
||||
|
||||
@DefaultMessage("Select a column...")
|
||||
String comboLatitudeEmptyText();
|
||||
|
||||
@DefaultMessage("Select a column...")
|
||||
String comboLongitudeEmptyMessage();
|
||||
|
||||
@DefaultMessage("Points")
|
||||
String columnFieldDefault();
|
||||
|
||||
@DefaultMessage("Column Label")
|
||||
String columnFieldLabel();
|
||||
|
||||
@DefaultMessage("Create")
|
||||
String btnCreatePointText();
|
||||
|
||||
@DefaultMessage("Create Point")
|
||||
String btnCreatePointToolTip();
|
||||
|
||||
@DefaultMessage("Longitude")
|
||||
String comboLongitudeLabel();
|
||||
|
||||
@DefaultMessage("Latitude")
|
||||
String comboLatitudeLabel();
|
||||
|
||||
@DefaultMessage("Select a column label!")
|
||||
String attentionSelectAColumnLabel();
|
||||
|
||||
@DefaultMessage("Select Latitude!")
|
||||
String attentionSelectLatitude();
|
||||
|
||||
@DefaultMessage("Select Longitude!")
|
||||
String attentionSelectLongitude();
|
||||
|
||||
@DefaultMessage("Error creating a point: ")
|
||||
String errorCreatingAPointFixed();
|
||||
|
||||
@DefaultMessage("Error retrieving columns of tabular resource: ")
|
||||
String errorRetrievingColumsOfTabularResourceFixed();
|
||||
|
||||
@DefaultMessage("No Integer or Numeric column is present in the tabular resource!")
|
||||
String attentionNoIntegerOrNumericColumnIsPresent();
|
||||
|
||||
@DefaultMessage("Select a column...")
|
||||
String comboCSquareColumnEmptyText();
|
||||
|
||||
@DefaultMessage("Select a resolution...")
|
||||
String comboDownscaleEmptyText();
|
||||
|
||||
@DefaultMessage("Downscale")
|
||||
String btnDownscaleText();
|
||||
|
||||
@DefaultMessage("Downscale C-Square")
|
||||
String btnDownscaleToolTip();
|
||||
|
||||
@DefaultMessage("Column")
|
||||
String comboCSquareColumnLabel();
|
||||
|
||||
@DefaultMessage("Resolution")
|
||||
String comboDownscaleLabel();
|
||||
|
||||
@DefaultMessage("Select Resolution!")
|
||||
String attentionSelectResolution();
|
||||
|
||||
@DefaultMessage("Select C-Square column!")
|
||||
String attentionSelectCSquareColumn();
|
||||
|
||||
@DefaultMessage("No text column is present in the tabular resource. C-Square is a text column data type!")
|
||||
String attentionNoTextColumnIsPresentCSquareIsTextColumn();
|
||||
|
||||
@DefaultMessage("Select a type...")
|
||||
String comboGsCoordinateTypeEmptyText();
|
||||
|
||||
@DefaultMessage("Select a resolution...")
|
||||
String comboResolutionEmptyText();
|
||||
|
||||
@DefaultMessage("Resolution")
|
||||
String comboResolutionLabel();
|
||||
|
||||
@DefaultMessage("True")
|
||||
String hasQuadrantTrue();
|
||||
|
||||
@DefaultMessage("False")
|
||||
String hasQuadrantFalse();
|
||||
|
||||
@DefaultMessage("No Integer column is present in the tabular resource!")
|
||||
String attentionNoIntegerColumnIsPresent();
|
||||
|
||||
@DefaultMessage("Has Quadrant")
|
||||
String hasQuadrantLabel();
|
||||
|
||||
@DefaultMessage("Select true if you want select quadrant column")
|
||||
String hasQuadrantToolTip();
|
||||
|
||||
@DefaultMessage("Select a column...")
|
||||
String comboQuadrantEmptyText();
|
||||
|
||||
@DefaultMessage("Quadrant")
|
||||
String comboQuadrantLabel();
|
||||
|
||||
@DefaultMessage("Create")
|
||||
String btnCreateCoordinatesText();
|
||||
|
||||
@DefaultMessage("Create Geospatial Coordinates")
|
||||
String btnCreateCoordinatesToolTip();
|
||||
|
||||
@DefaultMessage("Type")
|
||||
String comboGsCoordinatesTypeLabel();
|
||||
|
||||
@DefaultMessage("Select Quadrant column!")
|
||||
String attentionSelectQuadrantColumn();
|
||||
|
||||
@DefaultMessage("Select valid geospatial coordinates type!")
|
||||
String selectValidGeospatialCoordinatesType();
|
||||
|
||||
@DefaultMessage("Invalid Geospatial Coordinates Type!")
|
||||
String attentionInvalidGeospatialCoordinateType();
|
||||
|
||||
@DefaultMessage("Error creating geospatial coordinates: ")
|
||||
String errorCreatingGeospatialCoordinatesFixed();
|
||||
|
||||
@DefaultMessage("Error retrieving current tabular resource id!")
|
||||
String errorRetrievingCurrentTabularResourceId();
|
||||
|
||||
@DefaultMessage("Undo not applicable")
|
||||
String attentionUndoNotApplicable();
|
||||
|
||||
@DefaultMessage("Date:")
|
||||
String dateFixed();
|
||||
|
||||
@DefaultMessage("Description:")
|
||||
String descriptionFixed();
|
||||
|
||||
@DefaultMessage("Step")
|
||||
String stepCol();
|
||||
|
||||
@DefaultMessage("Date")
|
||||
String dateCol();
|
||||
|
||||
@DefaultMessage("Undo")
|
||||
String rollBackCol();
|
||||
|
||||
@DefaultMessage("Undo")
|
||||
String btnCellUndoTitle();
|
||||
|
||||
@DefaultMessage("Empty")
|
||||
String gridHistoryEmptyText();
|
||||
|
||||
@DefaultMessage("Error retrieving history!")
|
||||
String errorRetrievingHistory();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
|
@ -10,8 +10,10 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpire
|
|||
import org.gcube.portlets.user.td.gwtservice.shared.geometry.GeometryCreatePointSession;
|
||||
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog;
|
||||
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.TableWidgetMessages;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.resources.ResourceBundle;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.CommonMessages;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType;
|
||||
|
@ -44,7 +46,6 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
|
|||
import com.sencha.gxt.widget.core.client.form.ComboBox;
|
||||
import com.sencha.gxt.widget.core.client.form.FieldLabel;
|
||||
import com.sencha.gxt.widget.core.client.form.TextField;
|
||||
import com.sencha.gxt.widget.core.client.info.Info;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -64,12 +65,14 @@ public class GeometryCreatePointPanel extends FramedPanel implements
|
|||
private ArrayList<ColumnData> columns;
|
||||
private VerticalLayoutContainer vl;
|
||||
|
||||
private TextButton createPointButton;
|
||||
private TextButton btnCreatePoint;
|
||||
private ComboBox<ColumnData> comboLatitude;
|
||||
private ComboBox<ColumnData> comboLongitude;
|
||||
private ListStore<ColumnData> storeComboLatitude;
|
||||
private ListStore<ColumnData> storeComboLongitude;
|
||||
private TextField columnLabelField;
|
||||
private TextField columnField;
|
||||
private CommonMessages msgsCommon;
|
||||
private TableWidgetMessages msgs;
|
||||
|
||||
public GeometryCreatePointPanel(TRId trId, EventBus eventBus) {
|
||||
super();
|
||||
|
@ -78,10 +81,18 @@ public class GeometryCreatePointPanel extends FramedPanel implements
|
|||
this.eventBus = eventBus;
|
||||
this.created = false;
|
||||
forceLayoutOnResize = true;
|
||||
|
||||
initMessages();
|
||||
retrieveColumns();
|
||||
|
||||
}
|
||||
|
||||
protected void initMessages() {
|
||||
msgsCommon = GWT.create(CommonMessages.class);
|
||||
msgs = GWT.create(TableWidgetMessages.class);
|
||||
|
||||
}
|
||||
|
||||
protected void testCreated() {
|
||||
if (created) {
|
||||
updateCombo();
|
||||
|
@ -122,22 +133,6 @@ public class GeometryCreatePointPanel extends FramedPanel implements
|
|||
ColumnDataPropertiesCombo propsColumnData = GWT
|
||||
.create(ColumnDataPropertiesCombo.class);
|
||||
|
||||
// Latitude
|
||||
storeComboLatitude = new ListStore<ColumnData>(propsColumnData.id());
|
||||
storeComboLatitude.addAll(columns);
|
||||
|
||||
comboLatitude = new ComboBox<ColumnData>(storeComboLatitude,
|
||||
propsColumnData.label());
|
||||
Log.trace("Combo ColumnData created");
|
||||
|
||||
addHandlersForComboColumnLatitude(propsColumnData.label());
|
||||
|
||||
comboLatitude.setEmptyText("Select a column...");
|
||||
comboLatitude.setWidth(191);
|
||||
comboLatitude.setTypeAhead(false);
|
||||
comboLatitude.setEditable(false);
|
||||
comboLatitude.setTriggerAction(TriggerAction.ALL);
|
||||
|
||||
// Longitude
|
||||
storeComboLongitude = new ListStore<ColumnData>(propsColumnData.id());
|
||||
storeComboLongitude.addAll(columns);
|
||||
|
@ -148,24 +143,47 @@ public class GeometryCreatePointPanel extends FramedPanel implements
|
|||
|
||||
addHandlersForComboColumnLongitude(propsColumnData.label());
|
||||
|
||||
comboLongitude.setEmptyText("Select a column...");
|
||||
comboLongitude.setEmptyText(msgs.comboLongitudeEmptyMessage());
|
||||
comboLongitude.setWidth(191);
|
||||
comboLongitude.setTypeAhead(false);
|
||||
comboLongitude.setEditable(false);
|
||||
comboLongitude.setTriggerAction(TriggerAction.ALL);
|
||||
|
||||
FieldLabel comboLongitudeLabel=new FieldLabel(comboLongitude, msgs.comboLongitudeLabel());
|
||||
|
||||
|
||||
// Latitude
|
||||
storeComboLatitude = new ListStore<ColumnData>(propsColumnData.id());
|
||||
storeComboLatitude.addAll(columns);
|
||||
|
||||
comboLatitude = new ComboBox<ColumnData>(storeComboLatitude,
|
||||
propsColumnData.label());
|
||||
Log.trace("Combo ColumnData created");
|
||||
|
||||
addHandlersForComboColumnLatitude(propsColumnData.label());
|
||||
|
||||
comboLatitude.setEmptyText(msgs.comboLatitudeEmptyText());
|
||||
comboLatitude.setWidth(191);
|
||||
comboLatitude.setTypeAhead(false);
|
||||
comboLatitude.setEditable(false);
|
||||
comboLatitude.setTriggerAction(TriggerAction.ALL);
|
||||
|
||||
FieldLabel comboLatitudeLabel=new FieldLabel(comboLatitude, msgs.comboLatitudeLabel());
|
||||
|
||||
|
||||
|
||||
// Column Label
|
||||
columnLabelField = new TextField();
|
||||
columnLabelField.setValue("Points");
|
||||
FieldLabel columnLab = new FieldLabel(columnLabelField, "Column Label");
|
||||
columnField = new TextField();
|
||||
columnField.setValue(msgs.columnFieldDefault());
|
||||
FieldLabel columnFieldLabel = new FieldLabel(columnField, msgs.columnFieldLabel());
|
||||
|
||||
// Create
|
||||
createPointButton = new TextButton("Create");
|
||||
createPointButton.setIcon(ResourceBundle.INSTANCE.geometryPoint());
|
||||
createPointButton.setIconAlign(IconAlign.RIGHT);
|
||||
createPointButton.setTitle("Create Point");
|
||||
btnCreatePoint = new TextButton(msgs.btnCreatePointText());
|
||||
btnCreatePoint.setIcon(ResourceBundle.INSTANCE.geometryPoint());
|
||||
btnCreatePoint.setIconAlign(IconAlign.RIGHT);
|
||||
btnCreatePoint.setToolTip(msgs.btnCreatePointToolTip());
|
||||
|
||||
createPointButton.addSelectHandler(new SelectHandler() {
|
||||
btnCreatePoint.addSelectHandler(new SelectHandler() {
|
||||
|
||||
public void onSelect(SelectEvent event) {
|
||||
onGeometryCreatePoint();
|
||||
|
@ -177,14 +195,14 @@ public class GeometryCreatePointPanel extends FramedPanel implements
|
|||
vl.setScrollMode(ScrollMode.AUTO);
|
||||
vl.setAdjustForScroll(true);
|
||||
|
||||
vl.add(new FieldLabel(comboLongitude, "Longitude"),
|
||||
vl.add(comboLongitudeLabel,
|
||||
new VerticalLayoutData(1, -1));
|
||||
vl.add(new FieldLabel(comboLatitude, "Latitude"),
|
||||
vl.add(comboLatitudeLabel,
|
||||
new VerticalLayoutData(1, -1));
|
||||
|
||||
vl.add(columnLab, new VerticalLayoutData(1, -1));
|
||||
vl.add(columnFieldLabel, new VerticalLayoutData(1, -1));
|
||||
|
||||
vl.add(createPointButton, new VerticalLayoutData(-1, -1, new Margins(
|
||||
vl.add(btnCreatePoint, new VerticalLayoutData(-1, -1, new Margins(
|
||||
10, 0, 10, 0)));
|
||||
|
||||
add(vl);
|
||||
|
@ -198,12 +216,6 @@ public class GeometryCreatePointPanel extends FramedPanel implements
|
|||
|
||||
@Override
|
||||
public void onSelection(SelectionEvent<ColumnData> event) {
|
||||
Info.display(
|
||||
"Latitude Selected",
|
||||
"You selected "
|
||||
+ (event.getSelectedItem() == null ? "nothing"
|
||||
: labelProvider.getLabel(event
|
||||
.getSelectedItem()) + "!"));
|
||||
Log.debug("Latitude selected: " + event.getSelectedItem());
|
||||
ColumnData latitude = event.getSelectedItem();
|
||||
updatedLatitude(latitude);
|
||||
|
@ -225,12 +237,6 @@ public class GeometryCreatePointPanel extends FramedPanel implements
|
|||
|
||||
@Override
|
||||
public void onSelection(SelectionEvent<ColumnData> event) {
|
||||
Info.display(
|
||||
"Longitude Selected",
|
||||
"You selected "
|
||||
+ (event.getSelectedItem() == null ? "nothing"
|
||||
: labelProvider.getLabel(event
|
||||
.getSelectedItem()) + "!"));
|
||||
Log.debug("Longitude selected: " + event.getSelectedItem());
|
||||
ColumnData longitude = event.getSelectedItem();
|
||||
updatedLongitude(longitude);
|
||||
|
@ -251,19 +257,19 @@ public class GeometryCreatePointPanel extends FramedPanel implements
|
|||
if (longitude != null) {
|
||||
ColumnData latitude = comboLatitude.getCurrentValue();
|
||||
if (latitude != null) {
|
||||
String columnLab = columnLabelField.getCurrentValue();
|
||||
String columnLab = columnField.getCurrentValue();
|
||||
if (columnLab != null && !columnLab.isEmpty()) {
|
||||
GeometryCreatePointSession geoCreatePointSession = new GeometryCreatePointSession(
|
||||
trId, latitude, longitude, columnLab);
|
||||
callGeometryCreatePoint(geoCreatePointSession);
|
||||
} else {
|
||||
UtilsGXT3.alert("Attention", "Select a column label!");
|
||||
UtilsGXT3.alert(msgsCommon.attention(), msgs.attentionSelectAColumnLabel());
|
||||
}
|
||||
} else {
|
||||
UtilsGXT3.alert("Attention", "Select Latitude!");
|
||||
UtilsGXT3.alert(msgsCommon.attention(), msgs.attentionSelectLatitude());
|
||||
}
|
||||
} else {
|
||||
UtilsGXT3.alert("Attention", "Select Longitude!");
|
||||
UtilsGXT3.alert(msgsCommon.attention(), msgs.attentionSelectLongitude());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -279,19 +285,19 @@ public class GeometryCreatePointPanel extends FramedPanel implements
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
if (caught instanceof TDGWTIsFinalException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Final",
|
||||
UtilsGXT3.alert(msgsCommon.errorFinal(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.debug("Create a Point Error: "
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3
|
||||
.alert("Error Creating a point",
|
||||
"Error creating a point: "
|
||||
.alert(msgsCommon.error(),
|
||||
msgs.errorCreatingAPointFixed()
|
||||
+ caught.getLocalizedMessage());
|
||||
}
|
||||
}
|
||||
|
@ -318,18 +324,18 @@ public class GeometryCreatePointPanel extends FramedPanel implements
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
if (caught instanceof TDGWTIsFinalException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Final",
|
||||
UtilsGXT3.alert(msgsCommon.errorFinal(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.error("load combo failure:"
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error",
|
||||
"Error retrieving columns of tabular resource:"
|
||||
UtilsGXT3.alert(msgsCommon.error(),
|
||||
msgs.errorRetrievingColumsOfTabularResourceFixed()
|
||||
+ trId.getId());
|
||||
}
|
||||
}
|
||||
|
@ -366,8 +372,8 @@ public class GeometryCreatePointPanel extends FramedPanel implements
|
|||
if (columns.size() < 1) {
|
||||
Log.debug("Attention no Integer or Numeric column is present in the tabular resource");
|
||||
UtilsGXT3
|
||||
.alert("Attention",
|
||||
"No Integer or Numeric column is present in the tabular resource!");
|
||||
.alert(msgsCommon.attention(),
|
||||
msgs.attentionNoIntegerOrNumericColumnIsPresent());
|
||||
}
|
||||
testCreated();
|
||||
|
||||
|
|
|
@ -10,8 +10,10 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpire
|
|||
import org.gcube.portlets.user.td.gwtservice.shared.geospatial.GeospatialDownscaleCSquareSession;
|
||||
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog;
|
||||
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.TableWidgetMessages;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.resources.ResourceBundle;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.CommonMessages;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType;
|
||||
|
@ -42,7 +44,6 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent;
|
|||
import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
|
||||
import com.sencha.gxt.widget.core.client.form.ComboBox;
|
||||
import com.sencha.gxt.widget.core.client.form.FieldLabel;
|
||||
import com.sencha.gxt.widget.core.client.info.Info;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -62,7 +63,7 @@ public class DownscaleCSquarePanel extends FramedPanel implements
|
|||
private ArrayList<ColumnData> columns;
|
||||
private VerticalLayoutContainer vl;
|
||||
|
||||
private TextButton downscaleButton;
|
||||
private TextButton btnDownscale;
|
||||
private ComboBox<ColumnData> comboCSquareColumn;
|
||||
private ListStore<ColumnData> storeComboCSquare;
|
||||
|
||||
|
@ -70,6 +71,9 @@ public class DownscaleCSquarePanel extends FramedPanel implements
|
|||
private ListStore<Resolution> storeComboDownscale;
|
||||
private String columnLocalId;
|
||||
|
||||
private CommonMessages msgsCommon;
|
||||
private TableWidgetMessages msgs;
|
||||
|
||||
public DownscaleCSquarePanel(TRId trId, String columnLocalId,
|
||||
EventBus eventBus) {
|
||||
super();
|
||||
|
@ -78,10 +82,17 @@ public class DownscaleCSquarePanel extends FramedPanel implements
|
|||
this.eventBus = eventBus;
|
||||
this.created = false;
|
||||
forceLayoutOnResize = true;
|
||||
initMessages();
|
||||
retrieveColumns();
|
||||
|
||||
}
|
||||
|
||||
protected void initMessages() {
|
||||
msgsCommon = GWT.create(CommonMessages.class);
|
||||
msgs = GWT.create(TableWidgetMessages.class);
|
||||
|
||||
}
|
||||
|
||||
protected void testCreated() {
|
||||
if (created) {
|
||||
updateCombo();
|
||||
|
@ -134,12 +145,14 @@ public class DownscaleCSquarePanel extends FramedPanel implements
|
|||
|
||||
addHandlersForComboCSquare(propsColumnData.label());
|
||||
|
||||
comboCSquareColumn.setEmptyText("Select a column...");
|
||||
comboCSquareColumn.setEmptyText(msgs.comboCSquareColumnEmptyText());
|
||||
comboCSquareColumn.setWidth(191);
|
||||
comboCSquareColumn.setTypeAhead(false);
|
||||
comboCSquareColumn.setEditable(false);
|
||||
comboCSquareColumn.setTriggerAction(TriggerAction.ALL);
|
||||
|
||||
FieldLabel comboCSquareColumnLabel=new FieldLabel(comboCSquareColumn, msgs.comboCSquareColumnLabel());
|
||||
|
||||
// Downscale combo
|
||||
ResolutionPropertiesCombo propsDownscale = GWT
|
||||
.create(ResolutionPropertiesCombo.class);
|
||||
|
@ -154,21 +167,21 @@ public class DownscaleCSquarePanel extends FramedPanel implements
|
|||
|
||||
addHandlersForComboDownscale(propsDownscale.value());
|
||||
|
||||
comboDownscale.setEmptyText("Select a resolution...");
|
||||
comboDownscale.setEmptyText(msgs.comboDownscaleEmptyText());
|
||||
comboDownscale.setWidth(191);
|
||||
comboDownscale.setTypeAhead(false);
|
||||
comboDownscale.setEditable(false);
|
||||
comboDownscale.setTriggerAction(TriggerAction.ALL);
|
||||
|
||||
|
||||
FieldLabel comboDownscaleLabel=new FieldLabel(comboDownscale, msgs.comboDownscaleLabel());
|
||||
|
||||
// Create
|
||||
downscaleButton = new TextButton("Downscale");
|
||||
downscaleButton.setIcon(ResourceBundle.INSTANCE.downscaleCSquare());
|
||||
downscaleButton.setIconAlign(IconAlign.RIGHT);
|
||||
downscaleButton.setTitle("Downscale C-Square");
|
||||
btnDownscale = new TextButton(msgs.btnDownscaleText());
|
||||
btnDownscale.setIcon(ResourceBundle.INSTANCE.downscaleCSquare());
|
||||
btnDownscale.setIconAlign(IconAlign.RIGHT);
|
||||
btnDownscale.setToolTip(msgs.btnDownscaleToolTip());
|
||||
|
||||
downscaleButton.addSelectHandler(new SelectHandler() {
|
||||
btnDownscale.addSelectHandler(new SelectHandler() {
|
||||
|
||||
public void onSelect(SelectEvent event) {
|
||||
onGeometryCreatePoint();
|
||||
|
@ -180,12 +193,12 @@ public class DownscaleCSquarePanel extends FramedPanel implements
|
|||
vl.setScrollMode(ScrollMode.AUTO);
|
||||
vl.setAdjustForScroll(true);
|
||||
|
||||
vl.add(new FieldLabel(comboCSquareColumn, "Column"),
|
||||
vl.add(comboCSquareColumnLabel,
|
||||
new VerticalLayoutData(1, -1));
|
||||
vl.add(new FieldLabel(comboDownscale, "Resolution"),
|
||||
vl.add(comboDownscaleLabel,
|
||||
new VerticalLayoutData(1, -1));
|
||||
|
||||
vl.add(downscaleButton, new VerticalLayoutData(-1, -1, new Margins(10,
|
||||
vl.add(btnDownscale, new VerticalLayoutData(-1, -1, new Margins(10,
|
||||
0, 10, 0)));
|
||||
|
||||
add(vl);
|
||||
|
@ -225,13 +238,6 @@ public class DownscaleCSquarePanel extends FramedPanel implements
|
|||
|
||||
@Override
|
||||
public void onSelection(SelectionEvent<ColumnData> event) {
|
||||
Info.display(
|
||||
"Column Selected",
|
||||
"You selected "
|
||||
+ (event.getSelectedItem() == null ? "nothing"
|
||||
: labelProvider.getLabel(event
|
||||
.getSelectedItem())
|
||||
+ "!"));
|
||||
Log.debug("Latitude selected: "
|
||||
+ event.getSelectedItem());
|
||||
ColumnData csquareColumn = event.getSelectedItem();
|
||||
|
@ -254,12 +260,6 @@ public class DownscaleCSquarePanel extends FramedPanel implements
|
|||
|
||||
@Override
|
||||
public void onSelection(SelectionEvent<Resolution> event) {
|
||||
Info.display(
|
||||
"Resolution Selected",
|
||||
"You selected "
|
||||
+ (event.getSelectedItem() == null ? "nothing"
|
||||
: labelProvider.getLabel(event
|
||||
.getSelectedItem()) + "!"));
|
||||
Log.debug("Resolution selected: " + event.getSelectedItem());
|
||||
Resolution resolution = event.getSelectedItem();
|
||||
updatedResolution(resolution);
|
||||
|
@ -285,10 +285,10 @@ public class DownscaleCSquarePanel extends FramedPanel implements
|
|||
callGeospatialDownscaleCSquare(geospatialDownscaleCSquareSession);
|
||||
|
||||
} else {
|
||||
UtilsGXT3.alert("Attention", "Select Resolution!");
|
||||
UtilsGXT3.alert(msgsCommon.attention(), msgs.attentionSelectResolution());
|
||||
}
|
||||
} else {
|
||||
UtilsGXT3.alert("Attention", "Select C-Square column!");
|
||||
UtilsGXT3.alert(msgsCommon.attention(), msgs.attentionSelectCSquareColumn());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -304,18 +304,18 @@ public class DownscaleCSquarePanel extends FramedPanel implements
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
if (caught instanceof TDGWTIsFinalException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Final",
|
||||
UtilsGXT3.alert(msgsCommon.errorFinal(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.debug("Geospatial Downscale C-Square: "
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3
|
||||
.alert("Error Downscale C-Square",
|
||||
.alert(msgsCommon.error(),
|
||||
caught.getLocalizedMessage());
|
||||
}
|
||||
}
|
||||
|
@ -342,18 +342,18 @@ public class DownscaleCSquarePanel extends FramedPanel implements
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
if (caught instanceof TDGWTIsFinalException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Final",
|
||||
UtilsGXT3.alert(msgsCommon.errorFinal(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.error("load combo failure:"
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error",
|
||||
"Error retrieving columns of tabular resource:"
|
||||
UtilsGXT3.alert(msgsCommon.error(),
|
||||
msgs.errorRetrievingColumsOfTabularResourceFixed()
|
||||
+ trId.getId());
|
||||
}
|
||||
}
|
||||
|
@ -379,8 +379,8 @@ public class DownscaleCSquarePanel extends FramedPanel implements
|
|||
if (columns.size() < 1) {
|
||||
Log.debug("Attention no text column is present in the tabular resource. C-Square column is a text column data type!");
|
||||
UtilsGXT3
|
||||
.alert("Attention",
|
||||
"No text column is present in the tabular resource. C-Square is a text column data type!");
|
||||
.alert(msgsCommon.attention(),
|
||||
msgs.attentionNoTextColumnIsPresentCSquareIsTextColumn());
|
||||
}
|
||||
testCreated();
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@ package org.gcube.portlets.user.td.tablewidget.client.geospatial;
|
|||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import org.gcube.portlets.user.td.columnwidget.client.geospatial.GeospatialCoordinatesTypePropertiesCombo;
|
||||
import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataPropertiesCombo;
|
||||
import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
|
||||
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalException;
|
||||
|
@ -10,9 +11,10 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpire
|
|||
import org.gcube.portlets.user.td.gwtservice.shared.geospatial.GeospatialCreateCoordinatesSession;
|
||||
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog;
|
||||
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener;
|
||||
import org.gcube.portlets.user.td.columnwidget.client.geospatial.GeospatialCoordinatesTypePropertiesCombo;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.TableWidgetMessages;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.resources.ResourceBundle;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.CommonMessages;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType;
|
||||
|
@ -53,7 +55,6 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
|
|||
import com.sencha.gxt.widget.core.client.form.ComboBox;
|
||||
import com.sencha.gxt.widget.core.client.form.FieldLabel;
|
||||
import com.sencha.gxt.widget.core.client.form.Radio;
|
||||
import com.sencha.gxt.widget.core.client.info.Info;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -75,7 +76,7 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
private ArrayList<ColumnData> quadrantColumns;
|
||||
private VerticalLayoutContainer vl;
|
||||
|
||||
private TextButton createCoordinatesButton;
|
||||
private TextButton btnCreateCoordinates;
|
||||
private ComboBox<ColumnData> comboLatitude;
|
||||
private ComboBox<ColumnData> comboLongitude;
|
||||
private ComboBox<GeospatialCoordinatesType> comboGsCoordinatesType;
|
||||
|
@ -91,11 +92,15 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
private ComboBox<Resolution> comboResolution;
|
||||
private ListStore<Resolution> storeComboResolution;
|
||||
|
||||
private CommonMessages msgsCommon;
|
||||
private TableWidgetMessages msgs;
|
||||
|
||||
public GeospatialCreateCoordinatesPanel(TRId trId,
|
||||
RequestProperties requestProperties, EventBus eventBus) {
|
||||
super();
|
||||
this.trId = trId;
|
||||
initMessages();
|
||||
|
||||
this.trId = trId;
|
||||
this.gsCoordinatesType = (GeospatialCoordinatesType) requestProperties
|
||||
.getMap().get(RequestPropertiesParameterType.Coordinates);
|
||||
|
||||
|
@ -106,6 +111,12 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
|
||||
}
|
||||
|
||||
protected void initMessages() {
|
||||
msgsCommon = GWT.create(CommonMessages.class);
|
||||
msgs = GWT.create(TableWidgetMessages.class);
|
||||
|
||||
}
|
||||
|
||||
protected void testCreated() {
|
||||
if (created) {
|
||||
updateCombo();
|
||||
|
@ -163,7 +174,7 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
|
||||
addHandlersForComboColumnLatitude(propsColumnData.label());
|
||||
|
||||
comboLatitude.setEmptyText("Select a column...");
|
||||
comboLatitude.setEmptyText(msgs.comboLatitudeEmptyText());
|
||||
comboLatitude.setWidth(191);
|
||||
comboLatitude.setTypeAhead(false);
|
||||
comboLatitude.setEditable(false);
|
||||
|
@ -179,7 +190,7 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
|
||||
addHandlersForComboColumnLongitude(propsColumnData.label());
|
||||
|
||||
comboLongitude.setEmptyText("Select a column...");
|
||||
comboLongitude.setEmptyText(msgs.comboLongitudeEmptyMessage());
|
||||
comboLongitude.setWidth(191);
|
||||
comboLongitude.setTypeAhead(false);
|
||||
comboLongitude.setEditable(false);
|
||||
|
@ -201,7 +212,7 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
addHandlersForComboGsCoordinatesType(propsGeospatialCoordinatesType
|
||||
.label());
|
||||
|
||||
comboGsCoordinatesType.setEmptyText("Select a type...");
|
||||
comboGsCoordinatesType.setEmptyText(msgs.comboGsCoordinateTypeEmptyText());
|
||||
comboGsCoordinatesType.setWidth(191);
|
||||
comboGsCoordinatesType.setTypeAhead(false);
|
||||
comboGsCoordinatesType.setEditable(false);
|
||||
|
@ -221,7 +232,7 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
|
||||
addHandlersForComboResolution(propsResolution.value());
|
||||
|
||||
comboResolution.setEmptyText("Select a resolution...");
|
||||
comboResolution.setEmptyText(msgs.comboResolutionEmptyText());
|
||||
comboResolution.setValue(ResolutionStore
|
||||
.getStoreCSquareResolutionDefault());
|
||||
comboResolution.setWidth(191);
|
||||
|
@ -229,16 +240,16 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
comboResolution.setEditable(false);
|
||||
comboResolution.setTriggerAction(TriggerAction.ALL);
|
||||
|
||||
FieldLabel resolutionLabel = new FieldLabel(comboResolution,
|
||||
"Resolution");
|
||||
FieldLabel comboResolutionLabel = new FieldLabel(comboResolution,
|
||||
msgs.comboResolutionLabel());
|
||||
|
||||
// Has Quadrant
|
||||
hasQuadrantTrue = new Radio();
|
||||
hasQuadrantTrue.setBoxLabel("True");
|
||||
hasQuadrantTrue.setBoxLabel(msgs.hasQuadrantTrue());
|
||||
hasQuadrantTrue.setValue(true);
|
||||
|
||||
hasQuadrantFalse = new Radio();
|
||||
hasQuadrantFalse.setBoxLabel("False");
|
||||
hasQuadrantFalse.setBoxLabel(msgs.hasQuadrantFalse());
|
||||
|
||||
ToggleGroup hasQuadrantGroup = new ToggleGroup();
|
||||
hasQuadrantGroup.add(hasQuadrantTrue);
|
||||
|
@ -256,8 +267,8 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
|| quadrantColumns.size() < 1) {
|
||||
Log.debug("Attention no Integer column is present in the tabular resource");
|
||||
UtilsGXT3
|
||||
.alert("Attention",
|
||||
"No Integer column is present in the tabular resource!");
|
||||
.alert(msgsCommon.attention(),
|
||||
msgs.attentionNoIntegerColumnIsPresent());
|
||||
|
||||
}
|
||||
comboQuadrantLabel.setVisible(true);
|
||||
|
@ -280,9 +291,9 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
hasQuadrantPanel.add(hasQuadrantTrue);
|
||||
hasQuadrantPanel.add(hasQuadrantFalse);
|
||||
|
||||
hasQuadrantLabel = new FieldLabel(hasQuadrantPanel, "Has Quadrant");
|
||||
hasQuadrantLabel = new FieldLabel(hasQuadrantPanel, msgs.hasQuadrantLabel());
|
||||
hasQuadrantLabel
|
||||
.setToolTip("Select true if you want select quadrant column");
|
||||
.setToolTip(msgs.hasQuadrantToolTip());
|
||||
|
||||
// Quadrant
|
||||
storeComboQuadrant = new ListStore<ColumnData>(propsColumnData.id());
|
||||
|
@ -294,22 +305,22 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
|
||||
addHandlersForComboQuadrant(propsColumnData.label());
|
||||
|
||||
comboQuadrant.setEmptyText("Select a column...");
|
||||
comboQuadrant.setEmptyText(msgs.comboQuadrantEmptyText());
|
||||
comboQuadrant.setWidth(191);
|
||||
comboQuadrant.setTypeAhead(false);
|
||||
comboQuadrant.setEditable(false);
|
||||
comboQuadrant.setTriggerAction(TriggerAction.ALL);
|
||||
|
||||
comboQuadrantLabel = new FieldLabel(comboQuadrant, "Quadrant");
|
||||
comboQuadrantLabel = new FieldLabel(comboQuadrant, msgs.comboQuadrantLabel());
|
||||
|
||||
// Create
|
||||
createCoordinatesButton = new TextButton("Create");
|
||||
createCoordinatesButton.setIcon(ResourceBundle.INSTANCE
|
||||
btnCreateCoordinates = new TextButton(msgs.btnCreateCoordinatesText());
|
||||
btnCreateCoordinates.setIcon(ResourceBundle.INSTANCE
|
||||
.geospatialCoordinates());
|
||||
createCoordinatesButton.setIconAlign(IconAlign.RIGHT);
|
||||
createCoordinatesButton.setTitle("Create Geospatial Coordinates");
|
||||
btnCreateCoordinates.setIconAlign(IconAlign.RIGHT);
|
||||
btnCreateCoordinates.setToolTip(msgs.btnCreateCoordinatesToolTip());
|
||||
|
||||
createCoordinatesButton.addSelectHandler(new SelectHandler() {
|
||||
btnCreateCoordinates.addSelectHandler(new SelectHandler() {
|
||||
|
||||
public void onSelect(SelectEvent event) {
|
||||
onGeospatialCreateCoordinates();
|
||||
|
@ -321,21 +332,21 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
vl.setScrollMode(ScrollMode.AUTO);
|
||||
vl.setAdjustForScroll(true);
|
||||
|
||||
vl.add(new FieldLabel(comboLongitude, "Longitude"),
|
||||
vl.add(new FieldLabel(comboLongitude, msgs.comboLongitudeLabel()),
|
||||
new VerticalLayoutData(1, -1));
|
||||
vl.add(new FieldLabel(comboLatitude, "Latitude"),
|
||||
vl.add(new FieldLabel(comboLatitude, msgs.comboLatitudeLabel()),
|
||||
new VerticalLayoutData(1, -1));
|
||||
|
||||
vl.add(new FieldLabel(comboGsCoordinatesType, "Type"),
|
||||
vl.add(new FieldLabel(comboGsCoordinatesType, msgs.comboGsCoordinatesTypeLabel()),
|
||||
new VerticalLayoutData(1, -1));
|
||||
|
||||
vl.add(resolutionLabel, new VerticalLayoutData(1, -1));
|
||||
vl.add(comboResolutionLabel, new VerticalLayoutData(1, -1));
|
||||
|
||||
vl.add(hasQuadrantLabel, new VerticalLayoutData(-1, -1));
|
||||
|
||||
vl.add(comboQuadrantLabel, new VerticalLayoutData(1, -1));
|
||||
|
||||
vl.add(createCoordinatesButton, new VerticalLayoutData(-1, -1,
|
||||
vl.add(btnCreateCoordinates, new VerticalLayoutData(-1, -1,
|
||||
new Margins(10, 0, 10, 0)));
|
||||
|
||||
add(vl);
|
||||
|
@ -350,12 +361,6 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
|
||||
@Override
|
||||
public void onSelection(SelectionEvent<Resolution> event) {
|
||||
Info.display(
|
||||
"Resolution Selected",
|
||||
"You selected "
|
||||
+ (event.getSelectedItem() == null ? "nothing"
|
||||
: value.getLabel(event
|
||||
.getSelectedItem()) + "!"));
|
||||
Log.debug("Reolution selected: " + event.getSelectedItem());
|
||||
Resolution resolution = event.getSelectedItem();
|
||||
updatedResolution(resolution);
|
||||
|
@ -376,12 +381,6 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
|
||||
@Override
|
||||
public void onSelection(SelectionEvent<ColumnData> event) {
|
||||
Info.display(
|
||||
"Latitude Selected",
|
||||
"You selected "
|
||||
+ (event.getSelectedItem() == null ? "nothing"
|
||||
: labelProvider.getLabel(event
|
||||
.getSelectedItem()) + "!"));
|
||||
Log.debug("Latitude selected: " + event.getSelectedItem());
|
||||
ColumnData latitude = event.getSelectedItem();
|
||||
updatedLatitude(latitude);
|
||||
|
@ -403,12 +402,6 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
|
||||
@Override
|
||||
public void onSelection(SelectionEvent<ColumnData> event) {
|
||||
Info.display(
|
||||
"Longitude Selected",
|
||||
"You selected "
|
||||
+ (event.getSelectedItem() == null ? "nothing"
|
||||
: labelProvider.getLabel(event
|
||||
.getSelectedItem()) + "!"));
|
||||
Log.debug("Longitude selected: " + event.getSelectedItem());
|
||||
ColumnData longitude = event.getSelectedItem();
|
||||
updatedLongitude(longitude);
|
||||
|
@ -432,13 +425,6 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
@Override
|
||||
public void onSelection(
|
||||
SelectionEvent<GeospatialCoordinatesType> event) {
|
||||
Info.display(
|
||||
"Type Selected",
|
||||
"You selected "
|
||||
+ (event.getSelectedItem() == null ? "nothing"
|
||||
: labelProvider.getLabel(event
|
||||
.getSelectedItem())
|
||||
+ "!"));
|
||||
Log.debug("Type selected: " + event.getSelectedItem());
|
||||
GeospatialCoordinatesType type = event
|
||||
.getSelectedItem();
|
||||
|
@ -470,7 +456,7 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
comboResolution.reset();
|
||||
comboResolution.setValue(ResolutionStore
|
||||
.getStoreCSquareResolutionDefault());
|
||||
createCoordinatesButton.setIcon(ResourceBundle.INSTANCE
|
||||
btnCreateCoordinates.setIcon(ResourceBundle.INSTANCE
|
||||
.geospatialCSquare());
|
||||
|
||||
break;
|
||||
|
@ -495,7 +481,7 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
.getStoreOceanAreaResolutionDefault());
|
||||
hasQuadrantLabel.setVisible(true);
|
||||
comboGsCoordinatesType.setValue(gsCoordinatesType);
|
||||
createCoordinatesButton.setIcon(ResourceBundle.INSTANCE
|
||||
btnCreateCoordinates.setIcon(ResourceBundle.INSTANCE
|
||||
.geospatialOceanArea());
|
||||
break;
|
||||
default:
|
||||
|
@ -509,7 +495,7 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
.getStoreCSquareResolutionDefault());
|
||||
hasQuadrantLabel.setVisible(false);
|
||||
comboQuadrantLabel.setVisible(false);
|
||||
createCoordinatesButton.setIcon(ResourceBundle.INSTANCE
|
||||
btnCreateCoordinates.setIcon(ResourceBundle.INSTANCE
|
||||
.geospatialCoordinates());
|
||||
break;
|
||||
}
|
||||
|
@ -524,12 +510,6 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
|
||||
@Override
|
||||
public void onSelection(SelectionEvent<ColumnData> event) {
|
||||
Info.display(
|
||||
"Quadrant Selected",
|
||||
"You selected "
|
||||
+ (event.getSelectedItem() == null ? "nothing"
|
||||
: labelProvider.getLabel(event
|
||||
.getSelectedItem()) + "!"));
|
||||
Log.debug("Quadrant selected: " + event.getSelectedItem());
|
||||
ColumnData quadrant = event.getSelectedItem();
|
||||
updatedQuadrant(quadrant);
|
||||
|
@ -579,11 +559,12 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
if (quadrant != null) {
|
||||
gsCreateCoordinatesSession = new GeospatialCreateCoordinatesSession(
|
||||
trId, latitude, longitude, type,
|
||||
true, quadrant, resolution.getValue());
|
||||
true, quadrant,
|
||||
resolution.getValue());
|
||||
callGeospatialCreateCoordinates(gsCreateCoordinatesSession);
|
||||
} else {
|
||||
UtilsGXT3.alert("Attention",
|
||||
"Select Quadrant column!");
|
||||
UtilsGXT3.alert(msgsCommon.attention(),
|
||||
msgs.attentionSelectQuadrantColumn());
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -597,25 +578,25 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
break;
|
||||
default:
|
||||
UtilsGXT3
|
||||
.alert("Attention",
|
||||
"Select valid geospatial coordinates type!");
|
||||
.alert(msgsCommon.attention(),
|
||||
msgs.selectValidGeospatialCoordinatesType());
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
} else {
|
||||
UtilsGXT3.alert("Attention",
|
||||
"Invalid Geospatial Coordinates Type!");
|
||||
UtilsGXT3.alert(msgsCommon.attention(),
|
||||
msgs.attentionInvalidGeospatialCoordinateType());
|
||||
}
|
||||
} else {
|
||||
UtilsGXT3.alert("Attention", "Select Resolution!");
|
||||
UtilsGXT3.alert(msgsCommon.attention(), msgs.attentionSelectResolution());
|
||||
}
|
||||
|
||||
} else {
|
||||
UtilsGXT3.alert("Attention", "Select Latitude!");
|
||||
UtilsGXT3.alert(msgsCommon.attention(), msgs.attentionSelectLatitude());
|
||||
}
|
||||
} else {
|
||||
UtilsGXT3.alert("Attention", "Select Longitude!");
|
||||
UtilsGXT3.alert(msgsCommon.attention(), msgs.attentionSelectLongitude());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -631,19 +612,19 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
if (caught instanceof TDGWTIsFinalException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Final",
|
||||
UtilsGXT3.alert(msgsCommon.errorFinal(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.debug("Create Geospatial Coordinates Error: "
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3
|
||||
.alert("Error Creating Geospatial Coordinates",
|
||||
"Error creating geospatial coordinates: "
|
||||
.alert(msgsCommon.error(),
|
||||
msgs.errorCreatingGeospatialCoordinatesFixed()
|
||||
+ caught.getLocalizedMessage());
|
||||
}
|
||||
}
|
||||
|
@ -670,18 +651,18 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
if (caught instanceof TDGWTIsFinalException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Final",
|
||||
UtilsGXT3.alert(msgsCommon.errorFinal(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.error("load combo failure:"
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error",
|
||||
"Error retrieving columns of tabular resource:"
|
||||
UtilsGXT3.alert(msgsCommon.error(),
|
||||
msgs.errorRetrievingColumsOfTabularResourceFixed()
|
||||
+ trId.getId());
|
||||
}
|
||||
}
|
||||
|
@ -722,8 +703,8 @@ public class GeospatialCreateCoordinatesPanel extends FramedPanel implements
|
|||
if (columns.size() < 1) {
|
||||
Log.debug("Attention no Integer or Numeric column is present in the tabular resource");
|
||||
UtilsGXT3
|
||||
.alert("Attention",
|
||||
"No Integer or Numeric column is present in the tabular resource!");
|
||||
.alert(msgsCommon.attention(),
|
||||
msgs.attentionNoIntegerOrNumericColumnIsPresent());
|
||||
}
|
||||
testCreated();
|
||||
|
||||
|
|
|
@ -6,7 +6,9 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedExcep
|
|||
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
|
||||
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog;
|
||||
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.TableWidgetMessages;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.CommonMessages;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType;
|
||||
|
@ -16,21 +18,39 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.OperationResult;
|
|||
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
|
||||
|
||||
import com.allen_sauer.gwt.log.client.Log;
|
||||
import com.google.gwt.core.client.GWT;
|
||||
import com.google.gwt.user.client.rpc.AsyncCallback;
|
||||
import com.google.web.bindery.event.shared.EventBus;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author giancarlo
|
||||
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
|
||||
*
|
||||
*/
|
||||
public class HistoryDiscard implements MonitorDialogListener {
|
||||
protected TRId trId;
|
||||
protected EventBus eventBus;
|
||||
private TRId trId;
|
||||
private EventBus eventBus;
|
||||
|
||||
private CommonMessages msgsCommon;
|
||||
private TableWidgetMessages msgs;
|
||||
|
||||
|
||||
public HistoryDiscard(EventBus eventBus) {
|
||||
this.eventBus = eventBus;
|
||||
initMessages();
|
||||
}
|
||||
|
||||
public void discard() {
|
||||
retrieveCurrentTR();
|
||||
}
|
||||
|
||||
protected void initMessages() {
|
||||
msgsCommon = GWT.create(CommonMessages.class);
|
||||
msgs = GWT.create(TableWidgetMessages.class);
|
||||
|
||||
}
|
||||
|
||||
protected void retrieveCurrentTR() {
|
||||
TDGWTServiceAsync.INSTANCE.getCurrentTRId(new AsyncCallback<TRId>() {
|
||||
|
||||
|
@ -41,13 +61,13 @@ public class HistoryDiscard implements MonitorDialogListener {
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.error("Error retrieving trId: "
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error",
|
||||
"Error retrieving current tabular resource id");
|
||||
UtilsGXT3.alert(msgsCommon.error(),
|
||||
msgs.errorRetrievingCurrentTabularResourceId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -72,17 +92,17 @@ public class HistoryDiscard implements MonitorDialogListener {
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
if (caught instanceof TDGWTIsFinalException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Final",
|
||||
UtilsGXT3.alert(msgsCommon.errorFinal(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.error("Error in discard: "
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error in undo",
|
||||
UtilsGXT3.alert(msgsCommon.error(),
|
||||
caught.getLocalizedMessage());
|
||||
}
|
||||
}
|
||||
|
@ -93,7 +113,7 @@ public class HistoryDiscard implements MonitorDialogListener {
|
|||
Log.debug("Discard Session taskId: " + taskId);
|
||||
if (taskId == null) {
|
||||
Log.info("Attention: undo not applicable");
|
||||
UtilsGXT3.info("Attention", "Undo not applicable");
|
||||
UtilsGXT3.info(msgsCommon.error(), msgs.attentionUndoNotApplicable());
|
||||
} else {
|
||||
openMonitorDialog(taskId);
|
||||
}
|
||||
|
|
|
@ -9,13 +9,14 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedExcep
|
|||
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
|
||||
import org.gcube.portlets.user.td.gwtservice.shared.history.OpHistory;
|
||||
import org.gcube.portlets.user.td.gwtservice.shared.history.RollBackSession;
|
||||
import org.gcube.portlets.user.td.gwtservice.shared.tr.TableData;
|
||||
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog;
|
||||
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.TableWidgetMessages;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.custom.ActionButtonCellNoFirst;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.properties.OpHistoryProperties;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.resources.ResourceBundle;
|
||||
import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.CommonMessages;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
|
||||
import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType;
|
||||
|
@ -44,7 +45,6 @@ import com.sencha.gxt.data.shared.loader.ListLoader;
|
|||
import com.sencha.gxt.data.shared.loader.LoadResultListStoreBinding;
|
||||
import com.sencha.gxt.widget.core.client.FramedPanel;
|
||||
import com.sencha.gxt.widget.core.client.container.MarginData;
|
||||
import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
|
||||
import com.sencha.gxt.widget.core.client.event.SelectEvent;
|
||||
import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
|
||||
import com.sencha.gxt.widget.core.client.grid.ColumnConfig;
|
||||
|
@ -59,29 +59,30 @@ import com.sencha.gxt.widget.core.client.grid.RowExpander;
|
|||
*
|
||||
*/
|
||||
public class HistoryPanel extends FramedPanel implements MonitorDialogListener {
|
||||
protected String WIDTH = "298px";
|
||||
protected String HEIGHT = "520px";
|
||||
private static final String WIDTH = "298px";
|
||||
private static final String HEIGHT = "520px";
|
||||
|
||||
protected TRId trId;
|
||||
protected TableData table;
|
||||
protected String headingTitle;
|
||||
protected VerticalLayoutContainer vl;
|
||||
protected EventBus eventBus;
|
||||
private TRId trId;
|
||||
private EventBus eventBus;
|
||||
|
||||
protected ListStore<OpHistory> store;
|
||||
protected ListLoader<ListLoadConfig, ListLoadResult<OpHistory>> loader;
|
||||
protected Grid<OpHistory> grid;
|
||||
private ListStore<OpHistory> store;
|
||||
private ListLoader<ListLoadConfig, ListLoadResult<OpHistory>> loader;
|
||||
private Grid<OpHistory> gridHistory;
|
||||
|
||||
protected OpHistory currentOpHistory;
|
||||
protected int currentRowIndex;
|
||||
protected RollBackSession rollBackSession;
|
||||
private OpHistory currentOpHistory;
|
||||
private int currentRowIndex;
|
||||
private RollBackSession rollBackSession;
|
||||
|
||||
private boolean drawed = false;
|
||||
|
||||
private CommonMessages msgsCommon;
|
||||
private TableWidgetMessages msgs;
|
||||
|
||||
public HistoryPanel(EventBus eventBus) {
|
||||
super();
|
||||
this.eventBus = eventBus;
|
||||
forceLayoutOnResize = true;
|
||||
initMessages();
|
||||
retrieveCurrentTR();
|
||||
}
|
||||
|
||||
|
@ -90,9 +91,16 @@ public class HistoryPanel extends FramedPanel implements MonitorDialogListener {
|
|||
this.trId = trId;
|
||||
this.eventBus = eventBus;
|
||||
forceLayoutOnResize = true;
|
||||
initMessages();
|
||||
draw();
|
||||
}
|
||||
|
||||
protected void initMessages() {
|
||||
msgsCommon = GWT.create(CommonMessages.class);
|
||||
msgs = GWT.create(TableWidgetMessages.class);
|
||||
|
||||
}
|
||||
|
||||
protected void draw() {
|
||||
drawed = true;
|
||||
init();
|
||||
|
@ -117,18 +125,23 @@ public class HistoryPanel extends FramedPanel implements MonitorDialogListener {
|
|||
@Override
|
||||
public void render(Context context, OpHistory value,
|
||||
SafeHtmlBuilder sb) {
|
||||
sb.appendHtmlConstant("<p style='margin: 5px 5px 10px'><b>Date:</b>"
|
||||
+ SafeHtmlUtils.htmlEscape(value.getDate()) + "</p>");
|
||||
sb.appendHtmlConstant("<p style='margin: 5px 5px 10px'><b>Description:</b>"
|
||||
sb.appendHtmlConstant("<p style='margin: 5px 5px 10px'><b>"
|
||||
+ msgs.dateFixed()
|
||||
+ "</b>"
|
||||
+ SafeHtmlUtils.htmlEscape(value.getDate())
|
||||
+ "</p>");
|
||||
sb.appendHtmlConstant("<p style='margin: 5px 5px 10px'><b>"
|
||||
+ msgs.descriptionFixed()
|
||||
+ "</b>"
|
||||
+ SafeHtmlUtils.htmlEscape(value
|
||||
.getDescription()) + "</p>");
|
||||
}
|
||||
});
|
||||
|
||||
ColumnConfig<OpHistory, String> nameCol = new ColumnConfig<OpHistory, String>(
|
||||
props.name(), 132, "Step");
|
||||
ColumnConfig<OpHistory, String> stepCol = new ColumnConfig<OpHistory, String>(
|
||||
props.name(), 132, msgs.stepCol());
|
||||
|
||||
nameCol.setCell(new AbstractCell<String>() {
|
||||
stepCol.setCell(new AbstractCell<String>() {
|
||||
|
||||
@Override
|
||||
public void render(Context context, String value, SafeHtmlBuilder sb) {
|
||||
|
@ -141,15 +154,15 @@ public class HistoryPanel extends FramedPanel implements MonitorDialogListener {
|
|||
});
|
||||
|
||||
ColumnConfig<OpHistory, String> dateCol = new ColumnConfig<OpHistory, String>(
|
||||
props.date(), 106, "Date");
|
||||
props.date(), 106, msgs.dateCol());
|
||||
|
||||
ColumnConfig<OpHistory, String> rollBackColumn = new ColumnConfig<OpHistory, String>(
|
||||
props.date(), 40, "Undo");
|
||||
props.date(), 40, msgs.rollBackCol());
|
||||
|
||||
ActionButtonCellNoFirst button = new ActionButtonCellNoFirst();
|
||||
button.setIcon(ResourceBundle.INSTANCE.undo());
|
||||
button.setTitle("Undo");
|
||||
button.addSelectHandler(new SelectHandler() {
|
||||
ActionButtonCellNoFirst btnCellUndo = new ActionButtonCellNoFirst();
|
||||
btnCellUndo.setIcon(ResourceBundle.INSTANCE.undo());
|
||||
btnCellUndo.setTitle(msgs.btnCellUndoTitle());
|
||||
btnCellUndo.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
|
@ -160,11 +173,11 @@ public class HistoryPanel extends FramedPanel implements MonitorDialogListener {
|
|||
}
|
||||
});
|
||||
|
||||
rollBackColumn.setCell(button);
|
||||
rollBackColumn.setCell(btnCellUndo);
|
||||
|
||||
List<ColumnConfig<OpHistory, ?>> l = new ArrayList<ColumnConfig<OpHistory, ?>>();
|
||||
l.add(expander);
|
||||
l.add(nameCol);
|
||||
l.add(stepCol);
|
||||
l.add(dateCol);
|
||||
l.add(rollBackColumn);
|
||||
|
||||
|
@ -189,7 +202,7 @@ public class HistoryPanel extends FramedPanel implements MonitorDialogListener {
|
|||
store) {
|
||||
});
|
||||
|
||||
grid = new Grid<OpHistory>(store, cm) {
|
||||
gridHistory = new Grid<OpHistory>(store, cm) {
|
||||
@Override
|
||||
protected void onAfterFirstAttach() {
|
||||
super.onAfterFirstAttach();
|
||||
|
@ -202,26 +215,26 @@ public class HistoryPanel extends FramedPanel implements MonitorDialogListener {
|
|||
}
|
||||
};
|
||||
|
||||
grid.setLoader(loader);
|
||||
grid.setSize("200px", "300px");
|
||||
gridHistory.setLoader(loader);
|
||||
gridHistory.setSize("200px", "300px");
|
||||
|
||||
grid.getView().setStripeRows(true);
|
||||
grid.getView().setColumnLines(true);
|
||||
grid.getView().setAutoFill(true);
|
||||
grid.setBorders(false);
|
||||
grid.setLoadMask(true);
|
||||
grid.setColumnReordering(true);
|
||||
grid.setColumnResize(true);
|
||||
grid.getView().setAutoExpandColumn(nameCol);
|
||||
grid.getView().setEmptyText("Empty");
|
||||
expander.initPlugin(grid);
|
||||
gridHistory.getView().setStripeRows(true);
|
||||
gridHistory.getView().setColumnLines(true);
|
||||
gridHistory.getView().setAutoFill(true);
|
||||
gridHistory.setBorders(false);
|
||||
gridHistory.setLoadMask(true);
|
||||
gridHistory.setColumnReordering(true);
|
||||
gridHistory.setColumnResize(true);
|
||||
gridHistory.getView().setAutoExpandColumn(stepCol);
|
||||
gridHistory.getView().setEmptyText(msgs.gridHistoryEmptyText());
|
||||
expander.initPlugin(gridHistory);
|
||||
|
||||
/*
|
||||
* VerticalLayoutContainer v = new VerticalLayoutContainer();
|
||||
* v.setScrollMode(ScrollMode.AUTO); v.add(grid, new
|
||||
* VerticalLayoutData(1, 1, new Margins(0))); v.forceLayout();
|
||||
*/
|
||||
add(grid, new MarginData(0));
|
||||
add(gridHistory, new MarginData(0));
|
||||
|
||||
onResize();
|
||||
}
|
||||
|
@ -248,20 +261,18 @@ public class HistoryPanel extends FramedPanel implements MonitorDialogListener {
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
if (caught instanceof TDGWTIsFinalException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Final",
|
||||
UtilsGXT3.alert(msgsCommon.errorFinal(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.error("Error in rollback: "
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3
|
||||
.alert("Error in rollback",
|
||||
"Error: "
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert(msgsCommon.error(),
|
||||
caught.getLocalizedMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -289,13 +300,13 @@ public class HistoryPanel extends FramedPanel implements MonitorDialogListener {
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.error("Error Retrieving History: "
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error retrieving history",
|
||||
"Error retrieving history");
|
||||
UtilsGXT3.alert(msgsCommon.error(),
|
||||
msgs.errorRetrievingHistory());
|
||||
}
|
||||
}
|
||||
callback.onFailure(caught);
|
||||
|
@ -327,13 +338,13 @@ public class HistoryPanel extends FramedPanel implements MonitorDialogListener {
|
|||
} else {
|
||||
if (caught instanceof TDGWTIsLockedException) {
|
||||
Log.error(caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error Locked",
|
||||
UtilsGXT3.alert(msgsCommon.errorLocked(),
|
||||
caught.getLocalizedMessage());
|
||||
} else {
|
||||
Log.error("Error retrieving current TRId: "
|
||||
+ caught.getLocalizedMessage());
|
||||
UtilsGXT3.alert("Error",
|
||||
"Error retrieving current tabular resource id");
|
||||
UtilsGXT3.alert(msgsCommon.error(),
|
||||
msgs.errorRetrievingCurrentTabularResourceId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -380,7 +391,8 @@ public class HistoryPanel extends FramedPanel implements MonitorDialogListener {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void operationStopped(OperationResult operationResult, String reason, String details) {
|
||||
public void operationStopped(OperationResult operationResult,
|
||||
String reason, String details) {
|
||||
ChangeTableWhy why = ChangeTableWhy.TABLECURATION;
|
||||
ChangeTableRequestEvent changeTableRequestEvent = new ChangeTableRequestEvent(
|
||||
ChangeTableRequestType.ROLLBACK, operationResult.getTrId(), why);
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
<module rename-to='TableWidget'>
|
||||
<!-- Inherit the core Web Toolkit stuff. -->
|
||||
<inherits name='com.google.gwt.user.User' />
|
||||
<!-- <inherits name="com.google.gwt.i18n.I18N" /> -->
|
||||
|
||||
<!-- We need the JUnit module in the main module, -->
|
||||
<!-- otherwise eclipse complains (Google plugin bug?) -->
|
||||
|
@ -10,7 +11,7 @@
|
|||
<!-- Inherit the default GWT style sheet. You can change -->
|
||||
<!-- the theme of your GWT application by uncommenting -->
|
||||
<!-- any one of the following lines. -->
|
||||
<inherits name='com.google.gwt.user.theme.standard.Standard' />
|
||||
<!-- <inherits name='com.google.gwt.user.theme.standard.Standard' /> -->
|
||||
<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
|
||||
<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
|
||||
|
||||
|
@ -24,7 +25,29 @@
|
|||
<inherits name='org.gcube.portlets.user.td.monitorwidget.MonitorWidgetTD' />
|
||||
<inherits name='org.gcube.portlets.user.td.columnwidget.ColumnWidget' />
|
||||
<!-- Specify the app entry point class. -->
|
||||
<!-- <entry-point class='org.gcube.portlets.user.td.sharewidget.client.TableWidgetEntry' /> -->
|
||||
<!-- <entry-point class='org.gcube.portlets.user.td.sharewidget.client.TableWidgetEntry'
|
||||
/> -->
|
||||
|
||||
<!--
|
||||
<set-configuration-property name="locale.cookie"
|
||||
value="TDLangCookie" />
|
||||
<set-configuration-property name="locale.queryparam"
|
||||
value="TDLang" />
|
||||
<set-configuration-property name="locale.usemeta"
|
||||
value="Y" />
|
||||
<set-configuration-property name="locale.useragent"
|
||||
value="Y" />
|
||||
|
||||
<set-configuration-property name="locale.searchorder"
|
||||
value="cookie,queryparam,meta,useragent" />
|
||||
|
||||
<extend-property name="locale" values="en" />
|
||||
<extend-property name="locale" values="it" />
|
||||
<extend-property name="locale" values="es" />
|
||||
<set-property name="locale" value="en, it, es" />
|
||||
<set-property-fallback name="locale" value="en" />
|
||||
-->
|
||||
|
||||
|
||||
<!-- Specify the paths for translatable code -->
|
||||
<source path='client' />
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
sendButton = Send
|
||||
nameField = Enter your name
|
|
@ -1,2 +0,0 @@
|
|||
sendButton = Envoyer
|
||||
nameField = Entrez votre nom
|
|
@ -0,0 +1,16 @@
|
|||
buttonOpenLabel = Open
|
||||
tabResourcesSelectionCardSelectLabel = Select a Tabular Resource
|
||||
buttonSearchLabel = Search
|
||||
buttonReloadLabel = Reload
|
||||
tabResourcesSelectionPanelColumnNameLabel = Name
|
||||
tabResourcesSelectionPanelColumnTypeLabel = Type
|
||||
tabResourcesSelectionPanelColumnTableTypeLabel = Table Type
|
||||
tabResourcesSelectionPanelColumnLockLabel = Lock
|
||||
tabResourcesSelectionPanelColumnAgencyLabel = Agency
|
||||
tabResourcesSelectionPanelColumnOwnerLabel = Owner
|
||||
tabResourcesSelectionPanelColumnCreationDateLabel = Creation Date
|
||||
tabResourcesSelectionPanelContextMenuDelete = Delete
|
||||
tabResourcesSelectionPanelContextMenuInfo = Info
|
||||
attentionTabularResourceIsLockedNoInfoAvailable = Tabular Resource is locked no info available!
|
||||
deleteHead = Delete
|
||||
questionWouldYouLikeToDeleteThisTabularResource = Would you like to delete this tabular resource?
|
|
@ -0,0 +1,16 @@
|
|||
buttonOpenLabel = Abrir
|
||||
tabResourcesSelectionCardSelectLabel = Seleccione una Tabular Resource
|
||||
buttonSearchLabel = Búsqueda
|
||||
buttonReloadLabel = Recargar
|
||||
tabResourcesSelectionPanelColumnNameLabel = Nombre
|
||||
tabResourcesSelectionPanelColumnTypeLabel = Tipo
|
||||
tabResourcesSelectionPanelColumnTableTypeLabel = Tipo Tabla
|
||||
tabResourcesSelectionPanelColumnLockLabel = Lock
|
||||
tabResourcesSelectionPanelColumnAgencyLabel = Agencia
|
||||
tabResourcesSelectionPanelColumnOwnerLabel = Propietario
|
||||
tabResourcesSelectionPanelColumnCreationDateLabel = Fecha Creacion
|
||||
tabResourcesSelectionPanelContextMenuDelete = Borrar
|
||||
tabResourcesSelectionPanelContextMenuInfo = Información
|
||||
attentionTabularResourceIsLockedNoInfoAvailable = La Tabular Resource es locked no hay información disponible!
|
||||
deleteHead = Borrar
|
||||
questionWouldYouLikeToDeleteThisTabularResource = Seguro que quieres eliminar esta Tabular Resource?
|
|
@ -0,0 +1,16 @@
|
|||
buttonOpenLabel = Apri
|
||||
tabResourcesSelectionCardSelectLabel = Seleziona una Tabular Resource
|
||||
buttonSearchLabel = Cerca
|
||||
buttonReloadLabel = Reload
|
||||
tabResourcesSelectionPanelColumnNameLabel = Nome
|
||||
tabResourcesSelectionPanelColumnTypeLabel = Tipo
|
||||
tabResourcesSelectionPanelColumnTableTypeLabel = Tipo Tabella
|
||||
tabResourcesSelectionPanelColumnLockLabel = Lock
|
||||
tabResourcesSelectionPanelColumnAgencyLabel = Agenzia
|
||||
tabResourcesSelectionPanelColumnOwnerLabel = Proprietario
|
||||
tabResourcesSelectionPanelColumnCreationDateLabel = Data Creazione
|
||||
tabResourcesSelectionPanelContextMenuDelete = Elimina
|
||||
tabResourcesSelectionPanelContextMenuInfo = Informazioni
|
||||
attentionTabularResourceIsLockedNoInfoAvailable = La Tabular Resource è locked nessuna informazione disponibile!
|
||||
deleteHead = Elimina
|
||||
questionWouldYouLikeToDeleteThisTabularResource = Sei sicuro di voler eliminare questa Tabular Resource?
|
Loading…
Reference in New Issue