From 7811b9d1b61781af911aebe3f47f7196cbb0b059 Mon Sep 17 00:00:00 2001 From: Christos Stathis Date: Fri, 9 Sep 2011 16:15:51 +0300 Subject: [PATCH] Fixed various compilation warnings --- .../web/client/AbstractPropertiesDialog.java | 3 +- .../pithos/web/client/ConfirmationDialog.java | 4 +- .../grnet/pithos/web/client/DeleteFileDialog.java | 12 +- .../pithos/web/client/DeleteFolderDialog.java | 8 +- src/gr/grnet/pithos/web/client/FileList.java | 42 ++---- .../pithos/web/client/FilePropertiesDialog.java | 38 ++--- .../grnet/pithos/web/client/FileUploadDialog.java | 9 +- .../pithos/web/client/FilesPropertiesDialog.java | 6 +- .../grnet/pithos/web/client/FolderContextMenu.java | 4 +- .../pithos/web/client/FolderPropertiesDialog.java | 68 ++++----- .../web/client/GSSSelectionEventManager.java | 35 +++-- src/gr/grnet/pithos/web/client/MessagePanel.java | 10 +- .../pithos/web/client/PermissionsAddDialog.java | 6 +- .../grnet/pithos/web/client/PermissionsList.java | 4 +- src/gr/grnet/pithos/web/client/Pithos.java | 159 +++++++++----------- .../pithos/web/client/SessionExpiredDialog.java | 4 +- src/gr/grnet/pithos/web/client/SharingUsers.java | 5 +- src/gr/grnet/pithos/web/client/SortableHeader.java | 2 +- src/gr/grnet/pithos/web/client/StatusPanel.java | 3 - src/gr/grnet/pithos/web/client/TopPanel.java | 3 +- src/gr/grnet/pithos/web/client/VersionsList.java | 17 --- .../grnet/pithos/web/client/animation/FadeIn.java | 4 +- .../grnet/pithos/web/client/animation/FadeOut.java | 4 +- .../pithos/web/client/commands/CopyCommand.java | 1 + .../pithos/web/client/commands/CutCommand.java | 1 + .../pithos/web/client/commands/DeleteCommand.java | 3 +- .../web/client/commands/EmptyTrashCommand.java | 3 - .../pithos/web/client/commands/PasteCommand.java | 11 +- .../web/client/commands/PropertiesCommand.java | 5 +- .../pithos/web/client/commands/ToTrashCommand.java | 18 ++- .../web/client/components/TristateCheckBox.java | 8 +- .../web/client/foldertree/AccountResource.java | 9 +- .../grnet/pithos/web/client/foldertree/File.java | 18 ++- .../grnet/pithos/web/client/foldertree/Folder.java | 30 ++-- .../web/client/foldertree/FolderTreeView.java | 15 +- .../web/client/foldertree/FolderTreeViewModel.java | 61 ++++---- .../pithos/web/client/foldertree/Resource.java | 16 +- .../web/client/mysharedtree/MysharedTreeView.java | 20 ++- .../client/mysharedtree/MysharedTreeViewModel.java | 24 +-- .../othersharedtree/OtherSharedTreeView.java | 15 +- .../othersharedtree/OtherSharedTreeViewModel.java | 42 +++--- .../pithos/web/client/rest/DeleteRequest.java | 6 +- .../grnet/pithos/web/client/rest/GetRequest.java | 21 +-- .../grnet/pithos/web/client/rest/PostRequest.java | 6 +- .../grnet/pithos/web/client/rest/PutRequest.java | 6 +- src/gr/grnet/pithos/web/client/tagtree/Tag.java | 10 +- .../pithos/web/client/tagtree/TagTreeView.java | 15 +- .../web/client/tagtree/TagTreeViewModel.java | 84 ++++------- 48 files changed, 411 insertions(+), 487 deletions(-) diff --git a/src/gr/grnet/pithos/web/client/AbstractPropertiesDialog.java b/src/gr/grnet/pithos/web/client/AbstractPropertiesDialog.java index fc2a7b9..1a2262d 100644 --- a/src/gr/grnet/pithos/web/client/AbstractPropertiesDialog.java +++ b/src/gr/grnet/pithos/web/client/AbstractPropertiesDialog.java @@ -97,7 +97,8 @@ public abstract class AbstractPropertiesDialog extends DialogBox { switch (evt.getKeyCode()) { case KeyCodes.KEY_ENTER: accept(); - case KeyCodes.KEY_ESCAPE: + //$FALL-THROUGH$ + case KeyCodes.KEY_ESCAPE: closeDialog(); break; } diff --git a/src/gr/grnet/pithos/web/client/ConfirmationDialog.java b/src/gr/grnet/pithos/web/client/ConfirmationDialog.java index c82f97f..f03c90c 100644 --- a/src/gr/grnet/pithos/web/client/ConfirmationDialog.java +++ b/src/gr/grnet/pithos/web/client/ConfirmationDialog.java @@ -78,7 +78,7 @@ public abstract class ConfirmationDialog extends DialogBox { Button ok = new Button(buttonLabel, new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { confirm(); hide(); } @@ -91,7 +91,7 @@ public abstract class ConfirmationDialog extends DialogBox { Button cancel = new Button("Cancel", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { hide(); cancel(); } diff --git a/src/gr/grnet/pithos/web/client/DeleteFileDialog.java b/src/gr/grnet/pithos/web/client/DeleteFileDialog.java index d169e17..f00937a 100644 --- a/src/gr/grnet/pithos/web/client/DeleteFileDialog.java +++ b/src/gr/grnet/pithos/web/client/DeleteFileDialog.java @@ -65,7 +65,7 @@ public class DeleteFileDialog extends DialogBox { private List files; - private Pithos app; + protected Pithos app; /** * The widget's constructor. @@ -94,7 +94,7 @@ public class DeleteFileDialog extends DialogBox { // when the button is clicked and deletes the file. Button ok = new Button("Delete", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { deleteFiles(); hide(); } @@ -106,7 +106,7 @@ public class DeleteFileDialog extends DialogBox { // dialog when the button is clicked. Button cancel = new Button("Cancel", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { hide(); } }); @@ -125,18 +125,18 @@ public class DeleteFileDialog extends DialogBox { /** * Generate an RPC request to delete a file. */ - private void deleteFiles() { + protected void deleteFiles() { Iterator iter = files.iterator(); deleteFile(iter); } - private void deleteFile(final Iterator iter) { + protected void deleteFile(final Iterator iter) { if (iter.hasNext()) { File f = iter.next(); String path = f.getUri(); DeleteRequest deleteFile = new DeleteRequest(app.getApiPath(), app.getUsername(), path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { deleteFile(iter); } diff --git a/src/gr/grnet/pithos/web/client/DeleteFolderDialog.java b/src/gr/grnet/pithos/web/client/DeleteFolderDialog.java index c4a80aa..22c26b8 100644 --- a/src/gr/grnet/pithos/web/client/DeleteFolderDialog.java +++ b/src/gr/grnet/pithos/web/client/DeleteFolderDialog.java @@ -56,8 +56,8 @@ import com.google.gwt.user.client.ui.VerticalPanel; */ public class DeleteFolderDialog extends DialogBox { - private Pithos app; - private Folder folder; + protected Pithos app; + protected Folder folder; /** * The widget's constructor. @@ -83,7 +83,7 @@ public class DeleteFolderDialog extends DialogBox { // when the button is clicked and deletes the folder. Button ok = new Button("Delete", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { app.deleteFolder(folder); hide(); } @@ -94,7 +94,7 @@ public class DeleteFolderDialog extends DialogBox { // dialog when the button is clicked. Button cancel = new Button("Cancel", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { hide(); } }); diff --git a/src/gr/grnet/pithos/web/client/FileList.java b/src/gr/grnet/pithos/web/client/FileList.java index 7fc4411..7031544 100644 --- a/src/gr/grnet/pithos/web/client/FileList.java +++ b/src/gr/grnet/pithos/web/client/FileList.java @@ -35,11 +35,6 @@ package gr.grnet.pithos.web.client; -import com.google.gwt.event.dom.client.ContextMenuEvent; -import com.google.gwt.event.dom.client.ContextMenuHandler; - -import com.google.gwt.user.cellview.client.Column; -import gr.grnet.pithos.web.client.commands.UploadFileCommand; import gr.grnet.pithos.web.client.foldertree.File; import gr.grnet.pithos.web.client.foldertree.Folder; import gr.grnet.pithos.web.client.foldertree.FolderTreeView; @@ -55,27 +50,21 @@ import com.google.gwt.cell.client.SafeHtmlCell; import com.google.gwt.cell.client.TextCell; import com.google.gwt.cell.client.ValueUpdater; import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.Style.Cursor; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.ContextMenuEvent; +import com.google.gwt.event.dom.client.ContextMenuHandler; import com.google.gwt.i18n.client.DateTimeFormat; -import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.safehtml.client.SafeHtmlTemplates; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.user.cellview.client.CellTable; +import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.ui.AbstractImagePrototype; -import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.view.client.ListDataProvider; import com.google.gwt.view.client.MultiSelectionModel; import com.google.gwt.view.client.ProvidesKey; -import com.google.gwt.view.client.SelectionChangeEvent; -import com.google.gwt.view.client.SelectionChangeEvent.Handler; /** * A composite that displays the list of files in a particular folder. @@ -91,7 +80,8 @@ public class FileList extends Composite { } interface TableResources extends CellTable.Resources { - @Source({CellTable.Style.DEFAULT_CSS, "GssCellTable.css"}) + @Override + @Source({CellTable.Style.DEFAULT_CSS, "GssCellTable.css"}) TableStyle cellTableStyle(); } @@ -114,13 +104,13 @@ public class FileList extends Composite { public SafeHtml spanWithIdAndClass(String id, String cssClass, String content); } - private final DateTimeFormat formatter = DateTimeFormat.getFormat("d/M/yyyy h:mm a"); + protected final DateTimeFormat formatter = DateTimeFormat.getFormat("d/M/yyyy h:mm a"); /** * Specifies that the images available for this composite will be the ones * available in FileContextMenu. */ - public interface Images extends ClientBundle,FileContextMenu.Images, FolderTreeView.Images { + public interface Images extends FolderTreeView.Images { @Source("gr/grnet/pithos/resources/blank.gif") ImageResource blank(); @@ -214,19 +204,19 @@ public class FileList extends Composite { /** * The widget's image bundle. */ - private final Images images; + protected final Images images; - private CellTable celltable; + protected CellTable celltable; private final MultiSelectionModel selectionModel; - private final List allHeaders = new ArrayList(); + protected final List allHeaders = new ArrayList(); SortableHeader nameHeader; FolderTreeView treeView; - private Pithos app; + protected Pithos app; /** * Construct the file list widget. This entails setting up the widget @@ -391,7 +381,7 @@ public class FileList extends Composite { /** * Update the display of the file list. */ - void update(boolean sort) { + void update(@SuppressWarnings("unused") boolean sort) { showCellTable(); } @@ -401,7 +391,7 @@ public class FileList extends Composite { * @param file * @return the icon */ - private ImageResource getFileIcon(File file) { + protected ImageResource getFileIcon(File file) { String mimetype = file.getContentType(); boolean shared = file.isShared(); if (mimetype == null) @@ -495,13 +485,11 @@ public class FileList extends Composite { } } - private void sortFiles(final String sortingProperty, final boolean sortingType){ + protected void sortFiles(final String sortingProperty, final boolean sortingType){ Collections.sort(files, new Comparator() { @Override public int compare(File arg0, File arg1) { - AbstractImagePrototype descPrototype = AbstractImagePrototype.create(images.desc()); - AbstractImagePrototype ascPrototype = AbstractImagePrototype.create(images.asc()); if (sortingType){ if (sortingProperty.equals("version")) { return arg0.getVersion() - arg1.getVersion(); @@ -556,7 +544,7 @@ public class FileList extends Composite { this.header=header; } @Override - public void update(String value) { + public void update(@SuppressWarnings("unused") String value) { header.setSorted(true); header.toggleReverseSort(); diff --git a/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java b/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java index 92d6f23..473824c 100644 --- a/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java +++ b/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java @@ -34,21 +34,22 @@ */ package gr.grnet.pithos.web.client; -import com.google.gwt.core.client.Scheduler; -import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.Anchor; -import com.google.gwt.user.client.ui.Label; import gr.grnet.pithos.web.client.foldertree.File; import gr.grnet.pithos.web.client.foldertree.Resource; import gr.grnet.pithos.web.client.rest.PostRequest; import gr.grnet.pithos.web.client.rest.PutRequest; +import gr.grnet.pithos.web.client.tagtree.Tag; + +import java.util.Map; import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.Scheduler; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.i18n.client.DateTimeFormat; -import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.DecoratedTabPanel; @@ -58,10 +59,9 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FocusPanel; import com.google.gwt.user.client.ui.HasHorizontalAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.VerticalPanel; -import gr.grnet.pithos.web.client.tagtree.Tag; -import java.util.Map; /** * The 'File properties' dialog box implementation. @@ -69,14 +69,14 @@ import java.util.Map; */ public class FilePropertiesDialog extends AbstractPropertiesDialog { - private PermissionsList permList; + protected PermissionsList permList; - private CheckBox readForAll; + protected CheckBox readForAll; /** * An image bundle for this widgets images. */ - public interface Images extends ClientBundle,MessagePanel.Images { + public interface Images extends MessagePanel.Images { @Source("gr/grnet/pithos/resources/edit_user.png") ImageResource permUser(); @@ -136,7 +136,7 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog { // when the button is clicked. final Button ok = new Button("OK", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { accept(); closeDialog(); } @@ -148,7 +148,7 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog { // dialog when the button is clicked. final Button cancel = new Button("Cancel", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { closeDialog(); } }); @@ -223,7 +223,7 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog { tagAnchor.addClickHandler(new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { String existing = tags.getText().trim(); if (MULTIPLE_VALUES_TEXT.equals(existing)) existing = ""; @@ -251,7 +251,7 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog { HorizontalPanel permButtons = new HorizontalPanel(); Button add = new Button("Add Group", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { PermissionsAddDialog dlg = new PermissionsAddDialog(app, app.getAccount().getGroups(), permList, false); dlg.center(); permList.updatePermissionTable(); @@ -262,7 +262,7 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog { final Button addUser = new Button("Add User", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { PermissionsAddDialog dlg = new PermissionsAddDialog(app, app.getAccount().getGroups(), permList, true); dlg.center(); permList.updatePermissionTable(); @@ -286,7 +286,7 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog { readForAll.setValue(file.isPublished()); readForAll.addClickHandler(new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { readForAllNote.setVisible(readForAll.getValue()); } }); @@ -414,7 +414,7 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog { final String path = file.getParent().getUri() + "/" + newFilename; PutRequest updateFile = new PutRequest(app.getApiPath(), app.getUsername(), path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { updateMetaData(app.getApiPath(), app.getUsername(), path + "?update=", newTags, finalPublished, perms); } @@ -433,11 +433,11 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog { updateMetaData(app.getApiPath(), app.getUsername(), file.getUri() + "?update=", newTags, finalPublished, perms); } - private void updateMetaData(String api, String owner, String path, String[] newTags, Boolean published, Map newPermissions) { + protected void updateMetaData(String api, String owner, String path, String[] newTags, Boolean published, Map newPermissions) { if (newTags != null || published != null || newPermissions != null) { PostRequest updateFile = new PostRequest(api, owner, path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { app.updateFolder(file.getParent(), true); } diff --git a/src/gr/grnet/pithos/web/client/FileUploadDialog.java b/src/gr/grnet/pithos/web/client/FileUploadDialog.java index 9c53ff6..45a6e33 100644 --- a/src/gr/grnet/pithos/web/client/FileUploadDialog.java +++ b/src/gr/grnet/pithos/web/client/FileUploadDialog.java @@ -52,7 +52,6 @@ import com.google.gwt.user.client.ui.FormPanel.SubmitCompleteHandler; import com.google.gwt.user.client.ui.FormPanel.SubmitEvent; import com.google.gwt.user.client.ui.FormPanel.SubmitHandler; import com.google.gwt.user.client.ui.Grid; -import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HasHorizontalAlignment; import com.google.gwt.user.client.ui.Hidden; import com.google.gwt.user.client.ui.HorizontalPanel; @@ -69,7 +68,7 @@ public class FileUploadDialog extends DialogBox { /** * The Form element that performs the file upload. */ - private final FormPanel form = new FormPanel(); + protected final FormPanel form = new FormPanel(); private final FileUpload upload = new FileUpload(); @@ -128,7 +127,7 @@ public class FileUploadDialog extends DialogBox { // form. submit = new Button("Upload", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { prepareAndSubmit(); } }); @@ -138,7 +137,7 @@ public class FileUploadDialog extends DialogBox { // dialog when the button is clicked. final Button cancel = new Button("Cancel", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { hide(); } }); @@ -152,7 +151,7 @@ public class FileUploadDialog extends DialogBox { form.addSubmitHandler(new SubmitHandler() { @Override - public void onSubmit(SubmitEvent event) { + public void onSubmit(@SuppressWarnings("unused") SubmitEvent event) { auth.setValue(app.getToken()); //This is done here because the app object is not available in the constructor } }); diff --git a/src/gr/grnet/pithos/web/client/FilesPropertiesDialog.java b/src/gr/grnet/pithos/web/client/FilesPropertiesDialog.java index 4d124e9..efda620 100644 --- a/src/gr/grnet/pithos/web/client/FilesPropertiesDialog.java +++ b/src/gr/grnet/pithos/web/client/FilesPropertiesDialog.java @@ -61,8 +61,6 @@ public class FilesPropertiesDialog extends AbstractPropertiesDialog { private final List files; - private Boolean initialVersioned; - /** * The widget's constructor. * @@ -115,7 +113,7 @@ public class FilesPropertiesDialog extends AbstractPropertiesDialog { // when the button is clicked. final Button ok = new Button("OK", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { accept(); closeDialog(); } @@ -126,7 +124,7 @@ public class FilesPropertiesDialog extends AbstractPropertiesDialog { // dialog when the button is clicked. final Button cancel = new Button("Cancel", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { closeDialog(); } }); diff --git a/src/gr/grnet/pithos/web/client/FolderContextMenu.java b/src/gr/grnet/pithos/web/client/FolderContextMenu.java index 255dbbe..7fc6faa 100644 --- a/src/gr/grnet/pithos/web/client/FolderContextMenu.java +++ b/src/gr/grnet/pithos/web/client/FolderContextMenu.java @@ -34,7 +34,6 @@ */ package gr.grnet.pithos.web.client; -import gr.grnet.pithos.web.client.FileContextMenu.Images; import gr.grnet.pithos.web.client.commands.CopyCommand; import gr.grnet.pithos.web.client.commands.CutCommand; import gr.grnet.pithos.web.client.commands.DeleteCommand; @@ -44,7 +43,6 @@ import gr.grnet.pithos.web.client.commands.PropertiesCommand; import gr.grnet.pithos.web.client.commands.ToTrashCommand; import gr.grnet.pithos.web.client.foldertree.Folder; -import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.MenuBar; import com.google.gwt.user.client.ui.MenuItem; @@ -64,7 +62,7 @@ public class FolderContextMenu extends PopupPanel { * The image bundle for this widget's images that reuses images defined in * other menus. */ - public interface Images extends ClientBundle, FileContextMenu.Images { + public interface Images extends FileContextMenu.Images { } private MenuItem pasteItem; diff --git a/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java b/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java index 1daf0ee..86f3f2a 100644 --- a/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java +++ b/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java @@ -68,7 +68,7 @@ import java.util.Map; */ public class FolderPropertiesDialog extends DialogBox { - private Pithos app; + protected Pithos app; /** * The widget that holds the folderName of the folder. @@ -81,7 +81,7 @@ public class FolderPropertiesDialog extends DialogBox { */ private final boolean create; - private PermissionsList permList; + protected PermissionsList permList; final Folder folder; @@ -95,7 +95,7 @@ public class FolderPropertiesDialog extends DialogBox { setAnimationEnabled(true); // Enable IE selection for the dialog (must disable it upon closing it) - app.enableIESelection(); + Pithos.enableIESelection(); create = _create; @@ -153,7 +153,7 @@ public class FolderPropertiesDialog extends DialogBox { HorizontalPanel permButtons = new HorizontalPanel(); Button add = new Button("Add Group", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { PermissionsAddDialog dlg = new PermissionsAddDialog(app, app.getAccount().getGroups(), permList, false); dlg.center(); } @@ -163,7 +163,7 @@ public class FolderPropertiesDialog extends DialogBox { Button addUser = new Button("Add User", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { PermissionsAddDialog dlg = new PermissionsAddDialog(app, app.getAccount().getGroups(), permList, true); dlg.center(); } @@ -192,7 +192,7 @@ public class FolderPropertiesDialog extends DialogBox { okLabel = "Update"; Button ok = new Button(okLabel, new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { createOrUpdateFolder(); closeDialog(); } @@ -204,7 +204,7 @@ public class FolderPropertiesDialog extends DialogBox { // when the button is clicked. Button cancel = new Button("Cancel", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { closeDialog(); } }); @@ -250,7 +250,7 @@ public class FolderPropertiesDialog extends DialogBox { * (we disable the prevention on creation of the dialog) */ public void closeDialog() { - app.preventIESelection(); + Pithos.preventIESelection(); hide(); } @@ -262,7 +262,7 @@ public class FolderPropertiesDialog extends DialogBox { String path = folder.getUri() + "/" + name; PutRequest createFolder = new PutRequest(app.getApiPath(), app.getUsername(), path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { app.updateFolder(folder, true); } @@ -288,7 +288,7 @@ public class FolderPropertiesDialog extends DialogBox { * the actual work of modifying folder properties or creating a new Folder * depending on the value of the create field */ - private void createOrUpdateFolder() { + protected void createOrUpdateFolder() { if (create) createFolder(); else @@ -303,7 +303,7 @@ public class FolderPropertiesDialog extends DialogBox { final String path = folder.getParent().getUri() + "/" + newName; PutRequest newFolder = new PutRequest(app.getApiPath(), app.getUsername(), path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { Iterator iter = folder.getFiles().iterator(); app.copyFiles(iter, folder.getParent().getUri() + "/" + newName, new Command() { @Override @@ -340,11 +340,11 @@ public class FolderPropertiesDialog extends DialogBox { updateMetadata(folder.getUri() + "?update=", perms); } - private void updateMetadata(String path, Map newPermissions) { + protected void updateMetadata(String path, Map newPermissions) { if (newPermissions != null) { PostRequest updateFolder = new PostRequest(app.getApiPath(), folder.getOwner(), path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { app.updateFolder(folder.getParent(), false); } @@ -355,29 +355,27 @@ public class FolderPropertiesDialog extends DialogBox { } }; updateFolder.setHeader("X-Auth-Token", app.getToken()); - if (newPermissions != null) { - String readPermHeader = "read="; - String writePermHeader = "write="; - for (String u : newPermissions.keySet()) { - Boolean[] p = newPermissions.get(u); - if (p[0] != null && p[0]) - readPermHeader += u + ","; - if (p[1] != null && p[1]) - writePermHeader += u + ","; - } - if (readPermHeader.endsWith("=")) - readPermHeader = ""; - else if (readPermHeader.endsWith(",")) - readPermHeader = readPermHeader.substring(0, readPermHeader.length() - 1); - if (writePermHeader.endsWith("=")) - writePermHeader = ""; - else if (writePermHeader.endsWith(",")) - writePermHeader = writePermHeader.substring(0, writePermHeader.length() - 1); - String permHeader = readPermHeader + ((readPermHeader.length() > 0 && writePermHeader.length() > 0) ? ";" : "") + writePermHeader; - if (permHeader.length() == 0) - permHeader="~"; - updateFolder.setHeader("X-Object-Sharing", permHeader); + String readPermHeader = "read="; + String writePermHeader = "write="; + for (String u : newPermissions.keySet()) { + Boolean[] p = newPermissions.get(u); + if (p[0] != null && p[0]) + readPermHeader += u + ","; + if (p[1] != null && p[1]) + writePermHeader += u + ","; } + if (readPermHeader.endsWith("=")) + readPermHeader = ""; + else if (readPermHeader.endsWith(",")) + readPermHeader = readPermHeader.substring(0, readPermHeader.length() - 1); + if (writePermHeader.endsWith("=")) + writePermHeader = ""; + else if (writePermHeader.endsWith(",")) + writePermHeader = writePermHeader.substring(0, writePermHeader.length() - 1); + String permHeader = readPermHeader + ((readPermHeader.length() > 0 && writePermHeader.length() > 0) ? ";" : "") + writePermHeader; + if (permHeader.length() == 0) + permHeader="~"; + updateFolder.setHeader("X-Object-Sharing", permHeader); Scheduler.get().scheduleDeferred(updateFolder); } else diff --git a/src/gr/grnet/pithos/web/client/GSSSelectionEventManager.java b/src/gr/grnet/pithos/web/client/GSSSelectionEventManager.java index ec4541d..65195a0 100644 --- a/src/gr/grnet/pithos/web/client/GSSSelectionEventManager.java +++ b/src/gr/grnet/pithos/web/client/GSSSelectionEventManager.java @@ -49,7 +49,7 @@ import com.google.gwt.view.client.Range; import com.google.gwt.view.client.SelectionModel; /** - * An implementation of {@link CellPreviewEvent.Handler} that adds selection + * An implementation of {@link com.google.gwt.view.client.CellPreviewEvent.Handler} that adds selection * support via the spacebar and mouse clicks and handles the control key. * *

@@ -65,7 +65,7 @@ public class GSSSelectionEventManager implements CellPreviewEvent.Handler { /** - * Implementation of {@link EventTranslator} that only triggers selection when + * Implementation of {@link gr.grnet.pithos.web.client.GSSSelectionEventManager.EventTranslator} that only triggers selection when * any checkbox is selected. * * @param the data type @@ -78,7 +78,7 @@ public class GSSSelectionEventManager implements private final int column; /** - * Construct a new {@link CheckboxEventTranslator} that will trigger + * Construct a new {@link gr.grnet.pithos.web.client.GSSSelectionEventManager.CheckboxEventTranslator} that will trigger * selection when any checkbox in any column is selected. */ public CheckboxEventTranslator() { @@ -86,7 +86,7 @@ public class GSSSelectionEventManager implements } /** - * Construct a new {@link CheckboxEventTranslator} that will trigger + * Construct a new {@link gr.grnet.pithos.web.client.GSSSelectionEventManager.CheckboxEventTranslator} that will trigger * selection when a checkbox in the specified column is selected. * * @param column the column index, or -1 for all columns @@ -95,11 +95,13 @@ public class GSSSelectionEventManager implements this.column = column; } - public boolean clearCurrentSelection(CellPreviewEvent event) { + @Override + public boolean clearCurrentSelection(@SuppressWarnings("unused") CellPreviewEvent event) { return false; } - public SelectAction translateSelectionEvent(CellPreviewEvent event) { + @Override + public SelectAction translateSelectionEvent(CellPreviewEvent event) { // Handle the event. NativeEvent nativeEvent = event.getNativeEvent(); if ("click".equals(nativeEvent.getType())) { @@ -279,6 +281,8 @@ public class GSSSelectionEventManager implements case TOGGLE: addToSelection = !selectionModel.isSelected(rowValue); break; + case DEFAULT: + break; } } @@ -325,7 +329,8 @@ public class GSSSelectionEventManager implements } } - public void onCellPreview(CellPreviewEvent event) { + @Override +public void onCellPreview(CellPreviewEvent event) { // Early exit if selection is already handled or we are editing. if (event.isCellEditing() || event.isSelectionHandled()) { return; @@ -377,20 +382,21 @@ public class GSSSelectionEventManager implements NativeEvent nativeEvent = event.getNativeEvent(); String type = nativeEvent.getType(); boolean rightclick = "mousedown".equals(type) && nativeEvent.getButton()==NativeEvent.BUTTON_RIGHT; + SelectAction action1 = action; if(rightclick){ boolean shift = nativeEvent.getShiftKey(); boolean ctrlOrMeta = nativeEvent.getCtrlKey() || nativeEvent.getMetaKey(); boolean clearOthers = (translator == null) ? !ctrlOrMeta : translator.clearCurrentSelection(event); if (action == null || action == SelectAction.DEFAULT) { - action = ctrlOrMeta ? SelectAction.TOGGLE : SelectAction.SELECT; + action1 = ctrlOrMeta ? SelectAction.TOGGLE : SelectAction.SELECT; } //if the row is selected then do nothing if(selectionModel.isSelected(event.getValue())){ return; } doMultiSelection(selectionModel, event.getDisplay(), event.getIndex(), - event.getValue(), action, shift, clearOthers); + event.getValue(), action1, shift, clearOthers); } else if ("click".equals(type)) { /* @@ -403,10 +409,10 @@ public class GSSSelectionEventManager implements boolean clearOthers = (translator == null) ? !ctrlOrMeta : translator.clearCurrentSelection(event); if (action == null || action == SelectAction.DEFAULT) { - action = ctrlOrMeta ? SelectAction.TOGGLE : SelectAction.SELECT; + action1 = ctrlOrMeta ? SelectAction.TOGGLE : SelectAction.SELECT; } doMultiSelection(selectionModel, event.getDisplay(), event.getIndex(), - event.getValue(), action, shift, clearOthers); + event.getValue(), action1, shift, clearOthers); if(ctrlOrMeta){ event.setCanceled(true); } @@ -421,10 +427,10 @@ public class GSSSelectionEventManager implements boolean clearOthers = (translator == null) ? false : translator.clearCurrentSelection(event); if (action == null || action == SelectAction.DEFAULT) { - action = SelectAction.TOGGLE; + action1 = SelectAction.TOGGLE; } doMultiSelection(selectionModel, event.getDisplay(), event.getIndex(), - event.getValue(), action, shift, clearOthers); + event.getValue(), action1, shift, clearOthers); } } } @@ -455,6 +461,8 @@ public class GSSSelectionEventManager implements case TOGGLE: selectionModel.setSelected(value, !selectionModel.isSelected(value)); return; + case DEFAULT: + break; } } @@ -509,7 +517,6 @@ public class GSSSelectionEventManager implements Range range, boolean addToSelection, boolean clearOthers) { // Get the list of values to select. List toUpdate = new ArrayList(); - int itemCount = display.getVisibleItemCount(); int start = range.getStart(); int end = start + range.getLength(); for (int i = start; i < end ; i++) { diff --git a/src/gr/grnet/pithos/web/client/MessagePanel.java b/src/gr/grnet/pithos/web/client/MessagePanel.java index 385d026..392e51c 100644 --- a/src/gr/grnet/pithos/web/client/MessagePanel.java +++ b/src/gr/grnet/pithos/web/client/MessagePanel.java @@ -92,7 +92,7 @@ public class MessagePanel extends Composite { /** * The panel that enables special effects for this widget. */ - private SimplePanel simplePanel = new SimplePanel(); + protected SimplePanel simplePanel = new SimplePanel(); /** * The widget's constructor. @@ -122,7 +122,7 @@ public class MessagePanel extends Composite { clearMessageLink.addClickHandler(new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { FadeOut anim = new FadeOut(simplePanel){ @Override protected void onComplete() { @@ -146,7 +146,7 @@ public class MessagePanel extends Composite { message.addClickHandler(new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { FadeOut anim = new FadeOut(simplePanel){ @Override @@ -174,7 +174,7 @@ public class MessagePanel extends Composite { message.addClickHandler(new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { FadeOut anim = new FadeOut(simplePanel){ @Override @@ -203,7 +203,7 @@ public class MessagePanel extends Composite { message.addClickHandler(new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { FadeOut anim = new FadeOut(simplePanel){ @Override diff --git a/src/gr/grnet/pithos/web/client/PermissionsAddDialog.java b/src/gr/grnet/pithos/web/client/PermissionsAddDialog.java index ab58cd1..c503199 100644 --- a/src/gr/grnet/pithos/web/client/PermissionsAddDialog.java +++ b/src/gr/grnet/pithos/web/client/PermissionsAddDialog.java @@ -104,7 +104,7 @@ public class PermissionsAddDialog extends DialogBox { final HorizontalPanel buttons = new HorizontalPanel(); final Button ok = new Button("OK", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { addPermission(); hide(); } @@ -116,7 +116,7 @@ public class PermissionsAddDialog extends DialogBox { // when the button is clicked. final Button cancel = new Button("Cancel", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { hide(); } }); @@ -131,7 +131,7 @@ public class PermissionsAddDialog extends DialogBox { setWidget(panel); } - private void addPermission() { + protected void addPermission() { String selected = null; if (userAdd) { selected = userBox.getText(); diff --git a/src/gr/grnet/pithos/web/client/PermissionsList.java b/src/gr/grnet/pithos/web/client/PermissionsList.java index 03baa72..39aaad2 100644 --- a/src/gr/grnet/pithos/web/client/PermissionsList.java +++ b/src/gr/grnet/pithos/web/client/PermissionsList.java @@ -64,7 +64,7 @@ public class PermissionsList extends Composite { final String owner; - private boolean hasChanges = false; + protected boolean hasChanges = false; private boolean readonly = false; @@ -152,7 +152,7 @@ public class PermissionsList extends Composite { }); PushButton removeButton = new PushButton(AbstractImagePrototype.create(images.delete()).createImage(), new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { permissions.remove(user); updatePermissionTable(); hasChanges = true; diff --git a/src/gr/grnet/pithos/web/client/Pithos.java b/src/gr/grnet/pithos/web/client/Pithos.java index daf4d09..f9421a5 100644 --- a/src/gr/grnet/pithos/web/client/Pithos.java +++ b/src/gr/grnet/pithos/web/client/Pithos.java @@ -34,33 +34,6 @@ */ package gr.grnet.pithos.web.client; -import com.google.gwt.core.client.Scheduler; -import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.http.client.Request; -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.RequestCallback; -import com.google.gwt.http.client.RequestException; -import com.google.gwt.http.client.Response; -import com.google.gwt.json.client.JSONArray; -import com.google.gwt.json.client.JSONObject; -import com.google.gwt.json.client.JSONParser; -import com.google.gwt.json.client.JSONString; -import com.google.gwt.json.client.JSONValue; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.ui.Button; -import com.google.gwt.user.client.ui.HTML; -import com.google.gwt.user.client.ui.HasHorizontalAlignment.HorizontalAlignmentConstant; -import com.google.gwt.user.client.ui.HasVerticalAlignment; -import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.PushButton; -import com.google.gwt.view.client.SelectionChangeEvent; -import com.google.gwt.view.client.SelectionChangeEvent.Handler; -import com.google.gwt.view.client.SelectionModel; -import com.google.gwt.view.client.SingleSelectionModel; -import com.google.gwt.view.client.TreeViewModel; import gr.grnet.pithos.web.client.commands.UploadFileCommand; import gr.grnet.pithos.web.client.foldertree.AccountResource; import gr.grnet.pithos.web.client.foldertree.File; @@ -76,38 +49,54 @@ import gr.grnet.pithos.web.client.rest.DeleteRequest; import gr.grnet.pithos.web.client.rest.GetRequest; import gr.grnet.pithos.web.client.rest.PutRequest; import gr.grnet.pithos.web.client.rest.RestException; - import gr.grnet.pithos.web.client.tagtree.Tag; import gr.grnet.pithos.web.client.tagtree.TagTreeView; import gr.grnet.pithos.web.client.tagtree.TagTreeViewModel; + import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Set; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.logical.shared.ResizeEvent; import com.google.gwt.event.logical.shared.ResizeHandler; -import com.google.gwt.event.logical.shared.SelectionEvent; -import com.google.gwt.event.logical.shared.SelectionHandler; -import com.google.gwt.i18n.client.DateTimeFormat; -import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.http.client.Request; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.RequestCallback; +import com.google.gwt.http.client.RequestException; +import com.google.gwt.http.client.Response; +import com.google.gwt.json.client.JSONArray; +import com.google.gwt.json.client.JSONObject; +import com.google.gwt.json.client.JSONParser; +import com.google.gwt.json.client.JSONString; +import com.google.gwt.json.client.JSONValue; import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.user.client.Command; import com.google.gwt.user.client.Cookies; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.History; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.AbstractImagePrototype; -import com.google.gwt.user.client.ui.DecoratedTabPanel; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HasHorizontalAlignment; +import com.google.gwt.user.client.ui.HasVerticalAlignment; +import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.HorizontalSplitPanel; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.PushButton; import com.google.gwt.user.client.ui.RootPanel; -import com.google.gwt.user.client.ui.TabPanel; import com.google.gwt.user.client.ui.VerticalPanel; -import java.util.Set; +import com.google.gwt.view.client.SelectionChangeEvent; +import com.google.gwt.view.client.SelectionChangeEvent.Handler; +import com.google.gwt.view.client.SingleSelectionModel; /** * Entry point classes define onModuleLoad(). @@ -172,7 +161,7 @@ public class Pithos implements EntryPoint, ResizeHandler { * An aggregate image bundle that pulls together all the images for this * application into a single bundle. */ - public interface Images extends ClientBundle, TopPanel.Images, FilePropertiesDialog.Images, MessagePanel.Images, FileList.Images { + public interface Images extends TopPanel.Images, FileList.Images { @Source("gr/grnet/pithos/resources/document.png") ImageResource folders(); @@ -241,25 +230,26 @@ public class Pithos implements EntryPoint, ResizeHandler { */ private String token; - private SingleSelectionModel folderTreeSelectionModel; - private FolderTreeViewModel folderTreeViewModel; - private FolderTreeView folderTreeView; + protected SingleSelectionModel folderTreeSelectionModel; + protected FolderTreeViewModel folderTreeViewModel; + protected FolderTreeView folderTreeView; - private SingleSelectionModel mysharedTreeSelectionModel; + protected SingleSelectionModel mysharedTreeSelectionModel; private MysharedTreeViewModel mysharedTreeViewModel; private MysharedTreeView mysharedTreeView; - private SingleSelectionModel otherSharedTreeSelectionModel; + protected SingleSelectionModel otherSharedTreeSelectionModel; private OtherSharedTreeViewModel otherSharedTreeViewModel; private OtherSharedTreeView otherSharedTreeView; - private SingleSelectionModel tagTreeSelectionModel; + protected SingleSelectionModel tagTreeSelectionModel; private TagTreeViewModel tagTreeViewModel; private TagTreeView tagTreeView; - private AccountResource account; + protected AccountResource account; - private List selectionModels = new ArrayList(); + @SuppressWarnings("rawtypes") + private List selectionModels = new ArrayList(); @Override public void onModuleLoad() { @@ -291,7 +281,7 @@ public class Pithos implements EntryPoint, ResizeHandler { PushButton parentButton = new PushButton(new Image(images.asc()), new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { } }); @@ -309,7 +299,7 @@ public class Pithos implements EntryPoint, ResizeHandler { folderTreeSelectionModel = new SingleSelectionModel(); folderTreeSelectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() { @Override - public void onSelectionChange(SelectionChangeEvent event) { + public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { if (folderTreeSelectionModel.getSelectedObject() != null) { deselectOthers(folderTreeSelectionModel); Folder f = folderTreeSelectionModel.getSelectedObject(); @@ -328,7 +318,7 @@ public class Pithos implements EntryPoint, ResizeHandler { mysharedTreeSelectionModel = new SingleSelectionModel(); mysharedTreeSelectionModel.addSelectionChangeHandler(new Handler() { @Override - public void onSelectionChange(SelectionChangeEvent event) { + public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { if (mysharedTreeSelectionModel.getSelectedObject() != null) { deselectOthers(mysharedTreeSelectionModel); updateSharedFolder(mysharedTreeSelectionModel.getSelectedObject(), true); @@ -342,7 +332,7 @@ public class Pithos implements EntryPoint, ResizeHandler { otherSharedTreeSelectionModel = new SingleSelectionModel(); otherSharedTreeSelectionModel.addSelectionChangeHandler(new Handler() { @Override - public void onSelectionChange(SelectionChangeEvent event) { + public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { if (otherSharedTreeSelectionModel.getSelectedObject() != null) { deselectOthers(otherSharedTreeSelectionModel); updateOtherSharedFolder(otherSharedTreeSelectionModel.getSelectedObject(), true); @@ -356,7 +346,7 @@ public class Pithos implements EntryPoint, ResizeHandler { tagTreeSelectionModel = new SingleSelectionModel(); tagTreeSelectionModel.addSelectionChangeHandler(new Handler() { @Override - public void onSelectionChange(SelectionChangeEvent event) { + public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { if (tagTreeSelectionModel.getSelectedObject() != null) { deselectOthers(tagTreeSelectionModel); Tag t = tagTreeSelectionModel.getSelectedObject(); @@ -372,7 +362,7 @@ public class Pithos implements EntryPoint, ResizeHandler { Button upload = new Button("Upload File", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { new UploadFileCommand(Pithos.this, null, folderTreeView.getSelection()).execute(); } }); @@ -427,7 +417,8 @@ public class Pithos implements EntryPoint, ResizeHandler { }); } - public void deselectOthers(SingleSelectionModel model) { + @SuppressWarnings({ "rawtypes", "unchecked" }) + public void deselectOthers(SingleSelectionModel model) { for (SingleSelectionModel s : selectionModels) if (!s.equals(model)) s.setSelected(s.getSelectedObject(), false); @@ -444,13 +435,13 @@ public class Pithos implements EntryPoint, ResizeHandler { fileList.setFiles(new ArrayList(files)); } - private void fetchFile(final Iterator iter, final Set files) { + protected void fetchFile(final Iterator iter, final Set files) { if (iter.hasNext()) { File file = iter.next(); String path = file.getUri() + "?format=json"; GetRequest getFile = new GetRequest(File.class, getApiPath(), username, path, file) { @Override - public void onSuccess(File result) { + public void onSuccess(@SuppressWarnings("unused") File _result) { fetchFile(iter, files); } @@ -484,23 +475,17 @@ public class Pithos implements EntryPoint, ResizeHandler { authenticateUser(); return false; } - else { - String[] authSplit = auth.split("\\" + conf.cookieSeparator(), 2); - if (authSplit.length != 2) { - authenticateUser(); - return false; - } - else { - username = authSplit[0]; - token = authSplit[1]; - return true; - } - } - } - else { - Cookies.setCookie(conf.authCookie(), username + conf.cookieSeparator() + token); - return true; + String[] authSplit = auth.split("\\" + conf.cookieSeparator(), 2); + if (authSplit.length != 2) { + authenticateUser(); + return false; + } + username = authSplit[0]; + token = authSplit[1]; + return true; } + Cookies.setCookie(conf.authCookie(), username + conf.cookieSeparator() + token); + return true; } /** @@ -511,13 +496,13 @@ public class Pithos implements EntryPoint, ResizeHandler { Window.Location.assign(Window.Location.getHost() + conf.loginUrl() + "?next=" + Window.Location.getHref()); } - private void fetchAccount() { + protected void fetchAccount() { String path = "?format=json"; GetRequest getAccount = new GetRequest(AccountResource.class, getApiPath(), username, path) { @Override - public void onSuccess(AccountResource result) { - account = result; + public void onSuccess(AccountResource _result) { + account = _result; if (account.getContainers().isEmpty()) createHomeContainers(); else { @@ -538,11 +523,11 @@ public class Pithos implements EntryPoint, ResizeHandler { Scheduler.get().scheduleDeferred(getAccount); } - private void createHomeContainers() { + protected void createHomeContainers() { String path = "/pithos"; PutRequest createPithos = new PutRequest(getApiPath(), getUsername(), path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { fetchAccount(); } @@ -575,7 +560,7 @@ public class Pithos implements EntryPoint, ResizeHandler { return captionHTML; } - private void onWindowResized(int height) { + protected void onWindowResized(int height) { // Adjust the split panel to take up the available room in the window. int newHeight = height - splitPanel.getAbsoluteTop() - 60; if (newHeight < 1) @@ -695,7 +680,7 @@ public class Pithos implements EntryPoint, ResizeHandler { try { builder.sendRequest("", new RequestCallback() { @Override - public void onResponseReceived(Request request, Response response) { + public void onResponseReceived(@SuppressWarnings("unused") Request request, Response response) { if (response.getStatusCode() == Response.SC_OK) { JSONValue json = JSONParser.parseStrict(response.getText()); JSONArray array = json.isArray(); @@ -707,7 +692,7 @@ public class Pithos implements EntryPoint, ResizeHandler { } @Override - public void onError(Request request, Throwable exception) { + public void onError(@SuppressWarnings("unused") Request request, Throwable exception) { displayError("System error unable to delete folder: " + exception.getMessage()); } }); @@ -724,7 +709,7 @@ public class Pithos implements EntryPoint, ResizeHandler { String path = "/" + folder.getContainer() + "/" + name.stringValue(); DeleteRequest delete = new DeleteRequest(getApiPath(), getUsername(), path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { deleteObject(folder, i + 1, array); } @@ -737,7 +722,7 @@ public class Pithos implements EntryPoint, ResizeHandler { delete.setHeader("X-Auth-Token", getToken()); Scheduler.get().scheduleDeferred(delete); } - else { + else if (o != null) { String subdir = o.get("subdir").isString().stringValue(); subdir = subdir.substring(0, subdir.length() - 1); String path = getApiPath() + getUsername() + "/" + folder.getContainer() + "?format=json&delimiter=/&prefix=" + subdir; @@ -747,7 +732,7 @@ public class Pithos implements EntryPoint, ResizeHandler { try { builder.sendRequest("", new RequestCallback() { @Override - public void onResponseReceived(Request request, Response response) { + public void onResponseReceived(@SuppressWarnings("unused") Request request, Response response) { if (response.getStatusCode() == Response.SC_OK) { JSONValue json = JSONParser.parseStrict(response.getText()); JSONArray array2 = json.isArray(); @@ -762,7 +747,7 @@ public class Pithos implements EntryPoint, ResizeHandler { } @Override - public void onError(Request request, Throwable exception) { + public void onError(@SuppressWarnings("unused") Request request, Throwable exception) { displayError("System error unable to delete folder: " + exception.getMessage()); } }); @@ -775,7 +760,7 @@ public class Pithos implements EntryPoint, ResizeHandler { String path = folder.getUri(); DeleteRequest deleteFolder = new DeleteRequest(getApiPath(), getUsername(), path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { updateFolder(folder.getParent(), true); } @@ -804,7 +789,7 @@ public class Pithos implements EntryPoint, ResizeHandler { String path = targetUri + "/" + file.getName(); PutRequest copyFile = new PutRequest(getApiPath(), getUsername(), path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { copyFiles(iter, targetUri, callback); } @@ -841,7 +826,7 @@ public class Pithos implements EntryPoint, ResizeHandler { String path = targetUri + "/" + f.getName(); PutRequest createFolder = new PutRequest(getApiPath(), getUsername(), path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { Iterator iter = f.getFiles().iterator(); copyFiles(iter, targetUri + "/" + f.getName(), new Command() { @Override @@ -874,7 +859,7 @@ public class Pithos implements EntryPoint, ResizeHandler { Scheduler.get().scheduleDeferred(createFolder); } - public void addSelectionModel(SingleSelectionModel model) { + public void addSelectionModel(@SuppressWarnings("rawtypes") SingleSelectionModel model) { selectionModels.add(model); } diff --git a/src/gr/grnet/pithos/web/client/SessionExpiredDialog.java b/src/gr/grnet/pithos/web/client/SessionExpiredDialog.java index 362a90e..4ae6763 100644 --- a/src/gr/grnet/pithos/web/client/SessionExpiredDialog.java +++ b/src/gr/grnet/pithos/web/client/SessionExpiredDialog.java @@ -47,7 +47,7 @@ import com.google.gwt.user.client.ui.VerticalPanel; public class SessionExpiredDialog extends DialogBox { - private Pithos app; + protected Pithos app; /** * The widget constructor. */ @@ -67,7 +67,7 @@ public class SessionExpiredDialog extends DialogBox { // when the button is clicked. Button confirm = new Button("Proceed", new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { app.authenticateUser(); hide(); } diff --git a/src/gr/grnet/pithos/web/client/SharingUsers.java b/src/gr/grnet/pithos/web/client/SharingUsers.java index 4db725c..da63a04 100644 --- a/src/gr/grnet/pithos/web/client/SharingUsers.java +++ b/src/gr/grnet/pithos/web/client/SharingUsers.java @@ -1,7 +1,8 @@ package gr.grnet.pithos.web.client; +import gr.grnet.pithos.web.client.foldertree.Resource; + import java.util.ArrayList; -import java.util.Collection; import java.util.List; import com.google.gwt.http.client.Response; @@ -10,8 +11,6 @@ import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONParser; import com.google.gwt.json.client.JSONValue; -import gr.grnet.pithos.web.client.foldertree.Resource; - public class SharingUsers extends Resource { private List users; diff --git a/src/gr/grnet/pithos/web/client/SortableHeader.java b/src/gr/grnet/pithos/web/client/SortableHeader.java index 87af108..c55cef5 100644 --- a/src/gr/grnet/pithos/web/client/SortableHeader.java +++ b/src/gr/grnet/pithos/web/client/SortableHeader.java @@ -109,7 +109,7 @@ public class SortableHeader extends Header { } @Override - public void render(Context context, SafeHtmlBuilder sb) { + public void render(@SuppressWarnings("unused") Context context, SafeHtmlBuilder sb) { if (sorted) { sb.append(template.sorted(IMAGE_WIDTH, reverseSort ? DOWN_ARROW : UP_ARROW, text)); } else { diff --git a/src/gr/grnet/pithos/web/client/StatusPanel.java b/src/gr/grnet/pithos/web/client/StatusPanel.java index 2b970d6..34296d6 100644 --- a/src/gr/grnet/pithos/web/client/StatusPanel.java +++ b/src/gr/grnet/pithos/web/client/StatusPanel.java @@ -34,9 +34,6 @@ */ package gr.grnet.pithos.web.client; -import com.google.gwt.resources.client.ClientBundle; -import com.google.gwt.resources.client.ImageResource; -import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HasHorizontalAlignment; diff --git a/src/gr/grnet/pithos/web/client/TopPanel.java b/src/gr/grnet/pithos/web/client/TopPanel.java index 4824967..131f062 100644 --- a/src/gr/grnet/pithos/web/client/TopPanel.java +++ b/src/gr/grnet/pithos/web/client/TopPanel.java @@ -34,7 +34,6 @@ */ package gr.grnet.pithos.web.client; -import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.Composite; @@ -60,7 +59,7 @@ public class TopPanel extends Composite { /** * An image bundle for this widgets images. */ - public interface Images extends ClientBundle, FilePropertiesDialog.Images { + public interface Images extends FilePropertiesDialog.Images { @Source("gr/grnet/pithos/resources/pithos2-logo.png") ImageResource pithosLogo(); diff --git a/src/gr/grnet/pithos/web/client/VersionsList.java b/src/gr/grnet/pithos/web/client/VersionsList.java index 1af5372..30a4168 100644 --- a/src/gr/grnet/pithos/web/client/VersionsList.java +++ b/src/gr/grnet/pithos/web/client/VersionsList.java @@ -34,24 +34,7 @@ */ package gr.grnet.pithos.web.client; -import gr.grnet.pithos.web.client.FilePropertiesDialog.Images; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.List; - -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.i18n.client.DateTimeFormat; -import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.FlexTable; -import com.google.gwt.user.client.ui.HTML; -import com.google.gwt.user.client.ui.HasHorizontalAlignment; -import com.google.gwt.user.client.ui.VerticalPanel; public class VersionsList extends Composite { diff --git a/src/gr/grnet/pithos/web/client/animation/FadeIn.java b/src/gr/grnet/pithos/web/client/animation/FadeIn.java index 5a88afa..92c729b 100644 --- a/src/gr/grnet/pithos/web/client/animation/FadeIn.java +++ b/src/gr/grnet/pithos/web/client/animation/FadeIn.java @@ -51,8 +51,8 @@ public class FadeIn extends Animation { @Override protected void onUpdate(double progress) { if(currOpacity > 0.0){ - progress = 1.0 - progress; - currOpacity = initialOpacity * progress; + double progress1 = 1.0 - progress; + currOpacity = initialOpacity * progress1; DOM.setStyleAttribute(widget.getElement(), "opacity", ""+new Double(1d - currOpacity / 100d)); //required for ie to work //Disabled because IE has bugs rendering non-opaque objects diff --git a/src/gr/grnet/pithos/web/client/animation/FadeOut.java b/src/gr/grnet/pithos/web/client/animation/FadeOut.java index 1185f3d..3eba2a4 100644 --- a/src/gr/grnet/pithos/web/client/animation/FadeOut.java +++ b/src/gr/grnet/pithos/web/client/animation/FadeOut.java @@ -52,8 +52,8 @@ public class FadeOut extends Animation { @Override protected void onUpdate(double progress) { if(currOpacity>0.0){ - progress = 1.0 - progress; - currOpacity = initialOpacity*progress; + double progress1 = 1.0 - progress; + currOpacity = initialOpacity*progress1; DOM.setStyleAttribute(widget.getElement(), "opacity", ""+new Double(currOpacity/100d)); //required for ie to work //Disabled because IE has bugs rendering non-opaque objects diff --git a/src/gr/grnet/pithos/web/client/commands/CopyCommand.java b/src/gr/grnet/pithos/web/client/commands/CopyCommand.java index 9bc3e37..c76955d 100644 --- a/src/gr/grnet/pithos/web/client/commands/CopyCommand.java +++ b/src/gr/grnet/pithos/web/client/commands/CopyCommand.java @@ -59,6 +59,7 @@ public class CopyCommand implements Command{ resource = _resource; } + @SuppressWarnings("unchecked") @Override public void execute() { if (containerPanel != null) diff --git a/src/gr/grnet/pithos/web/client/commands/CutCommand.java b/src/gr/grnet/pithos/web/client/commands/CutCommand.java index 41b85ee..ae67da4 100644 --- a/src/gr/grnet/pithos/web/client/commands/CutCommand.java +++ b/src/gr/grnet/pithos/web/client/commands/CutCommand.java @@ -61,6 +61,7 @@ public class CutCommand implements Command { resource = _resource; } + @SuppressWarnings("unchecked") @Override public void execute() { if (containerPanel != null) diff --git a/src/gr/grnet/pithos/web/client/commands/DeleteCommand.java b/src/gr/grnet/pithos/web/client/commands/DeleteCommand.java index 0808878..dcfc719 100644 --- a/src/gr/grnet/pithos/web/client/commands/DeleteCommand.java +++ b/src/gr/grnet/pithos/web/client/commands/DeleteCommand.java @@ -78,7 +78,8 @@ public class DeleteCommand implements Command{ DeleteFolderDialog dlg = new DeleteFolderDialog(app, newImages, (Folder) resource); dlg.center(); } else if (resource instanceof List) { - DeleteFileDialog dlg = new DeleteFileDialog(app, newImages, (List) resource); + @SuppressWarnings("unchecked") + DeleteFileDialog dlg = new DeleteFileDialog(app, newImages, (List) resource); dlg.center(); } } diff --git a/src/gr/grnet/pithos/web/client/commands/EmptyTrashCommand.java b/src/gr/grnet/pithos/web/client/commands/EmptyTrashCommand.java index ed8f017..969e872 100644 --- a/src/gr/grnet/pithos/web/client/commands/EmptyTrashCommand.java +++ b/src/gr/grnet/pithos/web/client/commands/EmptyTrashCommand.java @@ -35,11 +35,8 @@ package gr.grnet.pithos.web.client.commands; import gr.grnet.pithos.web.client.Pithos; -import gr.grnet.pithos.web.client.rest.RestException; -import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.ui.PopupPanel; diff --git a/src/gr/grnet/pithos/web/client/commands/PasteCommand.java b/src/gr/grnet/pithos/web/client/commands/PasteCommand.java index 7223107..c07b10b 100644 --- a/src/gr/grnet/pithos/web/client/commands/PasteCommand.java +++ b/src/gr/grnet/pithos/web/client/commands/PasteCommand.java @@ -52,9 +52,9 @@ import com.google.gwt.user.client.ui.PopupPanel; public class PasteCommand implements Command { - private Pithos app; + protected Pithos app; private PopupPanel containerPanel; - private Folder folder; + protected Folder folder; public PasteCommand(Pithos _app, PopupPanel _containerPanel, Folder _folder) { app = _app; @@ -94,7 +94,8 @@ public class PasteCommand implements Command { } } else { - List tobeCopied = (List) clipboardItem; + @SuppressWarnings("unchecked") + List tobeCopied = (List) clipboardItem; Iterator iter = tobeCopied.iterator(); if (operation == Clipboard.COPY) { app.copyFiles(iter, folder.getUri(), new Command() { @@ -117,13 +118,13 @@ public class PasteCommand implements Command { } } - private void moveFiles(final Iterator iter, final Command callback) { + protected void moveFiles(final Iterator iter, final Command callback) { if (iter.hasNext()) { File file = iter.next(); String path = folder.getUri() + "/" + file.getName(); PutRequest copyFile = new PutRequest(app.getApiPath(), app.getUsername(), path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { moveFiles(iter, callback); } diff --git a/src/gr/grnet/pithos/web/client/commands/PropertiesCommand.java b/src/gr/grnet/pithos/web/client/commands/PropertiesCommand.java index 3b6b78b..be49fc9 100644 --- a/src/gr/grnet/pithos/web/client/commands/PropertiesCommand.java +++ b/src/gr/grnet/pithos/web/client/commands/PropertiesCommand.java @@ -60,8 +60,6 @@ public class PropertiesCommand implements Command { private int tabToShow = 0; - private String userName; - private Object resource; private Pithos app; @@ -91,7 +89,8 @@ public class PropertiesCommand implements Command { dlg.center(); } else if (resource instanceof List) { - List files = (List) resource; + @SuppressWarnings("unchecked") + List files = (List) resource; if (files.size() > 1) { FilesPropertiesDialog dlg = new FilesPropertiesDialog(app, files); dlg.selectTab(tabToShow); diff --git a/src/gr/grnet/pithos/web/client/commands/ToTrashCommand.java b/src/gr/grnet/pithos/web/client/commands/ToTrashCommand.java index 7cc1b6c..c28b01b 100644 --- a/src/gr/grnet/pithos/web/client/commands/ToTrashCommand.java +++ b/src/gr/grnet/pithos/web/client/commands/ToTrashCommand.java @@ -58,8 +58,8 @@ import com.google.gwt.user.client.ui.PopupPanel; */ public class ToTrashCommand implements Command{ private PopupPanel containerPanel; - private Pithos app; - private Object resource; + protected Pithos app; + protected Object resource; public ToTrashCommand(Pithos _app, PopupPanel _containerPanel, Object _resource){ containerPanel = _containerPanel; @@ -72,9 +72,11 @@ public class ToTrashCommand implements Command{ if (containerPanel != null) containerPanel.hide(); if (resource instanceof List) { - Iterator iter = ((List) resource).iterator(); + @SuppressWarnings("unchecked") + Iterator iter = ((List) resource).iterator(); trashFiles(iter, new Command() { - @Override + @SuppressWarnings("unchecked") + @Override public void execute() { app.updateFolder(((List) resource).get(0).getParent(), true); } @@ -96,7 +98,7 @@ public class ToTrashCommand implements Command{ String path = f.getUri() + "?update="; PostRequest trashFolder = new PostRequest(app.getApiPath(), app.getUsername(), path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { Iterator iter = f.getFiles().iterator(); trashFiles(iter, new Command() { @Override @@ -127,13 +129,13 @@ public class ToTrashCommand implements Command{ Scheduler.get().scheduleDeferred(trashFolder); } - private void trashFiles(final Iterator iter, final Command callback) { + protected void trashFiles(final Iterator iter, final Command callback) { if (iter.hasNext()) { File file = iter.next(); String path = file.getUri() + "?update="; PostRequest trashFile = new PostRequest(app.getApiPath(), app.getUsername(), path) { @Override - public void onSuccess(Resource result) { + public void onSuccess(@SuppressWarnings("unused") Resource result) { trashFiles(iter, callback); } @@ -156,7 +158,7 @@ public class ToTrashCommand implements Command{ } } - private void trashSubfolders(final Iterator iter, final Command callback) { + protected void trashSubfolders(final Iterator iter, final Command callback) { if (iter.hasNext()) { final Folder f = iter.next(); trashFolder(f, callback); diff --git a/src/gr/grnet/pithos/web/client/components/TristateCheckBox.java b/src/gr/grnet/pithos/web/client/components/TristateCheckBox.java index 88c668d..65af3b6 100644 --- a/src/gr/grnet/pithos/web/client/components/TristateCheckBox.java +++ b/src/gr/grnet/pithos/web/client/components/TristateCheckBox.java @@ -56,13 +56,13 @@ public class TristateCheckBox extends FocusWidget implements HasValue { private static final String CHECKED_IMG = "images/tristate_checked.gif"; - private final Element buttonElement = DOM.createElement("input"); + protected final Element buttonElement = DOM.createElement("input"); private boolean valueChangeHandlerInitialized; private Boolean value; - private Boolean initialValue; + protected Boolean initialValue; public TristateCheckBox(final Boolean state) { DOM.setElementProperty(buttonElement, "type", "image"); @@ -73,7 +73,7 @@ public class TristateCheckBox extends FocusWidget implements HasValue { addClickHandler(new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { final String img = DOM.getElementAttribute(buttonElement, "src"); String newImg; if (img.endsWith(UNCHECKED_IMG)) @@ -138,7 +138,7 @@ public class TristateCheckBox extends FocusWidget implements HasValue { protected void ensureDomEventHandlers() { addClickHandler(new ClickHandler() { @Override - public void onClick(ClickEvent event) { + public void onClick(@SuppressWarnings("unused") ClickEvent event) { ValueChangeEvent.fire(TristateCheckBox.this, getValue()); } }); diff --git a/src/gr/grnet/pithos/web/client/foldertree/AccountResource.java b/src/gr/grnet/pithos/web/client/foldertree/AccountResource.java index 839f251..4bec6c9 100644 --- a/src/gr/grnet/pithos/web/client/foldertree/AccountResource.java +++ b/src/gr/grnet/pithos/web/client/foldertree/AccountResource.java @@ -35,6 +35,10 @@ package gr.grnet.pithos.web.client.foldertree; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + import com.google.gwt.http.client.Header; import com.google.gwt.http.client.Response; import com.google.gwt.i18n.client.DateTimeFormat; @@ -44,11 +48,6 @@ import com.google.gwt.json.client.JSONArray; import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONParser; import com.google.gwt.json.client.JSONValue; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; /** * Created by IntelliJ IDEA. User: chstath Date: 5/19/11 Time: 2:55 PM To change this template use File | Settings | diff --git a/src/gr/grnet/pithos/web/client/foldertree/File.java b/src/gr/grnet/pithos/web/client/foldertree/File.java index 99a0160..10ee71b 100644 --- a/src/gr/grnet/pithos/web/client/foldertree/File.java +++ b/src/gr/grnet/pithos/web/client/foldertree/File.java @@ -145,14 +145,14 @@ public class File extends Resource { return inTrash; } - public void populate(Folder parent, JSONObject o, String owner, String container) { - this.parent = parent; + public void populate(Folder _parent, JSONObject o, String _owner, String _container) { + this.parent = _parent; path = unmarshallString(o, "name"); if (path.contains("/")) name = path.substring(path.lastIndexOf("/") + 1, path.length()); //strip the prefix else name = path; - this.owner = owner; + this.owner = _owner; hash = unmarshallString(o, "hash"); bytes = unmarshallLong(o, "bytes"); version = unmarshallInt(o, "version"); @@ -162,7 +162,7 @@ public class File extends Resource { versionTimestamp = unmarshallDate(o, "version_timestamp"); published = o.containsKey("x_object_public") ? true : false; publicUri = unmarshallString(o, "x_object_public"); - this.container = container; + this.container = _container; inheritedPermissionsFrom = unmarshallString(o, "x_object_shared_by"); String rawPermissions = unmarshallString(o, "x_object_sharing"); @@ -199,7 +199,8 @@ public class File extends Resource { } } - public boolean equals(Object other) { + @Override + public boolean equals(Object other) { if (other instanceof File) { File o = (File) other; return name.equals(o.getName()); @@ -207,7 +208,8 @@ public class File extends Resource { return false; } - public int hashCode() { + @Override + public int hashCode() { return name.hashCode(); } @@ -220,8 +222,8 @@ public class File extends Resource { return result; } - private void populate(String owner, Response response) { - this.owner = owner; + private void populate(String _owner, Response response) { + this.owner = _owner; for (Header h : response.getHeaders()) { String header = h.getName(); if (header.startsWith("X-Object-Meta-") && !header.equals("X-Object-Meta-Trash")) diff --git a/src/gr/grnet/pithos/web/client/foldertree/Folder.java b/src/gr/grnet/pithos/web/client/foldertree/Folder.java index da87d15..4098189 100644 --- a/src/gr/grnet/pithos/web/client/foldertree/Folder.java +++ b/src/gr/grnet/pithos/web/client/foldertree/Folder.java @@ -35,6 +35,13 @@ package gr.grnet.pithos.web.client.foldertree; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; + import com.google.gwt.http.client.Response; import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat; @@ -42,15 +49,6 @@ import com.google.gwt.json.client.JSONArray; import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONParser; import com.google.gwt.json.client.JSONValue; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.StringTokenizer; public class Folder extends Resource { /* @@ -159,8 +157,8 @@ public class Folder extends Resource { } } - public void populate(String owner, Response response) { - this.owner = owner; + public void populate(String _owner, Response response) { + this.owner = _owner; String header = response.getHeader("Last-Modified"); if (header != null) lastModified = DateTimeFormat.getFormat(PredefinedFormat.RFC_2822).parse(header); @@ -196,12 +194,12 @@ public class Folder extends Resource { String contentType = unmarshallString(o, "content_type"); if (o.containsKey("subdir") || (contentType != null && (contentType.startsWith("application/directory") || contentType.startsWith("application/folder")))) { Folder f = new Folder(); - f.populate(this, o, owner, container); + f.populate(this, o, _owner, container); subfolders.add(f); } else if (!(o.containsKey("x_object_meta_trash") && o.get("x_object_meta_trash").isString().stringValue().equals("true"))) { File file = new File(); - file.populate(this, o, owner, container); + file.populate(this, o, _owner, container); files.add(file); } } @@ -217,8 +215,8 @@ public class Folder extends Resource { } } - public void populate(Folder parent, JSONObject o, String owner, String aContainer) { - this.parent = parent; + public void populate(Folder _parent, JSONObject o, String _owner, String aContainer) { + this.parent = _parent; String path = null; if (o.containsKey("subdir")) { path = unmarshallString(o, "subdir"); @@ -241,7 +239,7 @@ public class Folder extends Resource { container = name; prefix = ""; } - this.owner = owner; + this.owner = _owner; if (o.containsKey("x_object_meta_trash") && o.get("x_object_meta_trash").isString().stringValue().equals("true")) inTrash = true; diff --git a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java index 7d554ad..f9c3f06 100644 --- a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java +++ b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java @@ -36,7 +36,6 @@ package gr.grnet.pithos.web.client.foldertree; import com.google.gwt.core.client.GWT; -import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.resources.client.ImageResource.ImageOptions; import com.google.gwt.safehtml.client.SafeHtmlTemplates; @@ -72,23 +71,27 @@ public class FolderTreeView extends Composite { static interface BasicResources extends CellTree.Resources { - @ImageOptions(flipRtl = true) + @Override + @ImageOptions(flipRtl = true) @Source("gr/grnet/pithos/web/client/cellTreeClosedItem.gif") ImageResource cellTreeClosedItem(); - @ImageOptions(flipRtl = true) + @Override + @ImageOptions(flipRtl = true) @Source("gr/grnet/pithos/web/client/cellTreeLoadingBasic.gif") ImageResource cellTreeLoading(); - @ImageOptions(flipRtl = true) + @Override + @ImageOptions(flipRtl = true) @Source("gr/grnet/pithos/web/client/cellTreeOpenItem.gif") ImageResource cellTreeOpenItem(); - @Source({"gr/grnet/pithos/web/client/GssCellTreeBasic.css"}) + @Override + @Source({"gr/grnet/pithos/web/client/GssCellTreeBasic.css"}) CellTree.Style cellTreeStyle(); } - public static interface Images extends ClientBundle,Tree.Resources, FolderContextMenu.Images { + public static interface Images extends Tree.Resources, FolderContextMenu.Images { @Source("gr/grnet/pithos/resources/folder_home.png") ImageResource home(); diff --git a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java index 0a71279..ac8a776 100644 --- a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java +++ b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java @@ -35,9 +35,18 @@ package gr.grnet.pithos.web.client.foldertree; +import gr.grnet.pithos.web.client.FolderContextMenu; +import gr.grnet.pithos.web.client.Pithos; +import gr.grnet.pithos.web.client.foldertree.FolderTreeView.Templates; +import gr.grnet.pithos.web.client.rest.GetRequest; +import gr.grnet.pithos.web.client.rest.RestException; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + import com.google.gwt.cell.client.AbstractCell; import com.google.gwt.cell.client.Cell; -import com.google.gwt.cell.client.ValueUpdater; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; @@ -45,30 +54,18 @@ import com.google.gwt.event.dom.client.ContextMenuEvent; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.ui.AbstractImagePrototype; -import com.google.gwt.view.client.CellPreviewEvent; -import com.google.gwt.view.client.CellPreviewEvent.Handler; import com.google.gwt.view.client.ListDataProvider; -import com.google.gwt.view.client.ProvidesKey; import com.google.gwt.view.client.SingleSelectionModel; import com.google.gwt.view.client.TreeViewModel; -import gr.grnet.pithos.web.client.FolderContextMenu; -import gr.grnet.pithos.web.client.Pithos; -import gr.grnet.pithos.web.client.foldertree.FolderTreeView.Templates; -import gr.grnet.pithos.web.client.rest.GetRequest; -import gr.grnet.pithos.web.client.rest.RestException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; public class FolderTreeViewModel implements TreeViewModel { - private Pithos app; + protected Pithos app; private Cell folderCell = new AbstractCell(ContextMenuEvent.getType().getName()) { @Override - public void render(Context context, Folder folder, SafeHtmlBuilder safeHtmlBuilder) { + public void render(@SuppressWarnings("unused") Context context, Folder folder, SafeHtmlBuilder safeHtmlBuilder) { String html; if (folder.isTrash()) html = AbstractImagePrototype.create(FolderTreeView.images.trash()).getHTML(); @@ -79,7 +76,7 @@ public class FolderTreeViewModel implements TreeViewModel { } @Override - public void onBrowserEvent(Cell.Context context, com.google.gwt.dom.client.Element parent, Folder folder, com.google.gwt.dom.client.NativeEvent event, com.google.gwt.cell.client.ValueUpdater valueUpdater) { + public void onBrowserEvent(@SuppressWarnings("unused") Cell.Context context, @SuppressWarnings("unused") com.google.gwt.dom.client.Element parent, Folder folder, com.google.gwt.dom.client.NativeEvent event, @SuppressWarnings("unused") com.google.gwt.cell.client.ValueUpdater valueUpdater) { if (event.getType().equals(ContextMenuEvent.getType().getName())) { FolderTreeViewModel.this.selectionModel.setSelected(folder, true); if (!folder.isTrash()) { @@ -91,11 +88,11 @@ public class FolderTreeViewModel implements TreeViewModel { } }; - private ListDataProvider rootDataProvider = new ListDataProvider(); + protected ListDataProvider rootDataProvider = new ListDataProvider(); private Map> dataProviderMap = new HashMap>(); - private SingleSelectionModel selectionModel; + protected SingleSelectionModel selectionModel; public FolderTreeViewModel(Pithos _app, SingleSelectionModel selectionModel) { app = _app; @@ -109,15 +106,13 @@ public class FolderTreeViewModel implements TreeViewModel { rootDataProvider.getList().add(f); return new DefaultNodeInfo(rootDataProvider, folderCell, selectionModel, null); } - else { - final Folder f = (Folder) value; - if (dataProviderMap.get(f) == null) { - dataProviderMap.put(f, new ListDataProvider()); - } - final ListDataProvider dataProvider = dataProviderMap.get(f); - fetchFolder(f, dataProvider, false); - return new DefaultNodeInfo(dataProvider, folderCell, selectionModel, null); - } + final Folder f = (Folder) value; + if (dataProviderMap.get(f) == null) { + dataProviderMap.put(f, new ListDataProvider()); + } + final ListDataProvider dataProvider = dataProviderMap.get(f); + fetchFolder(f, dataProvider, false); + return new DefaultNodeInfo(dataProvider, folderCell, selectionModel, null); } @Override @@ -129,14 +124,14 @@ public class FolderTreeViewModel implements TreeViewModel { return false; } - private void fetchFolder(final Iterator iter, final Command callback) { + protected void fetchFolder(final Iterator iter, final Command callback) { if (iter.hasNext()) { final Folder f = iter.next(); String path = "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + f.getPrefix(); GetRequest getFolder = new GetRequest(Folder.class, app.getApiPath(), app.getUsername(), path, f) { @Override - public void onSuccess(Folder result) { + public void onSuccess(@SuppressWarnings("unused") Folder _result) { fetchFolder(iter, callback); } @@ -195,15 +190,15 @@ public class FolderTreeViewModel implements TreeViewModel { String path = "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + f.getPrefix(); GetRequest getFolder = new GetRequest(Folder.class, app.getApiPath(), app.getUsername(), path, f) { @Override - public void onSuccess(final Folder result) { + public void onSuccess(final Folder _result) { if (showfiles) - app.showFiles(result); - Iterator iter = result.getSubfolders().iterator(); + app.showFiles(_result); + Iterator iter = _result.getSubfolders().iterator(); fetchFolder(iter, new Command() { @Override public void execute() { dataProvider.getList().clear(); - dataProvider.getList().addAll(result.getSubfolders()); + dataProvider.getList().addAll(_result.getSubfolders()); app.getFolderTreeView().updateChildren(f); } }); diff --git a/src/gr/grnet/pithos/web/client/foldertree/Resource.java b/src/gr/grnet/pithos/web/client/foldertree/Resource.java index 2805434..745833a 100644 --- a/src/gr/grnet/pithos/web/client/foldertree/Resource.java +++ b/src/gr/grnet/pithos/web/client/foldertree/Resource.java @@ -59,7 +59,7 @@ public class Resource { protected static int unmarshallInt(JSONObject obj, String key){ if(obj.get(key) != null) if(obj.get(key).isNumber() != null) - return (int) obj.get(key).isNumber().getValue(); + return (int) obj.get(key).isNumber().doubleValue(); return -1; } @@ -92,19 +92,21 @@ public class Resource { return (new Date(ms)).toUTCString(); }-*/; - public static T createFromResponse(Class aClass, String owner, Response response, T result) { + @SuppressWarnings("unchecked") + public static T createFromResponse(Class aClass, String owner, Response response, T result) { + T result1 = null; if (aClass.equals(AccountResource.class)) { - result = (T) AccountResource.createFromResponse(owner, response); + result1 = (T) AccountResource.createFromResponse(owner, response); } else if (aClass.equals(Folder.class)) { - result = (T) Folder.createFromResponse(owner, response, (Folder) result); + result1 = (T) Folder.createFromResponse(owner, response, (Folder) result); } else if (aClass.equals(File.class)) { - result = (T) File.createFromResponse(owner, response, (File) result); + result1 = (T) File.createFromResponse(owner, response, (File) result); } else if (aClass.equals(SharingUsers.class)) { - result = (T) SharingUsers.createFromResponse(response, (SharingUsers) result); + result1 = (T) SharingUsers.createFromResponse(response, (SharingUsers) result); } - return result; + return result1; } } diff --git a/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeView.java b/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeView.java index 6c7d85c..99aef4a 100644 --- a/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeView.java +++ b/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeView.java @@ -35,8 +35,10 @@ package gr.grnet.pithos.web.client.mysharedtree; +import gr.grnet.pithos.web.client.FolderContextMenu; +import gr.grnet.pithos.web.client.foldertree.Folder; + import com.google.gwt.core.client.GWT; -import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.resources.client.ImageResource.ImageOptions; import com.google.gwt.safehtml.client.SafeHtmlTemplates; @@ -46,8 +48,6 @@ import com.google.gwt.user.cellview.client.HasKeyboardSelectionPolicy.KeyboardSe import com.google.gwt.user.cellview.client.TreeNode; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Tree; -import gr.grnet.pithos.web.client.FolderContextMenu; -import gr.grnet.pithos.web.client.foldertree.Folder; public class MysharedTreeView extends Composite { @@ -73,23 +73,27 @@ public class MysharedTreeView extends Composite { static interface BasicResources extends CellTree.Resources { - @ImageOptions(flipRtl = true) + @Override + @ImageOptions(flipRtl = true) @Source("gr/grnet/pithos/web/client/cellTreeClosedItem.gif") ImageResource cellTreeClosedItem(); - @ImageOptions(flipRtl = true) + @Override + @ImageOptions(flipRtl = true) @Source("gr/grnet/pithos/web/client/cellTreeLoadingBasic.gif") ImageResource cellTreeLoading(); - @ImageOptions(flipRtl = true) + @Override + @ImageOptions(flipRtl = true) @Source("gr/grnet/pithos/web/client/cellTreeOpenItem.gif") ImageResource cellTreeOpenItem(); - @Source({"gr/grnet/pithos/web/client/GssCellTreeBasic.css"}) + @Override + @Source({"gr/grnet/pithos/web/client/GssCellTreeBasic.css"}) CellTree.Style cellTreeStyle(); } - public static interface Images extends ClientBundle,Tree.Resources, FolderContextMenu.Images { + public static interface Images extends Tree.Resources, FolderContextMenu.Images { @Source("gr/grnet/pithos/resources/folder_home.png") ImageResource home(); diff --git a/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java b/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java index f51760c..ee736fb 100644 --- a/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java +++ b/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java @@ -75,14 +75,14 @@ public class MysharedTreeViewModel implements TreeViewModel { private Cell folderCell = new AbstractCell(ContextMenuEvent.getType().getName()) { @Override - public void render(Context context, Folder folder, SafeHtmlBuilder safeHtmlBuilder) { + public void render(@SuppressWarnings("unused") Context context, Folder folder, SafeHtmlBuilder safeHtmlBuilder) { String html = AbstractImagePrototype.create(MysharedTreeView.images.folderYellow()).getHTML(); safeHtmlBuilder.appendHtmlConstant(html); safeHtmlBuilder.append(Templates.INSTANCE.nameSpan(folder.getName())); } @Override - public void onBrowserEvent(Context context, com.google.gwt.dom.client.Element parent, Folder folder, com.google.gwt.dom.client.NativeEvent event, ValueUpdater valueUpdater) { + public void onBrowserEvent(@SuppressWarnings("unused") Context context, @SuppressWarnings("unused") com.google.gwt.dom.client.Element parent, Folder folder, com.google.gwt.dom.client.NativeEvent event, @SuppressWarnings("unused") ValueUpdater valueUpdater) { if (event.getType().equals(ContextMenuEvent.getType().getName())) { MysharedTreeViewModel.this.selectionModel.setSelected(folder, true); FolderContextMenu menu = new FolderContextMenu(app, MysharedTreeView.images, folder); @@ -114,7 +114,7 @@ public class MysharedTreeViewModel implements TreeViewModel { selectionModel2.addSelectionChangeHandler(new Handler() { @Override - public void onSelectionChange(SelectionChangeEvent event) { + public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { if (selectionModel2.getSelectedObject() != null) { app.deselectOthers(selectionModel2); fetchSharedFiles(); @@ -198,13 +198,13 @@ public class MysharedTreeViewModel implements TreeViewModel { String path = "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + f.getPrefix(); GetRequest getFolder = new GetRequest(Folder.class, app.getApiPath(), app.getUsername(), path, f) { @Override - public void onSuccess(Folder result) { - if (!result.isShared()) { - for (File file : result.getFiles()) { + public void onSuccess(Folder _result) { + if (!_result.isShared()) { + for (File file : _result.getFiles()) { if (file.isShared()) sharedFiles.add(file); } - Iterator iter2 = result.getSubfolders().iterator(); + Iterator iter2 = _result.getSubfolders().iterator(); fetchFolder(iter2, dataProvider, new Command() { @Override @@ -214,7 +214,7 @@ public class MysharedTreeViewModel implements TreeViewModel { }); } else { - dataProvider.getList().add(result); + dataProvider.getList().add(_result); fetchFolder(iter, dataProvider, callback); } } @@ -251,15 +251,15 @@ public class MysharedTreeViewModel implements TreeViewModel { String path = "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + f.getPrefix(); GetRequest getFolder = new GetRequest(Folder.class, app.getApiPath(), app.getUsername(), path, f) { @Override - public void onSuccess(final Folder result) { + public void onSuccess(final Folder _result) { if (showfiles) - app.showFiles(result); - Iterator iter = result.getSubfolders().iterator(); + app.showFiles(_result); + Iterator iter = _result.getSubfolders().iterator(); fetchFolder(iter, dataProvider, new Command() { @Override public void execute() { dataProvider.getList().clear(); - dataProvider.getList().addAll(result.getSubfolders()); + dataProvider.getList().addAll(_result.getSubfolders()); app.getMySharedTreeView().updateChildren(f); } }); diff --git a/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeView.java b/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeView.java index 0be0831..a089d1f 100644 --- a/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeView.java +++ b/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeView.java @@ -39,7 +39,6 @@ import gr.grnet.pithos.web.client.FolderContextMenu; import gr.grnet.pithos.web.client.foldertree.Folder; import com.google.gwt.core.client.GWT; -import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.resources.client.ImageResource.ImageOptions; import com.google.gwt.safehtml.client.SafeHtmlTemplates; @@ -74,23 +73,27 @@ public class OtherSharedTreeView extends Composite { static interface BasicResources extends CellTree.Resources { - @ImageOptions(flipRtl = true) + @Override + @ImageOptions(flipRtl = true) @Source("gr/grnet/pithos/web/client/cellTreeClosedItem.gif") ImageResource cellTreeClosedItem(); - @ImageOptions(flipRtl = true) + @Override + @ImageOptions(flipRtl = true) @Source("gr/grnet/pithos/web/client/cellTreeLoadingBasic.gif") ImageResource cellTreeLoading(); - @ImageOptions(flipRtl = true) + @Override + @ImageOptions(flipRtl = true) @Source("gr/grnet/pithos/web/client/cellTreeOpenItem.gif") ImageResource cellTreeOpenItem(); - @Source({"gr/grnet/pithos/web/client/GssCellTreeBasic.css"}) + @Override + @Source({"gr/grnet/pithos/web/client/GssCellTreeBasic.css"}) CellTree.Style cellTreeStyle(); } - public static interface Images extends ClientBundle,Tree.Resources, FolderContextMenu.Images { + public static interface Images extends Tree.Resources, FolderContextMenu.Images { @Source("gr/grnet/pithos/resources/folder_home.png") ImageResource home(); diff --git a/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java b/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java index 573447f..89eb4c1 100644 --- a/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java +++ b/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java @@ -76,14 +76,14 @@ public class OtherSharedTreeViewModel implements TreeViewModel { private Cell folderCell = new AbstractCell(ContextMenuEvent.getType().getName()) { @Override - public void render(Context context, Folder folder, SafeHtmlBuilder safeHtmlBuilder) { + public void render(@SuppressWarnings("unused") Context context, Folder folder, SafeHtmlBuilder safeHtmlBuilder) { String html = AbstractImagePrototype.create(OtherSharedTreeView.images.folderYellow()).getHTML(); safeHtmlBuilder.appendHtmlConstant(html); safeHtmlBuilder.append(Templates.INSTANCE.nameSpan(folder.getName())); } @Override - public void onBrowserEvent(Context context, com.google.gwt.dom.client.Element parent, Folder folder, com.google.gwt.dom.client.NativeEvent event, ValueUpdater valueUpdater) { + public void onBrowserEvent(@SuppressWarnings("unused") Context context, @SuppressWarnings("unused") com.google.gwt.dom.client.Element parent, Folder folder, com.google.gwt.dom.client.NativeEvent event, @SuppressWarnings("unused") ValueUpdater valueUpdater) { if (event.getType().equals(ContextMenuEvent.getType().getName())) { OtherSharedTreeViewModel.this.selectionModel.setSelected(folder, true); FolderContextMenu menu = new FolderContextMenu(app, OtherSharedTreeView.images, folder); @@ -116,7 +116,7 @@ public class OtherSharedTreeViewModel implements TreeViewModel { selectionModel2.addSelectionChangeHandler(new Handler() { @Override - public void onSelectionChange(SelectionChangeEvent event) { + public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { if (selectionModel2.getSelectedObject() != null) { app.deselectOthers(selectionModel2); app.showFiles(new HashSet()); @@ -147,7 +147,7 @@ public class OtherSharedTreeViewModel implements TreeViewModel { selectionModel3.addSelectionChangeHandler(new Handler() { @Override - public void onSelectionChange(SelectionChangeEvent event) { + public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { if (selectionModel3.getSelectedObject() != null) { app.deselectOthers(selectionModel3); String username = selectionModel3.getSelectedObject(); @@ -195,10 +195,10 @@ public class OtherSharedTreeViewModel implements TreeViewModel { private void fetchSharingUsers() { GetRequest getSharingUsers = new GetRequest(SharingUsers.class, app.getApiPath(), "", "?format=json") { @Override - public void onSuccess(final SharingUsers result) { + public void onSuccess(final SharingUsers _result) { userLevelDataProvider.getList().clear(); - userLevelDataProvider.getList().addAll(result.getUsers()); - for (String name : result.getUsers()) { + userLevelDataProvider.getList().addAll(_result.getUsers()); + for (String name : _result.getUsers()) { sharedFiles.put(name, new HashSet()); } } @@ -229,9 +229,9 @@ public class OtherSharedTreeViewModel implements TreeViewModel { GetRequest getUserSharedContainers = new GetRequest(AccountResource.class, app.getApiPath(), username, "?format=json") { @Override - public void onSuccess(AccountResource result) { + public void onSuccess(AccountResource _result) { final ListDataProvider tempProvider = new ListDataProvider(); - Iterator iter = result.getContainers().iterator(); + Iterator iter = _result.getContainers().iterator(); fetchFolder(username, iter, tempProvider, new Command() { @Override @@ -259,9 +259,9 @@ public class OtherSharedTreeViewModel implements TreeViewModel { GetRequest getUserSharedContainers = new GetRequest(AccountResource.class, app.getApiPath(), username, "?format=json") { @Override - public void onSuccess(AccountResource result) { + public void onSuccess(AccountResource _result) { final ListDataProvider tempProvider = new ListDataProvider(); - Iterator iter = result.getContainers().iterator(); + Iterator iter = _result.getContainers().iterator(); fetchFolder(username, iter, tempProvider, new Command() { @Override @@ -293,13 +293,13 @@ public class OtherSharedTreeViewModel implements TreeViewModel { String path = "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + f.getPrefix(); GetRequest getFolder = new GetRequest(Folder.class, app.getApiPath(), username, path, f) { @Override - public void onSuccess(Folder result) { - if (!result.isShared()) { - for (File file : result.getFiles()) { + public void onSuccess(Folder _result) { + if (!_result.isShared()) { + for (File file : _result.getFiles()) { if (file.isShared()) sharedFiles.get(username).add(file); } - Iterator iter2 = result.getSubfolders().iterator(); + Iterator iter2 = _result.getSubfolders().iterator(); fetchFolder(username, iter2, dataProvider, new Command() { @Override @@ -309,7 +309,7 @@ public class OtherSharedTreeViewModel implements TreeViewModel { }); } else { - dataProvider.getList().add(result); + dataProvider.getList().add(_result); fetchFolder(username, iter, dataProvider, callback); } } @@ -346,15 +346,15 @@ public class OtherSharedTreeViewModel implements TreeViewModel { String path = "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + f.getPrefix(); GetRequest getFolder = new GetRequest(Folder.class, app.getApiPath(), f.getOwner(), path, f) { @Override - public void onSuccess(final Folder result) { + public void onSuccess(final Folder _result) { if (showfiles) - app.showFiles(result); - Iterator iter = result.getSubfolders().iterator(); - fetchFolder(result.getOwner(), iter, dataProvider, new Command() { + app.showFiles(_result); + Iterator iter = _result.getSubfolders().iterator(); + fetchFolder(_result.getOwner(), iter, dataProvider, new Command() { @Override public void execute() { dataProvider.getList().clear(); - dataProvider.getList().addAll(result.getSubfolders()); + dataProvider.getList().addAll(_result.getSubfolders()); app.getOtherSharedTreeView().updateChildren(f); } }); diff --git a/src/gr/grnet/pithos/web/client/rest/DeleteRequest.java b/src/gr/grnet/pithos/web/client/rest/DeleteRequest.java index 9d0c379..f3002ce 100644 --- a/src/gr/grnet/pithos/web/client/rest/DeleteRequest.java +++ b/src/gr/grnet/pithos/web/client/rest/DeleteRequest.java @@ -51,7 +51,7 @@ import java.util.Map; public abstract class DeleteRequest implements ScheduledCommand { private String api; - private String owner; + protected String owner; private String path; @@ -74,7 +74,7 @@ public abstract class DeleteRequest implements ScheduledCommand { builder.setHeader(header, headers.get(header)); } try { - builder.sendRequest("", new RestRequestCallback(api + owner + path, Response.SC_NO_CONTENT) { + builder.sendRequest("", new RestRequestCallback(api + owner + path, Response.SC_NO_CONTENT) { @Override public void onSuccess(Resource object) { DeleteRequest.this.onSuccess(object); @@ -86,7 +86,7 @@ public abstract class DeleteRequest implements ScheduledCommand { } @Override - public void onError(Request request, Throwable throwable) { + public void onError(@SuppressWarnings("unused") Request request, Throwable throwable) { DeleteRequest.this.onError(throwable); } }); diff --git a/src/gr/grnet/pithos/web/client/rest/GetRequest.java b/src/gr/grnet/pithos/web/client/rest/GetRequest.java index b1ca79b..9163fa2 100644 --- a/src/gr/grnet/pithos/web/client/rest/GetRequest.java +++ b/src/gr/grnet/pithos/web/client/rest/GetRequest.java @@ -35,36 +35,37 @@ package gr.grnet.pithos.web.client.rest; +import gr.grnet.pithos.web.client.foldertree.Resource; + +import java.util.HashMap; +import java.util.Map; + import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.http.client.Request; import com.google.gwt.http.client.RequestBuilder; import com.google.gwt.http.client.RequestException; import com.google.gwt.http.client.Response; -import gr.grnet.pithos.web.client.Pithos; -import gr.grnet.pithos.web.client.foldertree.Resource; -import java.util.HashMap; -import java.util.Map; public abstract class GetRequest implements ScheduledCommand { - private Class aClass; + protected Class aClass; private String api; - private String owner; + protected String owner; private String path; private int okCode; - private T cached; + protected T cached; - private T result; + protected T result; private Map headers = new HashMap(); - public abstract void onSuccess(T result); + public abstract void onSuccess(T _result); public abstract void onError(Throwable t); @@ -105,7 +106,7 @@ public abstract class GetRequest implements ScheduledCommand } @Override - public void onError(Request request, Throwable throwable) { + public void onError(@SuppressWarnings("unused") Request request, Throwable throwable) { if (throwable instanceof RestException) { if (((RestException) throwable).getHttpStatusCode() == 304 && cached != null){ GWT.log("Using cache: " + cached.toString(), null); diff --git a/src/gr/grnet/pithos/web/client/rest/PostRequest.java b/src/gr/grnet/pithos/web/client/rest/PostRequest.java index 81de5f4..85d60d3 100644 --- a/src/gr/grnet/pithos/web/client/rest/PostRequest.java +++ b/src/gr/grnet/pithos/web/client/rest/PostRequest.java @@ -48,7 +48,7 @@ public abstract class PostRequest implements ScheduledCommand { private String api; - private String owner; + protected String owner; private String path; @@ -71,7 +71,7 @@ public abstract class PostRequest implements ScheduledCommand { builder.setHeader(header, headers.get(header)); } try { - builder.sendRequest("", new RestRequestCallback(api + owner + path, Response.SC_ACCEPTED) { + builder.sendRequest("", new RestRequestCallback(api + owner + path, Response.SC_ACCEPTED) { @Override public void onSuccess(Resource object) { PostRequest.this.onSuccess(object); @@ -83,7 +83,7 @@ public abstract class PostRequest implements ScheduledCommand { } @Override - public void onError(Request request, Throwable throwable) { + public void onError(@SuppressWarnings("unused") Request request, Throwable throwable) { PostRequest.this.onError(throwable); } }); diff --git a/src/gr/grnet/pithos/web/client/rest/PutRequest.java b/src/gr/grnet/pithos/web/client/rest/PutRequest.java index 30b287c..2f8fc28 100644 --- a/src/gr/grnet/pithos/web/client/rest/PutRequest.java +++ b/src/gr/grnet/pithos/web/client/rest/PutRequest.java @@ -83,7 +83,7 @@ public abstract class PutRequest implements ScheduledCommand { private String api; - private String owner; + protected String owner; private String path; @@ -106,7 +106,7 @@ public abstract class PutRequest implements ScheduledCommand { builder.setHeader(header, headers.get(header)); } try { - builder.sendRequest("", new RestRequestCallback(api + owner + path, Response.SC_CREATED) { + builder.sendRequest("", new RestRequestCallback(api + owner + path, Response.SC_CREATED) { @Override public void onSuccess(Resource object) { PutRequest.this.onSuccess(object); @@ -118,7 +118,7 @@ public abstract class PutRequest implements ScheduledCommand { } @Override - public void onError(Request request, Throwable throwable) { + public void onError(@SuppressWarnings("unused") Request request, Throwable throwable) { PutRequest.this.onError(throwable); } }); diff --git a/src/gr/grnet/pithos/web/client/tagtree/Tag.java b/src/gr/grnet/pithos/web/client/tagtree/Tag.java index e596b51..f8544f7 100644 --- a/src/gr/grnet/pithos/web/client/tagtree/Tag.java +++ b/src/gr/grnet/pithos/web/client/tagtree/Tag.java @@ -35,17 +35,9 @@ package gr.grnet.pithos.web.client.tagtree; -import com.google.gwt.http.client.Response; -import com.google.gwt.i18n.client.DateTimeFormat; -import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat; -import com.google.gwt.json.client.JSONArray; -import com.google.gwt.json.client.JSONObject; -import com.google.gwt.json.client.JSONParser; -import com.google.gwt.json.client.JSONValue; import gr.grnet.pithos.web.client.foldertree.File; import gr.grnet.pithos.web.client.foldertree.Resource; -import java.util.Date; -import java.util.Iterator; + import java.util.LinkedHashSet; import java.util.Set; diff --git a/src/gr/grnet/pithos/web/client/tagtree/TagTreeView.java b/src/gr/grnet/pithos/web/client/tagtree/TagTreeView.java index 9148086..a47d483 100644 --- a/src/gr/grnet/pithos/web/client/tagtree/TagTreeView.java +++ b/src/gr/grnet/pithos/web/client/tagtree/TagTreeView.java @@ -36,7 +36,6 @@ package gr.grnet.pithos.web.client.tagtree; import com.google.gwt.core.client.GWT; -import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.resources.client.ImageResource.ImageOptions; import com.google.gwt.safehtml.client.SafeHtmlTemplates; @@ -51,23 +50,27 @@ public class TagTreeView extends Composite { static interface BasicResources extends CellTree.Resources { - @ImageOptions(flipRtl = true) + @Override + @ImageOptions(flipRtl = true) @Source("gr/grnet/pithos/web/client/cellTreeClosedItem.gif") ImageResource cellTreeClosedItem(); - @ImageOptions(flipRtl = true) + @Override + @ImageOptions(flipRtl = true) @Source("gr/grnet/pithos/web/client/cellTreeLoadingBasic.gif") ImageResource cellTreeLoading(); - @ImageOptions(flipRtl = true) + @Override + @ImageOptions(flipRtl = true) @Source("gr/grnet/pithos/web/client/cellTreeOpenItem.gif") ImageResource cellTreeOpenItem(); - @Source({"gr/grnet/pithos/web/client/GssCellTreeBasic.css"}) + @Override + @Source({"gr/grnet/pithos/web/client/GssCellTreeBasic.css"}) CellTree.Style cellTreeStyle(); } - static interface Images extends ClientBundle,Tree.Resources, FolderContextMenu.Images { + static interface Images extends Tree.Resources, FolderContextMenu.Images { @Source("gr/grnet/pithos/resources/folder_home.png") ImageResource home(); diff --git a/src/gr/grnet/pithos/web/client/tagtree/TagTreeViewModel.java b/src/gr/grnet/pithos/web/client/tagtree/TagTreeViewModel.java index b9f0840..9356f4c 100644 --- a/src/gr/grnet/pithos/web/client/tagtree/TagTreeViewModel.java +++ b/src/gr/grnet/pithos/web/client/tagtree/TagTreeViewModel.java @@ -35,12 +35,24 @@ package gr.grnet.pithos.web.client.tagtree; +import gr.grnet.pithos.web.client.Pithos; +import gr.grnet.pithos.web.client.foldertree.AccountResource; +import gr.grnet.pithos.web.client.foldertree.File; +import gr.grnet.pithos.web.client.foldertree.Folder; +import gr.grnet.pithos.web.client.rest.GetRequest; +import gr.grnet.pithos.web.client.rest.RestException; +import gr.grnet.pithos.web.client.tagtree.TagTreeView.Templates; + +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + import com.google.gwt.cell.client.AbstractCell; import com.google.gwt.cell.client.Cell; import com.google.gwt.cell.client.TextCell; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; -import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.dom.client.ContextMenuEvent; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; @@ -49,33 +61,20 @@ import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.view.client.ListDataProvider; import com.google.gwt.view.client.SingleSelectionModel; import com.google.gwt.view.client.TreeViewModel; -import gr.grnet.pithos.web.client.Pithos; -import gr.grnet.pithos.web.client.foldertree.AccountResource; -import gr.grnet.pithos.web.client.foldertree.File; -import gr.grnet.pithos.web.client.foldertree.Folder; -import gr.grnet.pithos.web.client.rest.GetRequest; -import gr.grnet.pithos.web.client.rest.RestException; -import gr.grnet.pithos.web.client.tagtree.TagTreeView.Templates; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; public class TagTreeViewModel implements TreeViewModel { private Cell tagCell = new AbstractCell(ContextMenuEvent.getType().getName()) { @Override - public void render(Context context, Tag tag, SafeHtmlBuilder safeHtmlBuilder) { + public void render(@SuppressWarnings("unused") Context context, Tag tag, SafeHtmlBuilder safeHtmlBuilder) { String html = AbstractImagePrototype.create(TagTreeView.images.tag()).getHTML(); safeHtmlBuilder.appendHtmlConstant(html); safeHtmlBuilder.append(Templates.INSTANCE.nameSpan(tag.getName())); } @Override - public void onBrowserEvent(Context context, com.google.gwt.dom.client.Element parent, Tag tag, com.google.gwt.dom.client.NativeEvent event, com.google.gwt.cell.client.ValueUpdater valueUpdater) { + public void onBrowserEvent(@SuppressWarnings("unused") Context context, @SuppressWarnings("unused") com.google.gwt.dom.client.Element parent, Tag tag, com.google.gwt.dom.client.NativeEvent event, @SuppressWarnings("unused") com.google.gwt.cell.client.ValueUpdater valueUpdater) { if (event.getType().equals(com.google.gwt.event.dom.client.ContextMenuEvent.getType().getName())) { TagTreeViewModel.this.selectionModel.setSelected(tag, true); } @@ -85,9 +84,9 @@ public class TagTreeViewModel implements TreeViewModel { private ListDataProvider rootDataProvider = new ListDataProvider(); private ListDataProvider tagDataProvider = new ListDataProvider(); - private SingleSelectionModel selectionModel; + protected SingleSelectionModel selectionModel; - private Pithos app; + protected Pithos app; public TagTreeViewModel(Pithos _app, SingleSelectionModel selectionModel) { app = _app; @@ -127,40 +126,9 @@ public class TagTreeViewModel implements TreeViewModel { return false; if (o instanceof String) return tagDataProvider.getList().isEmpty(); - else - return true; + return true; } - private void fetchTags(final Iterator iter) { - if (iter.hasNext()) { - final Folder f = iter.next(); - - String path = app.getApiPath() + app.getUsername() + "/" + f.getUri() + "?format=json&delimiter=/&prefix=" + f.getPrefix(); -// GetRequest getFolder = new GetRequest(Tag.class, path, f) { -// @Override -// public void onSuccess(Tag result) { -// fetchFolder(iter, dataProvider, tags); -// } -// -// @Override -// public void onError(Throwable t) { -// GWT.log("Error getting folder", t); -// if (t instanceof RestException) -// app.displayError("Error getting folder: " + ((RestException) t).getHttpStatusText()); -// else -// app.displayError("System error fetching folder: " + t.getMessage()); -// } -// }; -// getFolder.setHeader("X-Auth-Token", app.getToken()); -// Scheduler.get().scheduleDeferred(getFolder); - } - } -// -// public void initialize(AccountResource account) { -// Iterator iter = account.getContainers().iterator(); -// fetchFolder(iter, rootDataProvider, account.getContainers()); -// } -// public Tag getSelection() { return selectionModel.getSelectedObject(); } @@ -175,24 +143,24 @@ public class TagTreeViewModel implements TreeViewModel { fetchTag(iter, t, new LinkedHashSet()); } - private void fetchTag(final Iterator iter, final Tag t, final Set files) { + protected void fetchTag(final Iterator iter, final Tag t, final Set files) { if (iter.hasNext()) { Folder f = iter.next(); String path = f.getUri() + "?format=json&meta=" + t.getName(); GetRequest getFolder = new GetRequest(Folder.class, app.getApiPath(), app.getUsername(), path) { @Override - public void onSuccess(Folder result) { - files.addAll(result.getFiles()); + public void onSuccess(Folder _result) { + files.addAll(_result.getFiles()); fetchTag(iter, t, files); } @Override - public void onError(Throwable t) { - GWT.log("Error getting folder", t); - if (t instanceof RestException) - app.displayError("Error getting folder: " + ((RestException) t).getHttpStatusText()); + public void onError(Throwable th) { + GWT.log("Error getting folder", th); + if (th instanceof RestException) + app.displayError("Error getting folder: " + ((RestException) th).getHttpStatusText()); else - app.displayError("System error fetching folder: " + t.getMessage()); + app.displayError("System error fetching folder: " + th.getMessage()); } }; getFolder.setHeader("X-Auth-Token", app.getToken()); -- 1.7.10.4