reformat & small fixes

19 files changed, 163 insertions, 166 deletions

diff --git a/stubs/src/main/java/org/freedesktop/wayland/client/EventQueue.java b/stubs/src/main/java/org/freedesktop/wayland/client/EventQueue.java
index cf20d3c..6aada62 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/client/EventQueue.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/client/EventQueue.java
@@ -36,7 +36,7 @@ import org.freedesktop.wayland.util.ObjectCache;
  */
 public class EventQueue implements HasNative<Pointer> {
     private final Pointer pointer;
-    private boolean valid;
+    private       boolean valid;
 
     protected EventQueue(final Pointer pointer) {
         this.pointer = pointer;
@@ -45,9 +45,9 @@ public class EventQueue implements HasNative<Pointer> {
                           this);
     }
 
-    public static EventQueue get(Pointer pointer){
+    public static EventQueue get(Pointer pointer) {
         EventQueue eventQueue = ObjectCache.from(pointer);
-        if(eventQueue == null){
+        if (eventQueue == null) {
             eventQueue = new EventQueue(pointer);
         }
         return eventQueue;
@@ -73,10 +73,10 @@ public class EventQueue implements HasNative<Pointer> {
      * this function.
      */
     public void destroy() {
-        if(isValid()) {
+        if (isValid()) {
             this.valid = false;
             WaylandClientLibrary.INSTANCE()
-                .wl_event_queue_destroy(getNative());
+                                .wl_event_queue_destroy(getNative());
             ObjectCache.remove(getNative());
         }
     }
diff --git a/stubs/src/main/java/org/freedesktop/wayland/client/Proxy.java b/stubs/src/main/java/org/freedesktop/wayland/client/Proxy.java
index 83c9227..3e97271 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/client/Proxy.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/client/Proxy.java
@@ -56,9 +56,9 @@ public abstract class Proxy<I> implements WaylandObject {
     private final I       implementation;
 
     private final Dispatcher dispatcher;
-    private boolean valid;
+    private       boolean    valid;
 
-  /**
+    /**
      * @param pointer
      * @param implementation The listener to be added to proxy
      * @param version
@@ -93,7 +93,7 @@ public abstract class Proxy<I> implements WaylandObject {
              99);
     }
 
-  //TODO add get(Pointer) method for each generated proxy
+    //TODO add get(Pointer) method for each generated proxy
 
     public int getVersion() {
         return this.version;
@@ -254,21 +254,21 @@ public abstract class Proxy<I> implements WaylandObject {
         throw new NoSuchMethodException();
     }
 
-  @Override
-  public boolean isValid() {
-    return this.valid;
-  }
+    @Override
+    public boolean isValid() {
+        return this.valid;
+    }
 
-  /**
+    /**
      * Destroy a proxy object
      */
     public void destroy() {
-      if(isValid()) {
-        this.valid = false;
-        WaylandClientLibrary.INSTANCE()
-            .wl_proxy_destroy(getNative());
-        ObjectCache.remove(getNative());
-      }
+        if (isValid()) {
+            this.valid = false;
+            WaylandClientLibrary.INSTANCE()
+                                .wl_proxy_destroy(getNative());
+            ObjectCache.remove(getNative());
+        }
     }
 
     /**
@@ -333,9 +333,9 @@ public abstract class Proxy<I> implements WaylandObject {
         return getNative().hashCode();
     }
 
-  @Override
-  protected void finalize() throws Throwable {
-    destroy();
-    super.finalize();
-  }
+    @Override
+    protected void finalize() throws Throwable {
+        destroy();
+        super.finalize();
+    }
 }
\ No newline at end of file
diff --git a/stubs/src/main/java/org/freedesktop/wayland/client/egl/EglWindow.java b/stubs/src/main/java/org/freedesktop/wayland/client/egl/EglWindow.java
index cb6f52e..185cb20 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/client/egl/EglWindow.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/client/egl/EglWindow.java
@@ -51,7 +51,7 @@ public class EglWindow implements HasNative<Pointer> {
     }
 
     private final Pointer pointer;
-    private boolean valid;
+    private       boolean valid;
 
     public static EglWindow create(final Proxy<?> wlSurfaceProxy,
                                    final int width,
@@ -61,9 +61,9 @@ public class EglWindow implements HasNative<Pointer> {
                                                                              height));
     }
 
-    public static EglWindow get(Pointer pointer){
+    public static EglWindow get(Pointer pointer) {
         EglWindow eglWindow = ObjectCache.from(pointer);
-        if(eglWindow == null){
+        if (eglWindow == null) {
             eglWindow = new EglWindow(pointer);
         }
         return eglWindow;
@@ -82,7 +82,7 @@ public class EglWindow implements HasNative<Pointer> {
     }
 
     public void destroy() {
-        if(isValid()) {
+        if (isValid()) {
             this.valid = false;
             WaylandEglLibrary.INSTANCE.wl_egl_window_destroy(getNative());
             ObjectCache.remove(getNative());
diff --git a/stubs/src/main/java/org/freedesktop/wayland/server/Client.java b/stubs/src/main/java/org/freedesktop/wayland/server/Client.java
index 5eb947c..783aee1 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/server/Client.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/server/Client.java
@@ -67,9 +67,9 @@ public class Client implements HasNative<Pointer> {
                                                                 fd));
     }
 
-    public static Client get(final Pointer pointer){
+    public static Client get(final Pointer pointer) {
         Client client = ObjectCache.from(pointer);
-        if(client == null){
+        if (client == null) {
             client = new Client(pointer);
         }
         return client;
@@ -102,7 +102,7 @@ public class Client implements HasNative<Pointer> {
      */
     public Display getDisplay() {
         return Display.get(WaylandServerLibrary.INSTANCE()
-                                                    .wl_client_get_display(getNative()));
+                                               .wl_client_get_display(getNative()));
     }
 
     @Override
@@ -111,10 +111,10 @@ public class Client implements HasNative<Pointer> {
     }
 
     public void destroy() {
-        if(isValid()) {
+        if (isValid()) {
             ObjectCache.remove(getNative());
             WaylandServerLibrary.INSTANCE()
-                .wl_client_destroy(getNative());
+                                .wl_client_destroy(getNative());
         }
     }
 
diff --git a/stubs/src/main/java/org/freedesktop/wayland/server/Display.java b/stubs/src/main/java/org/freedesktop/wayland/server/Display.java
index d12d06d..00aa7d8 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/server/Display.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/server/Display.java
@@ -30,11 +30,11 @@ import org.freedesktop.wayland.util.ObjectCache;
 public class Display implements HasNative<Pointer> {
 
     private final Pointer pointer;
-  private boolean valid;
+    private       boolean valid;
 
-  protected Display(final Pointer pointer) {
+    protected Display(final Pointer pointer) {
         this.pointer = pointer;
-        this.valid =true;
+        this.valid = true;
         ObjectCache.store(getNative(),
                           this);
     }
@@ -48,16 +48,16 @@ public class Display implements HasNative<Pointer> {
      */
     public static Display create() {
         return Display.get(WaylandServerLibrary.INSTANCE()
-                               .wl_display_create());
+                                               .wl_display_create());
     }
 
-  public static Display get(Pointer pointer){
-    Display display = ObjectCache.from(pointer);
-    if(display == null){
-      display = new Display(pointer);
+    public static Display get(Pointer pointer) {
+        Display display = ObjectCache.from(pointer);
+        if (display == null) {
+            display = new Display(pointer);
+        }
+        return display;
     }
-    return display;
-  }
 
     public int addSocket(final String name) {
         final Pointer m = new Memory(name.length() + 1);
@@ -107,21 +107,21 @@ public class Display implements HasNative<Pointer> {
 
     public EventLoop getEventLoop() {
         return EventLoop.get(WaylandServerLibrary.INSTANCE()
-                                 .wl_display_get_event_loop(getNative()));
+                                                 .wl_display_get_event_loop(getNative()));
     }
 
-  @Override
-  public boolean isValid() {
-    return this.valid;
-  }
+    @Override
+    public boolean isValid() {
+        return this.valid;
+    }
 
-  public void destroy() {
-    if (isValid()){
-      this.valid = false;
-        ObjectCache.remove(getNative());
-        WaylandServerLibrary.INSTANCE()
-        .wl_display_destroy(getNative());
-      }
+    public void destroy() {
+        if (isValid()) {
+            this.valid = false;
+            ObjectCache.remove(getNative());
+            WaylandServerLibrary.INSTANCE()
+                                .wl_display_destroy(getNative());
+        }
     }
 
     public void addDestroyListener(final Listener listener) {
@@ -182,10 +182,10 @@ public class Display implements HasNative<Pointer> {
         return getNative().hashCode();
     }
 
-  @Override
-  protected void finalize() throws Throwable {
-    destroy();
-    super.finalize();
-  }
+    @Override
+    protected void finalize() throws Throwable {
+        destroy();
+        super.finalize();
+    }
 }
 
diff --git a/stubs/src/main/java/org/freedesktop/wayland/server/EventLoop.java b/stubs/src/main/java/org/freedesktop/wayland/server/EventLoop.java
index 8755f46..64eb94d 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/server/EventLoop.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/server/EventLoop.java
@@ -40,11 +40,11 @@ public class EventLoop implements HasNative<Pointer> {
 
     private final Pointer pointer;
 
-  private boolean valid;
+    private boolean valid;
 
     protected EventLoop(final Pointer pointer) {
         this.pointer = pointer;
-      this.valid = true;
+        this.valid = true;
         ObjectCache.store(getNative(),
                           this);
     }
@@ -54,13 +54,13 @@ public class EventLoop implements HasNative<Pointer> {
                                                  .wl_event_loop_create());
     }
 
-  public static EventLoop get(Pointer pointer){
-    EventLoop eventLoop = ObjectCache.from(pointer);
-    if(eventLoop == null){
-      eventLoop = new EventLoop(pointer);
+    public static EventLoop get(Pointer pointer) {
+        EventLoop eventLoop = ObjectCache.from(pointer);
+        if (eventLoop == null) {
+            eventLoop = new EventLoop(pointer);
+        }
+        return eventLoop;
     }
-    return eventLoop;
-  }
 
     public EventSource addFileDescriptor(final int fd,
                                          final int mask,
@@ -161,18 +161,18 @@ public class EventLoop implements HasNative<Pointer> {
                                                                 listener.getNative());
     }
 
-  @Override
-  public boolean isValid() {
-    return this.valid;
-  }
-
-  public void destroy() {
-    if(isValid()) {
-      this.valid = false;
-      ObjectCache.remove(getNative());
-      WaylandServerLibrary.INSTANCE()
-          .free(getNative());
+    @Override
+    public boolean isValid() {
+        return this.valid;
     }
+
+    public void destroy() {
+        if (isValid()) {
+            this.valid = false;
+            ObjectCache.remove(getNative());
+            WaylandServerLibrary.INSTANCE()
+                                .free(getNative());
+        }
     }
 
     public Pointer getNative() {
@@ -215,10 +215,10 @@ public class EventLoop implements HasNative<Pointer> {
         void handle();
     }
 
-  @Override
-  protected void finalize() throws Throwable {
-    destroy();
-    super.finalize();
-  }
+    @Override
+    protected void finalize() throws Throwable {
+        destroy();
+        super.finalize();
+    }
 }
 
diff --git a/stubs/src/main/java/org/freedesktop/wayland/server/Global.java b/stubs/src/main/java/org/freedesktop/wayland/server/Global.java
index 398c5e9..dfe7efd 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/server/Global.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/server/Global.java
@@ -60,7 +60,7 @@ public abstract class Global<R extends Resource<?>> implements HasNative<Pointer
                                                              version,
                                                              Pointer.NULL,
                                                              this.nativeCallback);
-      this.valid = true;
+        this.valid = true;
         ObjectCache.store(getNative(),
                           this);
     }
@@ -77,17 +77,17 @@ public abstract class Global<R extends Resource<?>> implements HasNative<Pointer
         //TODO add some extra checks?
     }
 
-  @Override
-  public boolean isValid() {
-    return valid;
-  }
-
-  public void destroy() {
-        if(isValid()) {
-          this.valid = false;
-          ObjectCache.remove(getNative());
-          WaylandServerLibrary.INSTANCE()
-              .wl_global_destroy(getNative());
+    @Override
+    public boolean isValid() {
+        return valid;
+    }
+
+    public void destroy() {
+        if (isValid()) {
+            this.valid = false;
+            ObjectCache.remove(getNative());
+            WaylandServerLibrary.INSTANCE()
+                                .wl_global_destroy(getNative());
         }
     }
 
@@ -100,7 +100,7 @@ public abstract class Global<R extends Resource<?>> implements HasNative<Pointer
         if (this == o) {
             return true;
         }
-        if (!(o instanceof Global)){
+        if (!(o instanceof Global)) {
             return false;
         }
 
@@ -114,10 +114,10 @@ public abstract class Global<R extends Resource<?>> implements HasNative<Pointer
         return getNative().hashCode();
     }
 
-  @Override
-  protected void finalize() throws Throwable {
-    destroy();
-    super.finalize();
-  }
+    @Override
+    protected void finalize() throws Throwable {
+        destroy();
+        super.finalize();
+    }
 }
 
diff --git a/stubs/src/main/java/org/freedesktop/wayland/server/Listener.java b/stubs/src/main/java/org/freedesktop/wayland/server/Listener.java
index ada779d..85563a5 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/server/Listener.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/server/Listener.java
@@ -21,16 +21,12 @@
  */
 package org.freedesktop.wayland.server;
 
-import com.sun.jna.Pointer;
 import org.freedesktop.wayland.HasNative;
 import org.freedesktop.wayland.server.jna.WaylandServerLibrary;
 import org.freedesktop.wayland.server.jna.wl_listener;
 import org.freedesktop.wayland.server.jna.wl_notify_func_t;
 import org.freedesktop.wayland.util.ObjectCache;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * A single listener for Wayland signals
  * <p/>
@@ -54,28 +50,24 @@ public abstract class Listener implements HasNative<wl_listener> {
         this.pointer = new wl_listener();
         this.valid = true;
         this.pointer.notify$ = new wl_notify_func_t() {
-                @Override
-                public void apply() {
-                    Listener.this.handle();
-                }
-            };
+            @Override
+            public void apply() {
+                Listener.this.handle();
+            }
+        };
         ObjectCache.store(getNative().getPointer(),
                           this);
     }
 
     public void remove() {
-        if(isValid()) {
+        if (isValid()) {
             this.valid = false;
             ObjectCache.remove(getNative().getPointer());
             WaylandServerLibrary.INSTANCE()
-                .wl_list_remove(this.pointer.link.getPointer());
+                                .wl_list_remove(this.pointer.link.getPointer());
         }
     }
 
-    public void destroy() {
-        ObjectCache.remove(getNative().getPointer());
-    }
-
     //called from jni
     public abstract void handle();
 
diff --git a/stubs/src/main/java/org/freedesktop/wayland/server/Resource.java b/stubs/src/main/java/org/freedesktop/wayland/server/Resource.java
index 18a655f..2f6e88a 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/server/Resource.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/server/Resource.java
@@ -37,6 +37,7 @@ public abstract class Resource<I> implements WaylandObject<Pointer> {
     private final wl_resource_destroy_func_t nativeDestroyCallback = new wl_resource_destroy_func_t() {
         @Override
         public void apply(final Pointer resource) {
+            Resource.this.valid = false;
             ObjectCache.remove(resource);
         }
     };
@@ -56,7 +57,7 @@ public abstract class Resource<I> implements WaylandObject<Pointer> {
                                                                             .getNative(),
                                                                version,
                                                                id);
-      this.valid = true;
+        this.valid = true;
         ObjectCache.store(getNative(),
                           this);
         WaylandServerLibrary.INSTANCE()
@@ -71,11 +72,18 @@ public abstract class Resource<I> implements WaylandObject<Pointer> {
         this.pointer = pointer;
         this.implementation = null;
         this.valid = false;
+        addDestroyListener(new Listener() {
+            @Override
+            public void handle() {
+                ObjectCache.remove(Resource.this.getNative());
+                remove();
+            }
+        });
         ObjectCache.store(getNative(),
                           this);
     }
 
-  //TODO add static get(Pointer) method for each generated resource
+    //TODO add static get(Pointer) method for each generated resource
 
     public int getVersion() {
         return WaylandServerLibrary.INSTANCE()
@@ -88,7 +96,7 @@ public abstract class Resource<I> implements WaylandObject<Pointer> {
 
     public Client getClient() {
         return Client.get(WaylandServerLibrary.INSTANCE()
-                                                    .wl_resource_get_client(getNative()));
+                                              .wl_resource_get_client(getNative()));
     }
 
     public int getId() {
@@ -103,20 +111,20 @@ public abstract class Resource<I> implements WaylandObject<Pointer> {
     }
 
     public void destroy() {
-        if(isValid()) {
-          this.valid= false;
-          ObjectCache.remove(getNative());
-          WaylandServerLibrary.INSTANCE()
-              .wl_resource_destroy(getNative());
+        if (isValid()) {
+            this.valid = false;
+            ObjectCache.remove(getNative());
+            WaylandServerLibrary.INSTANCE()
+                                .wl_resource_destroy(getNative());
         }
     }
 
-  @Override
-  public boolean isValid() {
-    return this.valid;
-  }
+    @Override
+    public boolean isValid() {
+        return this.valid;
+    }
 
-  /**
+    /**
      * Post an event to the client's object referred to by 'resource'.
      * 'opcode' is the event number generated from the protocol XML
      * description (the event name). The variable arguments are the event
@@ -187,9 +195,9 @@ public abstract class Resource<I> implements WaylandObject<Pointer> {
         return getNative().hashCode();
     }
 
-  @Override
-  protected void finalize() throws Throwable {
-    destroy();
-    super.finalize();
-  }
+    @Override
+    protected void finalize() throws Throwable {
+        destroy();
+        super.finalize();
+    }
 }
\ No newline at end of file
diff --git a/stubs/src/main/java/org/freedesktop/wayland/server/ShmBuffer.java b/stubs/src/main/java/org/freedesktop/wayland/server/ShmBuffer.java
index 86c4963..8a0ca8e 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/server/ShmBuffer.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/server/ShmBuffer.java
@@ -24,7 +24,6 @@ package org.freedesktop.wayland.server;
 import com.sun.jna.Pointer;
 import org.freedesktop.wayland.HasNative;
 import org.freedesktop.wayland.server.jna.WaylandServerLibrary;
-import org.freedesktop.wayland.util.ObjectCache;
 
 import java.nio.ByteBuffer;
 
@@ -32,7 +31,7 @@ public class ShmBuffer implements HasNative<Pointer> {
 
     private final Pointer pointer;
 
-  protected ShmBuffer(final Pointer pointer) {
+    protected ShmBuffer(final Pointer pointer) {
         this.pointer = pointer;
     }
 
@@ -79,13 +78,13 @@ public class ShmBuffer implements HasNative<Pointer> {
         return buffer;
     }
 
-  @Override
-  public boolean isValid() {
-    //we can not track the native lifecycle
-    return true;
-  }
+    @Override
+    public boolean isValid() {
+        //we can not track the native lifecycle
+        return true;
+    }
 
-  @Override
+    @Override
     public Pointer getNative() {
         return this.pointer;
     }
diff --git a/stubs/src/main/java/org/freedesktop/wayland/server/jna/WaylandServerLibraryMapping.java b/stubs/src/main/java/org/freedesktop/wayland/server/jna/WaylandServerLibraryMapping.java
index 89337c7..c480a74 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/server/jna/WaylandServerLibraryMapping.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/server/jna/WaylandServerLibraryMapping.java
@@ -5,7 +5,7 @@ import com.sun.jna.ptr.IntByReference;
 import org.freedesktop.wayland.util.jna.*;
 
 public interface WaylandServerLibraryMapping extends WaylandUtilLibraryMapping {
-    public static final String                      JNA_LIBRARY_NAME = "wayland-server";
+    public static final String JNA_LIBRARY_NAME = "wayland-server";
 
     Pointer wl_event_loop_create();
 
diff --git a/stubs/src/main/java/org/freedesktop/wayland/server/jna/wl_listener.java b/stubs/src/main/java/org/freedesktop/wayland/server/jna/wl_listener.java
index 6189edb..5eab73c 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/server/jna/wl_listener.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/server/jna/wl_listener.java
@@ -2,14 +2,13 @@ package org.freedesktop.wayland.server.jna;
 
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
-
 import org.freedesktop.wayland.util.jna.wl_list;
 
 import java.util.Arrays;
 import java.util.List;
 
 public class wl_listener extends Structure {
-    public wl_list.ByValue link;
+    public wl_list.ByValue  link;
     public wl_notify_func_t notify$;
 
     public wl_listener() {
diff --git a/stubs/src/main/java/org/freedesktop/wayland/server/jna/wl_notify_func_t.java b/stubs/src/main/java/org/freedesktop/wayland/server/jna/wl_notify_func_t.java
index 95feb19..8f25da3 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/server/jna/wl_notify_func_t.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/server/jna/wl_notify_func_t.java
@@ -1,7 +1,6 @@
 package org.freedesktop.wayland.server.jna;
 
 import com.sun.jna.Callback;
-import com.sun.jna.Pointer;
 
 public interface wl_notify_func_t extends Callback {
     void apply();
diff --git a/stubs/src/main/java/org/freedesktop/wayland/server/jna/wl_signal.java b/stubs/src/main/java/org/freedesktop/wayland/server/jna/wl_signal.java
index e0eb83c..cc9cd92 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/server/jna/wl_signal.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/server/jna/wl_signal.java
@@ -2,7 +2,6 @@ package org.freedesktop.wayland.server.jna;
 
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
-
 import org.freedesktop.wayland.util.jna.wl_list;
 
 import java.util.Arrays;
diff --git a/stubs/src/main/java/org/freedesktop/wayland/util/Arguments.java b/stubs/src/main/java/org/freedesktop/wayland/util/Arguments.java
index c7d46be..0572c22 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/util/Arguments.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/util/Arguments.java
@@ -34,7 +34,7 @@ import java.nio.ByteBuffer;
 public class Arguments implements HasNative<Pointer> {
 
     private final Pointer pointer;
-    private boolean valid;
+    private       boolean valid;
 
     Arguments(final Pointer pointer) {
         this.pointer = pointer;
diff --git a/stubs/src/main/java/org/freedesktop/wayland/util/Dispatcher.java b/stubs/src/main/java/org/freedesktop/wayland/util/Dispatcher.java
index 46bc3db..4ad3166 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/util/Dispatcher.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/util/Dispatcher.java
@@ -122,7 +122,7 @@ public final class Dispatcher implements wl_dispatcher_func_t {
                                       final Class<?> targetType) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException {
         Constructor<?> constructor = CONSTRUCTOR_CACHE.get(targetType);
         if (constructor == null) {
-          //FIXME use static get(Pointer) method instead of proxy or resource
+            //FIXME use static get(Pointer) method instead of proxy or resource
             constructor = targetType.getDeclaredConstructor(Pointer.class);
             constructor.setAccessible(true);
             CONSTRUCTOR_CACHE.put(targetType,
diff --git a/stubs/src/main/java/org/freedesktop/wayland/util/InterfaceMeta.java b/stubs/src/main/java/org/freedesktop/wayland/util/InterfaceMeta.java
index b4d19c6..9271c8c 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/util/InterfaceMeta.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/util/InterfaceMeta.java
@@ -50,10 +50,10 @@ public class InterfaceMeta implements HasNative<wl_interface> {
                           this);
     }
 
-    public static InterfaceMeta get(wl_interface pointer){
+    public static InterfaceMeta get(wl_interface pointer) {
         InterfaceMeta interfaceMeta = ObjectCache.from(pointer.getPointer());
-        if(interfaceMeta == null){
-            interfaceMeta= new InterfaceMeta(pointer);
+        if (interfaceMeta == null) {
+            interfaceMeta = new InterfaceMeta(pointer);
         }
         return interfaceMeta;
     }
diff --git a/stubs/src/main/java/org/freedesktop/wayland/util/MessageMeta.java b/stubs/src/main/java/org/freedesktop/wayland/util/MessageMeta.java
index 8915a7f..32064da 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/util/MessageMeta.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/util/MessageMeta.java
@@ -92,12 +92,12 @@ public class MessageMeta implements HasNative<wl_message> {
         return this.message;
     }
 
-  @Override
-  public boolean isValid() {
-    return this.valid;
-  }
+    @Override
+    public boolean isValid() {
+        return this.valid;
+    }
 
-  @Override
+    @Override
     public boolean equals(final Object o) {
         if (this == o) {
             return true;
@@ -116,9 +116,9 @@ public class MessageMeta implements HasNative<wl_message> {
         return getNative().hashCode();
     }
 
-  @Override
-  protected void finalize() throws Throwable {
-    valid= false;
-    super.finalize();
-  }
+    @Override
+    protected void finalize() throws Throwable {
+        valid = false;
+        super.finalize();
+    }
 }
diff --git a/stubs/src/main/java/org/freedesktop/wayland/util/ObjectCache.java b/stubs/src/main/java/org/freedesktop/wayland/util/ObjectCache.java
index af87878..7a9b0ea 100644
--- a/stubs/src/main/java/org/freedesktop/wayland/util/ObjectCache.java
+++ b/stubs/src/main/java/org/freedesktop/wayland/util/ObjectCache.java
@@ -56,10 +56,11 @@ public class ObjectCache {
     public static void store(final Pointer pointer,
                              final Object object) {
         final Object oldValue = MAPPED_OBJECTS.put(pointer,
-                                              object);
-        if(oldValue!=null){
+                                                   object);
+        if (oldValue != null) {
             //put it back!
-            MAPPED_OBJECTS.put(pointer,oldValue);
+            MAPPED_OBJECTS.put(pointer,
+                               oldValue);
             throw new IllegalStateException(String.format("Can not re-map existing pointer. Pointer=%s, old value=%s, new value=%s",
                                                           pointer,
                                                           oldValue,