Fix the alignment of the quota label and simplify the HTML widget for better performance.

diff --git a/src/gr/ebs/gss/client/StatusPanel.java b/src/gr/ebs/gss/client/StatusPanel.java
index 4ca00cb..847bae8 100644 (file)
--- a/src/gr/ebs/gss/client/StatusPanel.java
+++ b/src/gr/ebs/gss/client/StatusPanel.java
@@ -38,10 +38,11 @@ import com.google.gwt.user.client.ui.ImageBundle;
  */\r
 public class StatusPanel extends Composite {\r
        public static final boolean DONE = false;\r
-       private HTML fileCountLabel;\r
-       private HTML fileSizeLabel;\r
-       private HTML quotaLabel;\r
-       private HTML currentlyShowingLabel;\r
+       private HTML fileCountLabel = new HTML("");\r
+       private HTML fileSizeLabel = new HTML("");\r
+       private HTML quotaIcon = new HTML("");\r
+       private HTML quotaLabel = new HTML("");\r
+       private HTML currentlyShowingLabel = new HTML("");\r
 \r
        /**\r
         * An image bundle for this widget's images.\r
@@ -55,7 +56,7 @@ public class StatusPanel extends Composite {
                AbstractImagePrototype totalSize();\r
 \r
                @Resource("gr/ebs/gss/resources/redled.png")\r
-               AbstractImagePrototype freeSize();\r
+               AbstractImagePrototype redSize();\r
 \r
                @Resource("gr/ebs/gss/resources/greenled.png")\r
                AbstractImagePrototype greenSize();\r
@@ -85,11 +86,13 @@ public class StatusPanel extends Composite {
                outer.add(right);\r
                left.add(new HTML("<b>Totals:</b> "));\r
                left.add(images.totalFiles().createImage());\r
-               left.add(fileCountLabel = new HTML(""));\r
+               left.add(fileCountLabel);\r
                left.add(images.totalSize().createImage());\r
-               left.add(fileSizeLabel = new HTML(""));\r
-               left.add(quotaLabel = new HTML(""));\r
-               right.add(currentlyShowingLabel = new HTML(""));\r
+               left.add(fileSizeLabel);\r
+               quotaIcon.setHTML(images.greenSize().getHTML());\r
+               left.add(quotaIcon);\r
+               left.add(quotaLabel);\r
+               right.add(currentlyShowingLabel);\r
                outer.setStyleName("statusbar-inner");\r
                left.setStyleName("statusbar-inner");\r
                right.setStyleName("statusbar-inner");\r
@@ -120,12 +123,16 @@ public class StatusPanel extends Composite {
                        fileCountLabel.setHTML(stats.getFileCount() + " files");\r
                fileSizeLabel.setHTML(stats.getFileSizeAsString() + " used");\r
                long pc = stats.percentOfFreeSpace();\r
-               if(pc<10)\r
-                       quotaLabel.setHTML(images.freeSize().getHTML()+"&nbsp;"+stats.getQuotaLeftAsString() +" free");\r
-               else if(pc<20)\r
-                       quotaLabel.setHTML(images.yellowSize().getHTML()+"&nbsp;"+stats.getQuotaLeftAsString() +" free");\r
-               else\r
-                       quotaLabel.setHTML(images.greenSize().getHTML()+"&nbsp;"+stats.getQuotaLeftAsString() +" free");\r
+               if(pc<10) {\r
+                       quotaIcon.setHTML(images.redSize().getHTML());\r
+                       quotaLabel.setHTML(stats.getQuotaLeftAsString() +" free");\r
+               } else if(pc<20) {\r
+                       quotaIcon.setHTML(images.yellowSize().getHTML());\r
+                       quotaLabel.setHTML(stats.getQuotaLeftAsString() +" free");\r
+               } else {\r
+                       quotaIcon.setHTML(images.greenSize().getHTML());\r
+                       quotaLabel.setHTML(stats.getQuotaLeftAsString() +" free");\r
+               }\r
        }\r
 \r
        /**\r
@@ -144,9 +151,11 @@ public class StatusPanel extends Composite {
                        @Override\r
                        public void onError(Throwable t) {\r
                                if(t instanceof RestException)\r
-                                       app.displayError("Unable to fetch quota:"+((RestException)t).getHttpStatusText());\r
+                                       app.displayError("Unable to fetch quota:" +\r
+                                                               ((RestException)t).getHttpStatusText());\r
                                else\r
-                                       app.displayError("System error fetching quota:"+t.getMessage());\r
+                                       app.displayError("System error fetching quota:" +\r
+                                                               t.getMessage());\r
                                GWT.log("ERR", t);\r
                        }\r
                };\r