diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/ResourceCellLeft.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/ResourceCellLeft.java index 5d93450..94f632f 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/ResourceCellLeft.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/ResourceCellLeft.java @@ -35,7 +35,7 @@ public class ResourceCellLeft extends AbstractCell{ sb.appendHtmlConstant(""); sb.appendHtmlConstant(""); sb.appendHtmlConstant(""); - sb.appendEscaped(value.getEditableName()); + sb.appendEscaped(value.getName()); sb.appendHtmlConstant(""); sb.appendHtmlConstant(""); sb.appendHtmlConstant(""); diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/TwinColumnSelectionMainPanel.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/TwinColumnSelectionMainPanel.ui.xml index a016c82..499df65 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/TwinColumnSelectionMainPanel.ui.xml +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/TwinColumnSelectionMainPanel.ui.xml @@ -16,21 +16,21 @@ - + - + - + diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/GcubeDialogExtended.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/GcubeDialogExtended.java index 4627f1a..aa74ead 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/GcubeDialogExtended.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/GcubeDialogExtended.java @@ -9,6 +9,8 @@ import com.google.gwt.dom.client.EventTarget; import com.google.gwt.dom.client.Style.Cursor; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.DoubleClickEvent; +import com.google.gwt.event.dom.client.DoubleClickHandler; import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.FlexTable; import com.google.gwt.user.client.ui.HTML; @@ -71,7 +73,7 @@ public class GcubeDialogExtended extends GCubeDialog { * @param captionText * @param text */ - public GcubeDialogExtended(ResourceInfoForm form){ + public GcubeDialogExtended(final ResourceInfoForm form){ // add custom style addStyleName("metadata-popup-panel"); @@ -79,6 +81,12 @@ public class GcubeDialogExtended extends GCubeDialog { // create an anchor to close the dialogbox final Anchor closeAnchor = new Anchor("x"); closeAnchor.setTitle("Close"); + closeAnchor.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + hide(); + } + }); // create a panel that will be put into the caption FlexTable captionLayoutTable = new FlexTable(); @@ -99,13 +107,31 @@ public class GcubeDialogExtended extends GCubeDialog { } } }); - closeAnchor.addClickHandler(new ClickHandler() { + + setWidget(form); + HTML widget = (HTML)getWidget(); + + widget.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { - hide(); + EventTarget target = event.getNativeEvent().getEventTarget(); + Element targetElement = (Element) target.cast(); + if (targetElement == form.getElement()) { + form.fireEvent(event); + } + } + }); + + widget.addDoubleClickHandler(new DoubleClickHandler() { + + @Override + public void onDoubleClick(DoubleClickEvent event) { + EventTarget target = event.getNativeEvent().getEventTarget(); + Element targetElement = (Element) target.cast(); + if (targetElement == form.getElement()) { + form.fireEvent(event); + } } }); - add(form); } - }