gCubeSystem
/
workspace
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed dipendency to guided-tour-widget 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@129965 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante 2016-07-05 16:28:34 +00:00
parent 8f0b744348
commit c528f6b123
3 changed files with 45 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -84,13 +84,6 @@
<version>${gwtVersion}</version> <version>${gwtVersion}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.portlets.widgets</groupId>
<artifactId>guided-tour-widget</artifactId>
<version>[1.4.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>org.gcube.applicationsupportlayer</groupId> <groupId>org.gcube.applicationsupportlayer</groupId>
<artifactId>accesslogger</artifactId> <artifactId>accesslogger</artifactId>

49
src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java
View File

@ -1,13 +1,6 @@
package org.gcube.portlets.user.workspace.client; package org.gcube.portlets.user.workspace.client;
import org.gcube.portlets.user.workspace.client.resources.TourResources;
import org.gcube.portlets.widgets.guidedtour.client.GCUBEGuidedTour;
import org.gcube.portlets.widgets.guidedtour.client.GuidedTourResourceProvider;
import org.gcube.portlets.widgets.guidedtour.resources.client.GuidedTourResource;
import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.RunAsyncCallback;
import com.google.gwt.event.logical.shared.ResizeEvent; import com.google.gwt.event.logical.shared.ResizeEvent;
import com.google.gwt.event.logical.shared.ResizeHandler; import com.google.gwt.event.logical.shared.ResizeHandler;
import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window;
@ -40,7 +33,7 @@ public class WorkspacePortlet implements EntryPoint {
}); });
updateSize(); updateSize();
showGuidedTour(); // showGuidedTour();
} }
/** /**
@ -53,9 +46,9 @@ public class WorkspacePortlet implements EntryPoint {
int leftBorder = workspace.getAbsoluteLeft(); int leftBorder = workspace.getAbsoluteLeft();
int footer = 85; //footer is bottombar + sponsor int footer = 85; //footer is bottombar + sponsor
// int rootHeight = (Window.getClientHeight() - topBorder - 4) ;// - ((footer == null)?0:(footer.getOffsetHeight()-15)); // int rootHeight = (Window.getClientHeight() - topBorder - 4) ;// - ((footer == null)?0:(footer.getOffsetHeight()-15));
// if (rootHeight > 550) // if (rootHeight > 550)
// rootHeight = 550; // rootHeight = 550;
int rootHeight = Window.getClientHeight() - topBorder - 4 - footer;// - ((footer == null)?0:(footer.getOffsetHeight()-15)); int rootHeight = Window.getClientHeight() - topBorder - 4 - footer;// - ((footer == null)?0:(footer.getOffsetHeight()-15));
if (rootHeight < 550) if (rootHeight < 550)
@ -67,21 +60,21 @@ public class WorkspacePortlet implements EntryPoint {
appController.getMainPanel().setWidth(rootWidth); appController.getMainPanel().setWidth(rootWidth);
} }
private void showGuidedTour() { // private void showGuidedTour() {
GWT.runAsync(GCUBEGuidedTour.class, new RunAsyncCallback() { // GWT.runAsync(GCUBEGuidedTour.class, new RunAsyncCallback() {
public void onSuccess() { // public void onSuccess() {
//
GCUBEGuidedTour.showTour(WorkspacePortlet.class.getName(), new GuidedTourResourceProvider() { // GCUBEGuidedTour.showTour(WorkspacePortlet.class.getName(), new GuidedTourResourceProvider() {
@Override // @Override
public GuidedTourResource getResource() { // public GuidedTourResource getResource() {
TourResources resources = GWT.create(TourResources.class); // TourResources resources = GWT.create(TourResources.class);
return resources.quickTour(); // return resources.quickTour();
} // }
}); // });
} // }
public void onFailure(Throwable caught) { // public void onFailure(Throwable caught) {
Window.alert("Could not check show tour"); // Window.alert("Could not check show tour");
} // }
}); // });
} // }
} }

6
src/main/java/org/gcube/portlets/user/workspace/client/resources/TourResources.java
View File

@ -1,12 +1,10 @@
package org.gcube.portlets.user.workspace.client.resources; package org.gcube.portlets.user.workspace.client.resources;
import org.gcube.portlets.widgets.guidedtour.resources.client.GuidedTourResource;
import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ClientBundle;
public interface TourResources extends ClientBundle { public interface TourResources extends ClientBundle {
@Source("GuidedTour.xml") // @Source("GuidedTour.xml")
GuidedTourResource quickTour(); // GuidedTourResource quickTour();
} }