GNOME.org
 

[java-gobject-introspection] Remove @Override from interface implementations

commit 50f7aaddef1470b4f80b8d947655a5469e88b830
Author: Colin Walters <walters verbum org>
Date:   Mon Jul 20 15:52:29 2009 -0400

    Remove @Override from interface implementations
    
    Eclipse generated these, apparently OpenJDK started disliking them.

 src/gobject/internals/GList.java                 |    3 ---
 src/gobject/internals/GQuark.java                |    6 +++---
 src/gobject/internals/GSList.java                |    3 ---
 src/gobject/internals/GlibRuntime.java           |    2 --
 src/gobject/runtime/GFlags.java                  |    3 ---
 src/gobject/runtime/GObject.java                 |    4 ++--
 src/gobject/runtime/MainLoop.java                |   11 -----------
 src/org/gnome/gir/compiler/CodeFactory.java      |    2 --
 src/org/gnome/gir/compiler/DocFactory.java       |   11 +----------
 src/org/gnome/gir/repository/VFuncInfoFlags.java |    1 -
 10 files changed, 6 insertions(+), 40 deletions(-)
---
diff --git a/src/gobject/internals/GList.java b/src/gobject/internals/GList.java
index a8c16c5..9d190f8 100644
--- a/src/gobject/internals/GList.java
+++ b/src/gobject/internals/GList.java
@@ -31,17 +31,14 @@ public class GList extends Structure implements GenericGList {
 		return new GList(p);
 	}
 
-	@Override
 	public void free() {
 		GlibAPI.glib.g_list_free(this);
 	}
 
-	@Override
 	public Pointer getData() {
 		return data;
 	}
 
-	@Override
 	public GenericGList getNext() {
 		return next;
 	}
diff --git a/src/gobject/internals/GQuark.java b/src/gobject/internals/GQuark.java
index 97e2097..be00306 100644
--- a/src/gobject/internals/GQuark.java
+++ b/src/gobject/internals/GQuark.java
@@ -20,15 +20,15 @@ public class GQuark implements NativeMapped {
     public String toString() {
         return GObjectAPI.gobj.g_quark_to_string(this);
     }
-	@Override
+
 	public Object fromNative(Object nativeValue, FromNativeContext context) {
 		return new GQuark((Integer) nativeValue);
 	}
-	@Override
+
 	public Class<?> nativeType() {
 		return Integer.class;
 	}
-	@Override
+
 	public Object toNative() {
 		return Integer.valueOf(value);
 	}
diff --git a/src/gobject/internals/GSList.java b/src/gobject/internals/GSList.java
index 5b2c096..7116925 100644
--- a/src/gobject/internals/GSList.java
+++ b/src/gobject/internals/GSList.java
@@ -31,17 +31,14 @@ public class GSList extends Structure implements GenericGList {
 		return new GSList(p);
 	}	
 	
-	@Override
 	public void free() {
 		GlibAPI.glib.g_slist_free(this);
 	}
 
-	@Override
 	public Pointer getData() {
 		return data;
 	}
 
-	@Override
 	public GenericGList getNext() {
 		return next;
 	}
diff --git a/src/gobject/internals/GlibRuntime.java b/src/gobject/internals/GlibRuntime.java
index d5553c9..586c268 100644
--- a/src/gobject/internals/GlibRuntime.java
+++ b/src/gobject/internals/GlibRuntime.java
@@ -92,7 +92,6 @@ public class GlibRuntime {
 		
 		final CallbackData data = new CallbackData();
 		GlibAPI.GDestroyNotify destroy = new GlibAPI.GDestroyNotify() {
-			@Override
 			public void callback(Pointer ignored) {
 				outstandingCallbacks.remove(data);
 			}
@@ -108,7 +107,6 @@ public class GlibRuntime {
 			return null;
 		
 		AsyncReadyCallback proxy = new AsyncReadyCallback() {
-			@Override
 			public void callback(GObject object, AsyncResult result) {
 				outstandingAsync.remove(callback);
 				callback.callback(object, result);
diff --git a/src/gobject/runtime/GFlags.java b/src/gobject/runtime/GFlags.java
index 508bee5..063da03 100644
--- a/src/gobject/runtime/GFlags.java
+++ b/src/gobject/runtime/GFlags.java
@@ -65,7 +65,6 @@ public abstract class GFlags implements NativeMapped {
 	}
 
 	@SuppressWarnings("unchecked")
-	@Override
 	public final Object fromNative(Object nativeValue, FromNativeContext context) {
 		try {
 			return context.getTargetType().getConstructor(new Class<?>[] { int[].class })
@@ -75,12 +74,10 @@ public abstract class GFlags implements NativeMapped {
 		}
 	}
 
-	@Override
 	public final Class<?> nativeType() {
 		return Integer.class;
 	}
 
-	@Override
 	public final Object toNative() {
 		return value;
 	}
diff --git a/src/gobject/runtime/GObject.java b/src/gobject/runtime/GObject.java
index 31596ab..43726db 100644
--- a/src/gobject/runtime/GObject.java
+++ b/src/gobject/runtime/GObject.java
@@ -348,7 +348,7 @@ public abstract class GObject extends NativeObject {
 		 * connection
 		 */
 		NotifyCallback trampoline = new NotifyCallback() {
-			@Override
+
 			public void onNotify(GObject object, GParamSpec param, Pointer data) {
 				Method[] methods = callback.getClass().getDeclaredMethods();
 				if (methods.length != 1)
@@ -410,7 +410,7 @@ public abstract class GObject extends NativeObject {
 	};
 
 	private static final GWeakNotify weakNotify = new GWeakNotify() {
-		@Override
+
 		public void callback(Pointer data, Pointer obj) {
 			GObject o = (GObject) Internals.instanceFor(obj);
 			NativeObject.Internals.debugMemoryFinal("WEAK %s target=%s%n", obj, o);
diff --git a/src/gobject/runtime/MainLoop.java b/src/gobject/runtime/MainLoop.java
index 4685f3a..ab6e3b2 100644
--- a/src/gobject/runtime/MainLoop.java
+++ b/src/gobject/runtime/MainLoop.java
@@ -109,7 +109,6 @@ public class MainLoop extends RefCountedObject {
     private static MainLoop defaultLoop;
     private ThreadFactory asyncFactory = new ThreadFactory() {
     	private AtomicLong threadNum = new AtomicLong();
-		@Override
 		public Thread newThread(Runnable r) {
 			Thread t = new Thread(r);
 			long num = threadNum.getAndIncrement();
@@ -208,7 +207,6 @@ public class MainLoop extends RefCountedObject {
     		this.srcId = srcId;
     	}
     	
-		@Override
 		public synchronized boolean cancel(boolean mayInterruptIfRunning) {
 			if (thread != null && mayInterruptIfRunning) {
 				thread.interrupt();
@@ -222,23 +220,19 @@ public class MainLoop extends RefCountedObject {
 			return true;
 		}
 
-		@Override
 		public Object get() throws InterruptedException, ExecutionException {
 			return null;
 		}
 
-		@Override
 		public Object get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException,
 				TimeoutException {
 			return null;
 		}
 
-		@Override
 		public synchronized boolean isCancelled() {
 			return isDone() && cancelled;
 		}
 
-		@Override
 		public synchronized boolean isDone() {
 			return thread == null && srcId == 0;
 		}
@@ -259,7 +253,6 @@ public class MainLoop extends RefCountedObject {
     
     private GSourceFunc sourceFuncForRunnable(final Runnable r, final Runnable finallyHandler) {
     	GSourceFunc func = new GSourceFunc() {
-			@Override
 			public boolean callback(Pointer data) {
 				try {
 					r.run();
@@ -295,7 +288,6 @@ public class MainLoop extends RefCountedObject {
     public Future<?> invokeLater(int timeout, TimeUnit units, final Runnable r) {
     	final AsyncFuture handle = new AsyncFuture();
     	GSourceFunc func = sourceFuncForRunnable(r, new Runnable() {
-			@Override
 			public void run() {
 				handle.setComplete();
 			}
@@ -341,7 +333,6 @@ public class MainLoop extends RefCountedObject {
     public <T> Future<?> threadInvoke(ThreadFactory factory, final Callable<T> callable, final Handler<T> handler) {
     	final AsyncFuture handle = new AsyncFuture();    	
     	Thread taskRunner = factory.newThread(new Runnable() {
-			@Override
 			public void run() {
 				T result = null;
 				Exception e = null;
@@ -354,7 +345,6 @@ public class MainLoop extends RefCountedObject {
 				final T resultCapture = result;
 				final Exception exceptionCapture = e;
 				final FutureTask<T> proxy = new FutureTask<T>(new Callable<T>() {
-					@Override
 					public T call() throws Exception {
 						if (exceptionCapture != null)
 							throw exceptionCapture;
@@ -368,7 +358,6 @@ public class MainLoop extends RefCountedObject {
 				 */
 				synchronized (handle) {
 					int idleId = rawInvokeLater(new Runnable() {
-						@Override
 						public void run() {
 							handle.srcId = 0;
 							handler.handle(proxy);
diff --git a/src/org/gnome/gir/compiler/CodeFactory.java b/src/org/gnome/gir/compiler/CodeFactory.java
index a77f869..49ccdb2 100644
--- a/src/org/gnome/gir/compiler/CodeFactory.java
+++ b/src/org/gnome/gir/compiler/CodeFactory.java
@@ -2360,7 +2360,6 @@ public class CodeFactory {
 
 	public static void verifyAll() throws Exception {
 		File[] jars = getTypelibDir().listFiles(new FilenameFilter() {
-			@Override
 			public boolean accept(File dir, String name) {
 				return name.endsWith(".jar");
 			}
@@ -2384,7 +2383,6 @@ public class CodeFactory {
 
 	public static void compileAll() throws GErrorException, IOException {
 		File[] typelibs = getTypelibDir().listFiles(new FilenameFilter() {
-			@Override
 			public boolean accept(File dir, String name) {
 				return name.endsWith(".typelib");
 			}
diff --git a/src/org/gnome/gir/compiler/DocFactory.java b/src/org/gnome/gir/compiler/DocFactory.java
index 36a2252..3900f89 100644
--- a/src/org/gnome/gir/compiler/DocFactory.java
+++ b/src/org/gnome/gir/compiler/DocFactory.java
@@ -118,7 +118,7 @@ public class DocFactory {
 			return isAnonStub;
 		}
 
-		@Override
+
 		public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
 			isInner = name.contains("$");
 			
@@ -185,16 +185,13 @@ public class DocFactory {
 			}
 		}
 		
-		@Override
 		public AnnotationVisitor visitAnnotation(String arg0, boolean arg1) {
 			return null;
 		}
 
-		@Override
 		public void visitAttribute(Attribute arg0) {
 		}
 
-		@Override
 		public void visitEnd() {			
 		}
 		
@@ -208,16 +205,13 @@ public class DocFactory {
 			}			
 		}
 
-		@Override
 		public FieldVisitor visitField(int arg0, String arg1, String arg2, String arg3, Object arg4) {
 			return null;
 		}
 
-		@Override
 		public void visitInnerClass(String arg0, String arg1, String arg2, int arg3) {
 		}
 
-		@Override
 		public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
 			if (name.equals("<clinit>") || (access & Opcodes.ACC_PRIVATE) != 0)
 				return null;
@@ -253,11 +247,9 @@ public class DocFactory {
 			return null;
 		}
 
-		@Override
 		public void visitOuterClass(String arg0, String arg1, String arg2) {
 		}
 
-		@Override
 		public void visitSource(String arg0, String arg1) {
 		}
     }
@@ -417,7 +409,6 @@ public class DocFactory {
 
 	public static void generateAll(File outpath) throws Exception {
 		File[] girs = getGirDir().listFiles(new FilenameFilter() {
-			@Override
 			public boolean accept(File dir, String name) {
 				return name.endsWith(".gir");
 			}
diff --git a/src/org/gnome/gir/repository/VFuncInfoFlags.java b/src/org/gnome/gir/repository/VFuncInfoFlags.java
index 1895342..78d1398 100644
--- a/src/org/gnome/gir/repository/VFuncInfoFlags.java
+++ b/src/org/gnome/gir/repository/VFuncInfoFlags.java
@@ -32,7 +32,6 @@ public enum VFuncInfoFlags implements NativeEnum {
 	MUST_OVERRIDE,
 	MUST_NOT_OVERRIDE;
 
-	@Override
 	public int getNative() {
 		return 1 << ordinal();
 	}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]