[java-atk-wrapper] Wrapper: Add isTopLevel static method

[Magdalen Berns <mberns src gnome org>]

commit 50e2b59e3d165b7b307112c96bdd1e9dca076c6a
Author: Magdalen Berns <m berns thismagpie com>
Date:   Tue Feb 17 17:10:30 2015 +0000

    Wrapper: Add isTopLevel static method
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=744676

 wrapper/org/GNOME/Accessibility/AtkWrapper.java.in |  243 +++++++++++---------
 1 files changed, 133 insertions(+), 110 deletions(-)
---
diff --git a/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in 
b/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in
index a526d95..82a642d 100644
--- a/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in
+++ b/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in
@@ -28,116 +28,139 @@ import javax.accessibility.*;
 import java.awt.Toolkit;
 
 public class AtkWrapper {
-       public native void AtkWrapper();
-       static boolean accessibilityEnabled = false;
-       static {
-               try {
-                       Process p = Runtime.getRuntime().exec ("@XPROP@ -root");
-                       BufferedReader b = new BufferedReader (
-                                       new InputStreamReader (p.getInputStream ()));
-                       
-                       String result;
-                       while ((result = b.readLine()) != null) {
-                               if (result.indexOf("AT_SPI_IOR") >= 0 ||
-                                       result.indexOf("AT_SPI_BUS") >= 0) {
-                                       System.loadLibrary("atk-wrapper");
-                                       if (AtkWrapper.initNativeLibrary()) {
-                                               accessibilityEnabled = true;
-                                       }
-
-                                       break;
-                               }
-                       }
-               } catch (Exception e) {
-                       e.printStackTrace();
-                       e.getCause();
-               }
-       }
-
-       final WindowAdapter winAdapter = new WindowAdapter() {
-               public void windowActivated(WindowEvent e) {
-                       Object o = e.getSource();
-                       if ( o instanceof javax.accessibility.Accessible ) {
-                               AccessibleContext ac = 
((javax.accessibility.Accessible)o).getAccessibleContext();
-                               AtkWrapper.windowActivate(ac);
-                       }
-               }
-
-               public void windowDeactivated(WindowEvent e) {
-                       Object o = e.getSource();
-                       if ( o instanceof javax.accessibility.Accessible ) {
-                               AccessibleContext ac = 
((javax.accessibility.Accessible)o).getAccessibleContext();
-                               AtkWrapper.windowDeactivate(ac);
-                       }
-               }
-
-               public void windowStateChanged(WindowEvent e) {
-                       Object o = e.getSource();
-                       if ( o instanceof javax.accessibility.Accessible ) {
-                               AccessibleContext ac = 
((javax.accessibility.Accessible)o).getAccessibleContext();
-                               AtkWrapper.windowStateChange(ac);
-
-                               if( (e.getNewState() & Frame.MAXIMIZED_BOTH) == Frame.MAXIMIZED_BOTH ) {
-                                       AtkWrapper.windowMaximize(ac);
-                               }
-                       }
-               }
-
-               public void windowDeiconified(WindowEvent e) {
-                       Object o = e.getSource();
-                       if ( o instanceof javax.accessibility.Accessible ) {
-                               AccessibleContext ac = 
((javax.accessibility.Accessible)o).getAccessibleContext();
-                               AtkWrapper.windowRestore(ac);
-                       }
-               }
-
-               public void windowIconified(WindowEvent e) {
-                       Object o = e.getSource();
-                       if ( o instanceof javax.accessibility.Accessible ) {
-                               AccessibleContext ac = 
((javax.accessibility.Accessible)o).getAccessibleContext();
-                               AtkWrapper.windowMinimize(ac);
-                       }
-               }
-
-               public void windowOpened(WindowEvent e) {
-                       Object o = e.getSource();
-                       if ( o instanceof javax.accessibility.Accessible ) {
-                               boolean isToplevel = false;
-                               if (o instanceof java.awt.Window ||
-                                       o instanceof java.awt.Frame ||
-                                       o instanceof java.awt.Dialog) {
-                                       isToplevel = true;
-                               }
-
-                               AccessibleContext ac = 
((javax.accessibility.Accessible)o).getAccessibleContext();
-                               AtkWrapper.windowOpen(ac, isToplevel);
-                       }
-               }
-
-               public void windowClosed(WindowEvent e) {
-                       Object o = e.getSource();
-                       if ( o instanceof javax.accessibility.Accessible ) {
-                               boolean isToplevel = false;
-                               if (o instanceof java.awt.Window ||
-                                       o instanceof java.awt.Frame ||
-                                       o instanceof java.awt.Dialog) {
-                                       isToplevel = true;
-                               }
-
-                               AccessibleContext ac = 
((javax.accessibility.Accessible)o).getAccessibleContext();
-                               AtkWrapper.windowClose(ac, isToplevel);
-                       }
-               }
-
-               public void windowClosing(WindowEvent e) {
-               }
-
-               public void windowGainedFocus(WindowEvent e) {
-               }
-
-               public void windowLostFocus(WindowEvent e) {
-               }
-       };
+  public native void AtkWrapper();
+  static boolean accessibilityEnabled = false;
+  static {
+    try {
+      Process p = Runtime.getRuntime().exec("@XPROP@ -root");
+      BufferedReader b = new BufferedReader(new InputStreamReader (p.getInputStream ()));
+      String result;
+      while ((result = b.readLine()) != null) {
+        if (result.indexOf("AT_SPI_IOR") >= 0 || result.indexOf("AT_SPI_BUS") >= 0) {
+          System.loadLibrary("atk-wrapper");
+          if (AtkWrapper.initNativeLibrary())
+            accessibilityEnabled = true;
+          break;
+        }
+      }
+    } catch (Exception e) {
+      e.printStackTrace();
+      e.getCause();
+    }
+  }
+
+  final WindowAdapter winAdapter = new WindowAdapter() {
+    public void windowActivated(WindowEvent e) {
+      Object o = e.getSource();
+      if ( o instanceof javax.accessibility.Accessible ) {
+        AccessibleContext ac = ((javax.accessibility.Accessible)o).getAccessibleContext();
+        AtkWrapper.windowActivate(ac);
+      }
+    }
+
+   /**
+    * windowDeactivated
+    * @param e A WindowEvent object
+    */
+    public void windowDeactivated(WindowEvent e) {
+      Object o = e.getSource();
+      if (o instanceof javax.accessibility.Accessible) {
+        AccessibleContext ac = ((javax.accessibility.Accessible)o).getAccessibleContext();
+        AtkWrapper.windowDeactivate(ac);
+      }
+    }
+
+   /**
+    * windowStateChanged
+    * @param e A WindowEvent object
+    */
+    public void windowStateChanged(WindowEvent e) {
+      Object o = e.getSource();
+      if (o instanceof javax.accessibility.Accessible) {
+        AccessibleContext ac = ((javax.accessibility.Accessible)o).getAccessibleContext();
+        AtkWrapper.windowStateChange(ac);
+
+        if( (e.getNewState() & Frame.MAXIMIZED_BOTH) == Frame.MAXIMIZED_BOTH ) {
+          AtkWrapper.windowMaximize(ac);
+        }
+      }
+    }
+
+   /**
+    * windowDeiconified
+    * @param e A WindowEvent object
+    */
+    public void windowDeiconified(WindowEvent e) {
+      Object o = e.getSource();
+      if (o instanceof javax.accessibility.Accessible) {
+        AccessibleContext ac = ((javax.accessibility.Accessible)o).getAccessibleContext();
+        AtkWrapper.windowRestore(ac);
+      }
+    }
+
+   /**
+    *  windowIconified
+    * @param e A WindowEvent object
+    */
+    public void windowIconified(WindowEvent e) {
+      Object o = e.getSource();
+      if (o instanceof javax.accessibility.Accessible) {
+        AccessibleContext ac = ((javax.accessibility.Accessible)o).getAccessibleContext();
+        AtkWrapper.windowMinimize(ac);
+      }
+    }
+
+   /**
+    *  windowOpened
+    * @param e A WindowEvent object
+    */
+    public void windowOpened(WindowEvent e) {
+      Object o = e.getSource();
+      if ( o instanceof javax.accessibility.Accessible ) {
+        boolean isToplevel = isToplevel(o);
+        AccessibleContext ac = ((javax.accessibility.Accessible)o).getAccessibleContext();
+        AtkWrapper.windowOpen(ac, isToplevel);
+      }
+    }
+
+   /**
+    * windowClosed
+    * @param e A WindowEvent object
+    */
+    public void windowClosed(WindowEvent e) {
+      Object o = e.getSource();
+      if (o instanceof javax.accessibility.Accessible) {
+        boolean isToplevel = isToplevel(o);
+        AccessibleContext ac = ((javax.accessibility.Accessible)o).getAccessibleContext();
+        AtkWrapper.windowClose(ac, isToplevel);
+      }
+    }
+
+    public void windowClosing(WindowEvent e) {
+    }
+
+    public void windowGainedFocus(WindowEvent e) {
+    }
+
+    public void windowLostFocus(WindowEvent e) {
+    }
+  }; // Close WindowAdapter brace
+
+ /**
+  * isToplevel
+  * @param o an instance
+  * @return true if instance is of a window, frame or dialogue object
+  *         false otherwise.
+  */
+  public static boolean isToplevel(Object o) {
+    boolean isToplevel = false;
+    if (o instanceof java.awt.Window ||
+        o instanceof java.awt.Frame ||
+        o instanceof java.awt.Dialog) {
+      isToplevel = true;
+    }
+    return isToplevel;
+  }
 
        final AWTEventListener globalListener = new AWTEventListener() {
                private boolean firstEvent = true;