diff --git a/.classpath b/.classpath index ffaa61f..968534d 100644 --- a/.classpath +++ b/.classpath @@ -22,6 +22,18 @@ + + + + + + + + + + + + @@ -30,7 +42,6 @@ - diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log index b52dc63..5eaade3 100644 --- a/.gwt/.gwt-log +++ b/.gwt/.gwt-log @@ -382,3 +382,131 @@ Compiling... Compilation completed in 0.00 seconds Removing invalidated units Finding entry point classes +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 20% complete (ETR: 13 seconds) + 20% complete (ETR: 13 seconds) + 20% complete (ETR: 13 seconds) + 30% complete (ETR: 13 seconds) + 40% complete (ETR: 9 seconds) + 50% complete (ETR: 7 seconds) + 60% complete (ETR: 5 seconds) + 70% complete (ETR: 4 seconds) + 80% complete (ETR: 2 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 17.20 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 30% complete (ETR: 11 seconds) + 30% complete (ETR: 11 seconds) + 30% complete (ETR: 11 seconds) + 30% complete (ETR: 11 seconds) + 40% complete (ETR: 10 seconds) + 50% complete (ETR: 8 seconds) + 60% complete (ETR: 5 seconds) + 70% complete (ETR: 4 seconds) + 80% complete (ETR: 2 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 27.33 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 40% complete (ETR: 6 seconds) + 40% complete (ETR: 6 seconds) + 40% complete (ETR: 6 seconds) + 40% complete (ETR: 6 seconds) + 40% complete (ETR: 6 seconds) + 50% complete (ETR: 5 seconds) + 60% complete (ETR: 4 seconds) + 70% complete (ETR: 3 seconds) + 80% complete (ETR: 2 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 14.33 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 40% complete (ETR: 7 seconds) + 40% complete (ETR: 7 seconds) + 40% complete (ETR: 7 seconds) + 40% complete (ETR: 7 seconds) + 40% complete (ETR: 7 seconds) + 50% complete (ETR: 6 seconds) + 60% complete (ETR: 4 seconds) + 70% complete (ETR: 3 seconds) + 80% complete (ETR: 2 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 11.53 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 8ad6fb0..6f9777d 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,88 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.5 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index c7160d5..dc69409 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -7,9 +7,6 @@ uses - - uses - uses diff --git a/ColumnWidget.launch b/ColumnWidget.launch new file mode 100644 index 0000000..224ac01 --- /dev/null +++ b/ColumnWidget.launch @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index be7971a..92fa08d 100644 --- a/pom.xml +++ b/pom.xml @@ -14,15 +14,15 @@ org.gcube.portlets.user tabular-data-column-widget 1.0.0-SNAPSHOT - + tabular-data-column-widget tabular-data-column-widget allows to perform operations on the columns of a tabular resource - + https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget - + Giancarlo Panichi @@ -34,7 +34,7 @@ - + ${project.basedir}/distro ${project.build.directory}/${project.build.finalName} @@ -42,7 +42,7 @@ templates distro config - + 2.5.1 - - + org.gcube.portlets.user @@ -123,6 +115,7 @@ [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) + @@ -135,7 +128,7 @@ slf4j-api - + junit @@ -143,8 +136,8 @@ 4.8.1 test - - + + @@ -160,7 +153,7 @@ - + org.apache.maven.plugins @@ -178,7 +171,7 @@ - + org.codehaus.mojo @@ -197,7 +190,7 @@ org.gcube.portlets.user.td.columnwidget.ColumnWidget - + maven-resources-plugin @@ -301,5 +294,4 @@ - war diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml b/src/main/java/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml index 11306c0..c35e6d6 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml @@ -22,7 +22,7 @@ - + diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeDialog.java index 5c1abaf..57c5e59 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeDialog.java @@ -1,5 +1,6 @@ package org.gcube.portlets.user.td.columnwidget.client; +import com.google.web.bindery.event.shared.EventBus; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; @@ -16,15 +17,15 @@ public class ChangeColumnTypeDialog extends Window { protected ColumnData column=null; protected ComboBox combo=null; - public ChangeColumnTypeDialog(TRId trId) { - create(trId, null); + public ChangeColumnTypeDialog(TRId trId, EventBus eventBus) { + create(trId, null, eventBus); } - public ChangeColumnTypeDialog(TRId trId, String columnName) { - create(trId, columnName); + public ChangeColumnTypeDialog(TRId trId, String columnName, EventBus eventBus) { + create(trId, columnName, eventBus); } - protected void create(TRId trId, String columnName) { + protected void create(TRId trId, String columnName, EventBus eventBus) { setWidth(WIDTH); setHeight(HEIGHT); setBodyBorder(false); @@ -34,7 +35,7 @@ public class ChangeColumnTypeDialog extends Window { this.trId=trId; this.columnName=columnName; - ChangeColumnTypePanel changeColumnTypePanel= new ChangeColumnTypePanel(trId, columnName); + ChangeColumnTypePanel changeColumnTypePanel= new ChangeColumnTypePanel(trId, columnName, eventBus); add(changeColumnTypePanel); diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java index b63dbed..b698b3b 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java @@ -24,6 +24,7 @@ import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.web.bindery.event.shared.EventBus; import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction; import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.data.client.loader.RpcProxy; @@ -35,9 +36,12 @@ import com.sencha.gxt.data.shared.loader.ListLoadResultBean; 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.box.AlertMessageBox; import com.sencha.gxt.widget.core.client.button.TextButton; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; +import com.sencha.gxt.widget.core.client.event.HideEvent; +import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; 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; @@ -46,7 +50,7 @@ import com.sencha.gxt.widget.core.client.info.Info; public class ChangeColumnTypePanel extends FramedPanel { protected String WIDTH = "640px"; protected String HEIGHT = "520px"; - + protected EventBus eventBus; protected ChangeColumnTypeDialog parent; protected TextField label = null; protected TRId trId; @@ -61,13 +65,14 @@ public class ChangeColumnTypePanel extends FramedPanel { protected TextField labelColumn; - public ChangeColumnTypePanel(TRId trId, String columnName) { + public ChangeColumnTypePanel(TRId trId, String columnName, EventBus eventBus) { setWidth(WIDTH); setHeight(HEIGHT); setHeaderVisible(false); setBodyBorder(false); this.trId = trId; this.columnName = columnName; + this.eventBus = eventBus; ColumnDataProperties propsColumnData = GWT .create(ColumnDataProperties.class); @@ -75,6 +80,7 @@ public class ChangeColumnTypePanel extends FramedPanel { propsColumnData.id()); Log.trace("StoreCombo created"); + RpcProxy> proxy = new RpcProxy>() { public void load(ListLoadConfig loadConfig, @@ -104,13 +110,13 @@ public class ChangeColumnTypePanel extends FramedPanel { Log.trace("Combo ColumnData created"); addHandlersForEventObservation(comboColumn, propsColumnData.label()); - + comboColumn.setLoader(loader); comboColumn.setEmptyText("Select a column..."); comboColumn.setWidth(150); comboColumn.setTypeAhead(true); comboColumn.setEditable(true); comboColumn.setTriggerAction(TriggerAction.ALL); - comboColumn.setLoader(loader); + // comboColumnTypeCode ColumnTypeCodeProperties propsColumnTypeCode = GWT @@ -310,12 +316,25 @@ public class ChangeColumnTypePanel extends FramedPanel { protected void loadData(ListLoadConfig loadConfig, final AsyncCallback> callback) { + + + + TDGWTServiceAsync.INSTANCE.getColumns(trId, new AsyncCallback>() { public void onFailure(Throwable caught) { Log.error("load combo failure:" + caught.getLocalizedMessage()); + AlertMessageBox d = new AlertMessageBox("Error", "Error retrieving columns of tabular resource:"+trId.getId()); + d.addHideHandler(new HideHandler() { + + public void onHide(HideEvent event) { + + + } + }); + d.show(); callback.onFailure(caught); } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ColumnWidgetEntry.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ColumnWidgetEntry.java index 75e5eb8..63f53f3 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ColumnWidgetEntry.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ColumnWidgetEntry.java @@ -2,20 +2,47 @@ package org.gcube.portlets.user.td.columnwidget.client; -import org.gcube.portlets.user.td.columnwidget.client.combo.DialogCodelistSelection; +import java.util.ArrayList; + +import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; +import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; +import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; +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.user.client.rpc.AsyncCallback; +import com.google.web.bindery.event.shared.EventBus; +import com.google.web.bindery.event.shared.SimpleEventBus; public class ColumnWidgetEntry implements EntryPoint { public void onModuleLoad() { - /*TRId trId=new TRId(); - //For example Tabular Resource 1 and table 1 - trId.setId("1"); - trId.setTableId("1"); + EventBus eventBus= new SimpleEventBus(); + TRId trId=new TRId(); + //For example Tabular Resource 1 and table 1 + trId.setId("7"); + trId.setTableId("402"); + + TDGWTServiceAsync.INSTANCE.getColumns(trId, new AsyncCallback>() { + + public void onFailure(Throwable caught) { + Log.error("Error:"+caught.getMessage()); + caught.printStackTrace(); + } + + public void onSuccess(ArrayList result) { + Log.debug("Result:"+result.size()); + } + + + }); + + + + /* RemoveColumnDialog dialog=new RemoveColumnDialog(trId); dialog.show(); ChangeLabelColumnDialog changeLabel=new ChangeLabelColumnDialog(trId); @@ -23,12 +50,12 @@ public class ColumnWidgetEntry implements EntryPoint { ChangeToAnnotationColumnDialog changeToAnnotation=new ChangeToAnnotationColumnDialog(trId); changeToAnnotation.show(); - ChangeColumnTypeDialog changeColumnType=new ChangeColumnTypeDialog(trId); + ChangeColumnTypeDialog changeColumnType=new ChangeColumnTypeDialog(trId,eventBus); changeColumnType.show(); - */ - DialogCodelistSelection dcs=new DialogCodelistSelection(); - dcs.show(); + /*DialogCodelistSelection dcs=new DialogCodelistSelection(); + dcs.show(); + */ Log.info("Hello!"); } } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataProperties.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataProperties.java index 1df2f7c..a870664 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataProperties.java @@ -15,13 +15,5 @@ public interface ColumnDataProperties extends LabelProvider label(); - /* - ValueProvider name(); - - ValueProvider typeName(); - - ValueProvider typeCode(); - */ - } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataTypeProperties.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataTypeProperties.java index c625c7c..4790411 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataTypeProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataTypeProperties.java @@ -1,23 +1,18 @@ package org.gcube.portlets.user.td.columnwidget.client.properties; - - - - import org.gcube.portlets.user.td.columnwidget.client.store.ColumnDataTypeElement; import com.google.gwt.editor.client.Editor.Path; import com.sencha.gxt.data.shared.LabelProvider; import com.sencha.gxt.data.shared.ModelKeyProvider; import com.sencha.gxt.data.shared.PropertyAccess; - + public interface ColumnDataTypeProperties extends PropertyAccess { - + @Path("id") ModelKeyProvider id(); - + LabelProvider label(); - } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnTypeCodeProperties.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnTypeCodeProperties.java index a6cb64c..f991a28 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnTypeCodeProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnTypeCodeProperties.java @@ -1,21 +1,18 @@ package org.gcube.portlets.user.td.columnwidget.client.properties; - - import org.gcube.portlets.user.td.columnwidget.client.store.ColumnTypeCodeElement; import com.google.gwt.editor.client.Editor.Path; import com.sencha.gxt.data.shared.LabelProvider; import com.sencha.gxt.data.shared.ModelKeyProvider; import com.sencha.gxt.data.shared.PropertyAccess; - + public interface ColumnTypeCodeProperties extends PropertyAccess { - + @Path("id") ModelKeyProvider id(); - + LabelProvider label(); - } diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml index cbc59d7..4513a1d 100644 --- a/src/main/resources/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml @@ -22,7 +22,7 @@ - + diff --git a/src/main/webapp/ColumnWidget.html b/src/main/webapp/ColumnWidget.html index 5b7bd50..695f70b 100644 --- a/src/main/webapp/ColumnWidget.html +++ b/src/main/webapp/ColumnWidget.html @@ -24,7 +24,7 @@ - +