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

updated history operations 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@79619 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2013-07-24 15:59:20 +00:00
parent c04ef57cfa
commit db9fdde87b
2 changed files with 78 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java
View File

@ -1733,8 +1733,13 @@ public class GWTWorkspaceBuilder {
af.setOperation(GxtAccountingEntryType.CREATE);
// af.setDescription(GxtAccountingEntryType.CREATE.getName() + " by "+user.getName());
String msg = "";
if(create.getItemName()==null || create.getItemName().isEmpty())
msg = GxtAccountingEntryType.CREATE.getId() + " by "+user.getName();
else
msg = create.getItemName() + " " + GxtAccountingEntryType.CREATE.getName() + " by "+user.getName();
af.setDescription("itemName" + " " + GxtAccountingEntryType.CREATE.getName() + " by "+user.getName());
af.setDescription(msg);
}
break;
@ -1748,7 +1753,15 @@ public class GWTWorkspaceBuilder {
af.setOperation(GxtAccountingEntryType.READ);
// af.setDescription(GxtAccountingEntryType.READ.getName() + " by "+user.getName());
af.setDescription("itemName" + " " + GxtAccountingEntryType.READ.getName() + " by "+user.getName());
af.setDescription(read.getItemName() + " " + GxtAccountingEntryType.READ.getName() + " by "+user.getName());
String msg = "";
if(read.getItemName()==null || read.getItemName().isEmpty())
msg = GxtAccountingEntryType.READ.getId() + " by "+user.getName();
else
msg = read.getItemName() + " " + GxtAccountingEntryType.READ.getName() + " by "+user.getName();
af.setDescription(msg);
}
break;
@ -1763,7 +1776,15 @@ public class GWTWorkspaceBuilder {
// af.setDescription(GxtAccountingEntryType.CUT.getName()+ " "+cut.getItemName()+" by "+user.getName());
af.setDescription(cut.getItemName()+" "+GxtAccountingEntryType.CUT.getName() +" by "+user.getName());
String msg = "";
if(cut.getItemName()==null || cut.getItemName().isEmpty())
msg = GxtAccountingEntryType.CUT.getName() +" by "+user.getName();
else
msg = cut.getItemName()+" "+GxtAccountingEntryType.CUT.getName() +" by "+user.getName();
af.setDescription(msg);
// af.setDescription(cut.getItemName()+" "+GxtAccountingEntryType.CUT.getName() +" by "+user.getName());
}
break;
@ -1775,7 +1796,7 @@ public class GWTWorkspaceBuilder {
af.setOperation(GxtAccountingEntryType.PASTE);
AccountingEntryPaste paste = (AccountingEntryPaste) accountingEntry;
af.setDescription(GxtAccountingEntryType.PASTE.getName() + " from "+paste.getFromPath()+" by "+user.getName());
}
@ -1789,8 +1810,16 @@ public class GWTWorkspaceBuilder {
AccountingEntryRemoval rem = (AccountingEntryRemoval) accountingEntry;
String msg = "";
if(rem.getItemName()==null || rem.getItemName().isEmpty())
msg = GxtAccountingEntryType.REMOVE.getName() +" by "+user.getName();
else
msg = rem.getItemName() + " "+GxtAccountingEntryType.REMOVE.getName() +" by "+user.getName();
af.setDescription(msg);
// af.setDescription(GxtAccountingEntryType.REMOVE.getName() + " "+rem.getItemName()+" by "+user.getName());
af.setDescription(rem.getItemName() + " "+GxtAccountingEntryType.REMOVE.getName() +" by "+user.getName());
// af.setDescription(rem.getItemName() + " "+GxtAccountingEntryType.REMOVE.getName() +" by "+user.getName());
}
break;
@ -1802,8 +1831,16 @@ public class GWTWorkspaceBuilder {
AccountingEntryRenaming ren = (AccountingEntryRenaming) accountingEntry;
String msg = "";
if(ren.getOldItemName()==null || ren.getOldItemName().isEmpty())
msg = GxtAccountingEntryType.RENAME.getName()+ " by "+user.getName();
else
msg = ren.getOldItemName() +" "+GxtAccountingEntryType.RENAME.getName()+ " by "+user.getName();
af.setDescription(msg);
// af.setDescription(GxtAccountingEntryType.RENAME.getName()+" from "+ren.getOldItemName() + " by "+user.getName());
af.setDescription(ren.getOldItemName() +" "+GxtAccountingEntryType.RENAME.getName()+ " by "+user.getName());
// af.setDescription(ren.getOldItemName() +" "+GxtAccountingEntryType.RENAME.getName()+ " by "+user.getName());
}
break;
@ -1814,8 +1851,16 @@ public class GWTWorkspaceBuilder {
af.setOperation(GxtAccountingEntryType.ADD);
AccountingEntryAdd acc = (AccountingEntryAdd) accountingEntry;
String msg = "";
if(acc.getItemName()==null || acc.getItemName().isEmpty())
msg = GxtAccountingEntryType.ADD.getName()+ " by "+user.getName();
else
msg = acc.getItemName() + " "+GxtAccountingEntryType.ADD.getName()+ " by "+user.getName();
af.setDescription(msg);
af.setDescription(GxtAccountingEntryType.ADD.getName()+ " " +acc.getItemName() + " by "+user.getName());
// af.setDescription(acc.getItemName() + " "+GxtAccountingEntryType.ADD.getName()+ " by "+user.getName());
}
break;
@ -1826,9 +1871,17 @@ public class GWTWorkspaceBuilder {
af.setOperation(GxtAccountingEntryType.UPDATE);
AccountingEntryUpdate acc = (AccountingEntryUpdate) accountingEntry;
String msg = "";
if(acc.getItemName()==null || acc.getItemName().isEmpty())
msg = GxtAccountingEntryType.UPDATE.getName()+" by "+user.getName();
else
msg = acc.getItemName() +" "+GxtAccountingEntryType.UPDATE.getName()+" by "+user.getName();
af.setDescription(msg);
// af.setDescription(GxtAccountingEntryType.UPDATE.getName()+ " "+acc.getItemName() +" by "+user.getName());
af.setDescription(acc.getItemName() +" "+GxtAccountingEntryType.UPDATE.getName()+" by "+user.getName());
// af.setDescription(acc.getItemName() +" "+GxtAccountingEntryType.UPDATE.getName()+" by "+user.getName());
}
break;
}
@ -1869,7 +1922,15 @@ public class GWTWorkspaceBuilder {
af.setOperation(GxtAccountingEntryType.READ);
// af.setDescription(GxtAccountingEntryType.READ.getName() +" by "+user.getName());
af.setDescription("itemName" + " " + GxtAccountingEntryType.READ.getName() + " by "+user.getName());
String msg = "";
if(accReader.getItemName()==null || accReader.getItemName().isEmpty())
msg = GxtAccountingEntryType.READ.getName() + " by "+user.getName();
else
msg = accReader.getItemName() + " " + GxtAccountingEntryType.READ.getName() + " by "+user.getName();
af.setDescription(msg);
// af.setDescription(accReader.getItemName() + " " + GxtAccountingEntryType.READ.getName() + " by "+user.getName());
listAccFields.add(af);
}

16
src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingEntryType.java
View File

@ -10,21 +10,21 @@ 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("cut", "cut"),
CUT("Cut", "cut"),
READ("read", "read"),
READ("Read", "read"),
ADD("added", "added"),
ADD("Added", "added"),
UPDATE("updated", "updated"),
UPDATE("Updated", "updated"),
ALLWITHOUTREAD("all", "all");