*/\r
package gr.grnet.pithos.web.client;\r
\r
-import com.google.gwt.core.client.Scheduler;\r
-import com.google.gwt.user.client.Window;\r
-import com.google.gwt.user.client.ui.Anchor;\r
-import com.google.gwt.user.client.ui.Label;\r
import gr.grnet.pithos.web.client.foldertree.File;\r
+import gr.grnet.pithos.web.client.foldertree.FileVersions;\r
import gr.grnet.pithos.web.client.foldertree.Resource;\r
-import gr.grnet.pithos.web.client.rest.PostCommand;\r
+import gr.grnet.pithos.web.client.foldertree.Version;\r
+import gr.grnet.pithos.web.client.rest.GetRequest;\r
import gr.grnet.pithos.web.client.rest.PostRequest;\r
import gr.grnet.pithos.web.client.rest.PutRequest;\r
import gr.grnet.pithos.web.client.rest.RestException;\r
\r
+import java.util.HashMap;\r
+import java.util.List;\r
+import java.util.Map;\r
+\r
import com.google.gwt.core.client.GWT;\r
+import com.google.gwt.core.client.Scheduler;\r
import com.google.gwt.event.dom.client.ClickEvent;\r
import com.google.gwt.event.dom.client.ClickHandler;\r
+import com.google.gwt.http.client.Response;\r
+import com.google.gwt.http.client.URL;\r
import com.google.gwt.i18n.client.DateTimeFormat;\r
-import com.google.gwt.json.client.JSONBoolean;\r
-import com.google.gwt.json.client.JSONObject;\r
-import com.google.gwt.resources.client.ClientBundle;\r
import com.google.gwt.resources.client.ImageResource;\r
-import com.google.gwt.user.client.DeferredCommand;\r
+import com.google.gwt.user.client.Window;\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.DisclosurePanel;\r
import com.google.gwt.user.client.ui.FlexTable;\r
-import com.google.gwt.user.client.ui.FlowPanel;\r
import com.google.gwt.user.client.ui.FocusPanel;\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.Image;\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 gr.grnet.pithos.web.client.tagtree.Tag;\r
-import java.util.Map;\r
\r
/**\r
* The 'File properties' dialog box implementation.\r
*/\r
public class FilePropertiesDialog extends AbstractPropertiesDialog {\r
\r
- private PermissionsList permList;\r
+ protected PermissionsList permList;\r
\r
- private CheckBox readForAll;\r
+ protected CheckBox readForAll;\r
\r
/**\r
* An image bundle for this widgets images.\r
*/\r
- public interface Images extends ClientBundle,MessagePanel.Images {\r
+ public interface Images extends MessagePanel.Images {\r
\r
@Source("gr/grnet/pithos/resources/edit_user.png")\r
ImageResource permUser();\r
\r
- @Source("gr/grnet/pithos/resources/groupevent.png")\r
+ @Source("gr/grnet/pithos/resources/groups22.png")\r
ImageResource permGroup();\r
\r
@Source("gr/grnet/pithos/resources/editdelete.png")\r
\r
Images images = GWT.create(Images.class);\r
\r
+ FlexTable metaTable;\r
/**\r
* The widget's constructor.\r
*/\r
super(_app);\r
file = _file;\r
\r
+ Anchor close = new Anchor();\r
+ close.addStyleName("close");\r
+ close.addClickHandler(new ClickHandler() {\r
+ \r
+ @Override\r
+ public void onClick(@SuppressWarnings("unused") ClickEvent event) {\r
+ hide();\r
+ }\r
+ });\r
// Set the dialog's caption.\r
setText("File properties");\r
+ setAnimationEnabled(true);\r
+ setGlassEnabled(true);\r
+ setStyleName("pithos-DialogBox");\r
\r
// Outer contains inner and buttons.\r
final VerticalPanel outer = new VerticalPanel();\r
+ outer.add(close);\r
final FocusPanel focusPanel = new FocusPanel(outer);\r
// Inner contains generalPanel and permPanel.\r
inner = new DecoratedTabPanel();\r
inner.setAnimationEnabled(true);\r
+ inner.addStyleName("inner");\r
+ inner.getDeckPanel().addStyleName("pithos-TabPanelBottom");\r
\r
\r
inner.add(createGeneralPanel(), "General");\r
\r
inner.add(createSharingPanel(), "Sharing");\r
\r
- inner.add(createVersionPanel(), "Versions");\r
-\r
+ fetchVersions();\r
+ \r
inner.selectTab(0);\r
\r
outer.add(inner);\r
\r
- final HorizontalPanel buttons = new HorizontalPanel();\r
// Create the 'OK' button, along with a listener that hides the dialog\r
// when the button is clicked.\r
final Button ok = new Button("OK", new ClickHandler() {\r
@Override\r
- public void onClick(ClickEvent event) {\r
+ public void onClick(@SuppressWarnings("unused") ClickEvent event) {\r
accept();\r
closeDialog();\r
}\r
});\r
+ ok.addStyleName("button");\r
+\r
+ outer.add(ok);\r
+ outer.setCellHorizontalAlignment(inner, HasHorizontalAlignment.ALIGN_CENTER);\r
+\r
+ focusPanel.setFocus(true);\r
+ setWidget(outer);\r
+ }\r
+\r
+ protected void fetchVersions() {\r
+ String path = file.getUri() + "?format=json&version=list";\r
+ GetRequest<FileVersions> getVersions = new GetRequest<FileVersions>(FileVersions.class, app.getApiPath(), file.getOwner(), path) {\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 when the button is clicked.\r
- final Button cancel = new Button("Cancel", new ClickHandler() {\r
@Override\r
- public void onClick(ClickEvent event) {\r
- closeDialog();\r
+ public void onSuccess(FileVersions _result) {\r
+ inner.add(createVersionPanel(_result.getVersions()), "Versions");\r
}\r
- });\r
- buttons.add(cancel);\r
- buttons.setCellHorizontalAlignment(cancel, HasHorizontalAlignment.ALIGN_CENTER);\r
- buttons.setSpacing(8);\r
- buttons.addStyleName("pithos-TabPanelBottom");\r
\r
- outer.add(buttons);\r
- outer.setCellHorizontalAlignment(buttons, HasHorizontalAlignment.ALIGN_CENTER);\r
- outer.addStyleName("pithos-TabPanelBottom");\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 fetch versions: " + ((RestException) t).getHttpStatusText());\r
+ }\r
+ else\r
+ app.displayError("System error unable to fetch versions: "+t.getMessage());\r
+ }\r
\r
- focusPanel.setFocus(true);\r
- setWidget(outer);\r
+ @Override\r
+ protected void onUnauthorized(@SuppressWarnings("unused") Response response) {\r
+ app.sessionExpired();\r
+ }\r
+ };\r
+ getVersions.setHeader("X-Auth-Token", app.getToken());\r
+ Scheduler.get().scheduleDeferred(getVersions);\r
}\r
\r
- private VerticalPanel createGeneralPanel() {\r
+ private VerticalPanel createGeneralPanel() {\r
final VerticalPanel generalPanel = new VerticalPanel();\r
final FlexTable generalTable = new FlexTable();\r
generalTable.setText(0, 0, "Name");\r
generalTable.setText(1, 0, "Folder");\r
generalTable.setText(2, 0, "Owner");\r
generalTable.setText(3, 0, "Last modified");\r
- generalTable.setText(4, 0, "Tags");\r
\r
name.setWidth("100%");\r
name.setText(file.getName());\r
generalTable.setText(2, 1, file.getOwner());\r
\r
final DateTimeFormat formatter = DateTimeFormat.getFormat("d/M/yyyy h:mm a");\r
- generalTable.setText(3, 1, formatter.format(file.getLastModified()));\r
-\r
- StringBuffer tagsBuffer = new StringBuffer();\r
- for (String t : file.getTags())\r
- tagsBuffer.append(t).append(", ");\r
- if (tagsBuffer.length() > 1)\r
- tagsBuffer.delete(tagsBuffer.length() - 2, tagsBuffer.length() - 1);\r
- initialTagText = tagsBuffer.toString();\r
- tags.setWidth("100%");\r
- tags.setText(initialTagText);\r
- generalTable.setWidget(4, 1, tags);\r
+ generalTable.setText(3, 1, file.getLastModified() != null ? formatter.format(file.getLastModified()) : "");\r
\r
generalTable.getFlexCellFormatter().setStyleName(0, 0, "props-labels");\r
generalTable.getFlexCellFormatter().setStyleName(1, 0, "props-labels");\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.getFlexCellFormatter().setStyleName(4, 1, "props-values");\r
generalTable.setCellSpacing(4);\r
\r
generalPanel.add(generalTable);\r
\r
- DisclosurePanel allTags = new DisclosurePanel("All tags");\r
- allTagsContent = new FlowPanel();\r
- allTagsContent.setWidth("100%");\r
- for (Tag t : app.getAllTags()) {\r
- final Anchor tagAnchor = new Anchor(t.getName(), false);\r
- tagAnchor.addStyleName("pithos-tag");\r
- allTagsContent.add(tagAnchor);\r
- Label separator = new Label(", ");\r
- separator.addStyleName("pithos-tag");\r
- allTagsContent.add(separator);\r
- tagAnchor.addClickHandler(new ClickHandler() {\r
+ HorizontalPanel metaTitlePanel = new HorizontalPanel();\r
+ metaTitlePanel.setSpacing(5);\r
+ Label meta = new Label("Meta data");\r
+ meta.addStyleName("pithos-metaTitle");\r
+ metaTitlePanel.add(meta);\r
+ \r
+ Image plus = new Image("images/plus.png");\r
+ plus.addStyleName("pithos-addMetaImg");\r
+ metaTitlePanel.add(plus);\r
+ \r
+ generalPanel.add(metaTitlePanel);\r
+ \r
+ metaTable = new FlexTable();\r
+ metaTable.setCellSpacing(0);\r
+ metaTable.setHTML(0, 0, "Name");\r
+ metaTable.getFlexCellFormatter().setStyleName(0, 0, "props-labels");\r
+ metaTable.setText(0, 1, "Value");\r
+ metaTable.getFlexCellFormatter().setStyleName(0, 1, "props-labels");\r
+ int rows = 1;\r
+ for (String metaKey : file.getMeta().keySet()) {\r
+ addFormLine(metaTable, rows++, metaKey, file.getMeta().get(metaKey));\r
+ }\r
+ if (rows == 1) //If no meta add an empty line\r
+ addFormLine(metaTable, rows++, "", "");\r
+ \r
+ plus.addClickHandler(new ClickHandler() {\r
+ \r
+ @Override\r
+ public void onClick(@SuppressWarnings("unused") ClickEvent event) {\r
+ addFormLine(metaTable, metaTable.getRowCount(), "", "");\r
+ }\r
+ });\r
\r
- @Override\r
- public void onClick(ClickEvent event) {\r
- String existing = tags.getText().trim();\r
- if (MULTIPLE_VALUES_TEXT.equals(existing))\r
- existing = "";\r
- String newTag = tagAnchor.getText().trim();\r
- // insert the new tag only if it is not in the list\r
- // already\r
- if (existing.indexOf(newTag) == -1)\r
- tags.setText(existing + (existing.length() > 0 ? ", " : "") + newTag);\r
- }\r
- });\r
- }\r
- allTags.setContent(allTagsContent);\r
- generalPanel.add(allTags);\r
+ generalPanel.add(metaTable);\r
generalPanel.setSpacing(4);\r
return generalPanel;\r
}\r
\r
+ void addFormLine(final FlexTable table, int row, String _name, String _value) {\r
+ TextBox nameBox = new TextBox();\r
+ nameBox.setText(_name);\r
+ nameBox.addStyleName("pithos-metaName");\r
+ table.setWidget(row, 0, nameBox);\r
+ table.getFlexCellFormatter().setStyleName(1, 0, "props-values");\r
+\r
+ TextBox valueBox = new TextBox();\r
+ valueBox.setText(_value);\r
+ valueBox.addStyleName("pithos-metaValue");\r
+ table.setWidget(row, 1, valueBox);\r
+ table.getFlexCellFormatter().setStyleName(1, 1, "props-values");\r
+ \r
+ Image delete = new Image("images/delete.png");\r
+ delete.addStyleName("pithos-metaDeleteImg");\r
+ delete.addClickHandler(new ClickHandler() {\r
+ \r
+ @Override\r
+ public void onClick(ClickEvent event) {\r
+ int rowIndex = table.getCellForEvent(event).getRowIndex();\r
+ table.removeRow(rowIndex);\r
+ }\r
+ });\r
+ table.setWidget(row, 2, delete);\r
+ }\r
+\r
private VerticalPanel createSharingPanel() {\r
VerticalPanel permPanel = new VerticalPanel();\r
\r
HorizontalPanel permButtons = new HorizontalPanel();\r
Button add = new Button("Add Group", new ClickHandler() {\r
@Override\r
- public void onClick(ClickEvent event) {\r
+ public void onClick(@SuppressWarnings("unused") ClickEvent event) {\r
PermissionsAddDialog dlg = new PermissionsAddDialog(app, app.getAccount().getGroups(), permList, false);\r
dlg.center();\r
permList.updatePermissionTable();\r
}\r
});\r
+ add.addStyleName("button");\r
permButtons.add(add);\r
permButtons.setCellHorizontalAlignment(add, HasHorizontalAlignment.ALIGN_CENTER);\r
\r
final Button addUser = new Button("Add User", new ClickHandler() {\r
@Override\r
- public void onClick(ClickEvent event) {\r
+ public void onClick(@SuppressWarnings("unused") ClickEvent event) {\r
PermissionsAddDialog dlg = new PermissionsAddDialog(app, app.getAccount().getGroups(), permList, true);\r
dlg.center();\r
permList.updatePermissionTable();\r
}\r
});\r
+ addUser.addStyleName("button");\r
permButtons.add(addUser);\r
permButtons.setCellHorizontalAlignment(addUser, HasHorizontalAlignment.ALIGN_CENTER);\r
\r
readForAll.setValue(file.isPublished());\r
readForAll.addClickHandler(new ClickHandler() {\r
@Override\r
- public void onClick(ClickEvent event) {\r
+ public void onClick(@SuppressWarnings("unused") ClickEvent event) {\r
readForAllNote.setVisible(readForAll.getValue());\r
}\r
});\r
return permPanel;\r
}\r
\r
- private VerticalPanel createVersionPanel() {\r
+ VerticalPanel createVersionPanel(List<Version> versions) {\r
VerticalPanel versionPanel = new VerticalPanel();\r
-\r
-// VersionsList verList = new VersionsList(this, images, bodies);\r
-// versionPanel.add(verList);\r
-//\r
-// HorizontalPanel vPanel = new HorizontalPanel();\r
-//\r
-// vPanel.setSpacing(8);\r
-// vPanel.addStyleName("pithos-TabPanelBottom");\r
-// vPanel.add(new Label("Versioned"));\r
-//\r
-// versioned.setValue(file.isVersioned());\r
-// vPanel.add(versioned);\r
-// versionPanel.add(vPanel);\r
-//\r
-// HorizontalPanel vPanel2 = new HorizontalPanel();\r
-// vPanel2.setSpacing(8);\r
-// vPanel2.addStyleName("pithos-TabPanelBottom");\r
-//\r
-// HTML removeAllVersion = new HTML("<span>Remove all previous versions?</span>");\r
-// vPanel2.add(removeAllVersion);\r
-//\r
-// Button removeVersionsButton = new Button(AbstractImagePrototype.create(images.delete()).getHTML(), new ClickHandler() {\r
-// @Override\r
-// public void onClick(ClickEvent event) {\r
-// ConfirmationDialog confirm = new ConfirmationDialog("Really " +\r
-// "remove all previous versions?", "Remove") {\r
-//\r
-// @Override\r
-// public void cancel() {\r
-// }\r
-//\r
-// @Override\r
-// public void confirm() {\r
-// FilePropertiesDialog.this.closeDialog();\r
-// removeAllOldVersions();\r
-// }\r
-//\r
-// };\r
-// confirm.center();\r
-// }\r
-//\r
-// });\r
-// vPanel2.add(removeVersionsButton);\r
-// if(!file.isVersioned())\r
-// vPanel2.setVisible(false);\r
-//\r
-// versionPanel.add(vPanel2);\r
-\r
+ VersionsList verList = new VersionsList(app, this, images, file, versions);\r
+ versionPanel.add(verList);\r
return versionPanel;\r
}\r
\r
String newFilename = null;\r
\r
final Map<String, Boolean[]> perms = (permList.hasChanges() ? permList.getPermissions() : null);\r
+\r
if (!name.getText().trim().equals(file.getName())) {\r
newFilename = name.getText().trim();\r
}\r
published = readForAll.getValue();\r
final Boolean finalPublished = published;\r
\r
- String[] tagset = null;\r
- if (!tags.getText().equals(initialTagText))\r
- tagset = tags.getText().split(",");\r
- final String[] newTags = tagset;\r
+ final Map<String, String> newMeta = new HashMap<String, String>();\r
+ for (int row = 1; row < metaTable.getRowCount(); row++) {\r
+ String key = ((TextBox) metaTable.getWidget(row, 0)).getText().trim();\r
+ String value = ((TextBox) metaTable.getWidget(row, 1)).getText().trim();\r
+ if (key.length() > 0 && value.length() > 0)\r
+ newMeta.put(key, value);\r
+ }\r
\r
if (newFilename != null) {\r
final String path = file.getParent().getUri() + "/" + newFilename;\r
PutRequest updateFile = new PutRequest(app.getApiPath(), app.getUsername(), path) {\r
@Override\r
- public void onSuccess(Resource result) {\r
- updateMetaData(app.getApiPath(), app.getUsername(), path + "?update=", newTags, finalPublished, perms);\r
+ public void onSuccess(@SuppressWarnings("unused") Resource result) {\r
+ updateMetaData(app.getApiPath(), file.getOwner(), path + "?update=", newMeta, finalPublished, perms);\r
}\r
\r
@Override\r
public void onError(Throwable t) {\r
GWT.log("", t);\r
+ app.setError(t);\r
app.displayError("System error modifying file:" + t.getMessage());\r
}\r
+\r
+ @Override\r
+ protected void onUnauthorized(@SuppressWarnings("unused") Response response) {\r
+ app.sessionExpired();\r
+ }\r
};\r
updateFile.setHeader("X-Auth-Token", app.getToken());\r
- updateFile.setHeader("X-Move-From", file.getUri());\r
+ updateFile.setHeader("X-Move-From", URL.encodePathSegment(file.getUri()));\r
updateFile.setHeader("Content-Type", file.getContentType());\r
Scheduler.get().scheduleDeferred(updateFile);\r
}\r
else\r
- updateMetaData(app.getApiPath(), app.getUsername(), file.getUri() + "?update=", newTags, finalPublished, perms);\r
+ updateMetaData(app.getApiPath(), app.getUsername(), file.getUri() + "?update=", newMeta, finalPublished, perms);\r
}\r
\r
- private void updateMetaData(String api, String owner, String path, String[] newTags, Boolean published, Map<String, Boolean[]> newPermissions) {\r
- if (newTags != null || published != null || newPermissions != null) {\r
+ protected void updateMetaData(String api, String owner, String path, Map<String, String> newMeta, Boolean published, Map<String, Boolean[]> newPermissions) {\r
+ if (newMeta != null || published != null || newPermissions != null) {\r
PostRequest updateFile = new PostRequest(api, owner, path) {\r
@Override\r
- public void onSuccess(Resource result) {\r
- app.updateFolder(file.getParent());\r
+ public void onSuccess(@SuppressWarnings("unused") Resource result) {\r
+ app.updateFolder(file.getParent(), true, null);\r
}\r
\r
@Override\r
public void onError(Throwable t) {\r
GWT.log("", t);\r
+ app.setError(t);\r
app.displayError("System error modifying file:" + t.getMessage());\r
}\r
+\r
+ @Override\r
+ protected void onUnauthorized(@SuppressWarnings("unused") Response response) {\r
+ app.sessionExpired();\r
+ }\r
};\r
updateFile.setHeader("X-Auth-Token", app.getToken());\r
- if (newTags != null)\r
- for (String t : newTags)\r
- updateFile.setHeader("X-Object-Meta-" + t.trim(), "true");\r
+ \r
+ if (newMeta != null) {\r
+ for (String t : file.getMeta().keySet()) {\r
+ updateFile.setHeader("X-Object-Meta-" + URL.encodePathSegment(t.trim()), "~");\r
+ }\r
+ \r
+ for (String key : newMeta.keySet())\r
+ updateFile.setHeader("X-Object-Meta-" + URL.encodePathSegment(key.trim()), URL.encodePathSegment(newMeta.get(key)));\r
+ }\r
+ \r
if (published != null)\r
updateFile.setHeader("X-Object-Public", published.toString());\r
if (newPermissions != null) {\r
- String readPermHeader = "read=" + app.getUsername() + ",";\r
- String writePermHeader = "write=" + app.getUsername() + ",";\r
+ String readPermHeader = "read=";\r
+ String writePermHeader = "write=";\r
for (String u : newPermissions.keySet()) {\r
Boolean[] p = newPermissions.get(u);\r
if (p[0] != null && p[0])\r
if (p[1] != null && p[1])\r
writePermHeader += u + ",";\r
}\r
- if (readPermHeader.endsWith(","))\r
+ if (readPermHeader.endsWith("="))\r
+ readPermHeader = "";\r
+ else if (readPermHeader.endsWith(","))\r
readPermHeader = readPermHeader.substring(0, readPermHeader.length() - 1);\r
- if (writePermHeader.endsWith(","))\r
+ if (writePermHeader.endsWith("="))\r
+ writePermHeader = "";\r
+ else if (writePermHeader.endsWith(","))\r
writePermHeader = writePermHeader.substring(0, writePermHeader.length() - 1);\r
- String permHeader = readPermHeader + ";" + writePermHeader;\r
+ String permHeader = readPermHeader + ((readPermHeader.length() > 0 && writePermHeader.length() > 0) ? ";" : "") + writePermHeader;\r
+ if (permHeader.length() == 0)\r
+ permHeader="~";\r
+ else\r
+ permHeader = URL.encodePathSegment(permHeader);\r
updateFile.setHeader("X-Object-Sharing", permHeader);\r
}\r
Scheduler.get().scheduleDeferred(updateFile);\r
}\r
else\r
- app.updateFolder(file.getParent());\r
+ app.updateFolder(file.getParent(), true, null);\r
}\r
-\r
- private void removeAllOldVersions() {\r
- }\r
}\r
projects / pithos-web-client / blobdiff