From a6b996e88ea4482e1698a0c9661913f4306fedc3 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 30 Sep 2016 15:12:02 +0000 Subject: [PATCH] Fixed casting problem on AccountingEntryEnabledPublicAccess and AccountingEntryDisabledPublicAccess git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@132216 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 2 +- .../user/workspace/server/GWTWorkspaceBuilder.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c889ec0..0a376d5 100644 --- a/pom.xml +++ b/pom.xml @@ -167,7 +167,7 @@ org.gcube.common home-library-jcr - [2.5.0-SNAPSHOT,3.5.0-SNAPSHOT) + [2.5.0-SNAPSHOT,3.0.0-SNAPSHOT) provided diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java index abaff54..93af254 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java @@ -32,6 +32,8 @@ import org.gcube.common.homelibrary.home.workspace.accounting.AccountingEntry; import org.gcube.common.homelibrary.home.workspace.accounting.AccountingEntryAdd; import org.gcube.common.homelibrary.home.workspace.accounting.AccountingEntryCreate; import org.gcube.common.homelibrary.home.workspace.accounting.AccountingEntryCut; +import org.gcube.common.homelibrary.home.workspace.accounting.AccountingEntryDisabledPublicAccess; +import org.gcube.common.homelibrary.home.workspace.accounting.AccountingEntryEnabledPublicAccess; import org.gcube.common.homelibrary.home.workspace.accounting.AccountingEntryPaste; import org.gcube.common.homelibrary.home.workspace.accounting.AccountingEntryRead; import org.gcube.common.homelibrary.home.workspace.accounting.AccountingEntryRemoval; @@ -1860,7 +1862,7 @@ public class GWTWorkspaceBuilder { if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.DISABLED_PUBLIC_ACCESS)){ af.setOperation(GxtAccountingEntryType.DISABLED_PUBLIC_ACCESS); - AccountingEntryRestore acc = (AccountingEntryRestore) accountingEntry; + AccountingEntryDisabledPublicAccess acc = (AccountingEntryDisabledPublicAccess) accountingEntry; String msg = acc.getItemName()==null || acc.getItemName().isEmpty()?"":acc.getItemName()+" "; msg+=GxtAccountingEntryType.DISABLED_PUBLIC_ACCESS.getName()+" by "+user.getName(); af.setDescription(msg); @@ -1870,11 +1872,10 @@ public class GWTWorkspaceBuilder { case ENABLED_PUBLIC_ACCESS: - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.ENABLED_PUBLIC_ACCESS)){ af.setOperation(GxtAccountingEntryType.ENABLED_PUBLIC_ACCESS); - AccountingEntryRestore acc = (AccountingEntryRestore) accountingEntry; + AccountingEntryEnabledPublicAccess acc = (AccountingEntryEnabledPublicAccess) accountingEntry; String msg = acc.getItemName()==null || acc.getItemName().isEmpty()?"":acc.getItemName()+" "; msg+=GxtAccountingEntryType.ENABLED_PUBLIC_ACCESS.getName()+" by "+user.getName(); af.setDescription(msg);