From fce6b7cb4bb8ae0ec44f0ac88cd3aaa3cf3ba05d Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 30 May 2013 14:00:12 +0000 Subject: [PATCH] accountings: changed names of the operations from present to past participle git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@76559 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/server/GWTWorkspaceBuilder.java | 14 +++++++------- .../shared/accounting/GxtAccountingEntryType.java | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) 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 b20f109..4af6908 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 @@ -1667,7 +1667,7 @@ public class GWTWorkspaceBuilder { if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.CREATE)){ af.setOperation(GxtAccountingEntryType.CREATE); - af.setDescription("create by "+user.getName()); + af.setDescription(GxtAccountingEntryType.CREATE.getName() + " by "+user.getName()); } break; @@ -1677,7 +1677,7 @@ public class GWTWorkspaceBuilder { if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.READ)){ af.setOperation(GxtAccountingEntryType.READ); - af.setDescription("read by "+user.getName()); + af.setDescription(GxtAccountingEntryType.READ.getName() + " by "+user.getName()); } break; @@ -1690,7 +1690,7 @@ public class GWTWorkspaceBuilder { AccountingEntryCut cut = (AccountingEntryCut) accountingEntry; - af.setDescription("cut "+cut.getItemName()+" by "+user.getName()); + af.setDescription(GxtAccountingEntryType.CUT.getName()+ " "+cut.getItemName()+" by "+user.getName()); } break; @@ -1703,7 +1703,7 @@ public class GWTWorkspaceBuilder { AccountingEntryPaste paste = (AccountingEntryPaste) accountingEntry; - af.setDescription("paste by "+user.getName() +" from path: "+paste.getFromPath()); + af.setDescription(GxtAccountingEntryType.PASTE.getName() +" by "+user.getName() +" from path: "+paste.getFromPath()); } break; @@ -1716,7 +1716,7 @@ public class GWTWorkspaceBuilder { AccountingEntryRemoval rem = (AccountingEntryRemoval) accountingEntry; - af.setDescription("remove "+rem.getItemName()+" by "+user.getName()); + af.setDescription(GxtAccountingEntryType.REMOVE.getName() + " "+rem.getItemName()+" by "+user.getName()); } break; @@ -1728,7 +1728,7 @@ public class GWTWorkspaceBuilder { AccountingEntryRenaming ren = (AccountingEntryRenaming) accountingEntry; - af.setDescription("rename by "+user.getName() +", last name: "+ren.getOldItemName()); + af.setDescription(GxtAccountingEntryType.RENAME.getName()+ " by "+user.getName() +", last name: "+ren.getOldItemName()); } break; } @@ -1767,7 +1767,7 @@ public class GWTWorkspaceBuilder { af.setDate(toDate(accReader.getDate())); af.setOperation(GxtAccountingEntryType.READ); - af.setDescription("read by "+user.getName()); + af.setDescription(GxtAccountingEntryType.READ.getName() +" by "+user.getName()); listAccFields.add(af); } diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingEntryType.java b/src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingEntryType.java index 59506ae..bb02ffb 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingEntryType.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingEntryType.java @@ -10,17 +10,17 @@ package org.gcube.portlets.user.workspace.shared.accounting; */ public enum GxtAccountingEntryType { - REMOVE("removed", "removed"), + REMOVE("removed", "Removed"), - RENAME("renamed", "renamed"), + RENAME("renamed", "Renamed"), - CREATE("created", "created"), + CREATE("created", "Created"), - PASTE("pasted", "pasted"), + PASTE("pasted", "Pasted"), - CUT("cutted", "cutted"), + CUT("cut", "Cut"), - READ("read", "read"), + READ("read", "Read"), ALLWITHOUTREAD("all", "all");