reset sorting when updating file list

[pithos] / src / gr / ebs / gss / client / FileList.java

diff --git a/src/gr/ebs/gss/client/FileList.java b/src/gr/ebs/gss/client/FileList.java
index cb10a21..90c503b 100644 (file)
--- a/src/gr/ebs/gss/client/FileList.java
+++ b/src/gr/ebs/gss/client/FileList.java
@@ -361,8 +361,8 @@ public class FileList extends Composite {
                initDragOperation(nameColumn);
                celltable.addColumn(nameColumn,nameHeader = new SortableHeader("Name"));
                allHeaders.add(nameHeader);
                initDragOperation(nameColumn);
                celltable.addColumn(nameColumn,nameHeader = new SortableHeader("Name"));
                allHeaders.add(nameHeader);

-               nameHeader.setSorted(true);
-               nameHeader.toggleReverseSort();
+               //nameHeader.setSorted(true);
+               //nameHeader.toggleReverseSort();

                nameHeader.setUpdater(new FileValueUpdater(nameHeader, "name"));
                celltable.redrawHeaders();
                
                nameHeader.setUpdater(new FileValueUpdater(nameHeader, "name"));
                celltable.redrawHeaders();
                

@@ -394,7 +394,6 @@ public class FileList extends Composite {
                celltable.addColumn(aColumn=new DragAndDropColumn<FileResource,String>(new TextCell()) {
                        @Override
                        public String getValue(FileResource object) {
                celltable.addColumn(aColumn=new DragAndDropColumn<FileResource,String>(new TextCell()) {
                        @Override
                        public String getValue(FileResource object) {

-                               // TODO Auto-generated method stub

                                return object.getVersion().toString();
                        }                       
                },aheader = new SortableHeader("Version"));
                                return object.getVersion().toString();
                        }                       
                },aheader = new SortableHeader("Version"));

@@ -427,11 +426,15 @@ public class FileList extends Composite {
 
                      public void onDragStart(DragStartEvent event) {
                        FileResource value = event.getDraggableData();
 
                      public void onDragStart(DragStartEvent event) {
                        FileResource value = event.getDraggableData();

+                       

                        com.google.gwt.dom.client.Element helper = event.getHelper();
                        SafeHtmlBuilder sb = new SafeHtmlBuilder();
                        sb.appendHtmlConstant("<b>");
                        DisplayHelper.log(value.getName());
                        com.google.gwt.dom.client.Element helper = event.getHelper();
                        SafeHtmlBuilder sb = new SafeHtmlBuilder();
                        sb.appendHtmlConstant("<b>");
                        DisplayHelper.log(value.getName());

-                       sb.appendEscaped(value.getName());
+                       if(getSelectedFiles().size()==1)
+                               sb.appendEscaped(value.getName());
+                       else
+                               sb.appendEscaped(getSelectedFiles().size()+" files");

                        sb.appendHtmlConstant("</b>");
                        helper.setInnerHTML(sb.toSafeHtml().asString());
 
                        sb.appendHtmlConstant("</b>");
                        helper.setInnerHTML(sb.toSafeHtml().asString());
 

@@ -691,35 +694,10 @@ public class FileList extends Composite {
        public void updateCurrentlyShowingStats() {
                GSS.get().getStatusPanel().updateCurrentlyShowing(showingStats);
        }
        public void updateCurrentlyShowingStats() {
                GSS.get().getStatusPanel().updateCurrentlyShowing(showingStats);
        }

-
-       public void updateFileCache(boolean updateSelectedFolder, final boolean clearSelection) {
-               updateFileCache(updateSelectedFolder, clearSelection, null);
-       }
-
-       public void updateFileCache(boolean updateSelectedFolder, final boolean clearSelection, final String newFilename) {
-               if (!updateSelectedFolder && !GSS.get().getTreeView().getSelection().equals(GSS.get().getTreeView().getTrash()))
-                       updateFileCache(clearSelection);
-               else if (GSS.get().getTreeView().getSelection() != null) {
-                       update(true);
-               }
-               updateFileCache(clearSelection);
-       }
-
-
-       private void updateFileCache(boolean clearSelection) {
-               updateFileCache(clearSelection, null);
-       }
-
-       /**
-        * Update the file cache with data from the server.
-        *
-        * @param newFilename the new name of the previously selected file,
-        *                      if a rename operation has taken place
-        */
-       private void updateFileCache(boolean clearSelection, String newFilename) {
-               if (clearSelection)
+       
+       public void updateFileCache(boolean clearSelection){
+               if(clearSelection)

                        clearSelectedRows();
                        clearSelectedRows();

-               startIndex = 0;

                final RestResource folderItem = GSS.get().getTreeView().getSelection();
                // Validation.
                if (folderItem == null || folderItem.equals(GSS.get().getTreeView().getOthers())) {
                final RestResource folderItem = GSS.get().getTreeView().getSelection();
                // Validation.
                if (folderItem == null || folderItem.equals(GSS.get().getTreeView().getOthers())) {

@@ -727,26 +705,24 @@ public class FileList extends Composite {
                        update(true);
                        return;
                }
                        update(true);
                        return;
                }

-               if (folderItem instanceof RestResourceWrapper) {
+               else if (folderItem instanceof RestResourceWrapper) {

                        setFiles(((RestResourceWrapper) folderItem).getResource().getFiles());
                        update(true);
                }
                        setFiles(((RestResourceWrapper) folderItem).getResource().getFiles());
                        update(true);
                }

-               if (folderItem instanceof SharedResource) {
+               else if (folderItem instanceof SharedResource) {

                        setFiles(((SharedResource) folderItem).getFiles());
                        update(true);
                }
                        setFiles(((SharedResource) folderItem).getFiles());
                        update(true);
                }

-               if (folderItem instanceof OtherUserResource) {
-                       
+               else if (folderItem instanceof OtherUserResource) {

                        setFiles(((OtherUserResource) folderItem).getFiles());
                        setFiles(((OtherUserResource) folderItem).getFiles());

-                       GWT.log("----->"+files);

                        update(true);
                }
                        update(true);
                }

-               if (folderItem instanceof TrashResource) {
+               else if (folderItem instanceof TrashResource) {

                        setFiles(((TrashResource) folderItem).getFiles());
                        update(true);
                }
                        setFiles(((TrashResource) folderItem).getFiles());
                        update(true);
                }

-               GWT.log(folderItem.getClass().getName());

        }
        }

+       

 
        /**
         * Fill the file cache with data.
 
        /**
         * Fill the file cache with data.

@@ -769,6 +745,16 @@ public class FileList extends Composite {
 
                });
                folderFileCount = files.size();
 
                });
                folderFileCount = files.size();

+               
+               nameHeader.setSorted(true);
+               nameHeader.toggleReverseSort();
+               for (SortableHeader otherHeader : allHeaders) {
+                 if (otherHeader != nameHeader) {
+                   otherHeader.setSorted(false);
+                   otherHeader.setReverseSort(true);
+                 }
+               }
+               //

        }
 
        
        }
 
        

@@ -798,7 +784,7 @@ public class FileList extends Composite {
         *
         */
        public void selectAllRows() {
         *
         */
        public void selectAllRows() {

-               Iterator<FileResource> it = selectionModel.getSelectedSet().iterator();
+               Iterator<FileResource> it = provider.getList().iterator();

                while(it.hasNext()){
                        selectionModel.setSelected(it.next(),true);
                }
                while(it.hasNext()){
                        selectionModel.setSelected(it.next(),true);
                }