From 5d06d96a4f45283586acf0704503760ecd7cad4e Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 22 Feb 2019 14:18:21 +0000
Subject: [PATCH] Working on  [Feature #13074] integration with
 'openlayer-basic-widgets'

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@177244 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component    |  6 --
 .tern-project                                 | 18 +---
 .../user/workspace/WorkspacePortlet.gwt.xml   |  5 +-
 .../user/workspace/client/AppController.java  |  1 +
 .../user/workspace/WorkspacePortlet.gwt.xml   |  5 +-
 src/main/webapp/WorkspacePortlet.html         | 88 ++++++++++---------
 6 files changed, 58 insertions(+), 65 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 322f647..f880c95 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,12 +5,6 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="workspace-tree-widget-6.25.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget/workspace-tree-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="workspace-sharing-widget-1.9.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-sharing-widget/workspace-sharing-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="workspace"/>
   </wb-module>
diff --git a/.tern-project b/.tern-project
index 61348cc..f53d877 100644
--- a/.tern-project
+++ b/.tern-project
@@ -1,17 +1 @@
-{
-  "plugins": {
-    "aui": {
-      
-    },
-    "liferay": {
-      
-    },
-    "yui": {
-      
-    }
-  },
-  "libs": [
-    "ecma5",
-    "browser"
-  ]
-}
\ No newline at end of file
+{"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"],"ide":{"scriptPaths":[]}}
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml b/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
index c94bdfa..8e423c3 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
+++ b/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
@@ -5,7 +5,7 @@
 
 
 	<!-- To Comment out -->
-<!-- 	<set-property name="user.agent" value="safari" /> -->
+	<!-- <set-property name="user.agent" value="safari" /> -->
 
 	<!-- <inherits name='org.gcube.portlets.widgets.guidedtour.GuidedTour' /> -->
 
@@ -25,6 +25,9 @@
 	<inherits
 		name='org.gcube.portlets.widgets.ckandatapublisherwidget.CKanMetadataPublisher' />
 	<inherits name="org.realityforge.gwt.websockets.WebSockets" />
+
+
+
 	<!-- Specify the app entry point class. -->
 	<entry-point
 		class='org.gcube.portlets.user.workspace.client.WorkspacePortlet' />
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
index 68489b2..bbc02d8 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
@@ -1510,6 +1510,7 @@ public class AppController implements SubscriberInterface {
 
 			@Override
 			public void onSuccess(List<FileGridModel> result) {
+				GWT.log("Update GRID store for parent: "+parent.getName());
 				wsPortlet.getGridGroupContainer().setCurrentFolderView(parent); //SET folder as current view
 				wsPortlet.getGridGroupContainer().unmask();
 				wsPortlet.getGridGroupContainer().updateStore(result);
diff --git a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
index c94bdfa..8e423c3 100644
--- a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
@@ -5,7 +5,7 @@
 
 
 	<!-- To Comment out -->
-<!-- 	<set-property name="user.agent" value="safari" /> -->
+	<!-- <set-property name="user.agent" value="safari" /> -->
 
 	<!-- <inherits name='org.gcube.portlets.widgets.guidedtour.GuidedTour' /> -->
 
@@ -25,6 +25,9 @@
 	<inherits
 		name='org.gcube.portlets.widgets.ckandatapublisherwidget.CKanMetadataPublisher' />
 	<inherits name="org.realityforge.gwt.websockets.WebSockets" />
+
+
+
 	<!-- Specify the app entry point class. -->
 	<entry-point
 		class='org.gcube.portlets.user.workspace.client.WorkspacePortlet' />
diff --git a/src/main/webapp/WorkspacePortlet.html b/src/main/webapp/WorkspacePortlet.html
index 7b5206c..274cc08 100644
--- a/src/main/webapp/WorkspacePortlet.html
+++ b/src/main/webapp/WorkspacePortlet.html
@@ -5,48 +5,56 @@
 <!-- with a "Quirks Mode" doctype is not supported. -->
 
 <html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-    <!--                                                               -->
-    <!-- Consider inlining CSS to reduce the number of requested files -->
-    <!--                                                               -->
-    <link type="text/css" rel="stylesheet" href="workspaceportlet.css">
+<!--                                                               -->
+<!-- Consider inlining CSS to reduce the number of requested files -->
+<!--                                                               -->
+<link type="text/css" rel="stylesheet" href="workspaceportlet.css">
 
-    <!--                                           -->
-    <!-- Any title is fine                         -->
-    <!--                                           -->
-    <title>Web Application Starter Project</title>
-    
-    <!--                                           -->
-    <!-- This script loads your compiled module.   -->
-    <!-- If you add any GWT meta tags, they must   -->
-    <!-- be added before this line.                -->
-    <!--                                           -->
-    <script type="text/javascript" language="javascript" src="workspace/workspace.nocache.js"></script>
-    
-           <!-- GXT -->
-  <link rel='stylesheet' type='text/css' href='resources/css/gxt-all.css' />
-  <script language='javascript' src='resources/flash/swfobject.js'></script>
-  </head>
 
-  <!--                                           -->
-  <!-- The body can have arbitrary html, or      -->
-  <!-- you can leave the body empty if you want  -->
-  <!-- to create a completely dynamic UI.        -->
-  <!--                                           -->
-  <body>
+<!-- They are needed to 'openlayers-widget' -->   
+<link type="text/css" rel="stylesheet" href="CKanMetadataPublisher/css/ol.css">
+<script type="text/javascript" src="workspace/js/ol.js"></script>
 
-    <!-- OPTIONAL: include this if you want history support -->
-    <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe>
-    
-    <!-- RECOMMENDED if your web app will not function without JavaScript enabled -->
-    <noscript>
-      <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif">
-        Your web browser must have JavaScript enabled
-        in order for this application to display correctly.
-      </div>
-    </noscript>
-     <div id="workspaceDiv"></div>
-  </body>
+
+<!--                                           -->
+<!-- Any title is fine                         -->
+<!--                                           -->
+<title>Web Application Starter Project</title>
+
+<!--                                           -->
+<!-- This script loads your compiled module.   -->
+<!-- If you add any GWT meta tags, they must   -->
+<!-- be added before this line.                -->
+<!--                                           -->
+<script type="text/javascript" language="javascript"
+	src="workspace/workspace.nocache.js"></script>
+
+<!-- GXT -->
+<link rel='stylesheet' type='text/css' href='resources/css/gxt-all.css' />
+<script language='javascript' src='resources/flash/swfobject.js'></script>
+</head>
+
+<!--                                           -->
+<!-- The body can have arbitrary html, or      -->
+<!-- you can leave the body empty if you want  -->
+<!-- to create a completely dynamic UI.        -->
+<!--                                           -->
+<body>
+
+	<!-- OPTIONAL: include this if you want history support -->
+	<iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1'
+		style="position: absolute; width: 0; height: 0; border: 0"></iframe>
+
+	<!-- RECOMMENDED if your web app will not function without JavaScript enabled -->
+	<noscript>
+		<div
+			style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif">
+			Your web browser must have JavaScript enabled in order for this
+			application to display correctly.</div>
+	</noscript>
+	<div id="workspaceDiv"></div>
+</body>
 </html>