/*\r
- * Copyright 2011 GRNET S.A. All rights reserved.\r
+ * Copyright 2011-2012 GRNET S.A. All rights reserved.\r
*\r
* Redistribution and use in source and binary forms, with or\r
* without modification, are permitted provided that the following\r
*/\r
package gr.grnet.pithos.web.client;\r
\r
-import com.google.gwt.core.client.Scheduler;\r
-import com.google.gwt.event.dom.client.KeyDownEvent;\r
-import com.google.gwt.user.client.Command;\r
import gr.grnet.pithos.web.client.foldertree.File;\r
import gr.grnet.pithos.web.client.foldertree.Folder;\r
import gr.grnet.pithos.web.client.foldertree.Resource;\r
import gr.grnet.pithos.web.client.rest.PutRequest;\r
import gr.grnet.pithos.web.client.rest.RestException;\r
\r
+import java.util.Iterator;\r
+\r
import com.google.gwt.core.client.GWT;\r
+import com.google.gwt.core.client.Scheduler;\r
import com.google.gwt.dom.client.NativeEvent;\r
+import com.google.gwt.event.dom.client.ChangeEvent;\r
+import com.google.gwt.event.dom.client.ChangeHandler;\r
import com.google.gwt.event.dom.client.ClickEvent;\r
import com.google.gwt.event.dom.client.ClickHandler;\r
import com.google.gwt.event.dom.client.KeyCodes;\r
+import com.google.gwt.event.dom.client.KeyDownEvent;\r
+import com.google.gwt.http.client.Response;\r
import com.google.gwt.i18n.client.DateTimeFormat;\r
+import com.google.gwt.user.client.Command;\r
import com.google.gwt.user.client.Event.NativePreviewEvent;\r
+import com.google.gwt.user.client.ui.Anchor;\r
import com.google.gwt.user.client.ui.Button;\r
-import com.google.gwt.user.client.ui.CheckBox;\r
-import com.google.gwt.user.client.ui.DecoratedTabPanel;\r
import com.google.gwt.user.client.ui.DialogBox;\r
import com.google.gwt.user.client.ui.FlexTable;\r
import com.google.gwt.user.client.ui.HasHorizontalAlignment;\r
-import com.google.gwt.user.client.ui.HorizontalPanel;\r
-import com.google.gwt.user.client.ui.TabPanel;\r
+import com.google.gwt.user.client.ui.Label;\r
import com.google.gwt.user.client.ui.TextBox;\r
import com.google.gwt.user.client.ui.VerticalPanel;\r
-import java.util.Iterator;\r
\r
/**\r
* The 'Folder properties' dialog box implementation.\r
*/\r
public class FolderPropertiesDialog extends DialogBox {\r
\r
- private Pithos app;\r
-\r
- private CheckBox readForAll;\r
+ protected Pithos app;\r
\r
/**\r
* The widget that holds the folderName of the folder.\r
*/\r
- private TextBox folderName = new TextBox();\r
+ TextBox folderName = new TextBox();\r
\r
/**\r
* A flag that denotes whether the dialog will be used to create or modify a\r
\r
final Folder folder;\r
\r
- final TabPanel inner;\r
+ final VerticalPanel inner;\r
\r
/**\r
* The widget's constructor.\r
*/\r
- public FolderPropertiesDialog(Pithos app, boolean _create, Folder selected) {\r
+ public FolderPropertiesDialog(final Pithos app, boolean _create, Folder selected) {\r
this.app = app;\r
+ Anchor close = new Anchor();\r
+ close.addStyleName("close");\r
+ close.addClickHandler(new ClickHandler() {\r
+ \r
+ @Override\r
+ public void onClick(ClickEvent event) {\r
+ hide();\r
+ }\r
+ });\r
+\r
setAnimationEnabled(true);\r
+ setGlassEnabled(true);\r
+ setStyleName("pithos-DialogBox");\r
\r
// Enable IE selection for the dialog (must disable it upon closing it)\r
- app.enableIESelection();\r
+ Pithos.enableIESelection();\r
\r
create = _create;\r
\r
\r
// Outer contains inner and buttons\r
VerticalPanel outer = new VerticalPanel();\r
+ outer.add(close);\r
// Inner contains generalPanel and permPanel\r
- inner = new DecoratedTabPanel();\r
- inner.setAnimationEnabled(true);\r
+ inner = new VerticalPanel();\r
+ inner.addStyleName("inner");\r
+\r
VerticalPanel generalPanel = new VerticalPanel();\r
- VerticalPanel permPanel = new VerticalPanel();\r
- final HorizontalPanel permForAll = new HorizontalPanel();\r
- final HorizontalPanel pathPanel = new HorizontalPanel();\r
- HorizontalPanel buttons = new HorizontalPanel();\r
- HorizontalPanel permButtons = new HorizontalPanel();\r
-\r
- inner.add(generalPanel, "General");\r
- if (!create)\r
- inner.add(permPanel, "Sharing");\r
- inner.selectTab(0);\r
-\r
- FlexTable generalTable = new FlexTable();\r
- generalTable.setText(0, 0, "Name");\r
- generalTable.setText(1, 0, "Parent");\r
- generalTable.setText(2, 0, "Creator");\r
- generalTable.setText(3, 0, "Last modified");\r
+ FlexTable generalTable = new FlexTable();\r
+ generalTable.setText(0, 0, "Name");\r
+ generalTable.setText(1, 0, "Parent");\r
+ generalTable.setText(2, 0, "Creator");\r
+ generalTable.setText(3, 0, "Last modified");\r
+\r
folderName.setText(create ? "" : folder.getName());\r
folderName.setReadOnly(folder.isContainer() && !create);\r
- generalTable.setWidget(0, 1, folderName);\r
+ generalTable.setWidget(0, 1, folderName);\r
\r
- if (create)\r
- generalTable.setText(1, 1, folder.getName());\r
- else\r
- generalTable.setText(1, 1, folder.getPrefix());\r
- generalTable.setText(2, 1, "");\r
- DateTimeFormat formatter = DateTimeFormat.getFormat("d/M/yyyy h:mm a");\r
- if(folder.getLastModified() != null)\r
- generalTable.setText(3, 1, formatter.format(folder.getLastModified()));\r
- generalTable.getFlexCellFormatter().setStyleName(0, 0, "props-labels");\r
- generalTable.getFlexCellFormatter().setStyleName(1, 0, "props-labels");\r
- generalTable.getFlexCellFormatter().setStyleName(2, 0, "props-labels");\r
- generalTable.getFlexCellFormatter().setStyleName(3, 0, "props-labels");\r
- generalTable.getFlexCellFormatter().setStyleName(0, 1, "props-values");\r
- generalTable.getFlexCellFormatter().setStyleName(1, 1, "props-values");\r
- generalTable.getFlexCellFormatter().setStyleName(2, 1, "props-values");\r
- generalTable.getFlexCellFormatter().setStyleName(3, 1, "props-values");\r
- generalTable.setCellSpacing(4);\r
+ final Label folderNameNote = new Label("Please note that slashes ('/') are not allowed in folder names.", true);\r
+ folderNameNote.setVisible(false);\r
+ folderNameNote.setStylePrimaryName("gss-readForAllNote");\r
+ generalTable.setWidget(0, 2, folderNameNote);\r
+ \r
+ if (create)\r
+ generalTable.setText(1, 1, folder.getName());\r
+ else\r
+ generalTable.setText(1, 1, folder.getPrefix());\r
+ generalTable.setText(2, 1, "");\r
+ DateTimeFormat formatter = DateTimeFormat.getFormat("d/M/yyyy h:mm a");\r
+ if(folder.getLastModified() != null)\r
+ generalTable.setText(3, 1, formatter.format(folder.getLastModified()));\r
+ generalTable.getFlexCellFormatter().setStyleName(0, 0, "props-labels");\r
+ generalTable.getFlexCellFormatter().setStyleName(1, 0, "props-labels");\r
+ generalTable.getFlexCellFormatter().setStyleName(2, 0, "props-labels");\r
+ generalTable.getFlexCellFormatter().setStyleName(3, 0, "props-labels");\r
+ generalTable.getFlexCellFormatter().setStyleName(0, 1, "props-values");\r
+ generalTable.getFlexCellFormatter().setStyleName(1, 1, "props-values");\r
+ generalTable.getFlexCellFormatter().setStyleName(2, 1, "props-values");\r
+ generalTable.getFlexCellFormatter().setStyleName(3, 1, "props-values");\r
+ generalTable.setCellSpacing(4);\r
+ generalPanel.add(generalTable);\r
+ inner.add(generalPanel);\r
+\r
+ outer.add(inner);\r
\r
// Create the 'Create/Update' button, along with a listener that hides the dialog\r
// when the button is clicked and quits the application.\r
okLabel = "Create";\r
else\r
okLabel = "Update";\r
- Button ok = new Button(okLabel, new ClickHandler() {\r
+ final Button ok = new Button(okLabel, new ClickHandler() {\r
@Override\r
public void onClick(ClickEvent event) {\r
createOrUpdateFolder();\r
closeDialog();\r
}\r
});\r
- buttons.add(ok);\r
- buttons.setCellHorizontalAlignment(ok, HasHorizontalAlignment.ALIGN_CENTER);\r
- // Create the 'Cancel' button, along with a listener that hides the\r
- // dialog\r
- // when the button is clicked.\r
- Button cancel = new Button("Cancel", new ClickHandler() {\r
+ ok.addStyleName("button");\r
+ outer.add(ok);\r
+ outer.setCellHorizontalAlignment(inner, HasHorizontalAlignment.ALIGN_CENTER);\r
+\r
+ folderName.addChangeHandler(new ChangeHandler() {\r
+ \r
@Override\r
- public void onClick(ClickEvent event) {\r
- closeDialog();\r
+ public void onChange(ChangeEvent event) {\r
+ if(folderName.getText().contains("/")) {\r
+ folderNameNote.setVisible(true);\r
+ ok.setEnabled(false);\r
+ }\r
+ else {\r
+ folderNameNote.setVisible(false);\r
+ ok.setEnabled(true);\r
+ }\r
}\r
});\r
- buttons.add(cancel);\r
- buttons.setCellHorizontalAlignment(cancel, HasHorizontalAlignment.ALIGN_CENTER);\r
- buttons.setSpacing(8);\r
- buttons.addStyleName("pithos-TabPanelBottom");\r
-\r
- generalPanel.add(generalTable);\r
-\r
-\r
- outer.add(inner);\r
- outer.add(buttons);\r
- outer.setCellHorizontalAlignment(buttons, HasHorizontalAlignment.ALIGN_CENTER);\r
- outer.addStyleName("pithos-TabPanelBottom");\r
-\r
- setWidget(outer);\r
\r
- /*if (create)\r
- folderName.setFocus(true);\r
- else\r
- ok.setFocus(true);*/\r
+ setWidget(outer);\r
}\r
\r
@Override\r
// enter or escape is pressed.\r
switch (evt.getKeyCode()) {\r
case KeyCodes.KEY_ENTER:\r
- closeDialog();\r
createOrUpdateFolder();\r
+ closeDialog();\r
break;\r
case KeyCodes.KEY_ESCAPE:\r
closeDialog();\r
* (we disable the prevention on creation of the dialog)\r
*/\r
public void closeDialog() {\r
- app.preventIESelection();\r
+ Pithos.preventIESelection();\r
hide();\r
}\r
\r
* Generate an RPC request to create a new folder.\r
*/\r
private void createFolder() {\r
- String name = folderName.getText();\r
- String prefix = folder.getPrefix();\r
- String path = app.getApiPath() + app.getUsername() + "/" + folder.getContainer() + "/" + (prefix.length() == 0 ? "" : prefix + "/") + name;\r
- PutRequest createFolder = new PutRequest(path) {\r
+ String name = folderName.getText().trim();\r
+ String path = folder.getUri() + "/" + name;\r
+ PutRequest createFolder = new PutRequest(app.getApiPath(), folder.getOwner(), path) {\r
@Override\r
public void onSuccess(Resource result) {\r
- app.updateFolder(folder);\r
+ app.updateFolder(folder, true, new Command() {\r
+ \r
+ @Override\r
+ public void execute() {\r
+ app.updateStatistics();\r
+ }\r
+ });\r
}\r
\r
@Override\r
public void onError(Throwable t) {\r
GWT.log("", t);\r
+ app.setError(t);\r
if (t instanceof RestException) {\r
app.displayError("Unable to create folder:" + ((RestException) t).getHttpStatusText());\r
}\r
else\r
app.displayError("System error creating folder:" + t.getMessage());\r
}\r
- };\r
+\r
+ @Override\r
+ protected void onUnauthorized(Response response) {\r
+ app.sessionExpired();\r
+ }\r
+ };\r
createFolder.setHeader("X-Auth-Token", app.getToken());\r
createFolder.setHeader("Accept", "*/*");\r
createFolder.setHeader("Content-Length", "0");\r
- createFolder.setHeader("Content-Type", "application/folder");\r
+ createFolder.setHeader("Content-Type", "application/directory");\r
Scheduler.get().scheduleDeferred(createFolder);\r
}\r
\r
* the actual work of modifying folder properties or creating a new Folder\r
* depending on the value of the create field\r
*/\r
- private void createOrUpdateFolder() {\r
+ protected void createOrUpdateFolder() {\r
if (create)\r
createFolder();\r
else\r
}\r
\r
private void updateFolder() {\r
-// permList.updatePermissionsAccordingToInput();\r
-// Set<PermissionHolder> perms = permList.getPermissions();\r
-// JSONObject json = new JSONObject();\r
-// if(!folder.getName().equals(folderName.getText()))\r
-// json.put("name", new JSONString(folderName.getText()));\r
-// //only update the read for all perm if the user is the owner\r
-// if (readForAll.getValue() != folder.isReadForAll())\r
-// if (folder.getOwner().equals(app.getCurrentUserResource().getUsername()))\r
-// json.put("readForAll", JSONBoolean.getInstance(readForAll.getValue()));\r
-// if (permList.hasChanges()) {\r
-// JSONArray perma = new JSONArray();\r
-// int i=0;\r
-// for(PermissionHolder p : perms){\r
-// JSONObject po = new JSONObject();\r
-// if(p.getUser() != null)\r
-// po.put("user", new JSONString(p.getUser()));\r
-// if(p.getGroup() != null)\r
-// po.put("group", new JSONString(p.getGroup()));\r
-// po.put("read", JSONBoolean.getInstance(p.isRead()));\r
-// po.put("write", JSONBoolean.getInstance(p.isWrite()));\r
-// po.put("modifyACL", JSONBoolean.getInstance(p.isModifyACL()));\r
-// perma.set(i,po);\r
-// i++;\r
-// }\r
-// json.put("permissions", perma);\r
-// GWT.log(json.toString(), null);\r
-// }\r
-// PostCommand ep = new PostCommand(folder.getUri()+"?update=", json.toString(), 200){\r
-//\r
-// @Override\r
-// public void onComplete() {\r
-// //TODO:CELLTREE\r
-//\r
-// if(getPostBody() != null && !"".equals(getPostBody().trim())){\r
-//\r
-//\r
-// FolderResource fres = ((RestResourceWrapper) app.getTreeView().getSelection()).getResource();\r
-// String initialPath = fres.getUri();\r
-// String newPath = getPostBody().trim();\r
-// fres.setUri(newPath);\r
-// ((RestResourceWrapper) app.getTreeView().getSelection()).getResource().setUri(newPath);\r
-// ((RestResourceWrapper) app.getTreeView().getSelection()).setUri(newPath);\r
-// app.getTreeView().updateNodeChildren(fres.getParentURI());\r
-// if (permList.hasChanges()) {\r
-// app.getTreeView().updateMySharedNode();\r
-// }\r
-// /*\r
-// if(folderItem.getParentItem() != null && ((DnDTreeItem)folderItem.getParentItem()).getFolderResource() != null){\r
-// ((DnDTreeItem)folderItem.getParentItem()).getFolderResource().removeSubfolderPath(initialPath);\r
-// ((DnDTreeItem)folderItem.getParentItem()).getFolderResource().getSubfolderPaths().add(newPath);\r
-// }*/\r
-// }\r
-// //app.getFolders().updateFolder( (DnDTreeItem) app.getFolders().getCurrent());\r
-//\r
-// app.get().showFileList(true);\r
-// }\r
-//\r
-// @Override\r
-// public void onError(Throwable t) {\r
-// GWT.log("", t);\r
-// if(t instanceof RestException){\r
-// int statusCode = ((RestException)t).getHttpStatusCode();\r
-// if(statusCode == 405)\r
-// app.displayError("You don't have the necessary permissions or" +\r
-// " a folder with same name already exists");\r
-// else if(statusCode == 404)\r
-// app.displayError("Resource not found, or user specified in sharing does not exist");\r
-// else\r
-// app.displayError("Unable to update folder: "+((RestException)t).getHttpStatusText());\r
-// }\r
-// else\r
-// app.displayError("System error moifying file: "+t.getMessage());\r
-// //TODO:CELLTREE\r
-// //app.getFolders().updateFolder( (DnDTreeItem) app.getFolders().getCurrent());\r
-// }\r
-// };\r
-// DeferredCommand.addCommand(ep);\r
- final String newName = folderName.getText();\r
+ final String newName = folderName.getText().trim();\r
if (!folder.isContainer() && !folder.getName().equals(newName)) {\r
- final String path = app.getApiPath() + app.getUsername() + folder.getParent().getUri() + "/" + newName;\r
- PutRequest newFolder = new PutRequest(path) {\r
+ final String path = folder.getParent().getUri() + "/" + newName;\r
+ PutRequest newFolder = new PutRequest(app.getApiPath(), folder.getParent().getOwner(), path) {\r
@Override\r
public void onSuccess(Resource result) {\r
Iterator<File> iter = folder.getFiles().iterator();\r
- app.copyFiles(iter, folder.getParent().getUri() + "/" + newName, new Command() {\r
+ app.copyFiles(iter, folder.getParent().getOwner(), folder.getParent().getUri() + "/" + newName, new Command() {\r
@Override\r
public void execute() {\r
Iterator<Folder> iterf = folder.getSubfolders().iterator();\r
- app.copySubfolders(iterf, folder.getParent().getUri() + "/" + newName, new Command() {\r
+ app.copySubfolders(iterf, folder.getParent().getOwner(), folder.getParent().getUri() + "/" + newName, new Command() {\r
@Override\r
public void execute() {\r
- app.deleteFolder(folder);\r
- app.updateFolder(folder.getParent());\r
+ app.deleteFolder(folder, new Command() {\r
+ \r
+ @Override\r
+ public void execute() {\r
+ app.updateFolder(folder.getParent(), false, new Command() {\r
+ \r
+ @Override\r
+ public void execute() {\r
+ app.updateMySharedRoot();\r
+ }\r
+ });\r
+ }\r
+ });\r
}\r
});\r
}\r
@Override\r
public void onError(Throwable t) {\r
GWT.log("", t);\r
+ app.setError(t);\r
if(t instanceof RestException){\r
app.displayError("Unable to update folder: " + ((RestException) t).getHttpStatusText());\r
}\r
else\r
app.displayError("System error modifying folder: " + t.getMessage());\r
}\r
+\r
+ @Override\r
+ protected void onUnauthorized(Response response) {\r
+ app.sessionExpired();\r
+ }\r
};\r
newFolder.setHeader("X-Auth-Token", app.getToken());\r
newFolder.setHeader("Content-Type", "application/folder");\r
newFolder.setHeader("Content-Length", "0");\r
Scheduler.get().scheduleDeferred(newFolder);\r
}\r
- }\r
-\r
- public void selectTab(int _tab) {\r
- inner.selectTab(_tab);\r
+ else\r
+ app.updateFolder(folder.getParent(), false, new Command() {\r
+ \r
+ @Override\r
+ public void execute() {\r
+ app.updateMySharedRoot();\r
+ }\r
+ });\r
}\r
}\r
projects / pithos-web-client / blobdiff