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

removed mark as read method according to HL 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@112333 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2015-03-03 16:13:29 +00:00
parent 3478257d04
commit 500864da5f
6 changed files with 5 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
View File

@ -1091,7 +1091,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
}
}
markItemInTreeAsRead(fileDownloadEvent.getItemIdentifier(), true);
// markItemInTreeAsRead(fileDownloadEvent.getItemIdentifier(), true);
notifySubscriber(fileDownloadEvent);
}
@ -1649,8 +1649,6 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
//ADDED 24/07/2013
if(imagePreviewEvent.getSourceFileModel()!=null){ //FILE CAN NOT LOADED IN TREE
markItemInTreeAsRead(imagePreviewEvent.getSourceFileModel().getIdentifier(), true);
// imagePreviewEvent.getSourceFileModel().setMarkAsRead(true);
notifySubscriber(new FileDownloadEvent(imagePreviewEvent.getSourceFileModel().getIdentifier(), imagePreviewEvent.getSourceFileModel().getName(), FileDownloadEvent.DownloadType.SHOW));
}
@ -2596,15 +2594,12 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
}
}
/*
private void markItemInTreeAsRead(String itemId, boolean bool){
FileModel file = explorerPanel.getAsycTreePanel().getFileModelByIdentifier(itemId);
//MARK AS READ WAS REMOVED FROM HL
// if(file!=null){ //FILE CAN NOT LOADED IN TREE
// file.setMarkAsRead(bool);
// }
}
*/
public AsyncCallback<WindowOpenParameter> downloadHandlerCallback = new AsyncCallback<WindowOpenParameter>() {

13
src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java
View File

@ -62,7 +62,6 @@ public class FileModel extends BaseModelData implements Serializable {
}
private void initDefaultProperties(){
// setMarkAsRead(false);
setShortcutCategory("");
setShareable(true);
}
@ -147,17 +146,7 @@ public class FileModel extends BaseModelData implements Serializable {
public void setOwnerFullName(String fullName){
set(ConstantsExplorer.OWNERFULLNAME, fullName);
}
// public void setMarkAsRead(boolean mark){
// set(ConstantsExplorer.MARKASREAD, mark);
// }
// public boolean isMarkAsRead(){
// return (Boolean) get(ConstantsExplorer.MARKASREAD);
// }
//TODO Accounting
public InfoContactModel getOwner(){
return (InfoContactModel) get(ConstantsExplorer.OWNER);
}

13
src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java
View File

@ -756,19 +756,6 @@ public class ContextMenuTree {
contextMenu.getItemByItemId(WorkspaceOperation.VRE_CHANGE_PERIMISSIONS.getId()).setVisible(false); //VRE CHANGE PERMISSIONS
//COMMENTED AT 29/08/2013
/*
//ACCOUNTINGS
if(selectedItem.isMarkAsRead()){
contextMenu.getItemByItemId(WorkspaceOperation.ACCREAD.getId()).setVisible(true); //ACCOUNTING READ
mnRead.setIcon(Resources.getIconRead());
}
else{
contextMenu.getItemByItemId(WorkspaceOperation.ACCREAD.getId()).setVisible(false); //ACCOUNTING READ
mnRead.setIcon(Resources.getIconNotRead());
}
*/
if(selectedItem.isShared()){ //SHARE LINK ON SHARED ITEM
contextMenu.getItemByItemId(WorkspaceOperation.SHARE_LINK.getId()).setVisible(true);

8
src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java
View File

@ -127,14 +127,6 @@ public class DownloadServlet extends HttpServlet{
return;
}
try{
//ACCOUNTING
item.markAsRead(true);
} catch (InternalErrorException e) {
logger.error("Requested item "+itemId+" has trow an internal error exception",e);
}
} catch (ItemNotFoundException e) {
logger.error("Requested item "+itemId+" not found",e);
// sendError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": Error, no items found");

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

@ -810,10 +810,6 @@ public class GWTWorkspaceBuilder {
FolderModel root = new FolderModel(workspaceRoot.getId(),workspaceRoot.getName(),null, true, workspaceRoot.isShared(), false);
root.setIsRoot(true);
// root.setShareable(true);
// root.setOwner(new InfoContactModel(workspaceRoot.getOwner().getId(), workspaceRoot.getOwner().getPortalLogin(), "name"));
// root.setShared(workspaceRoot.isShared());
// root.setMarkAsRead(workspaceRoot.isMarkedAsRead());
return root;
}
@ -999,7 +995,6 @@ public class GWTWorkspaceBuilder {
// fileModel.setOwner(new InfoContactModel(item.getOwner().getId(), item.getOwner().getPortalLogin(), "name"));
//// fileModel.setShared(item.isShared());
// fileModel.setMarkAsRead(item.isMarkedAsRead());
return fileModel;
@ -1058,10 +1053,7 @@ public class GWTWorkspaceBuilder {
}
//TODO ISSHARED IN SEARCH ITEM IN HL TO RETRIEVE SHARE ON WORKSPACEITEM
//ACCOUNTING
// fileGridModel.setMarkAsRead(item.isMarkedAsRead());
//OWNER
if(item.isShared()){ //IS READ FROM HL ONLY IF THE ITEM IS SHARED
@ -1141,9 +1133,6 @@ public class GWTWorkspaceBuilder {
}
//ACCOUNTING
//REMOVED IS MARK AS READ FROM HL
// fileGridModel.setMarkAsRead(item.isMarkedAsRead());
if(parentFileModel!=null && parentFileModel.isShared()){
fileGridModel.setShared(true);
@ -1168,7 +1157,6 @@ public class GWTWorkspaceBuilder {
fileGridModel.setOwnerFullName(userLogged.getName());
}
//// fileGridModel.setShared(item.isShared());
// fileGridModel.setMarkAsRead(item.isMarkedAsRead());
return fileGridModel;

3
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
View File

@ -1186,9 +1186,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
WorkspaceItem item = workspace.getItem(identifier); //get item from workspace
//ACCOUNTING READ
item.markAsRead(true);
workspaceLogger.trace("item name " + item.getName());
GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();