ref #9056:TabMan - Improve resource management in TabMan

https://support.d4science.org/issues/9056

Improve resources management

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-resources-widget@152476 82a268e6-3cf1-43bd-a215-b396298e98cf

.classpath

@@ -42,7 +42,6 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/tabular-data-resources-widget-1.7.0-SNAPSHOT/WEB-INF/classes"/>

ResourcesWidget.launch

@@ -10,7 +10,7 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gdt.eclipse.maven.mavenClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 -port 8888 org.gcube.portlets.user.td.resourceswidget.ResourcesWidget ResourcesWidget.html"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 -port 8888 ResourcesWidget.html"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-resources-widget"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -Dgwt.nowarn.legacy.tools"/>
 </launchConfiguration>

pom.xml

@@ -59,6 +59,32 @@
 		<profile>
 			<id>localRun</id>
 			<dependencies>
+				<!-- PORTAL -->
+				<dependency>
+					<groupId>org.gcube.core</groupId>
+					<artifactId>common-scope-maps</artifactId>
+					<scope>compile</scope>
+				</dependency>
+
+				<dependency>
+					<groupId>org.gcube.common.portal</groupId>
+					<artifactId>portal-manager</artifactId>
+					<scope>runtime</scope>
+				</dependency>
+
+				<dependency>
+					<groupId>org.gcube.dvos</groupId>
+					<artifactId>usermanagement-core</artifactId>
+					<scope>runtime</scope>
+				</dependency>
+
+				<dependency>
+					<groupId>org.gcube.portal</groupId>
+					<artifactId>client-context-library</artifactId>
+					<version>[1.0.0-SNAPSHOT,)</version>
+					<scope>compile</scope>
+				</dependency>
+
 				<dependency>
 					<groupId>org.gcube.common</groupId>
 					<artifactId>home-library</artifactId>
@@ -85,6 +111,21 @@
 					<artifactId>common-scope-maps</artifactId>
 					<scope>compile</scope>
 				</dependency>
+
+				<!-- tabular-data-widget-common-event -->
+				<dependency>
+					<groupId>org.gcube.portlets.user</groupId>
+					<artifactId>tabular-data-widget-common-event</artifactId>
+					<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+				</dependency>
+
+				<!-- tabular-data-gwt-service -->
+				<dependency>
+					<groupId>org.gcube.portlets.user</groupId>
+					<artifactId>tabular-data-gwt-service</artifactId>
+					<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+				</dependency>
+
 			</dependencies>
 		</profile>
 	</profiles>

src/main/java/org/gcube/portlets/user/td/resourceswidget/ResourcesWidget.gwt.xml

@@ -26,8 +26,13 @@
 	<inherits name='org.gcube.portlets.user.td.gwtservice.TDGWTService' />
 	<inherits name='org.gcube.portlets.user.td.wizardwidget.Wizard' />
 	
+	<!--  DataMiner Manager CL  -->
+	<inherits name="org.gcube.data.analysis.dataminermanagercl.dataminermanagercl"/>
+	
+	
 	<inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
 	
+	
 	<!-- Specify the app entry point class. -->
 	<!-- <entry-point class='org.gcube.portlets.user.td.resourceswidget.client.ResourcesWidgetEntry' 
 		/> --> 

src/main/java/org/gcube/portlets/user/td/resourceswidget/client/ResourcesDialog.java

@@ -1,7 +1,9 @@
 package org.gcube.portlets.user.td.resourceswidget.client;
 
+
 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.web.bindery.event.shared.EventBus;
 import com.sencha.gxt.widget.core.client.Window;
@@ -16,17 +18,23 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
  *
  */
 public class ResourcesDialog extends Window {
-	private static final String WIDTH = "320px";
-	private static final String HEIGHT = "540px";
+	private static final String WIDTH = "640px";
+	private static final String HEIGHT = "400px";
 	private ResourcesMessages msgs;
+	private ResourcesPanel resourcesPanel;
 	
-	public ResourcesDialog(TRId trId,  EventBus eventBus) {
+	public ResourcesDialog(EventBus eventBus) {
 		initMessages();
 		initWindow();
-		ResourcesPanel resourcesPanel= new ResourcesPanel(this, trId, eventBus);
+		resourcesPanel= new ResourcesPanel(this, eventBus);
 		add(resourcesPanel);
 	}
 	
+	public void open(TRId trId){
+		Log.debug("Open: "+trId);
+		resourcesPanel.open(trId);
+	}
+	
 	protected void initMessages(){
 		msgs = GWT.create(ResourcesMessages.class);
 	}

src/main/java/org/gcube/portlets/user/td/resourceswidget/client/ResourcesListViewPanel.java

@@ -221,7 +221,7 @@ public class ResourcesListViewPanel extends FramedPanel {
 		create();
 	}
 
-	protected void initMessages() {
+	private void initMessages() {
 		msgs = GWT.create(ResourcesMessages.class);
 		msgsCommon = GWT.create(CommonMessages.class);
 	}
@@ -238,7 +238,7 @@ public class ResourcesListViewPanel extends FramedPanel {
 		}
 	}
 
-	protected void init() {
+	private void init() {
 		forceLayoutOnResize = true;
 		setHeaderVisible(false);
 		setBodyBorder(false);
@@ -248,7 +248,7 @@ public class ResourcesListViewPanel extends FramedPanel {
 
 	}
 
-	protected void create() {
+	private void create() {
 		Log.debug("Create Resource List View");
 		RpcProxy<Object, List<ResourceTDDescriptor>> proxy = new RpcProxy<Object, List<ResourceTDDescriptor>>() {
 			@Override
@@ -411,8 +411,8 @@ public class ResourcesListViewPanel extends FramedPanel {
 		centerData.setMinSize(330);
 		centerData.setMargins(new Margins(0, 5, 0, 0));
 
-		BorderLayoutData eastData = new BorderLayoutData(200);
-		eastData.setMinSize(150);
+		BorderLayoutData eastData = new BorderLayoutData(230);
+		eastData.setMinSize(180);
 
 		BorderLayoutContainer con = new BorderLayoutContainer();
 		con.setCenterWidget(main, centerData);
@@ -421,7 +421,7 @@ public class ResourcesListViewPanel extends FramedPanel {
 		add(con, new MarginData(0));
 	}
 
-	protected SafeHtml renderCellResource(ResourceTDDescriptor descriptor) {
+	private SafeHtml renderCellResource(ResourceTDDescriptor descriptor) {
 		SafeUri thumbnailPath;
 
 		ResourceTDType resourceTDType = descriptor.getResourceType();
@@ -495,7 +495,7 @@ public class ResourcesListViewPanel extends FramedPanel {
 
 	}
 
-	protected void loadData(final AsyncCallback<List<ResourceTDDescriptor>> callback) {
+	private void loadData(final AsyncCallback<List<ResourceTDDescriptor>> callback) {
 		Log.debug("Called loadData");
 		if (trId != null) {
 			TDGWTServiceAsync.INSTANCE.getResourcesTD(trId, new AsyncCallback<ArrayList<ResourceTDDescriptor>>() {
@@ -538,7 +538,7 @@ public class ResourcesListViewPanel extends FramedPanel {
 		}
 	}
 
-	protected void createContextMenu() {
+	private void createContextMenu() {
 		contextMenu = new Menu();
 
 		openItem = new MenuItem();
@@ -642,6 +642,7 @@ public class ResourcesListViewPanel extends FramedPanel {
 					break;
 				case SDMX:
 					contextMenu.clear();
+					contextMenu.add(openItem);
 					contextMenu.add(deleteItem);
 					listView.setContextMenu(contextMenu);
 					break;
@@ -704,7 +705,7 @@ public class ResourcesListViewPanel extends FramedPanel {
 
 	}
 
-	protected void requestSaveResource(ResourceTDDescriptor resourceTDDescriptor, MimeTypeSupport mime) {
+	private void requestSaveResource(ResourceTDDescriptor resourceTDDescriptor, MimeTypeSupport mime) {
 
 		saveResourceSession = new SaveResourceSession();
 		saveResourceSession.setResourceTDDescriptor(resourceTDDescriptor);
@@ -777,7 +778,6 @@ public class ResourcesListViewPanel extends FramedPanel {
 				loader.load();
 				details.setDescriptor(null);
 				forceLayout();
-				// UtilsGXT3.info("Resource", "Resource Removed!");
 			}
 
 		});
@@ -832,7 +832,7 @@ public class ResourcesListViewPanel extends FramedPanel {
 		}
 	}
 
-	protected void requestOpenMap(final ResourceTDDescriptor resourceTDDescriptor) {
+	private void requestOpenMap(final ResourceTDDescriptor resourceTDDescriptor) {
 		ResourceTD resource = resourceTDDescriptor.getResourceTD();
 		if (resource instanceof StringResourceTD) {
 			StringResourceTD stringResourceTD = (StringResourceTD) resource;
@@ -894,37 +894,18 @@ public class ResourcesListViewPanel extends FramedPanel {
 		}
 	}
 
-	protected void requestOpenGenericFile(final ResourceTDDescriptor resourceTDDescriptor) {
+	private void requestOpenGenericFile(final ResourceTDDescriptor resourceTDDescriptor) {
 		ResourceTD resource = resourceTDDescriptor.getResourceTD();
 		if (resource instanceof InternalURITD) {
 
 			InternalURITD genericFileResourceTD = (InternalURITD) resource;
 			String name = resourceTDDescriptor.getName();
 
-			/*
-			 * MimeTypeSupport ext=null; String extentionInName=null;
-			 * if(name!=null){ List<String> nameS=null; try{
-			 * nameS=Arrays.asList(name.split("\\.(?=[^\\.]+$)")); }
-			 * catch(Throwable e) {
-			 * Log.error("No valid name for resource: "+name); }
-			 * 
-			 * if(nameS!=null&&nameS.size()>1){
-			 * extentionInName=nameS.get(nameS.size()-1);
-			 * ext=MimeTypeSupport.getMimeTypeSupportFromExtension
-			 * ("."+extentionInName);
-			 * 
-			 * } } if(ext==null){
-			 */
-
 			MimeTypeSupport mts = MimeTypeSupport.getMimeTypeSupportFromMimeName(genericFileResourceTD.getMimeType());
 			if (mts != null) {
 				name = name + mts.getExtension();
 			}
 
-			/*
-			 * }
-			 */
-
 			if (genericFileResourceTD.getId() != null && !genericFileResourceTD.getId().isEmpty()
 					&& (genericFileResourceTD.getId().startsWith("http:")
 							|| genericFileResourceTD.getId().startsWith("https:"))) {

src/main/java/org/gcube/portlets/user/td/resourceswidget/client/ResourcesMessages.java

@@ -94,9 +94,30 @@ public interface ResourcesMessages extends Messages {
 	@DefaultMessage("Value: ")
 	String valueLabelFixed();
 	
+	@DefaultMessage("Internal Id: ")
+	String internalURIIdLabelFixed();
+	
+	@DefaultMessage("MimeType: ")
+	String internalURIMimeTypeLabelFixed();
+
 	@DefaultMessage("Table Id: ")
 	String tableIdLabelFixed();
 	
+	@DefaultMessage("SDMX Name Id: ")
+	String sdmxNameIdLabelFixed();
+	
+	@DefaultMessage("SDMX URL: ")
+	String sdmxURLLabelFixed();
+	
+	@DefaultMessage("SDMX Version: ")
+	String sdmxVersionLabelFixed();
+	
+	@DefaultMessage("SDMX Agency: ")
+	String sdmxAgencyLabelFixed();
+	
+	@DefaultMessage("SDMX Registry: ")
+	String sdmxRegistryLabelFixed();
+	
 	@DefaultMessage("Name")
 	String nameCol();
 
@@ -122,4 +143,8 @@ public interface ResourcesMessages extends Messages {
 	@AlternateMessage({ "Name", "Name", "CreationDate", "Creation Date" })
 	String resourceSortInfo(@Select ResourcesListViewPanel.ResourcesSortInfo sortItem);
 	
+	@DefaultMessage("Error invalid resource!")
+	String errorInvalidResource();
+
+
 }

src/main/java/org/gcube/portlets/user/td/resourceswidget/client/ResourcesWidgetEntry.java

@@ -37,14 +37,17 @@ public class ResourcesWidgetEntry implements EntryPoint {
 		initMessages();
 		eventBus = new SimpleEventBus();
 		trId = new TRId();
-		// TabularResource: [ id=202, type=STANDARD, lastTable=[ id=4901,
-		// type=Generic]]
-		// TabularResource: [ id=68, type=STANDARD, lastTable=[ id=4884,
-		// type=Dataset]]
 
-		trId.setId("68");
+		// TabResource [trId=TRId [id=381, tabResourceType=Standard,
+		// tableTypeName=Generic, tableId=null, tableType=null,
+		// referenceTargetTableId=null, viewTable=false]
+		//
+		// TabularResource: [ id=355, type=STANDARD, date=2017-03-16 11:52 CET,
+		// lastTable=[ id=6435, type=Codelist]]
+		//
+		trId.setId("355");
 		trId.setTableType("STANDARD");
-		trId.setTableId("4884");
+		trId.setTableId("6435");
 		retrieveUserInfo();
 	}
 
@@ -55,8 +58,9 @@ public class ResourcesWidgetEntry implements EntryPoint {
 
 	private void start() {
 		try {
-			// ResourcesDialog dialog=new ResourcesDialog(trId,eventBus);
-			// dialog.show();
+			ResourcesDialog resourceDialog = new ResourcesDialog(eventBus);
+			resourceDialog.open(trId);
+			resourceDialog.show();
 
 			/*
 			 * resourceTDDescriptor=new ResourceTDDescriptor();
@@ -65,10 +69,12 @@ public class ResourcesWidgetEntry implements EntryPoint {
 			 * eventBus, true); chartDialog.show();
 			 */
 
-			ResourcesListViewDialog resourcesListViewDialog = new ResourcesListViewDialog(
-					eventBus);
-			resourcesListViewDialog.show();
-			resourcesListViewDialog.open(trId);
+			/*
+			 * ResourcesListViewDialog resourcesListViewDialog = new
+			 * ResourcesListViewDialog( eventBus);
+			 * resourcesListViewDialog.show();
+			 * resourcesListViewDialog.open(trId);
+			 */
 		} catch (Throwable e) {
 			Log.error(e.getLocalizedMessage());
 			e.printStackTrace();
@@ -76,16 +82,15 @@ public class ResourcesWidgetEntry implements EntryPoint {
 	}
 
 	protected void retrieveUserInfo() {
+		Log.debug("Retrieve User Info");
 		TDGWTServiceAsync.INSTANCE.hello(new AsyncCallback<UserInfo>() {
 
 			public void onFailure(Throwable caught) {
 				if (caught instanceof TDGWTSessionExpiredException) {
-					eventBus.fireEvent(new SessionExpiredEvent(
-							SessionExpiredType.EXPIREDONSERVER));
+					eventBus.fireEvent(new SessionExpiredEvent(SessionExpiredType.EXPIREDONSERVER));
 				} else {
 
-					Log.error("Error Retrieving User Info: "
-							+ caught.getLocalizedMessage());
+					Log.error("Error Retrieving User Info: " + caught.getLocalizedMessage());
 					UtilsGXT3.alert(msgsCommon.error(), msgs.errorRetrievingUserInfo());
 
 				}
@@ -100,20 +105,16 @@ public class ResourcesWidgetEntry implements EntryPoint {
 	}
 
 	protected void getTabularResource() {
-		TDGWTServiceAsync.INSTANCE.getTabResourceInformation(trId,
-				new AsyncCallback<TabResource>() {
+		TDGWTServiceAsync.INSTANCE.getTabResourceInformation(trId, new AsyncCallback<TabResource>() {
 
 			@Override
 			public void onFailure(Throwable caught) {
 				if (caught instanceof TDGWTSessionExpiredException) {
-							eventBus.fireEvent(new SessionExpiredEvent(
-									SessionExpiredType.EXPIREDONSERVER));
+					eventBus.fireEvent(new SessionExpiredEvent(SessionExpiredType.EXPIREDONSERVER));
 				} else {
 
-							Log.error("Error get TR information: "
-									+ caught.getLocalizedMessage());
-							UtilsGXT3
-									.alert(msgsCommon.error(), msgs.errorGetTRInformation());
+					Log.error("Error get TR information: " + caught.getLocalizedMessage());
+					UtilsGXT3.alert(msgsCommon.error(), msgs.errorGetTRInformation());
 
 				}
 
@@ -130,18 +131,15 @@ public class ResourcesWidgetEntry implements EntryPoint {
 	}
 
 	protected void setCurrentTabularResource() {
-		TDGWTServiceAsync.INSTANCE.setTabResource(tabResource,
-				new AsyncCallback<Void>() {
+		TDGWTServiceAsync.INSTANCE.setTabResource(tabResource, new AsyncCallback<Void>() {
 
 			@Override
 			public void onFailure(Throwable caught) {
 				if (caught instanceof TDGWTSessionExpiredException) {
-							eventBus.fireEvent(new SessionExpiredEvent(
-									SessionExpiredType.EXPIREDONSERVER));
+					eventBus.fireEvent(new SessionExpiredEvent(SessionExpiredType.EXPIREDONSERVER));
 				} else {
 
-							Log.error("Error setting Active TR: "
-									+ caught.getLocalizedMessage());
+					Log.error("Error setting Active TR: " + caught.getLocalizedMessage());
 					UtilsGXT3.alert(msgsCommon.error(), msgs.errorSettingActiveTR());
 
 				}

src/main/java/org/gcube/portlets/user/td/resourceswidget/client/custom/ResourceTDTypeButton.css

@@ -1,3 +1,4 @@
 .image {
-  cursor: pointer; 
+	cursor: default;
+	width: 24px;
 }

src/main/java/org/gcube/portlets/user/td/resourceswidget/client/custom/ResourceTDTypeButtonCellAppearance.java

@@ -54,31 +54,31 @@ public class ResourceTDTypeButtonCellAppearance {
 		ImageResource imageResource;
 		switch (value) {
 		case CHART:
-			imageResource = ResourceBundle.INSTANCE.chart();
+			imageResource = ResourceBundle.INSTANCE.chart24();
 			break;
 		case CODELIST:
-			imageResource = ResourceBundle.INSTANCE.codelist();
+			imageResource = ResourceBundle.INSTANCE.codelist24();
 			break;
 		case CSV:
-			imageResource = ResourceBundle.INSTANCE.csv();
+			imageResource = ResourceBundle.INSTANCE.csv24();
 			break;
 		case GUESSER:
-			imageResource = ResourceBundle.INSTANCE.resources();
+			imageResource = ResourceBundle.INSTANCE.resources24();
 			break;
 		case JSON:
-			imageResource = ResourceBundle.INSTANCE.json();
+			imageResource = ResourceBundle.INSTANCE.json24();
 			break;
 		case MAP:
-			imageResource = ResourceBundle.INSTANCE.gis();
+			imageResource = ResourceBundle.INSTANCE.gis24();
 			break;
 		case SDMX:
-			imageResource = ResourceBundle.INSTANCE.sdmx();
+			imageResource = ResourceBundle.INSTANCE.sdmx24();
 			break;
 		case GENERIC_FILE:
-			imageResource = ResourceBundle.INSTANCE.file();
+			imageResource = ResourceBundle.INSTANCE.file24();
 			break;	
 		case GENERIC_TABLE:
-			imageResource = ResourceBundle.INSTANCE.table();
+			imageResource = ResourceBundle.INSTANCE.table24();
 			break;	
 		default:
 			imageResource = ResourceBundle.INSTANCE.resources();

src/main/java/org/gcube/portlets/user/td/resourceswidget/client/custom/ResourcesActionCell.java

@@ -0,0 +1,49 @@
+package org.gcube.portlets.user.td.resourceswidget.client.custom;
+
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTDDescriptor;
+
+import com.google.gwt.cell.client.Cell;
+import com.google.gwt.cell.client.FieldUpdater;
+import com.google.gwt.cell.client.HasCell;
+import com.sencha.gxt.cell.core.client.TextButtonCell;
+
+/**
+ * 
+ * @author Giancarlo Panichi
+ *
+ */
+public class ResourcesActionCell implements HasCell<ResourceTDDescriptor, String> {
+
+	private TextButtonCell buttonCell;
+	private String name;
+
+	
+	public ResourcesActionCell(String name){
+		buttonCell = new TextButtonCell();
+		this.name=name;
+	}
+	
+	@Override
+	public Cell<String> getCell() {
+		return buttonCell;
+	}
+
+	@Override
+	public FieldUpdater<ResourceTDDescriptor, String> getFieldUpdater() {
+		return new FieldUpdater<ResourceTDDescriptor, String>() {
+			@Override
+			public void update(int index, ResourceTDDescriptor object, String value) {
+			}
+		};
+	}
+
+	@Override
+	public String getValue(ResourceTDDescriptor object) {
+		return name;
+	}
+
+	
+	
+	
+
+}

src/main/java/org/gcube/portlets/user/td/resourceswidget/client/properties/ResourceTDDescriptorProperties.java

@@ -22,6 +22,8 @@ public interface ResourceTDDescriptorProperties extends
 	
 	ValueProvider<ResourceTDDescriptor,String> name();
 	
+	ValueProvider<ResourceTDDescriptor,String> creationDate();
+ 	
 	ValueProvider<ResourceTDDescriptor,ResourceTDType> resourceType();
 
 }

src/main/java/org/gcube/portlets/user/td/resourceswidget/client/resources/ResourceBundle.java

@@ -20,7 +20,7 @@ public interface ResourceBundle extends ClientBundle {
 	
 	
 	@Source("arrow-refresh_16.png")
-	ImageResource refresh();
+	ImageResource refresh16();
 	
 	@Source("arrow-refresh_24.png")
 	ImageResource refresh24();
@@ -62,6 +62,9 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("chart-bar.png")
 	ImageResource chart();
 	
+	@Source("chart-bar_24.png")
+	ImageResource chart24();
+	
 	@Source("chart-bar_32.png")
 	ImageResource chart32();
 	
@@ -74,6 +77,9 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("codelist.png")
 	ImageResource codelist();
 	
+	@Source("codelist_24.png")
+	ImageResource codelist24();
+	
 	@Source("codelist_32.png")
 	ImageResource codelist32();
 	
@@ -86,6 +92,9 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("csv.png")
 	ImageResource csv();
 	
+	@Source("csv_24.png")
+	ImageResource csv24();
+	
 	@Source("csv_32.png")
 	ImageResource csv32();
 	
@@ -98,6 +107,9 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("gis.png")
 	ImageResource gis();
 	
+	@Source("gis_24.png")
+	ImageResource gis24();
+	
 	@Source("gis_32.png")
 	ImageResource gis32();
 	
@@ -110,6 +122,9 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("json.png")
 	ImageResource json();
 	
+	@Source("json_24.png")
+	ImageResource json24();
+	
 	@Source("json_32.png")
 	ImageResource json32();
 	
@@ -122,6 +137,9 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("sdmx.png")
 	ImageResource sdmx();
 	
+	@Source("sdmx_24.png")
+	ImageResource sdmx24();
+	
 	@Source("sdmx_32.png")
 	ImageResource sdmx32();
 	
@@ -131,6 +149,9 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("sdmx_160.png")
 	ImageResource sdmx160();
 	
+	@Source("world_24.png")
+	ImageResource world24();
+	
 	@Source("world_32.png")
 	ImageResource world32();
 	
@@ -143,6 +164,9 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("table.png")
 	ImageResource table();
 	
+	@Source("table_24.png")
+	ImageResource table24();
+	
 	@Source("table_32.png")
 	ImageResource table32();
 	
@@ -155,6 +179,9 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("resources.png")
 	ImageResource resources();
 	
+	@Source("resources_24.png")
+	ImageResource resources24();
+
 	@Source("resources_32.png")
 	ImageResource resources32();
 	
@@ -167,6 +194,9 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("file.png")
 	ImageResource file();
 	
+	@Source("file_24.png")
+	ImageResource file24();
+	
 	@Source("file_32.png")
 	ImageResource file32();
 	
@@ -179,6 +209,9 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("picture.png")
 	ImageResource picture();
 	
+	@Source("picture_24.png")
+	ImageResource picture24();
+	
 	@Source("picture_32.png")
 	ImageResource picture32();
 	

src/main/resources/org/gcube/portlets/user/td/resourceswidget/ResourcesWidget.gwt.xml

@@ -28,31 +28,24 @@
 	<inherits name='org.gcube.portlets.user.td.gwtservice.TDGWTService' />
 	<inherits name='org.gcube.portlets.user.td.wizardwidget.Wizard' />
 
+	<!--  DataMiner Manager CL  -->
+	<inherits name="org.gcube.data.analysis.dataminermanagercl.dataminermanagercl"/>
+	
+	
 	<inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
 
 	<!-- Specify the app entry point class. -->
-    <!-- <entry-point class='org.gcube.portlets.user.td.resourceswidget.client.ResourcesWidgetEntry' 
-		/> -->
+	<!-- <entry-point
+		class='org.gcube.portlets.user.td.resourceswidget.client.ResourcesWidgetEntry' /> -->
 
-	<!-- 
-	<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" />
-	 -->			
+	<!-- <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' />

src/main/resources/org/gcube/portlets/user/td/resourceswidget/client/ResourcesMessages.properties

@@ -26,7 +26,12 @@ creationDateLabelFixed = Creation Date:
 creatorIdLabelFixed = Creator Id: 
 typeLabelFixed = Type: 
 valueLabelFixed = Value: 
+internalURIIdLabelFixed = Internal Id: 
+internalURIMimeTypeLabelFixed = MimeType: 
 tableIdLabelFixed = Table Id: 
+sdmxNameIdLabelFixed = SDMX Name Id: 
+sdmxURLLabelFixed = SDMX URL: 
+sdmxVersionLabelFixed = SDMX Version: 
 nameCol = Name
 typeCol = Type
 gridEmptyText = Empty
@@ -37,3 +42,4 @@ errorSettingActiveTR = Error setting Active TR!
 resourceSortInfo =  
 resourceSortInfo[Name] = Name
 resourceSortInfo[CreationDate] = Creation Date
+errorInvalidResource = Error invalid resource!

src/main/resources/org/gcube/portlets/user/td/resourceswidget/client/ResourcesMessages_es.properties

@@ -26,7 +26,12 @@ creationDateLabelFixed = Fecha Creacion:
 creatorIdLabelFixed = Id de Creacion: 
 typeLabelFixed = Tipo: 
 valueLabelFixed = Valor:  
+internalURIIdLabelFixed = Id Interno: 
+internalURIMimeTypeLabelFixed = MimeType: 
 tableIdLabelFixed = Tabla Id: 
+sdmxNameIdLabelFixed = SDMX Nombre Id: 
+sdmxURLLabelFixed = SDMX URL: 
+sdmxVersionLabelFixed = SDMX Versión: 
 nameCol = Nombre
 typeCol = Tipo
 gridEmptyText = Vacío
@@ -37,4 +42,5 @@ errorSettingActiveTR = Error al poner Tabular Resource Activa!
 resourceSortInfo=  
 resourceSortInfo[Name]= Nombre
 resourceSortInfo[CreationDate]= Fecha Creacion
+errorInvalidResource = Error recurso no válido!
 

src/main/resources/org/gcube/portlets/user/td/resourceswidget/client/ResourcesMessages_it.properties

@@ -26,7 +26,12 @@ creationDateLabelFixed = Data Creazione:
 creatorIdLabelFixed = Id di Creazione: 
 typeLabelFixed = Tipo: 
 valueLabelFixed = Valore:  
+internalURIIdLabelFixed = Id Interno: 
+internalURIMimeTypeLabelFixed = MimeType: 
 tableIdLabelFixed = Tabella Id: 
+sdmxNameIdLabelFixed = SDMX Nome Id: 
+sdmxURLLabelFixed = SDMX URL: 
+sdmxVersionLabelFixed = SDMX Versione: 
 nameCol = Nome
 typeCol = Tipo
 gridEmptyText = Vuoto
@@ -37,4 +42,4 @@ errorSettingActiveTR = Errore settando la Tabular Resource Attiva!
 resourceSortInfo =  
 resourceSortInfo[Name] = Nome
 resourceSortInfo[CreationDate] = Data Creazione
-
+errorInvalidResource = Errore risorsa non valida!

src/main/resources/org/gcube/portlets/user/td/resourceswidget/client/custom/ResourceTDTypeButton.css

@@ -1,3 +1,4 @@
 .image {
-  cursor: pointer; 
+  cursor: default; 
+  width: 24px;
 }