Revision 10ff638f

b/src/gr/grnet/pithos/web/client/FileContextMenu.java
203 203 
        }
204 204 
        boolean isFolderTreeSelected = selectedTree.equals(app.getFolderTreeView());
205 205 
        boolean isMysharedSelected = selectedTree.equals(app.getMySharedTreeView());
206 

  		





  
  207
  
    
        Pithos.LOG("FileContextMenu(), selectedFolder=", selectedFolder);


  		





  
  208
  
    
        Pithos.LOG("FileContextMenu(), isFolderTreeSelected=", isFolderTreeSelected);


  		





  
  209
  
    
        Pithos.LOG("FileContextMenu(), isMysharedSelected=", isMysharedSelected);


  		





  
  210
  
    

  		





  206
  211
  
    
        if (selectedFolder != null) {


  		





  207
  212
  
    
		    if (!selectedFolder.isInTrash()) {


  		





  208
  213
  
    
		        if (canWrite && app.getClipboard().hasFiles() && !isMysharedSelected) {


  		





  ......




  230
  235
  
    
		    else {


  		





  231
  236
  
    
				MenuItem restore = new MenuItem("<span>" + AbstractImagePrototype.create(images.versions()).getHTML() + "&nbsp;Restore</span>", true, new RestoreTrashCommand(app, this, selectedFiles));


  		





  232
  237
  
    
				contextMenu.addItem(restore);


  		





  233
  
  
    
		    }


  		





  234
  
  
    
        }


  		





  235
  238
  
    

  		





  236
  
  
    
        if (isFolderTreeSelected || isMysharedSelected) {


  		





  237
  
  
    
			deleteItem = new MenuItem("<span>" + AbstractImagePrototype.create(newImages.delete()).getHTML() + "&nbsp;Delete</span>", true, new DeleteCommand(app, this, selectedFiles, MessagePanel.images));


  		





  238
  
  
    
	        contextMenu.addItem(deleteItem);


  		





  
  239
  
    
                deleteItem = new MenuItem("<span>" + AbstractImagePrototype.create(newImages.delete()).getHTML() + "&nbsp;Delete</span>", true, new DeleteCommand(app, this, selectedFiles, MessagePanel.images));


  		





  
  240
  
    
                contextMenu.addItem(deleteItem);


  		





  
  241
  
    
		    }


  		





  239
  242
  
    
        }


  		





  240
  243
  
    

  		





  241
  244
  
    
        if (selectedFolder != null && !selectedFolder.isInTrash()) {


  		












  

    
      b/src/gr/grnet/pithos/web/client/FolderContextMenu.java
    
  






  119
  119
  
    
			    if (isFolderTreeSelected && !folder.isContainer()) {


  		





  120
  120
  
    
			        MenuItem moveToTrash = new MenuItem("<span id = 'folderContextMenu.moveToTrash'>" + AbstractImagePrototype.create(newImages.emptyTrash()).getHTML() + "&nbsp;Move to Trash</span>", true, new ToTrashCommand(app, this, folder));


  		





  121
  121
  
    
			        contextMenu.addItem(moveToTrash);


  		





  122
  
  
    
			


  		





  123
  
  
    
			        MenuItem delete = new MenuItem("<span id = 'folderContextMenu.delete'>" + AbstractImagePrototype.create(newImages.delete()).getHTML() + "&nbsp;Delete</span>", true, new DeleteCommand(app, this, folder, MessagePanel.images));


  		





  124
  
  
    
			        contextMenu.addItem(delete);


  		





  125
  
  
    
			


  		





  
  122
  
    

  		





  126
  123
  
    
			        contextMenu.addItem(new MenuItem("<span>" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + "&nbsp;Properties</span>", true, new PropertiesCommand(app, this, folder, PropertiesCommand.PROPERTIES)));


  		





  127
  124
  
    
			        contextMenu.addItem(new MenuItem("<span>" + AbstractImagePrototype.create(newImages.sharing()).getHTML() + "&nbsp;Share</span>", true, new PropertiesCommand(app, this, folder, PropertiesCommand.PERMISSIONS)));


  		





  128
  125
  
    
			    }


  		





  ......




  137
  134
  
    
			    }


  		





  138
  135
  
    
        	}


  		





  139
  136
  
    
        }


  		





  140
  
  
    
        else {


  		





  141
  
  
    
        	if (!folder.isTrash()) {


  		





  142
  
  
    
    			MenuItem restore = new MenuItem("<span>" + AbstractImagePrototype.create(images.versions()).getHTML() + "&nbsp;Restore</span>", true, new RestoreTrashCommand(app, this, folder));


  		





  143
  
  
    
    			contextMenu.addItem(restore);


  		





  
  137
  
    
        else if(!folder.isTrash()) {


  		





  
  138
  
    
            MenuItem restore = new MenuItem("<span>" + AbstractImagePrototype.create(images.versions()).getHTML() + "&nbsp;Restore</span>", true, new RestoreTrashCommand(app, this, folder));


  		





  
  139
  
    
            contextMenu.addItem(restore);


  		





  144
  140
  
    

  		





  145
  
  
    
    			MenuItem delete = new MenuItem("<span id = 'folderContextMenu.delete'>" + AbstractImagePrototype.create(newImages.delete()).getHTML() + "&nbsp;Delete</span>", true, new DeleteCommand(app, this, folder, MessagePanel.images));


  		





  146
  
  
    
		        contextMenu.addItem(delete);


  		





  147
  
  
    
        	}


  		





  148
  
  
    
        	else {


  		





  149
  
  
    
    			MenuItem emptyTrash = new MenuItem("<span>" + AbstractImagePrototype.create(images.emptyTrash()).getHTML() + "&nbsp;Empty Trash</span>", true, new PurgeContainerCommand(app, this, folder));


  		





  150
  
  
    
    			contextMenu.addItem(emptyTrash);


  		





  151
  
  
    
        	}


  		





  
  141
  
    
            MenuItem delete = new MenuItem("<span id = 'folderContextMenu.delete'>" + AbstractImagePrototype.create(newImages.delete()).getHTML() + "&nbsp;Delete</span>", true, new DeleteCommand(app, this, folder, MessagePanel.images));


  		





  
  142
  
    
            contextMenu.addItem(delete);


  		





  
  143
  
    
        }


  		





  
  144
  
    
        else {


  		





  
  145
  
    
            MenuItem emptyTrash = new MenuItem("<span>" + AbstractImagePrototype.create(images.emptyTrash()).getHTML() + "&nbsp;Empty Trash</span>", true, new PurgeContainerCommand(app, this, folder));


  		





  
  146
  
    
            contextMenu.addItem(emptyTrash);


  		





  152
  147
  
    
        }


  		





  153
  148
  
    
		add(contextMenu);


  		





  154
  149
  
    
	}


  		












  

    
      b/src/gr/grnet/pithos/web/client/Helpers.java
    
  






  87
  87
  
    

  		





  88
  88
  
    
                final String body = response.getText();


  		





  89
  89
  
    
                if(body != null && body.trim().length() > 0) {


  		





  90
  
  
    
                    final String s = body.trim().substring(0, 120);


  		





  91
  
  
    
                    Pithos.LOG(body, body.length() <= 120 ? "" : " ...");


  		





  
  90
  
    
                    if(Pithos.IsFullResponseBodyLOGEnabled) {


  		





  
  91
  
    
                        Pithos.LOG(body);


  		





  
  92
  
    
                    }


  		





  
  93
  
    
                    else {


  		





  
  94
  
    
                        final int LEN = 120;


  		





  
  95
  
    
                        Pithos.LOG(body.trim().substring(0, LEN), body.length() <= LEN ? "" : " ...");


  		





  
  96
  
    
                    }


  		





  92
  97
  
    
                }


  		





  93
  98
  
    

  		





  94
  99
  
    
                final Header[] headers = response.getHeaders();


  		












  

    
      b/src/gr/grnet/pithos/web/client/Pithos.java
    
  






  80
  80
  
    
public class Pithos implements EntryPoint, ResizeHandler {


  		





  81
  81
  
    
    private static final boolean IsLOGEnabled = true;


  		





  82
  82
  
    
    public static final boolean IsDetailedHTTPLOGEnabled = true;


  		





  
  83
  
    
    public static final boolean IsFullResponseBodyLOGEnabled = true;


  		





  
  84
  
    

  		





  83
  85
  
    
    public static final Set<String> HTTPHeadersToIgnoreInLOG = new HashSet<String>();


  		





  84
  86
  
    
    static {


  		





  85
  87
  
    
        HTTPHeadersToIgnoreInLOG.add(Const.HTTP_HEADER_CONNECTION);


  		





  ......




  87
  89
  
    
        HTTPHeadersToIgnoreInLOG.add(Const.HTTP_HEADER_KEEP_ALIVE);


  		





  88
  90
  
    
        HTTPHeadersToIgnoreInLOG.add(Const.HTTP_HEADER_SERVER);


  		





  89
  91
  
    
        HTTPHeadersToIgnoreInLOG.add(Const.HTTP_HEADER_VARY);


  		





  
  92
  
    
        HTTPHeadersToIgnoreInLOG.add(Const.IF_MODIFIED_SINCE);


  		





  90
  93
  
    
    }


  		





  91
  94
  
    

  		





  92
  95
  
    
    public static final Configuration config = GWT.create(Configuration.class);


  		












  

    
      b/src/gr/grnet/pithos/web/client/ToolsMenu.java
    
  






  152
  152
  
    
				    		contextMenu.addItem(moveToTrash);


  		





  153
  153
  
    
				        	empty = false;


  		





  154
  154
  
    
				    	}


  		





  155
  
  
    
				


  		





  156
  
  
    
				        MenuItem delete = null;


  		





  157
  
  
    
				        if (files != null && !files.isEmpty()) {


  		





  158
  
  
    
				        	delete = new MenuItem("<span>" + AbstractImagePrototype.create(newImages.delete()).getHTML() + "&nbsp;Delete files</span>", true, new DeleteCommand(app, this, files, MessagePanel.images));


  		





  159
  
  
    
				        }


  		





  160
  
  
    
				        else if (!folder.isContainer())


  		





  161
  
  
    
				        	delete = new MenuItem("<span>" + AbstractImagePrototype.create(newImages.delete()).getHTML() + "&nbsp;Delete folder</span>", true, new DeleteCommand(app, this, folder, MessagePanel.images));


  		





  162
  
  
    
				        if (delete != null) {


  		





  163
  
  
    
				        	contextMenu.addItem(delete);


  		





  164
  
  
    
				        	empty = false;


  		





  165
  
  
    
				        }


  		





  166
  155
  
    
				    }


  		





  167
  156
  
    
				    if (isFolderTreeSelected || isMysharedTreeSelected) {


  		





  168
  157
  
    
				        if (files != null && files.size() == 1) {


  		





  ......




  173
  162
  
    
				        }


  		





  174
  163
  
    
				        else if (!folder.isContainer()) {


  		





  175
  164
  
    
				        	contextMenu.addItem(new MenuItem("<span>" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + "&nbsp;Folder properties</span>", true, new PropertiesCommand(app, this, folder, PropertiesCommand.PROPERTIES)));


  		





  176
  
  
    
				        	contextMenu.addItem(new MenuItem("<span>" + AbstractImagePrototype.create(newImages.sharing()).getHTML() + "&nbsp;Folder sharing</span>", true, new PropertiesCommand(app, this, folder, PropertiesCommand.PERMISSIONS)));


  		





  
  165
  
    
				        	contextMenu.addItem(new MenuItem("<span>" + AbstractImagePrototype.create(newImages.sharing()).getHTML() + "&nbsp;Share</span>", true, new PropertiesCommand(app, this, folder, PropertiesCommand.PERMISSIONS)));


  		





  177
  166
  
    
				        	empty = false;


  		





  178
  167
  
    
				        }


  		





  179
  168
  
    
				    }


  		












Also available in:
  Unified diff