Formating commit. Comments fixed after code review. 1. Added a 2010 entry in copyrigh...

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

diff --git a/src/gr/ebs/gss/client/HelpMenu.java b/src/gr/ebs/gss/client/HelpMenu.java
index a75ab1b..63c66ca 100644 (file)
--- a/src/gr/ebs/gss/client/HelpMenu.java
+++ b/src/gr/ebs/gss/client/HelpMenu.java
@@ -18,18 +18,19 @@
  */\r
 package gr.ebs.gss.client;\r
 \r
+import com.google.gwt.event.dom.client.ClickEvent;\r
+import com.google.gwt.event.dom.client.ClickHandler;\r
+import com.google.gwt.resources.client.ClientBundle;\r
+import com.google.gwt.resources.client.ImageResource;\r
 import com.google.gwt.user.client.Command;\r
 import com.google.gwt.user.client.ui.AbstractImagePrototype;\r
-import com.google.gwt.user.client.ui.ClickListener;\r
 import com.google.gwt.user.client.ui.MenuBar;\r
 import com.google.gwt.user.client.ui.PopupPanel;\r
-import com.google.gwt.user.client.ui.Widget;\r
-import com.google.gwt.user.client.ui.ImageBundle.Resource;\r
 \r
 /**\r
  * The 'Help' menu implementation.\r
  */\r
-public class HelpMenu extends PopupPanel implements ClickListener {\r
+public class HelpMenu extends PopupPanel implements ClickHandler {\r
 \r
        /**\r
         * The widget's images.\r
@@ -41,18 +42,18 @@ public class HelpMenu extends PopupPanel implements ClickListener {
        /**\r
         * An image bundle for this widget's images.\r
         */\r
-       public interface Images {\r
-               @Resource("gr/ebs/gss/resources/khelpcenter.png")\r
-               AbstractImagePrototype userGuide();\r
+       public interface Images extends ClientBundle{\r
+               @Source("gr/ebs/gss/resources/khelpcenter.png")\r
+               ImageResource userGuide();\r
 \r
-               @Resource("gr/ebs/gss/resources/linewidth.png")\r
-               AbstractImagePrototype terms();\r
+               @Source("gr/ebs/gss/resources/linewidth.png")\r
+               ImageResource terms();\r
 \r
-               @Resource("gr/ebs/gss/resources/bell.png")\r
-               AbstractImagePrototype reportAbuse();\r
+               @Source("gr/ebs/gss/resources/bell.png")\r
+               ImageResource reportAbuse();\r
 \r
-               @Resource("gr/ebs/gss/resources/info.png")\r
-               AbstractImagePrototype about();\r
+               @Source("gr/ebs/gss/resources/info.png")\r
+               ImageResource about();\r
        }\r
 \r
        /**\r
@@ -70,10 +71,10 @@ public class HelpMenu extends PopupPanel implements ClickListener {
                add(contextMenu);\r
        }\r
 \r
-       public void onClick(Widget sender) {\r
+       public void onClick(ClickEvent event) {\r
                HelpMenu menu = new HelpMenu(images);\r
-               int left = sender.getAbsoluteLeft();\r
-               int top = sender.getAbsoluteTop() + sender.getOffsetHeight();\r
+               int left = event.getRelativeElement().getAbsoluteLeft();\r
+               int top = event.getRelativeElement().getAbsoluteTop() + event.getRelativeElement().getOffsetHeight();\r
                menu.setPopupPosition(left, top);\r
                menu.show();\r
        }\r
@@ -92,13 +93,13 @@ public class HelpMenu extends PopupPanel implements ClickListener {
                                dlg.center();\r
                        }\r
                };\r
-               contextMenu.addItem("<span>" + images.userGuide().getHTML() + "&nbsp;<a class='hidden-link' " +\r
+               contextMenu.addItem("<span>" + AbstractImagePrototype.create(images.userGuide()).getHTML() + "&nbsp;<a class='hidden-link' " +\r
                                        "href='/userguide/el' target='_blank'>User Guide</a></span>", true, hideCommand);\r
-               contextMenu.addItem("<span>" + images.terms().getHTML() + "&nbsp;<a class='hidden-link' " +\r
+               contextMenu.addItem("<span>" + AbstractImagePrototype.create(images.terms()).getHTML() + "&nbsp;<a class='hidden-link' " +\r
                                        "href='/terms' target='_blank'>Terms &amp; Conditions</a></span>", true, hideCommand);\r
-               contextMenu.addItem("<span>" + images.reportAbuse().getHTML() + "&nbsp;<a class='hidden-link' " +\r
+               contextMenu.addItem("<span>" + AbstractImagePrototype.create(images.reportAbuse()).getHTML() + "&nbsp;<a class='hidden-link' " +\r
                                "href='/report-abuse' target='_blank'>Report abuse</a></span>", true, hideCommand);\r
-               contextMenu.addItem("<span>" + images.about().getHTML() + "&nbsp;About</span>", true, aboutCommand);\r
+               contextMenu.addItem("<span>" + AbstractImagePrototype.create(images.about()).getHTML() + "&nbsp;About</span>", true, aboutCommand);\r
                return contextMenu;\r
        }\r
 \r