java-gobject-introspection r23 - in trunk/src/org/gnome/gir: compiler gobject

[walters svn gnome org]

Author: walters
Date: Thu Sep  4 18:37:11 2008
New Revision: 23
URL: http://svn.gnome.org/viewvc/java-gobject-introspection?rev=23&view=rev

Log:
Fix up some bits FindBugs found


Modified:
   trunk/src/org/gnome/gir/compiler/CodeFactory.java
   trunk/src/org/gnome/gir/gobject/GObject.java
   trunk/src/org/gnome/gir/gobject/GQuark.java
   trunk/src/org/gnome/gir/gobject/IntPtr.java

Modified: trunk/src/org/gnome/gir/compiler/CodeFactory.java
==============================================================================
--- trunk/src/org/gnome/gir/compiler/CodeFactory.java	(original)
+++ trunk/src/org/gnome/gir/compiler/CodeFactory.java	Thu Sep  4 18:37:11 2008
@@ -41,11 +41,9 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -346,17 +344,6 @@
 		
 		return types;
 	}
-
-	public static final class RepositoryClassSet {
-		Map<String,byte[]> klasses;
-
-		public RepositoryClassSet() {
-		}
-
-		public Map<String, byte[]> getKlasses() {
-			return Collections.unmodifiableMap(klasses);
-		}
-	}
 	
 	private static String getInternalNameMapped(String namespace, String name) {
 		String key = namespace + "." + name;
@@ -1701,15 +1688,11 @@
 	}
 	
 	public static void verifyJarFiles(Set<File> jarPaths) throws IOException {
-		Set<URL> urls = new HashSet<URL>();
+		List<URL> urls = new ArrayList<URL>();
 		Set<String> allClassnames = new HashSet<String>();		
 		logger.info("Verifying " + jarPaths.size() + " jar paths");
 		for (File jarPath : jarPaths) {
-			try {
-				urls.add(jarPath.toURI().toURL());
-			} catch (MalformedURLException e) {
-				throw new RuntimeException(e);
-			}
+			urls.add(jarPath.toURI().toURL());
 			ZipFile zf = new ZipFile(jarPath);
 			for (Enumeration<? extends ZipEntry> e = zf.entries(); e.hasMoreElements();) {
 				String name = e.nextElement().getName();

Modified: trunk/src/org/gnome/gir/gobject/GObject.java
==============================================================================
--- trunk/src/org/gnome/gir/gobject/GObject.java	(original)
+++ trunk/src/org/gnome/gir/gobject/GObject.java	Thu Sep  4 18:37:11 2008
@@ -394,10 +394,6 @@
             super.invalidate();
         }
     }
-    
-    protected NativeLong g_signal_connect(String signal, Callback callback) {
-        return GObjectAPI.gobj.g_signal_connect_data(this, signal, callback, null, null, 0);
-    }
  
     public synchronized long connect(String signal, Callback closure) {
         NativeLong connectID = GSignalAPI.gsignal.g_signal_connect_data(GObject.this, 
@@ -459,7 +455,9 @@
 		public void callback(Pointer data, Pointer obj) {
 			GObject o = (GObject) NativeObject.instanceFor(obj);
 			// Clear out the signal handler references
-			o.signalHandlers = null;
+			synchronized (o) {
+				o.signalHandlers = null;
+			}
 		}
     };    
 }

Modified: trunk/src/org/gnome/gir/gobject/GQuark.java
==============================================================================
--- trunk/src/org/gnome/gir/gobject/GQuark.java	(original)
+++ trunk/src/org/gnome/gir/gobject/GQuark.java	Thu Sep  4 18:37:11 2008
@@ -30,6 +30,6 @@
 	}
 	@Override
 	public Object toNative() {
-		return new Integer(value);
+		return Integer.valueOf(value);
 	}
 }

Modified: trunk/src/org/gnome/gir/gobject/IntPtr.java
==============================================================================
--- trunk/src/org/gnome/gir/gobject/IntPtr.java	(original)
+++ trunk/src/org/gnome/gir/gobject/IntPtr.java	Thu Sep  4 18:37:11 2008
@@ -49,8 +49,9 @@
 public class IntPtr extends Number {
 	private static final long serialVersionUID = 1L;
 	public final Number value;
+
     public IntPtr(int value) {
-        this.value = Pointer.SIZE == 8 ? new Long(value) : new Integer(value);
+        this.value = Pointer.SIZE == 8 ? Long.valueOf(value) : Integer.valueOf(value);
     }
     
     public String toString() {