updated: GetInfo, Uploader in case of error
git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@101368 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
18619ec866
commit
2bb5be9ffc
|
@ -48661,3 +48661,35 @@ Compiling...
|
||||||
Compilation completed in 0.00 seconds
|
Compilation completed in 0.00 seconds
|
||||||
Removing invalidated units
|
Removing invalidated units
|
||||||
Finding entry point classes
|
Finding entry point classes
|
||||||
|
Public resources found in...
|
||||||
|
Translatable source found in...
|
||||||
|
Found 0 cached/archived units. Used 0 / 2719 units from cache.
|
||||||
|
Compiling...
|
||||||
|
10% complete (ETR: 45 seconds)
|
||||||
|
10% complete (ETR: 45 seconds)
|
||||||
|
20% complete (ETR: 30 seconds)
|
||||||
|
30% complete (ETR: 20 seconds)
|
||||||
|
40% complete (ETR: 15 seconds)
|
||||||
|
50% complete (ETR: 11 seconds)
|
||||||
|
60% complete (ETR: 8 seconds)
|
||||||
|
70% complete (ETR: 6 seconds)
|
||||||
|
80% complete (ETR: 3 seconds)
|
||||||
|
90% complete (ETR: 2 seconds)
|
||||||
|
100% complete (ETR: 0 seconds)
|
||||||
|
Compilation completed in 17.94 seconds
|
||||||
|
Removing invalidated units
|
||||||
|
Finding entry point classes
|
||||||
|
Public resources found in...
|
||||||
|
Translatable source found in...
|
||||||
|
Found 2719 cached/archived units. Used 2719 / 2719 units from cache.
|
||||||
|
Compiling...
|
||||||
|
Compilation completed in 0.00 seconds
|
||||||
|
Removing invalidated units
|
||||||
|
Finding entry point classes
|
||||||
|
Public resources found in...
|
||||||
|
Translatable source found in...
|
||||||
|
Found 2719 cached/archived units. Used 2719 / 2719 units from cache.
|
||||||
|
Compiling...
|
||||||
|
Compilation completed in 0.00 seconds
|
||||||
|
Removing invalidated units
|
||||||
|
Finding entry point classes
|
||||||
|
|
|
@ -136,17 +136,20 @@ public class UpdateServiceUploader extends Window{
|
||||||
case ERROR:
|
case ERROR:
|
||||||
// new MessageBoxAlert("Error during upload", resultMessage.getMessage(), null);
|
// new MessageBoxAlert("Error during upload", resultMessage.getMessage(), null);
|
||||||
GWT.log("Error during upload: "+resultMessage.getMessage());
|
GWT.log("Error during upload: "+resultMessage.getMessage());
|
||||||
fileUploaderDlg.getDlg().showRegisteringResult(false);
|
// fileUploaderDlg.getDlg().showRegisteringResult(false);
|
||||||
|
fileUploaderDlg.getDlg().showRegisteringResult(false, resultMessage.getMessage());
|
||||||
break;
|
break;
|
||||||
case UNKNOWN:
|
case UNKNOWN:
|
||||||
// new MessageBoxAlert("Error during upload", resultMessage.getMessage(), null);
|
// new MessageBoxAlert("Error during upload", resultMessage.getMessage(), null);
|
||||||
GWT.log("Error during upload: "+resultMessage.getMessage());
|
GWT.log("Error during upload: "+resultMessage.getMessage());
|
||||||
fileUploaderDlg.getDlg().showRegisteringResult(false);
|
// fileUploaderDlg.getDlg().showRegisteringResult(false);
|
||||||
|
fileUploaderDlg.getDlg().showRegisteringResult(false, "Error during upload: "+resultMessage.getMessage());
|
||||||
break;
|
break;
|
||||||
case WARN: {
|
case WARN: {
|
||||||
// new MessageBoxAlert("Upload completed with warnings", resultMessage.getMessage(), null);
|
// new MessageBoxAlert("Upload completed with warnings", resultMessage.getMessage(), null);
|
||||||
GWT.log("Upload completed with warnings: "+resultMessage.getMessage());
|
GWT.log("Upload completed with warnings: "+resultMessage.getMessage());
|
||||||
fileUploaderDlg.getDlg().showRegisteringResult(false);
|
// fileUploaderDlg.getDlg().showRegisteringResult(false);
|
||||||
|
fileUploaderDlg.getDlg().showRegisteringResult(false, "Upload completed with warnings: "+resultMessage.getMessage());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case OK: {
|
case OK: {
|
||||||
|
|
|
@ -30,7 +30,11 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
|
||||||
*/
|
*/
|
||||||
public class DialogGetInfo extends Dialog {
|
public class DialogGetInfo extends Dialog {
|
||||||
|
|
||||||
protected static final String UNKNOWN = "unknown";
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public static final String EMPTY = "empty";
|
||||||
|
public static final String UNKNOWN = "unknown";
|
||||||
private int widthDialog = 450;
|
private int widthDialog = 450;
|
||||||
private int heightTextArea = 50;
|
private int heightTextArea = 50;
|
||||||
private TextField<String> txtName = new TextField<String>();
|
private TextField<String> txtName = new TextField<String>();
|
||||||
|
@ -349,6 +353,8 @@ public class DialogGetInfo extends Dialog {
|
||||||
if(kb<1)
|
if(kb<1)
|
||||||
kb=1;
|
kb=1;
|
||||||
return number.format(kb);
|
return number.format(kb);
|
||||||
|
}else if(value==0){
|
||||||
|
return EMPTY;
|
||||||
}else
|
}else
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
|
@ -2355,8 +2355,8 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
|
||||||
System.out.println("get itemExistsInWorkpace by parentId: "+parentId);
|
System.out.println("get itemExistsInWorkpace by parentId: "+parentId);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
Workspace workspace = getWorkspace();
|
Workspace workspace = getWorkspace();
|
||||||
|
|
||||||
WorkspaceItem wsItem = workspace.getItem(parentId); //GET PARENT
|
WorkspaceItem wsItem = workspace.getItem(parentId); //GET PARENT
|
||||||
|
|
||||||
if(wsItem.getType().equals(WorkspaceItemType.FOLDER) || wsItem.getType().equals(WorkspaceItemType.SHARED_FOLDER)){
|
if(wsItem.getType().equals(WorkspaceItemType.FOLDER) || wsItem.getType().equals(WorkspaceItemType.SHARED_FOLDER)){
|
||||||
|
@ -2371,15 +2371,10 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
|
||||||
else
|
else
|
||||||
throw new Exception("Invalid Folder parent");
|
throw new Exception("Invalid Folder parent");
|
||||||
|
|
||||||
|
|
||||||
} catch (InternalErrorException e) {
|
} catch (InternalErrorException e) {
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
} catch (ItemNotFoundException e) {
|
} catch (ItemNotFoundException e) {
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
String error = "an error occurred on search item in folder ";
|
String error = "an error occurred on search item in folder ";
|
||||||
workspaceLogger.error(error, e);
|
workspaceLogger.error(error, e);
|
||||||
|
@ -2393,9 +2388,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
|
||||||
try {
|
try {
|
||||||
|
|
||||||
Workspace workspace = getWorkspace();
|
Workspace workspace = getWorkspace();
|
||||||
|
|
||||||
WorkspaceItem wsItem = workspace.getItem(itemId);
|
WorkspaceItem wsItem = workspace.getItem(itemId);
|
||||||
|
|
||||||
Calendar cl = wsItem.getCreationTime();
|
Calendar cl = wsItem.getCreationTime();
|
||||||
|
|
||||||
if(cl!=null)
|
if(cl!=null)
|
||||||
|
@ -2412,25 +2405,24 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
|
||||||
@Override
|
@Override
|
||||||
public Long loadSizeByItemId(String itemId) throws Exception {
|
public Long loadSizeByItemId(String itemId) throws Exception {
|
||||||
|
|
||||||
workspaceLogger.trace("get Size By ItemId "+ itemId);
|
workspaceLogger.info("get Size By ItemId "+ itemId);
|
||||||
try {
|
try {
|
||||||
|
|
||||||
Workspace workspace = getWorkspace();
|
Workspace workspace = getWorkspace();
|
||||||
|
|
||||||
WorkspaceItem wsItem = workspace.getItem(itemId);
|
WorkspaceItem wsItem = workspace.getItem(itemId);
|
||||||
|
|
||||||
Long size = new Long(-1);
|
Long size = new Long(-1);
|
||||||
|
|
||||||
if(wsItem instanceof FolderItem){
|
if(wsItem instanceof FolderItem){ //ITEM
|
||||||
|
|
||||||
FolderItem folderItem = (FolderItem) wsItem;
|
FolderItem folderItem = (FolderItem) wsItem;
|
||||||
|
|
||||||
size = new Long(folderItem.getLength());
|
size = new Long(folderItem.getLength());
|
||||||
} else if (wsItem instanceof WorkspaceFolder ){
|
} else if (wsItem instanceof WorkspaceFolder ){ //FOLDER
|
||||||
WorkspaceFolder theFolder = (WorkspaceFolder) wsItem;
|
WorkspaceFolder theFolder = (WorkspaceFolder) wsItem;
|
||||||
size = theFolder.getSize();
|
size = theFolder.getSize();
|
||||||
|
} else if (wsItem instanceof WorkspaceSharedFolder){ //SHARED FOLDER
|
||||||
|
WorkspaceSharedFolder theFolder = (WorkspaceSharedFolder) wsItem;
|
||||||
|
size = theFolder.getSize();
|
||||||
}
|
}
|
||||||
|
workspaceLogger.info("returning size: " +size);
|
||||||
return size;
|
return size;
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
Loading…
Reference in New Issue