gCubeSystem
/
workspace-explorer
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug on select panel 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-explorer@119486 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2015-10-07 15:10:52 +00:00
parent d7aabc1098
commit d5cb35af15
3 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pom.xml
View File

@ -55,6 +55,13 @@
<dependencies>
<!-- <dependency> -->
<!-- <groupId>xerces</groupId> -->
<!-- <artifactId>xerces</artifactId> -->
<!-- <version>2.4.0</version> -->
<!-- <scope>compile</scope> -->
<!-- </dependency> -->
<!-- Google Web Toolkit (GWT) -->
<dependency>
<groupId>com.google.gwt</groupId>
@ -173,25 +180,25 @@
<goal>test-jar</goal>
</goals>
</execution>
<!-- <execution> -->
<!-- <id>copy-css</id> -->
<!-- <phase>install</phase> -->
<!-- <goals> -->
<!-- <goal>copy-resources</goal> -->
<!-- </goals> -->
<!-- <configuration> -->
<!-- <outputDirectory>target/public</outputDirectory> -->
<!-- <resources> -->
<!-- <resource> -->
<!-- <directory>src/main/java/org/gcube/portlets/user/workspace/public</directory> -->
<!-- <filtering>true</filtering> -->
<!-- <includes> -->
<!-- <include>*.css</include> -->
<!-- </includes> -->
<!-- </resource> -->
<!-- </resources> -->
<!-- </configuration> -->
<!-- </execution> -->
<!-- <execution> -->
<!-- <id>copy-css</id> -->
<!-- <phase>install</phase> -->
<!-- <goals> -->
<!-- <goal>copy-resources</goal> -->
<!-- </goals> -->
<!-- <configuration> -->
<!-- <outputDirectory>target/public</outputDirectory> -->
<!-- <resources> -->
<!-- <resource> -->
<!-- <directory>src/main/java/org/gcube/portlets/user/workspace/public</directory> -->
<!-- <filtering>true</filtering> -->
<!-- <includes> -->
<!-- <include>*.css</include> -->
<!-- </includes> -->
<!-- </resource> -->
<!-- </resources> -->
<!-- </configuration> -->
<!-- </execution> -->
</executions>
</plugin>

12
src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerController.java
View File

@ -3,7 +3,6 @@
*/
package org.gcube.portlets.widgets.wsexplorer.client;
import java.util.ArrayList;
import java.util.List;
import org.gcube.portlets.widgets.wsexplorer.client.event.BreadcrumbClickEvent;
@ -55,8 +54,6 @@ public class WorkspaceExplorerController implements EventHandler {
private WorkspaceExplorer wsExplorer;
private Breadcrumbs breadcrumbs = new Breadcrumbs();
private Navigation navigation = new Navigation();
protected List<ItemType> selectableTypes = new ArrayList<ItemType>();
protected List<ItemType> showableTypes = new ArrayList<ItemType>();
public static final WorkspaceExplorerServiceAsync workspaceNavigatorService = GWT.create(WorkspaceExplorerService.class);
@ -327,8 +324,6 @@ public class WorkspaceExplorerController implements EventHandler {
* @param selectableTypes the new selectable types
*/
public void setSelectableTypes(ItemType[] selectableTypes) {
this.selectableTypes.clear();
if (selectableTypes!=null) for (ItemType type:selectableTypes) this.selectableTypes.add(type);
wsExplorer.setSelectableTypes(selectableTypes);
}
@ -356,8 +351,6 @@ public class WorkspaceExplorerController implements EventHandler {
* @param showableTypes the new showable types
*/
public void setShowableTypes(ItemType[] showableTypes) {
this.showableTypes.clear();
if (showableTypes!=null) for (ItemType type:showableTypes) this.showableTypes.add(type);
wsExplorer.setShowableTypes(showableTypes);
}
@ -368,9 +361,10 @@ public class WorkspaceExplorerController implements EventHandler {
* @return true, if successful
*/
public boolean itemIsSelectable(Item item){
GWT.log("Selectable type: "+wsExplorer.getSelectableTypes());
GWT.log("item: "+item);
if (item!=null){
boolean selectable = selectableTypes.contains(item.getType());
boolean selectable = wsExplorer.getSelectableTypes().contains(item.getType());
return (selectable)?true:false;
}
return false;

2
src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectDialog.java
View File

@ -177,7 +177,7 @@ public class WorkspaceExplorerSelectDialog extends Modal implements HasWorskpace
isSelect = false;
Item item = controller.getWsExplorer().getItemSelected();
boolean isSelectable = controller.itemIsSelectable(item);
GWT.log("Item is selectable? "+isSelectable);
if(item!=null && isSelectable){
isSelect = true;
INSTANCE.hide();