diff options
author | Erik De Rijcke <derijcke.erik@gmail.com> | 2015-03-24 21:43:34 +0100 |
---|---|---|
committer | Erik De Rijcke <derijcke.erik@gmail.com> | 2015-03-24 21:43:34 +0100 |
commit | 602a0033a1aada9c3e3574c4d895d3d13a725945 (patch) | |
tree | 95105d271a675fd0699a772ffe7f509493f93c57 | |
parent | 7b5edfda9ad819304a9ab83ac91902c293343257 (diff) |
reformat code
6 files changed, 33 insertions, 33 deletions
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 e548596..51e1371 100644 --- a/stubs/src/main/java/org/freedesktop/wayland/client/Proxy.java +++ b/stubs/src/main/java/org/freedesktop/wayland/client/Proxy.java @@ -47,7 +47,7 @@ public abstract class Proxy<I> implements WaylandObject { private final int version; private final I implementation; - private boolean valid; + private boolean valid; /** * @param pointer 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 18300fe..592c7bf 100644 --- a/stubs/src/main/java/org/freedesktop/wayland/server/EventLoop.java +++ b/stubs/src/main/java/org/freedesktop/wayland/server/EventLoop.java @@ -27,9 +27,9 @@ public class EventLoop implements HasNative<Pointer> { //event callback: //This map maps different pointers with same address but separate instance to a single instance. - private static final Map<Pointer,Pointer> HANDLER_REF_CACHE = new WeakHashMap<Pointer,Pointer>(); + private static final Map<Pointer, Pointer> HANDLER_REF_CACHE = new WeakHashMap<Pointer, Pointer>(); //This map maps a single pointer instance to the java object that will be used as handler object. - private static final Map<Pointer, Object> HANDLER_REFS = new WeakHashMap<Pointer, Object>(); + private static final Map<Pointer, Object> HANDLER_REFS = new WeakHashMap<Pointer, Object>(); //this map is used to link handler object lifecycle to an event source lifecycle. private static final Map<EventSource, Pointer> EVENT_SOURCE_HANDLER_REFS = new WeakHashMap<EventSource, Pointer>(); @@ -39,8 +39,8 @@ public class EventLoop implements HasNative<Pointer> { final int mask, final Pointer data) { final FileDescriptorEventHandler handler = (FileDescriptorEventHandler) HANDLER_REFS.get(data); - return handler.handle(fd, - mask); + return handler.handle(fd, + mask); } }; @@ -48,7 +48,7 @@ public class EventLoop implements HasNative<Pointer> { @Override public int apply(final Pointer data) { final TimerEventHandler handler = (TimerEventHandler) HANDLER_REFS.get(data); - return handler.handle(); + return handler.handle(); } }; @@ -99,33 +99,34 @@ public class EventLoop implements HasNative<Pointer> { return eventLoop; } - private Pointer getHandlerRef(Object handler){ + private Pointer getHandlerRef(Object handler) { final Pointer handlerRefKey = Pointer.createConstant(handler.hashCode()); Pointer handlerRef = HANDLER_REF_CACHE.get(handlerRefKey); - if(handlerRef == null){ + if (handlerRef == null) { handlerRef = handlerRefKey; - HANDLER_REF_CACHE.put(handlerRefKey,handlerRef); + HANDLER_REF_CACHE.put(handlerRefKey, + handlerRef); } - return handlerRef; + return handlerRef; } public EventSource addFileDescriptor(final int fd, final int mask, final FileDescriptorEventHandler handler) { Pointer handlerRef = getHandlerRef(handler); - if(!HANDLER_REFS.containsKey(handlerRef)){ + if (!HANDLER_REFS.containsKey(handlerRef)) { //handler will be garbage collected once event source is collected. HANDLER_REFS.put(handlerRef, handler); } final EventSource eventSource = EventSource.create(WaylandServerLibrary.INSTANCE() - .wl_event_loop_add_fd(getNative(), - fd, - mask, - WL_EVENT_LOOP_FD_FUNC, - handlerRef)); + .wl_event_loop_add_fd(getNative(), + fd, + mask, + WL_EVENT_LOOP_FD_FUNC, + handlerRef)); EVENT_SOURCE_HANDLER_REFS.put(eventSource, handlerRef); return eventSource; @@ -133,15 +134,15 @@ public class EventLoop implements HasNative<Pointer> { public EventSource addTimer(final TimerEventHandler handler) { Pointer handlerRef = getHandlerRef(handler); - if(!HANDLER_REFS.containsKey(handlerRef)){ + if (!HANDLER_REFS.containsKey(handlerRef)) { //handler will be garbage collected once event source is collected. HANDLER_REFS.put(handlerRef, handler); } final EventSource eventSource = EventSource.create(WaylandServerLibrary.INSTANCE() - .wl_event_loop_add_timer(getNative(), - WL_EVENT_LOOP_TIMER_FUNC, - handlerRef)); + .wl_event_loop_add_timer(getNative(), + WL_EVENT_LOOP_TIMER_FUNC, + handlerRef)); EVENT_SOURCE_HANDLER_REFS.put(eventSource, handlerRef); return eventSource; @@ -150,16 +151,16 @@ public class EventLoop implements HasNative<Pointer> { public EventSource addSignal(final int signalNumber, final SignalEventHandler handler) { Pointer handlerRef = getHandlerRef(handler); - if(!HANDLER_REFS.containsKey(handlerRef)){ + if (!HANDLER_REFS.containsKey(handlerRef)) { //handler will be garbage collected once event source is collected. HANDLER_REFS.put(handlerRef, handler); } final EventSource eventSource = EventSource.create(WaylandServerLibrary.INSTANCE() - .wl_event_loop_add_signal(getNative(), - signalNumber, - WL_EVENT_LOOP_SIGNAL_FUNC, - handlerRef)); + .wl_event_loop_add_signal(getNative(), + signalNumber, + WL_EVENT_LOOP_SIGNAL_FUNC, + handlerRef)); EVENT_SOURCE_HANDLER_REFS.put(eventSource, handlerRef); return eventSource; @@ -167,15 +168,15 @@ public class EventLoop implements HasNative<Pointer> { public EventSource addIdle(final IdleHandler handler) { Pointer handlerRef = getHandlerRef(handler); - if(!HANDLER_REFS.containsKey(handlerRef)){ + if (!HANDLER_REFS.containsKey(handlerRef)) { //handler will be garbage collected once event source is collected. HANDLER_REFS.put(handlerRef, handler); } final EventSource eventSource = EventSource.create(WaylandServerLibrary.INSTANCE() - .wl_event_loop_add_idle(getNative(), - WL_EVENT_LOOP_IDLE_FUNC, - handlerRef)); + .wl_event_loop_add_idle(getNative(), + WL_EVENT_LOOP_IDLE_FUNC, + handlerRef)); EVENT_SOURCE_HANDLER_REFS.put(eventSource, handlerRef); return eventSource; diff --git a/stubs/src/main/java/org/freedesktop/wayland/server/EventSource.java b/stubs/src/main/java/org/freedesktop/wayland/server/EventSource.java index 960405e..3b747ed 100644 --- a/stubs/src/main/java/org/freedesktop/wayland/server/EventSource.java +++ b/stubs/src/main/java/org/freedesktop/wayland/server/EventSource.java @@ -48,7 +48,7 @@ public class EventSource implements HasNative<Pointer> { } public int remove() { - if(this.valid) { + if (this.valid) { this.valid = false; ObjectCache.remove(getNative()); return WaylandServerLibrary.INSTANCE() 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 ee5190c..90a6cd3 100644 --- a/stubs/src/main/java/org/freedesktop/wayland/server/Resource.java +++ b/stubs/src/main/java/org/freedesktop/wayland/server/Resource.java @@ -133,7 +133,7 @@ public abstract class Resource<I> implements WaylandObject { * </ul> * * @param opcode the protocol opcode - * @param args the protocol arguments + * @param args the protocol arguments */ public void postEvent(final int opcode, final Arguments args) { diff --git a/stubs/src/main/java/org/freedesktop/wayland/util/Fixed.java b/stubs/src/main/java/org/freedesktop/wayland/util/Fixed.java index ca6d74f..4a4ca98 100644 --- a/stubs/src/main/java/org/freedesktop/wayland/util/Fixed.java +++ b/stubs/src/main/java/org/freedesktop/wayland/util/Fixed.java @@ -61,7 +61,7 @@ public final class Fixed { return "Fixed{" + " raw=" + raw + " asInt=" + asInt() + - " asFloat="+asFloat()+ + " asFloat=" + asFloat() + '}'; } }
\ No newline at end of file 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 3a0e0fd..dc1ef61 100644 --- a/stubs/src/main/java/org/freedesktop/wayland/util/ObjectCache.java +++ b/stubs/src/main/java/org/freedesktop/wayland/util/ObjectCache.java @@ -65,7 +65,6 @@ public class ObjectCache { * Remove a mapped POJO. This method should be used when the native context of the POJO is no longer valid. * * @param pointer The pointer of the associated object. - * */ public static <T> T remove(final Pointer pointer) { return (T) MAPPED_OBJECTS.remove(pointer); |