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

[walters svn gnome org]

Author: walters
Date: Thu Sep 18 17:15:50 2008
New Revision: 59
URL: http://svn.gnome.org/viewvc/java-gobject-introspection?rev=59&view=rev

Log:
Fix up properties to use field info flags and not GParamSpec


Modified:
   trunk/src/org/gnome/gir/compiler/CodeFactory.java
   trunk/src/org/gnome/gir/repository/FieldInfoFlags.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 18 17:15:50 2008
@@ -72,7 +72,6 @@
 import org.gnome.gir.gobject.GErrorException;
 import org.gnome.gir.gobject.GList;
 import org.gnome.gir.gobject.GObjectAPI;
-import org.gnome.gir.gobject.GParamFlags;
 import org.gnome.gir.gobject.GSList;
 import org.gnome.gir.gobject.GType;
 import org.gnome.gir.repository.ArgInfo;
@@ -83,6 +82,7 @@
 import org.gnome.gir.repository.Direction;
 import org.gnome.gir.repository.EnumInfo;
 import org.gnome.gir.repository.FieldInfo;
+import org.gnome.gir.repository.FieldInfoFlags;
 import org.gnome.gir.repository.FlagsInfo;
 import org.gnome.gir.repository.FunctionInfo;
 import org.gnome.gir.repository.FunctionInfoFlags;
@@ -943,7 +943,7 @@
 				propTypeBox = Type.getType(propBox);
 			else
 				propTypeBox = type;
-			if ((propFlags & GParamFlags.READABLE) != 0) {
+			if ((propFlags & FieldInfoFlags.READABLE) != 0) {
 				String getterName = "get" + ucaseToPascal(prop.getName());
 				String descriptor = Type.getMethodDescriptor(type, new Type[] {});
 				String signature = getUniqueSignature(getterName, type, Arrays.asList(new Type[] {}));
@@ -973,8 +973,7 @@
 				mv.visitMaxs(0, 0);				
 				mv.visitEnd();
 			}
-			if ((propFlags & GParamFlags.WRITABLE) != 0 &&
-					(propFlags & GParamFlags.CONSTRUCT_ONLY) == 0) {
+			if ((propFlags & FieldInfoFlags.WRITABLE) != 0) {
 				String setterName = "set" + ucaseToPascal(prop.getName());
 				String descriptor = Type.getMethodDescriptor(Type.VOID_TYPE, new Type[] { type });
 				String signature = getUniqueSignature(setterName, Type.VOID_TYPE, Arrays.asList(new Type[] { type }));

Modified: trunk/src/org/gnome/gir/repository/FieldInfoFlags.java
==============================================================================
--- trunk/src/org/gnome/gir/repository/FieldInfoFlags.java	(original)
+++ trunk/src/org/gnome/gir/repository/FieldInfoFlags.java	Thu Sep 18 17:15:50 2008
@@ -1,14 +1,7 @@
 package org.gnome.gir.repository;
 
-import org.gnome.gir.gobject.NativeEnum;
 
-public enum FieldInfoFlags implements NativeEnum{
-	IS_READABLE,
-	IS_WRITABLE;
-
-	@Override
-	public int getNative() {
-		return 1 << ordinal();
-	}
-	
+public interface FieldInfoFlags {
+	public static final int READABLE = 1 << 0;
+	public static final int WRITABLE = 1 << 1;
 }
\ No newline at end of file