Removed some unused methods

diff --git a/src/gr/grnet/pithos/web/client/Pithos.java b/src/gr/grnet/pithos/web/client/Pithos.java
index 2adb7fd..56194c1 100644 (file)
--- a/src/gr/grnet/pithos/web/client/Pithos.java
+++ b/src/gr/grnet/pithos/web/client/Pithos.java
@@ -151,16 +151,6 @@ public class Pithos implements EntryPoint, ResizeHandler {
        otherSharedTreeView.updateFolder(f, showfiles);
     }
 
-    public List<Tag> getAllTags() {
-        List<Tag> tagList = new ArrayList<Tag>();
-        for (Folder f : account.getContainers()) {
-            for (String t : f.getTags()) {
-                tagList.add(new Tag(t));
-            }
-        }
-        return tagList;
-    }
-
     public MysharedTreeView getMySharedTreeView() {
         return mysharedTreeView;
     }
@@ -519,38 +509,6 @@ public class Pithos implements EntryPoint, ResizeHandler {
         fileList.setFiles(new ArrayList<File>(files));
     }
 
-    protected void fetchFile(final Iterator<File> iter, final Set<File> files) {
-        if (iter.hasNext()) {
-            File file = iter.next();
-            String path = file.getUri() + "?format=json";
-            GetRequest<File> getFile = new GetRequest<File>(File.class, getApiPath(), username, path, file) {
-                @Override
-                public void onSuccess(File _result) {
-                    fetchFile(iter, files);
-                }
-
-                @Override
-                public void onError(Throwable t) {
-                    GWT.log("Error getting file", t);
-                                       setError(t);
-                    if (t instanceof RestException)
-                        displayError("Error getting file: " + ((RestException) t).getHttpStatusText());
-                    else
-                        displayError("System error fetching file: " + t.getMessage());
-                }
-
-                               @Override
-                               protected void onUnauthorized(Response response) {
-                                       sessionExpired();
-                               }
-            };
-            getFile.setHeader("X-Auth-Token", "0000");
-            Scheduler.get().scheduleDeferred(getFile);
-        }
-        else
-            fileList.setFiles(new ArrayList<File>(files));
-    }
-
     /**
         * Parse and store the user credentials to the appropriate fields.
         */

diff --git a/src/gr/grnet/pithos/web/client/foldertree/File.java b/src/gr/grnet/pithos/web/client/foldertree/File.java
index 4956981..2f0c56e 100644 (file)
--- a/src/gr/grnet/pithos/web/client/foldertree/File.java
+++ b/src/gr/grnet/pithos/web/client/foldertree/File.java
@@ -217,6 +217,7 @@ public class File extends Resource {
         return container;
     }
 
+    //Never called
     public static File createFromResponse(String owner, Response response, File result) {
         result.populate(owner, response);
         return result;

diff --git a/src/gr/grnet/pithos/web/client/foldertree/Folder.java b/src/gr/grnet/pithos/web/client/foldertree/Folder.java
index fb03f1b..3881525 100644 (file)
--- a/src/gr/grnet/pithos/web/client/foldertree/Folder.java
+++ b/src/gr/grnet/pithos/web/client/foldertree/Folder.java
@@ -80,8 +80,6 @@ public class Folder extends Resource {
 
     private Set<File> files = new LinkedHashSet<File>();
 
-    private Set<String> tags = new LinkedHashSet<String>();
-
     private String owner;
 
     private Map<String, Boolean[]> permissions = new HashMap<String, Boolean[]>();
@@ -161,13 +159,6 @@ public class Folder extends Resource {
         if (header != null && header.length() > 0)
             bytesUsed = Long.valueOf(header);
 
-        header = response.getHeader("X-Container-Object-Meta");
-        if (header != null && header.length() > 0) {
-            for (String t : header.split(",")) {
-                tags.add(URL.decodePathSegment(t));
-            }
-        }
-
         subfolders.clear(); //This is necessary in case we update a pre-existing Folder so that stale subfolders won't show up
         files.clear();
         JSONValue json = JSONParser.parseStrict(response.getText());
@@ -278,10 +269,6 @@ public class Folder extends Resource {
         this.container = container;
     }
 
-    public Set<String> getTags() {
-        return tags;
-    }
-
     public String getInheritedPermissionsFrom() {
         return inheritedPermissionsFrom;
     }

diff --git a/src/gr/grnet/pithos/web/client/foldertree/Resource.java b/src/gr/grnet/pithos/web/client/foldertree/Resource.java
index 9c1a482..2e97018 100644 (file)
--- a/src/gr/grnet/pithos/web/client/foldertree/Resource.java
+++ b/src/gr/grnet/pithos/web/client/foldertree/Resource.java
@@ -109,6 +109,7 @@ public abstract class Resource {
             result1 = (T) Folder.createFromResponse(owner, response, (Folder) result);
         }
         else if (aClass.equals(File.class)) {
+               //This case cannot happen since we never GET a file directly. Files are always fetch through their parent Folder
             result1 = (T) File.createFromResponse(owner, response, (File) result);
         }
         else if (aClass.equals(SharingUsers.class)) {