first styling effort

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

diff --git a/src/gr/ebs/gss/client/FileContextMenu.java b/src/gr/ebs/gss/client/FileContextMenu.java
index d813f15..dc4f6ba 100644 (file)
--- a/src/gr/ebs/gss/client/FileContextMenu.java
+++ b/src/gr/ebs/gss/client/FileContextMenu.java
@@ -232,7 +232,8 @@ public class FileContextMenu extends PopupPanel implements ClickHandler {
                        }
        }
 
-       public void onEvent(Event event) {
+       
+       public void onContextEvent(ContextMenuEvent event) {
                if (GSS.get().getCurrentSelection() != null)
                        if (GSS.get().getCurrentSelection() instanceof FileResource) {
                                FileResource res = (FileResource) GSS.get().getCurrentSelection();
@@ -241,10 +242,11 @@ public class FileContextMenu extends PopupPanel implements ClickHandler {
                                        menu = new FileContextMenu(images, true, false);
                                else
                                        menu = new FileContextMenu(images, false, false);
-                               int left = event.getClientX();
-                               int top = event.getClientY();
+                               int left = event.getNativeEvent().getClientX();
+                               int top = event.getNativeEvent().getClientY();
                                menu.setPopupPosition(left, top);
                                menu.show();
+
                        } else if (GSS.get().getCurrentSelection() instanceof List) {
                                FileContextMenu menu;
                                if (GSS.get().getFolders().isTrashItem(GSS.get().getFolders().getCurrent()))
@@ -253,66 +255,55 @@ public class FileContextMenu extends PopupPanel implements ClickHandler {
                                        menu = new FileContextMenu(images, false, false);
                                        menu.onMultipleSelection();
                                }
-                               int left = event.getClientX();
-                               int top = event.getClientY();
+                               int left = event.getNativeEvent().getClientX();
+                               int top = event.getNativeEvent().getClientY();
                                menu.setPopupPosition(left, top);
                                menu.show();
                        }
        }
 
-       public void onContextEvent(ContextMenuEvent event) {
+       public FileContextMenu onEvent(Event event) {
+               FileContextMenu menu=null;
                if (GSS.get().getCurrentSelection() != null)
                        if (GSS.get().getCurrentSelection() instanceof FileResource) {
                                FileResource res = (FileResource) GSS.get().getCurrentSelection();
-                               FileContextMenu menu;
+
                                if (res.isDeleted())
                                        menu = new FileContextMenu(images, true, false);
                                else
                                        menu = new FileContextMenu(images, false, false);
-                               int left = event.getNativeEvent().getClientX();
-                               int top = event.getNativeEvent().getClientY();
+                               int left = event.getClientX();
+                               int top = event.getClientY();
                                menu.setPopupPosition(left, top);
                                menu.show();
-
                        } else if (GSS.get().getCurrentSelection() instanceof List) {
-                               FileContextMenu menu;
+
                                if (GSS.get().getFolders().isTrashItem(GSS.get().getFolders().getCurrent()))
                                        menu = new FileContextMenu(images, true, false);
                                else {
                                        menu = new FileContextMenu(images, false, false);
                                        menu.onMultipleSelection();
                                }
-                               int left = event.getNativeEvent().getClientX();
-                               int top = event.getNativeEvent().getClientY();
+                               int left = event.getClientX();
+                               int top = event.getClientY();
                                menu.setPopupPosition(left, top);
                                menu.show();
                        }
+               return menu;
        }
 
-       public void onContextEmptyEvent(ContextMenuEvent event) {
-               FileContextMenu menu;
-               if (GSS.get().getFolders().isTrashItem(GSS.get().getFolders().getCurrent()))
-                       menu = new FileContextMenu(images, true, true);
-               else if(((DnDTreeItem)GSS.get().getFolders().getCurrent()).getFolderResource() != null)
-                       menu = new FileContextMenu(images, false, true);
-               else return;
-               int left = event.getNativeEvent().getClientX();
-               int top = event.getNativeEvent().getClientY();
-               menu.setPopupPosition(left, top);
-               menu.show();
-       }
-
-       public void onEmptyEvent(Event event) {
-               FileContextMenu menu;
+       public FileContextMenu onEmptyEvent(Event event) {
+               FileContextMenu menu=null;
                if (GSS.get().getFolders().isTrashItem(GSS.get().getFolders().getCurrent()))
                        menu = new FileContextMenu(images, true, true);
                else if(((DnDTreeItem)GSS.get().getFolders().getCurrent()).getFolderResource() != null)
                        menu = new FileContextMenu(images, false, true);
-               else return;
+               else return menu;
                int left = event.getClientX();
                int top = event.getClientY();
                menu.setPopupPosition(left, top);
                menu.show();
+               return menu;
        }