Fix warnings.

diff --git a/gss/src/gr/ebs/gss/client/tree/FolderSubtree.java b/gss/src/gr/ebs/gss/client/tree/FolderSubtree.java
index 253de88..dff91a3 100644 (file)
--- a/gss/src/gr/ebs/gss/client/tree/FolderSubtree.java
+++ b/gss/src/gr/ebs/gss/client/tree/FolderSubtree.java
@@ -46,9 +46,9 @@ public class FolderSubtree extends Subtree {
 
        private DnDTreeItem rootItem;
 
-       public FolderSubtree(PopupTree tree, final Images _images) {
-               super(tree, _images);
-               tree.clear();
+       public FolderSubtree(PopupTree aTree, final Images _images) {
+               super(aTree, _images);
+               aTree.clear();
                DeferredCommand.addCommand(new IncrementalCommand() {
 
                        public boolean execute() {
@@ -57,11 +57,7 @@ public class FolderSubtree extends Subtree {
                });
        }
 
-       /**
-        * @return
-        */
        public boolean fetchRootFolder() {
-
                UserResource userResource = GSS.get().getCurrentUserResource();
                if (userResource == null)
                        return !DONE;
@@ -69,6 +65,7 @@ public class FolderSubtree extends Subtree {
                final String path = userResource.getFilesPath();
                GetCommand<FolderResource> gf = new GetCommand<FolderResource>(FolderResource.class, path) {
 
+                       @Override
                        public void onComplete() {
                                FolderResource rootResource = getResult();
                                rootItem = new DnDTreeItem(imageItemHTML(images.home(), rootResource.getName()), rootResource.getName(), false);
@@ -77,24 +74,11 @@ public class FolderSubtree extends Subtree {
                                tree.addItem(rootItem);
                                rootItem.doDroppable();
                                GSS.get().getFolders().select(rootItem);
-                               //hack for lazy loading
-                               /*for(String s : rootResource.getSubfolderPaths()){
-                                       if(!s.endsWith("/"))
-                                               s=s+"/";
-                                       String[] pathElements =  s.split("/");
-                                       FolderResource tr = new FolderResource(s);
-                                       tr.setName(pathElements[pathElements.length-1]);
-                                       DnDTreeItem child = (DnDTreeItem) addImageItem(rootItem, URL.decode(tr.getName()), images.folderYellow(), true);
-                                       child.doDraggable();
-                                       child.setUserObject(tr);
-                                       child.setState(false);
-                               }*/
-                               //for(FolderResource r : rootResource.get)
                                updateSubFoldersLazily(rootItem, rootResource.getFolders(), images.folderYellow());
                                rootItem.setState(true);
-                               //updateSubfolders(rootItem, true);
                        }
 
+                       @Override
                        public void onError(Throwable t) {
                                GWT.log("Error fetching root folder", t);
                                GSS.get().displayError("Unable to fetch root folder");
@@ -107,56 +91,38 @@ public class FolderSubtree extends Subtree {
 
                };
                DeferredCommand.addCommand(gf);
-
                return DONE;
        }
 
-
-
        public void updateSubfolders(final DnDTreeItem folderItem) {
                if (folderItem.getFolderResource() == null) {
                        GWT.log("folder resource is null", null);
                        return;
                }
-               updateNodes(folderItem, folderItem);
-
+               updateNodes(folderItem);
        }
 
-       private void updateNodes(final DnDTreeItem folderItem, final DnDTreeItem initialParent) {
+       private void updateNodes(final DnDTreeItem folderItem) {
                String parentName = "";
                if (folderItem.getParentItem() != null)
                        parentName = ((DnDTreeItem) folderItem.getParentItem()).getFolderResource().getName() + "->";
                parentName = parentName + folderItem.getFolderResource().getName();
-               final boolean firstRun = getRootItem().getChildCount() == 0;
                MultipleGetCommand<FolderResource> gf = new MultipleGetCommand<FolderResource>(FolderResource.class, folderItem .getFolderResource()
                                                                                                                                                                                                                                                .getSubfolderPaths()
                                                                                                                                                                                                                                                .toArray(new String[] {})) {
+                       @Override
                        public void onComplete() {
                                List<FolderResource> res = getResult();
-                               /*folderItem.removeItems();
-                               if (folderItem.equals(getRootItem()))
-                                       getRootItem().setState(true);
-
-                               for (FolderResource r : res) {
-
-                                       DnDTreeItem child = (DnDTreeItem) addImageItem(folderItem, r.getName(), images.folderYellow(), true);
-                                       child.doDraggable();
-                                       child.setUserObject(r);
-                                       child.setState(false);
-                               }*/
                                folderItem.getFolderResource().setFolders(res);
                                updateSubFoldersLazily(folderItem, res, images.folderYellow());
                                for (int i = 0; i < folderItem.getChildCount(); i++) {
                                        DnDTreeItem anItem = (DnDTreeItem) folderItem.getChild(i);
-
-                                       //if(anItem.getParentItem().equals(initialParent))
-                                               //updateNodes(anItem, initialParent);
-                                       //else
-                                               updateSubFoldersLazily(anItem, anItem.getFolderResource().getFolders(), images.folderYellow());
-                                               anItem.setState(false);
+                                       updateSubFoldersLazily(anItem, anItem.getFolderResource().getFolders(), images.folderYellow());
+                                       anItem.setState(false);
                                }
                        }
 
+                       @Override
                        public void onError(Throwable t) {
                                GSS.get().displayError("Unable to fetch subfolders");
                                GWT.log("Unable to fetch subfolders", t);
@@ -167,16 +133,15 @@ public class FolderSubtree extends Subtree {
                                GWT.log("Path:"+p, throwable);
                        }
 
-
                };
                DeferredCommand.addCommand(gf);
-
        }
 
        public void updateFolderAndSubfolders(final DnDTreeItem folderItem) {
                final String path = folderItem.getFolderResource().getUri();
                GetCommand<FolderResource> gf = new GetCommand<FolderResource>(FolderResource.class, path) {
 
+                       @Override
                        public void onComplete() {
                                FolderResource rootResource = getResult();
                                if (!folderItem.equals(rootItem)) {
@@ -193,13 +158,13 @@ public class FolderSubtree extends Subtree {
                                updateSubfolders(folderItem);
                        }
 
+                       @Override
                        public void onError(Throwable t) {
                                GWT.log("Error fetching folder", t);
                                GSS.get().displayError("Unable to fetch folder:" + folderItem.getFolderResource().getName());
                        }
                };
                DeferredCommand.addCommand(gf);
-
        }
 
        /**
@@ -211,6 +176,4 @@ public class FolderSubtree extends Subtree {
                return rootItem;
        }
 
-
-
 }

diff --git a/gss/src/gr/ebs/gss/client/tree/MyShareSubtree.java b/gss/src/gr/ebs/gss/client/tree/MyShareSubtree.java
index 0c3500b..9e3507f 100644 (file)
--- a/gss/src/gr/ebs/gss/client/tree/MyShareSubtree.java
+++ b/gss/src/gr/ebs/gss/client/tree/MyShareSubtree.java
@@ -47,8 +47,8 @@ public class MyShareSubtree extends Subtree {
 
        private DnDTreeItem rootItem;
 
-       public MyShareSubtree(PopupTree tree, final Images _images) {
-               super(tree, _images);
+       public MyShareSubtree(PopupTree aTree, final Images _images) {
+               super(aTree, _images);
 
                DeferredCommand.addCommand(new IncrementalCommand() {
 
@@ -65,6 +65,7 @@ public class MyShareSubtree extends Subtree {
 
                GetCommand<SharedResource> gs = new GetCommand<SharedResource>(SharedResource.class, userResource.getSharedPath()) {
 
+                       @Override
                        public void onComplete() {
                                rootItem = new DnDTreeItem(imageItemHTML(images.myShared(), "My Shared"), "My Shared", false);
                                rootItem.setUserObject(getResult());
@@ -74,6 +75,7 @@ public class MyShareSubtree extends Subtree {
                                update(rootItem);
                        }
 
+                       @Override
                        public void onError(Throwable t) {
                                GWT.log("Error fetching Shared Root folder", t);
                                GSS.get().displayError("Unable to fetch Shared Root folder");
@@ -85,7 +87,6 @@ public class MyShareSubtree extends Subtree {
                };
                DeferredCommand.addCommand(gs);
                return DONE;
-
        }
 
        public void update(final DnDTreeItem folderItem) {
@@ -93,7 +94,6 @@ public class MyShareSubtree extends Subtree {
                        folderItem.removeItems();
                        List<String> newPaths = new ArrayList<String>();
                        for (String s : folderItem.getFolderResource().getSubfolderPaths()) {
-
                                if (!s.endsWith("/"))
                                        s = s + "/";
                                if (rootItem.getSharedResource().getSubfolderPaths().contains(s))
@@ -106,10 +106,10 @@ public class MyShareSubtree extends Subtree {
                        folderItem.getFolderResource().setSubfolderPaths(newPaths);
                        MultipleGetCommand<FolderResource> gf = new MultipleGetCommand<FolderResource>(FolderResource.class, newPaths.toArray(new String[] {})) {
 
+                               @Override
                                public void onComplete() {
                                        List<FolderResource> res = getResult();
                                        for (FolderResource r : res) {
-
                                                DnDTreeItem child = (DnDTreeItem) addImageItem(folderItem, r.getName(), images.folderYellow(), true);
                                                child.setUserObject(r);
                                                child.setState(false);
@@ -117,9 +117,9 @@ public class MyShareSubtree extends Subtree {
                                                if(folderItem.getState())
                                                        update(child);
                                        }
-
                                }
 
+                               @Override
                                public void onError(Throwable t) {
                                        GSS.get().displayError("Unable to fetch subfolders");
                                        GWT.log("Unable to fetch subfolders", t);
@@ -141,6 +141,7 @@ public class MyShareSubtree extends Subtree {
                                        newPaths.add(r);
                        MultipleGetCommand<FolderResource> gf = new MultipleGetCommand<FolderResource>(FolderResource.class, newPaths.toArray(new String[] {})) {
 
+                               @Override
                                public void onComplete() {
                                        List<FolderResource> res = getResult();
                                        for (FolderResource r : res) {
@@ -150,9 +151,9 @@ public class MyShareSubtree extends Subtree {
                                                child.doDraggable();
                                                update(child);
                                        }
-
                                }
 
+                               @Override
                                public void onError(Throwable t) {
                                        GSS.get().displayError("Unable to fetch subfolders");
                                        GWT.log("Unable to fetch subfolders", t);
@@ -167,17 +168,6 @@ public class MyShareSubtree extends Subtree {
                }
        }
 
-       private void handleFolders(DnDTreeItem child, FolderResource ff, List<FolderResource> folders) {
-
-       }
-
-       private boolean isRoot(FolderResource f, List<FolderResource> folders) {
-               for (FolderResource t : folders)
-                       if (!f.getUri().equals(t.getUri()) && f.getUri().startsWith(t.getUri()))
-                               return false;
-               return true;
-       }
-
        private boolean isRoot(String f, List<String> folders) {
                for (String t : folders)
                        if (!f.equals(t) && f.startsWith(t))
@@ -185,17 +175,17 @@ public class MyShareSubtree extends Subtree {
                return true;
        }
 
-
-
        public void updateFolderAndSubfolders(final DnDTreeItem folderItem) {
                if (folderItem.getFolderResource() != null) {
                        final String path = folderItem.getFolderResource().getUri();
                        GetCommand<SharedResource> gs = new GetCommand<SharedResource>(SharedResource.class, GSS.get().getCurrentUserResource().getSharedPath()) {
 
+                               @Override
                                public void onComplete() {
                                        rootItem.setUserObject(getResult());
                                        GetCommand<FolderResource> gf = new GetCommand<FolderResource>(FolderResource.class, path) {
 
+                                               @Override
                                                public void onComplete() {
                                                        FolderResource rootResource = getResult();
                                                        if(rootItem.getSharedResource().getSubfolderPaths().contains(rootResource.getUri())){
@@ -208,6 +198,7 @@ public class MyShareSubtree extends Subtree {
                                                                folderItem.getParentItem().removeItem(folderItem);
                                                }
 
+                                               @Override
                                                public void onError(Throwable t) {
                                                        GWT.log("Error fetching folder", t);
                                                        GSS.get().displayError("Unable to fetch folder:" + folderItem.getFolderResource().getName());
@@ -216,23 +207,25 @@ public class MyShareSubtree extends Subtree {
                                        DeferredCommand.addCommand(gf);
                                }
 
+                               @Override
                                public void onError(Throwable t) {
                                        GWT.log("Error fetching Shared Root folder", t);
                                        GSS.get().displayError("Unable to fetch Shared Root folder");
                                }
                        };
                        DeferredCommand.addCommand(gs);
-
                }
                else if( folderItem.getSharedResource() != null){
                        GetCommand<SharedResource> gs = new GetCommand<SharedResource>(SharedResource.class, GSS.get().getCurrentUserResource().getSharedPath()) {
 
+                               @Override
                                public void onComplete() {
                                        rootItem.setUserObject(getResult());
                                        rootItem.removeItems();
                                        update(rootItem);
                                }
 
+                               @Override
                                public void onError(Throwable t) {
                                        GWT.log("Error fetching Shared Root folder", t);
                                        GSS.get().displayError("Unable to fetch Shared Root folder");
@@ -240,7 +233,6 @@ public class MyShareSubtree extends Subtree {
                        };
                        DeferredCommand.addCommand(gs);
                }
-
        }
 
        /**
@@ -252,9 +244,6 @@ public class MyShareSubtree extends Subtree {
                return rootItem;
        }
 
-
-
-
        public void updateNode(TreeItem node, FolderResource folder) {
                node.getWidget().removeStyleName("gss-SelectedRow");
                if (node instanceof DnDTreeItem) {

diff --git a/gss/src/gr/ebs/gss/client/tree/Subtree.java b/gss/src/gr/ebs/gss/client/tree/Subtree.java
index c154b73..cbc11a5 100644 (file)
--- a/gss/src/gr/ebs/gss/client/tree/Subtree.java
+++ b/gss/src/gr/ebs/gss/client/tree/Subtree.java
@@ -39,10 +39,9 @@ public abstract class Subtree {
 
        final Images images;
 
-       public Subtree(PopupTree tree, final Images _images) {
+       public Subtree(PopupTree aTree, final Images _images) {
                images = _images;
-               this.tree = tree;
-
+               tree = aTree;
        }
 
        /**
@@ -60,8 +59,6 @@ public abstract class Subtree {
                return item;
        }
 
-
-
        /**
         * Generates HTML for a tree item with an attached icon.
         *
@@ -93,7 +90,6 @@ public abstract class Subtree {
                                item.updateWidget(imageItemHTML(image, subfolder.getName()));
                        item.setUserObject(subfolder);
                        itemList.add(item);
-
                }
                for (DnDTreeItem it : itemList)
                        it.remove();
@@ -102,12 +98,9 @@ public abstract class Subtree {
                for (int i = 0; i < folderItem.getChildCount(); i++) {
                        DnDTreeItem c = (DnDTreeItem) folderItem.getChild(i);
                        c.doDraggable();
-                       FolderResource f = (FolderResource) c.getUserObject();
                }
        }
 
-
-
        private boolean listContainsFolder(FolderResource folder, List<FolderResource> subfolders) {
                for (FolderResource f : subfolders)
                        if (f.getUri().equals(folder.getUri()))
@@ -115,5 +108,4 @@ public abstract class Subtree {
                return false;
        }
 
-
 }

diff --git a/gss/src/gr/ebs/gss/client/tree/TrashSubtree.java b/gss/src/gr/ebs/gss/client/tree/TrashSubtree.java
index e7c5290..5785a7e 100644 (file)
--- a/gss/src/gr/ebs/gss/client/tree/TrashSubtree.java
+++ b/gss/src/gr/ebs/gss/client/tree/TrashSubtree.java
@@ -35,8 +35,6 @@ import com.google.gwt.user.client.DeferredCommand;
 import com.google.gwt.user.client.IncrementalCommand;
 import com.google.gwt.user.client.ui.TreeItem;
 
-
-
 /**
  * @author kman
  */
@@ -49,9 +47,8 @@ public class TrashSubtree extends Subtree {
 
        private DnDTreeItem rootItem;
 
-       public TrashSubtree(PopupTree tree, final Images _images) {
-               super(tree, _images);
-
+       public TrashSubtree(PopupTree aTree, final Images _images) {
+               super(aTree, _images);
                DeferredCommand.addCommand(new IncrementalCommand() {
 
                        public boolean execute() {
@@ -61,17 +58,16 @@ public class TrashSubtree extends Subtree {
        }
 
        public boolean updateInit() {
-
                UserResource userResource = GSS.get().getCurrentUserResource();
                if ( userResource == null || GSS.get().getFolders().getRootItem() == null)
                        return !DONE;
                update();
                return DONE;
-
        }
 
        public void update() {
                DeferredCommand.addCommand(new GetCommand<TrashResource>(TrashResource.class, GSS.get().getCurrentUserResource().getTrashPath()) {
+                       @Override
                        public void onComplete() {
                                if(rootItem == null){
                                        rootItem = new DnDTreeItem(imageItemHTML(images.trash(), "Trash"), "Trash", false);
@@ -88,10 +84,11 @@ public class TrashSubtree extends Subtree {
                                }
                        }
 
+                       @Override
                        public void onError(Throwable t) {
                                if(t instanceof RestException){
                                        int statusCode = ((RestException)t).getHttpStatusCode();
-                                       //empty trash ie returns 1223 status code instead of 204
+                                       // On IE status code 1223 may be returned instead of 204.
                                        if(statusCode == 204 || statusCode == 1223){
                                                GWT.log("Trash is empty", null);
                                                if(rootItem == null){
@@ -122,7 +119,6 @@ public class TrashSubtree extends Subtree {
                                }
                        }
                });
-
        }
 
        /**