java-gobject-introspection r152 - in trunk: src/gobject src/gobject/internals src/gobject/runtime src/org/gnome/gir/compiler src/org/gnome/gir/gobject src/org/gnome/gir/repository src/org/gnome/gir/runtime stub-examples
- From: walters svn gnome org
- To: svn-commits-list gnome org
- Subject: java-gobject-introspection r152 - in trunk: src/gobject src/gobject/internals src/gobject/runtime src/org/gnome/gir/compiler src/org/gnome/gir/gobject src/org/gnome/gir/repository src/org/gnome/gir/runtime stub-examples
- Date: Sat, 20 Dec 2008 01:27:31 +0000 (UTC)
Author: walters
Date: Sat Dec 20 01:27:31 2008
New Revision: 152
URL: http://svn.gnome.org/viewvc/java-gobject-introspection?rev=152&view=rev
Log:
Major namespace changes
Rename org.gnome.gir.dynamic to "gobject.introspection"; it's actually the exact
same number of characters, but it's more informative and friendlier.
Also move the current org.gnome.gir.gobject to gobject.internals, and the
"stable public API" to gobject.runtime.
Added:
trunk/src/gobject/
trunk/src/gobject/internals/
trunk/src/gobject/internals/Closure.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/Closure.java
trunk/src/gobject/internals/EnumMapper.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/EnumMapper.java
trunk/src/gobject/internals/GBoxedAPI.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GBoxedAPI.java
trunk/src/gobject/internals/GClosure.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GClosure.java
trunk/src/gobject/internals/GErrorStruct.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GErrorStruct.java
trunk/src/gobject/internals/GHashTable.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GHashTable.java
trunk/src/gobject/internals/GIOFunc.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GIOFunc.java
trunk/src/gobject/internals/GList.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GList.java
trunk/src/gobject/internals/GMainContext.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GMainContext.java
trunk/src/gobject/internals/GModuleAPI.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GModuleAPI.java
trunk/src/gobject/internals/GNative.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GNative.java
trunk/src/gobject/internals/GObjectAPI.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GObjectAPI.java
trunk/src/gobject/internals/GOptionContext.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GOptionContext.java
trunk/src/gobject/internals/GOptionEntry.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GOptionEntry.java
trunk/src/gobject/internals/GOptionGroup.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GOptionGroup.java
trunk/src/gobject/internals/GParamFlags.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GParamFlags.java
trunk/src/gobject/internals/GQuark.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GQuark.java
trunk/src/gobject/internals/GSList.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GSList.java
trunk/src/gobject/internals/GScanner.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GScanner.java
trunk/src/gobject/internals/GSignalAPI.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GSignalAPI.java
trunk/src/gobject/internals/GSignalFlags.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GSignalFlags.java
trunk/src/gobject/internals/GSignalQuery.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GSignalQuery.java
trunk/src/gobject/internals/GSource.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GSource.java
trunk/src/gobject/internals/GSourceFunc.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GSourceFunc.java
trunk/src/gobject/internals/GString.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GString.java
trunk/src/gobject/internals/GThreadAPI.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GThreadAPI.java
trunk/src/gobject/internals/GTimeVal.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GTimeVal.java
trunk/src/gobject/internals/GTypeInstance.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GTypeInstance.java
trunk/src/gobject/internals/GTypeMapper.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GTypeMapper.java
trunk/src/gobject/internals/GTypeModule.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GTypeModule.java
trunk/src/gobject/internals/GTypePlugin.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GTypePlugin.java
trunk/src/gobject/internals/GValueAPI.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GValueAPI.java
trunk/src/gobject/internals/GenericGList.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GenericGList.java
trunk/src/gobject/internals/GlibAPI.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GlibAPI.java
trunk/src/gobject/internals/GlibRuntime.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GlibRuntime.java
trunk/src/gobject/internals/Handle.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/Handle.java
trunk/src/gobject/internals/IntPtr.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/IntPtr.java
trunk/src/gobject/internals/NativeEnum.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/NativeEnum.java
trunk/src/gobject/internals/NativeObject.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/NativeObject.java
trunk/src/gobject/internals/NativeValue.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/NativeValue.java
trunk/src/gobject/internals/RefCountedObject.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/RefCountedObject.java
trunk/src/gobject/internals/RegisteredType.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/RegisteredType.java
trunk/src/gobject/internals/UnmappedPointer.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/UnmappedPointer.java
trunk/src/gobject/runtime/
trunk/src/gobject/runtime/BooleanByReference.java
- copied, changed from r151, /trunk/src/org/gnome/gir/runtime/BooleanByReference.java
trunk/src/gobject/runtime/BoxedStructure.java
- copied, changed from r151, /trunk/src/org/gnome/gir/runtime/BoxedStructure.java
trunk/src/gobject/runtime/BoxedUnion.java
- copied, changed from r151, /trunk/src/org/gnome/gir/runtime/BoxedUnion.java
trunk/src/gobject/runtime/GBoxed.java
- copied, changed from r151, /trunk/src/org/gnome/gir/runtime/GBoxed.java
trunk/src/gobject/runtime/GErrorException.java
- copied, changed from r151, /trunk/src/org/gnome/gir/gobject/GErrorException.java
trunk/src/gobject/runtime/GFlags.java
trunk/src/gobject/runtime/GInitiallyUnowned.java
- copied, changed from r151, /trunk/src/org/gnome/gir/runtime/GInitiallyUnowned.java
trunk/src/gobject/runtime/GObject.java
- copied, changed from r151, /trunk/src/org/gnome/gir/runtime/GObject.java
trunk/src/gobject/runtime/GType.java
- copied, changed from r151, /trunk/src/org/gnome/gir/runtime/GType.java
trunk/src/gobject/runtime/GValue.java
- copied, changed from r151, /trunk/src/org/gnome/gir/runtime/GValue.java
trunk/src/gobject/runtime/MainLoop.java
- copied, changed from r151, /trunk/src/org/gnome/gir/runtime/MainLoop.java
Removed:
trunk/src/org/gnome/gir/gobject/Closure.java
trunk/src/org/gnome/gir/gobject/EnumMapper.java
trunk/src/org/gnome/gir/gobject/GBoxedAPI.java
trunk/src/org/gnome/gir/gobject/GClosure.java
trunk/src/org/gnome/gir/gobject/GErrorException.java
trunk/src/org/gnome/gir/gobject/GErrorStruct.java
trunk/src/org/gnome/gir/gobject/GHashTable.java
trunk/src/org/gnome/gir/gobject/GIOFunc.java
trunk/src/org/gnome/gir/gobject/GList.java
trunk/src/org/gnome/gir/gobject/GMainContext.java
trunk/src/org/gnome/gir/gobject/GModuleAPI.java
trunk/src/org/gnome/gir/gobject/GNative.java
trunk/src/org/gnome/gir/gobject/GObjectAPI.java
trunk/src/org/gnome/gir/gobject/GOptionContext.java
trunk/src/org/gnome/gir/gobject/GOptionEntry.java
trunk/src/org/gnome/gir/gobject/GOptionGroup.java
trunk/src/org/gnome/gir/gobject/GParamFlags.java
trunk/src/org/gnome/gir/gobject/GQuark.java
trunk/src/org/gnome/gir/gobject/GSList.java
trunk/src/org/gnome/gir/gobject/GScanner.java
trunk/src/org/gnome/gir/gobject/GSignalAPI.java
trunk/src/org/gnome/gir/gobject/GSignalFlags.java
trunk/src/org/gnome/gir/gobject/GSignalQuery.java
trunk/src/org/gnome/gir/gobject/GSource.java
trunk/src/org/gnome/gir/gobject/GSourceFunc.java
trunk/src/org/gnome/gir/gobject/GString.java
trunk/src/org/gnome/gir/gobject/GThreadAPI.java
trunk/src/org/gnome/gir/gobject/GTimeVal.java
trunk/src/org/gnome/gir/gobject/GTypeInstance.java
trunk/src/org/gnome/gir/gobject/GTypeMapper.java
trunk/src/org/gnome/gir/gobject/GTypeModule.java
trunk/src/org/gnome/gir/gobject/GTypePlugin.java
trunk/src/org/gnome/gir/gobject/GValueAPI.java
trunk/src/org/gnome/gir/gobject/GenericGList.java
trunk/src/org/gnome/gir/gobject/GlibAPI.java
trunk/src/org/gnome/gir/gobject/GlibRuntime.java
trunk/src/org/gnome/gir/gobject/Handle.java
trunk/src/org/gnome/gir/gobject/IntPtr.java
trunk/src/org/gnome/gir/gobject/NativeEnum.java
trunk/src/org/gnome/gir/gobject/NativeObject.java
trunk/src/org/gnome/gir/gobject/NativeValue.java
trunk/src/org/gnome/gir/gobject/RefCountedObject.java
trunk/src/org/gnome/gir/gobject/RegisteredType.java
trunk/src/org/gnome/gir/gobject/UnmappedPointer.java
trunk/src/org/gnome/gir/runtime/BooleanByReference.java
trunk/src/org/gnome/gir/runtime/BoxedStructure.java
trunk/src/org/gnome/gir/runtime/BoxedUnion.java
trunk/src/org/gnome/gir/runtime/GBoxed.java
trunk/src/org/gnome/gir/runtime/GInitiallyUnowned.java
trunk/src/org/gnome/gir/runtime/GObject.java
trunk/src/org/gnome/gir/runtime/GType.java
trunk/src/org/gnome/gir/runtime/GValue.java
trunk/src/org/gnome/gir/runtime/MainLoop.java
Modified:
trunk/src/org/gnome/gir/compiler/ClassCompilation.java
trunk/src/org/gnome/gir/compiler/CodeFactory.java
trunk/src/org/gnome/gir/compiler/StubClassCompilation.java
trunk/src/org/gnome/gir/compiler/TypeMap.java
trunk/src/org/gnome/gir/repository/BaseInfo.java
trunk/src/org/gnome/gir/repository/GIntrospectionAPI.java
trunk/src/org/gnome/gir/repository/Repository.java
trunk/src/org/gnome/gir/repository/VFuncInfoFlags.java
trunk/stub-examples/Test.java
trunk/stub-examples/TestAbs.java
trunk/stub-examples/TestCallback.java
Copied: trunk/src/gobject/internals/Closure.java (from r151, /trunk/src/org/gnome/gir/gobject/Closure.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/Closure.java (original)
+++ trunk/src/gobject/internals/Closure.java Sat Dec 20 01:27:31 2008
@@ -43,7 +43,7 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
/**
* A signal callback.
Copied: trunk/src/gobject/internals/EnumMapper.java (from r151, /trunk/src/org/gnome/gir/gobject/EnumMapper.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/EnumMapper.java (original)
+++ trunk/src/gobject/internals/EnumMapper.java Sat Dec 20 01:27:31 2008
@@ -43,7 +43,7 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
import java.util.EnumSet;
Copied: trunk/src/gobject/internals/GBoxedAPI.java (from r151, /trunk/src/org/gnome/gir/gobject/GBoxedAPI.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GBoxedAPI.java (original)
+++ trunk/src/gobject/internals/GBoxedAPI.java Sat Dec 20 01:27:31 2008
@@ -43,11 +43,12 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
+
+import gobject.runtime.GType;
import java.util.HashMap;
-import org.gnome.gir.runtime.GType;
import com.sun.jna.Library;
import com.sun.jna.Pointer;
Copied: trunk/src/gobject/internals/GClosure.java (from r151, /trunk/src/org/gnome/gir/gobject/GClosure.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GClosure.java (original)
+++ trunk/src/gobject/internals/GClosure.java Sat Dec 20 01:27:31 2008
@@ -1,6 +1,6 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
-import org.gnome.gir.runtime.GBoxed;
+import gobject.runtime.GBoxed;
import com.sun.jna.Pointer;
Copied: trunk/src/gobject/internals/GErrorStruct.java (from r151, /trunk/src/org/gnome/gir/gobject/GErrorStruct.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GErrorStruct.java (original)
+++ trunk/src/gobject/internals/GErrorStruct.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.Pointer;
Copied: trunk/src/gobject/internals/GHashTable.java (from r151, /trunk/src/org/gnome/gir/gobject/GHashTable.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GHashTable.java (original)
+++ trunk/src/gobject/internals/GHashTable.java Sat Dec 20 01:27:31 2008
@@ -1,6 +1,6 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
-import org.gnome.gir.runtime.GBoxed;
+import gobject.runtime.GBoxed;
import com.sun.jna.Pointer;
Copied: trunk/src/gobject/internals/GIOFunc.java (from r151, /trunk/src/org/gnome/gir/gobject/GIOFunc.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GIOFunc.java (original)
+++ trunk/src/gobject/internals/GIOFunc.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.Callback;
import com.sun.jna.Pointer;
Copied: trunk/src/gobject/internals/GList.java (from r151, /trunk/src/org/gnome/gir/gobject/GList.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GList.java (original)
+++ trunk/src/gobject/internals/GList.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.Pointer;
import com.sun.jna.Structure;
Copied: trunk/src/gobject/internals/GMainContext.java (from r151, /trunk/src/org/gnome/gir/gobject/GMainContext.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GMainContext.java (original)
+++ trunk/src/gobject/internals/GMainContext.java Sat Dec 20 01:27:31 2008
@@ -43,7 +43,7 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
/**
Copied: trunk/src/gobject/internals/GModuleAPI.java (from r151, /trunk/src/org/gnome/gir/gobject/GModuleAPI.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GModuleAPI.java (original)
+++ trunk/src/gobject/internals/GModuleAPI.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import java.util.HashMap;
import com.sun.jna.Library;
Copied: trunk/src/gobject/internals/GNative.java (from r151, /trunk/src/org/gnome/gir/gobject/GNative.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GNative.java (original)
+++ trunk/src/gobject/internals/GNative.java Sat Dec 20 01:27:31 2008
@@ -43,7 +43,7 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
Copied: trunk/src/gobject/internals/GObjectAPI.java (from r151, /trunk/src/org/gnome/gir/gobject/GObjectAPI.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GObjectAPI.java (original)
+++ trunk/src/gobject/internals/GObjectAPI.java Sat Dec 20 01:27:31 2008
@@ -43,13 +43,14 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
+
+import gobject.runtime.GObject;
+import gobject.runtime.GType;
+import gobject.runtime.GValue;
import java.util.HashMap;
-import org.gnome.gir.runtime.GObject;
-import org.gnome.gir.runtime.GType;
-import org.gnome.gir.runtime.GValue;
import com.sun.jna.Callback;
import com.sun.jna.Library;
Copied: trunk/src/gobject/internals/GOptionContext.java (from r151, /trunk/src/org/gnome/gir/gobject/GOptionContext.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GOptionContext.java (original)
+++ trunk/src/gobject/internals/GOptionContext.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.PointerType;
Copied: trunk/src/gobject/internals/GOptionEntry.java (from r151, /trunk/src/org/gnome/gir/gobject/GOptionEntry.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GOptionEntry.java (original)
+++ trunk/src/gobject/internals/GOptionEntry.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.Pointer;
import com.sun.jna.Structure;
Copied: trunk/src/gobject/internals/GOptionGroup.java (from r151, /trunk/src/org/gnome/gir/gobject/GOptionGroup.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GOptionGroup.java (original)
+++ trunk/src/gobject/internals/GOptionGroup.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.PointerType;
Copied: trunk/src/gobject/internals/GParamFlags.java (from r151, /trunk/src/org/gnome/gir/gobject/GParamFlags.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GParamFlags.java (original)
+++ trunk/src/gobject/internals/GParamFlags.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
public interface GParamFlags {
public static final int READABLE = 1 << 0;
Copied: trunk/src/gobject/internals/GQuark.java (from r151, /trunk/src/org/gnome/gir/gobject/GQuark.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GQuark.java (original)
+++ trunk/src/gobject/internals/GQuark.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.FromNativeContext;
import com.sun.jna.NativeMapped;
Copied: trunk/src/gobject/internals/GSList.java (from r151, /trunk/src/org/gnome/gir/gobject/GSList.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GSList.java (original)
+++ trunk/src/gobject/internals/GSList.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.Pointer;
import com.sun.jna.Structure;
Copied: trunk/src/gobject/internals/GScanner.java (from r151, /trunk/src/org/gnome/gir/gobject/GScanner.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GScanner.java (original)
+++ trunk/src/gobject/internals/GScanner.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.PointerType;
Copied: trunk/src/gobject/internals/GSignalAPI.java (from r151, /trunk/src/org/gnome/gir/gobject/GSignalAPI.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GSignalAPI.java (original)
+++ trunk/src/gobject/internals/GSignalAPI.java Sat Dec 20 01:27:31 2008
@@ -43,13 +43,14 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
+
+import gobject.internals.GObjectAPI.GClosureNotify;
+import gobject.runtime.GObject;
+import gobject.runtime.GType;
import java.util.HashMap;
-import org.gnome.gir.gobject.GObjectAPI.GClosureNotify;
-import org.gnome.gir.runtime.GObject;
-import org.gnome.gir.runtime.GType;
import com.sun.jna.Callback;
import com.sun.jna.Library;
Copied: trunk/src/gobject/internals/GSignalFlags.java (from r151, /trunk/src/org/gnome/gir/gobject/GSignalFlags.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GSignalFlags.java (original)
+++ trunk/src/gobject/internals/GSignalFlags.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
public enum GSignalFlags implements NativeEnum {
RUN_FIRST,
Copied: trunk/src/gobject/internals/GSignalQuery.java (from r151, /trunk/src/org/gnome/gir/gobject/GSignalQuery.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GSignalQuery.java (original)
+++ trunk/src/gobject/internals/GSignalQuery.java Sat Dec 20 01:27:31 2008
@@ -23,9 +23,9 @@
/**
*
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
-import org.gnome.gir.runtime.GType;
+import gobject.runtime.GType;
import com.sun.jna.Pointer;
Copied: trunk/src/gobject/internals/GSource.java (from r151, /trunk/src/org/gnome/gir/gobject/GSource.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GSource.java (original)
+++ trunk/src/gobject/internals/GSource.java Sat Dec 20 01:27:31 2008
@@ -43,7 +43,7 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
import java.util.concurrent.Callable;
Copied: trunk/src/gobject/internals/GSourceFunc.java (from r151, /trunk/src/org/gnome/gir/gobject/GSourceFunc.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GSourceFunc.java (original)
+++ trunk/src/gobject/internals/GSourceFunc.java Sat Dec 20 01:27:31 2008
@@ -1,7 +1,7 @@
/**
*
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.Callback;
import com.sun.jna.Pointer;
Copied: trunk/src/gobject/internals/GString.java (from r151, /trunk/src/org/gnome/gir/gobject/GString.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GString.java (original)
+++ trunk/src/gobject/internals/GString.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.NativeLong;
import com.sun.jna.Structure;
Copied: trunk/src/gobject/internals/GThreadAPI.java (from r151, /trunk/src/org/gnome/gir/gobject/GThreadAPI.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GThreadAPI.java (original)
+++ trunk/src/gobject/internals/GThreadAPI.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import java.util.HashMap;
import com.sun.jna.Library;
Copied: trunk/src/gobject/internals/GTimeVal.java (from r151, /trunk/src/org/gnome/gir/gobject/GTimeVal.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GTimeVal.java (original)
+++ trunk/src/gobject/internals/GTimeVal.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.NativeLong;
import com.sun.jna.Structure;
Copied: trunk/src/gobject/internals/GTypeInstance.java (from r151, /trunk/src/org/gnome/gir/gobject/GTypeInstance.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GTypeInstance.java (original)
+++ trunk/src/gobject/internals/GTypeInstance.java Sat Dec 20 01:27:31 2008
@@ -43,9 +43,9 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
-import org.gnome.gir.runtime.GType;
+import gobject.runtime.GType;
import com.sun.jna.Pointer;
import com.sun.jna.Structure;
Copied: trunk/src/gobject/internals/GTypeMapper.java (from r151, /trunk/src/org/gnome/gir/gobject/GTypeMapper.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GTypeMapper.java (original)
+++ trunk/src/gobject/internals/GTypeMapper.java Sat Dec 20 01:27:31 2008
@@ -43,12 +43,13 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
+
+import gobject.runtime.GObject;
import java.net.URI;
import java.util.Date;
-import org.gnome.gir.runtime.GObject;
import com.sun.jna.CallbackParameterContext;
import com.sun.jna.FromNativeContext;
Copied: trunk/src/gobject/internals/GTypeModule.java (from r151, /trunk/src/org/gnome/gir/gobject/GTypeModule.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GTypeModule.java (original)
+++ trunk/src/gobject/internals/GTypeModule.java Sat Dec 20 01:27:31 2008
@@ -21,10 +21,10 @@
*
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
-import org.gnome.gir.runtime.GObject;
-import org.gnome.gir.runtime.GType;
+import gobject.runtime.GObject;
+import gobject.runtime.GType;
public class GTypeModule extends GObject {
protected GTypeModule(GType gtype, Object[] args) {
Copied: trunk/src/gobject/internals/GTypePlugin.java (from r151, /trunk/src/org/gnome/gir/gobject/GTypePlugin.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GTypePlugin.java (original)
+++ trunk/src/gobject/internals/GTypePlugin.java Sat Dec 20 01:27:31 2008
@@ -21,7 +21,7 @@
*
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
public interface GTypePlugin {
Copied: trunk/src/gobject/internals/GValueAPI.java (from r151, /trunk/src/org/gnome/gir/gobject/GValueAPI.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GValueAPI.java (original)
+++ trunk/src/gobject/internals/GValueAPI.java Sat Dec 20 01:27:31 2008
@@ -43,13 +43,14 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
+
+import gobject.runtime.GObject;
+import gobject.runtime.GType;
+import gobject.runtime.GValue;
import java.util.HashMap;
-import org.gnome.gir.runtime.GObject;
-import org.gnome.gir.runtime.GType;
-import org.gnome.gir.runtime.GValue;
import com.sun.jna.Library;
import com.sun.jna.NativeLong;
Copied: trunk/src/gobject/internals/GenericGList.java (from r151, /trunk/src/org/gnome/gir/gobject/GenericGList.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GenericGList.java (original)
+++ trunk/src/gobject/internals/GenericGList.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.Pointer;
Copied: trunk/src/gobject/internals/GlibAPI.java (from r151, /trunk/src/org/gnome/gir/gobject/GlibAPI.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GlibAPI.java (original)
+++ trunk/src/gobject/internals/GlibAPI.java Sat Dec 20 01:27:31 2008
@@ -43,10 +43,11 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
+import gobject.runtime.MainLoop;
+
import java.util.HashMap;
-import org.gnome.gir.runtime.MainLoop;
import com.sun.jna.Callback;
import com.sun.jna.Library;
Copied: trunk/src/gobject/internals/GlibRuntime.java (from r151, /trunk/src/org/gnome/gir/gobject/GlibRuntime.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GlibRuntime.java (original)
+++ trunk/src/gobject/internals/GlibRuntime.java Sat Dec 20 01:27:31 2008
@@ -20,7 +20,9 @@
*
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
+
+import gobject.runtime.GObject;
import java.util.ArrayList;
import java.util.Collections;
@@ -30,7 +32,6 @@
import java.util.concurrent.atomic.AtomicBoolean;
import org.gnome.gir.repository.Transfer;
-import org.gnome.gir.runtime.GObject;
import com.sun.jna.Callback;
import com.sun.jna.Pointer;
Copied: trunk/src/gobject/internals/Handle.java (from r151, /trunk/src/org/gnome/gir/gobject/Handle.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/Handle.java (original)
+++ trunk/src/gobject/internals/Handle.java Sat Dec 20 01:27:31 2008
@@ -43,7 +43,7 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.Pointer;
Copied: trunk/src/gobject/internals/IntPtr.java (from r151, /trunk/src/org/gnome/gir/gobject/IntPtr.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/IntPtr.java (original)
+++ trunk/src/gobject/internals/IntPtr.java Sat Dec 20 01:27:31 2008
@@ -42,7 +42,7 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.Pointer;
Copied: trunk/src/gobject/internals/NativeEnum.java (from r151, /trunk/src/org/gnome/gir/gobject/NativeEnum.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/NativeEnum.java (original)
+++ trunk/src/gobject/internals/NativeEnum.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
public interface NativeEnum {
public int getNative();
Copied: trunk/src/gobject/internals/NativeObject.java (from r151, /trunk/src/org/gnome/gir/gobject/NativeObject.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/NativeObject.java (original)
+++ trunk/src/gobject/internals/NativeObject.java Sat Dec 20 01:27:31 2008
@@ -43,7 +43,10 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
+
+import gobject.runtime.GObject;
+import gobject.runtime.GType;
import java.lang.ref.WeakReference;
import java.lang.reflect.Constructor;
@@ -53,8 +56,6 @@
import java.util.concurrent.ConcurrentMap;
import org.gnome.gir.repository.BaseInfo;
-import org.gnome.gir.runtime.GObject;
-import org.gnome.gir.runtime.GType;
import com.sun.jna.Pointer;
Copied: trunk/src/gobject/internals/NativeValue.java (from r151, /trunk/src/org/gnome/gir/gobject/NativeValue.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/NativeValue.java (original)
+++ trunk/src/gobject/internals/NativeValue.java Sat Dec 20 01:27:31 2008
@@ -43,7 +43,7 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
/**
*
Copied: trunk/src/gobject/internals/RefCountedObject.java (from r151, /trunk/src/org/gnome/gir/gobject/RefCountedObject.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/RefCountedObject.java (original)
+++ trunk/src/gobject/internals/RefCountedObject.java Sat Dec 20 01:27:31 2008
@@ -43,7 +43,7 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
/**
* A { link NativeObject} that has an associated reference count
Copied: trunk/src/gobject/internals/RegisteredType.java (from r151, /trunk/src/org/gnome/gir/gobject/RegisteredType.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/RegisteredType.java (original)
+++ trunk/src/gobject/internals/RegisteredType.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.gobject;
+package gobject.internals;
public interface RegisteredType {
/* public GType getGType(); */
Copied: trunk/src/gobject/internals/UnmappedPointer.java (from r151, /trunk/src/org/gnome/gir/gobject/UnmappedPointer.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/UnmappedPointer.java (original)
+++ trunk/src/gobject/internals/UnmappedPointer.java Sat Dec 20 01:27:31 2008
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307 USA.
*
*/
-package org.gnome.gir.gobject;
+package gobject.internals;
import com.sun.jna.PointerType;
Copied: trunk/src/gobject/runtime/BooleanByReference.java (from r151, /trunk/src/org/gnome/gir/runtime/BooleanByReference.java)
==============================================================================
--- /trunk/src/org/gnome/gir/runtime/BooleanByReference.java (original)
+++ trunk/src/gobject/runtime/BooleanByReference.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.runtime;
+package gobject.runtime;
import com.sun.jna.ptr.ByReference;
Copied: trunk/src/gobject/runtime/BoxedStructure.java (from r151, /trunk/src/org/gnome/gir/runtime/BoxedStructure.java)
==============================================================================
--- /trunk/src/org/gnome/gir/runtime/BoxedStructure.java (original)
+++ trunk/src/gobject/runtime/BoxedStructure.java Sat Dec 20 01:27:31 2008
@@ -1,8 +1,8 @@
-package org.gnome.gir.runtime;
+package gobject.runtime;
-import org.gnome.gir.gobject.GBoxedAPI;
-import org.gnome.gir.gobject.GObjectAPI;
-import org.gnome.gir.gobject.RegisteredType;
+import gobject.internals.GBoxedAPI;
+import gobject.internals.GObjectAPI;
+import gobject.internals.RegisteredType;
import com.sun.jna.Pointer;
import com.sun.jna.Structure;
Copied: trunk/src/gobject/runtime/BoxedUnion.java (from r151, /trunk/src/org/gnome/gir/runtime/BoxedUnion.java)
==============================================================================
--- /trunk/src/org/gnome/gir/runtime/BoxedUnion.java (original)
+++ trunk/src/gobject/runtime/BoxedUnion.java Sat Dec 20 01:27:31 2008
@@ -1,8 +1,8 @@
-package org.gnome.gir.runtime;
+package gobject.runtime;
-import org.gnome.gir.gobject.GBoxedAPI;
-import org.gnome.gir.gobject.GObjectAPI;
-import org.gnome.gir.gobject.RegisteredType;
+import gobject.internals.GBoxedAPI;
+import gobject.internals.GObjectAPI;
+import gobject.internals.RegisteredType;
import com.sun.jna.Pointer;
import com.sun.jna.TypeMapper;
Copied: trunk/src/gobject/runtime/GBoxed.java (from r151, /trunk/src/org/gnome/gir/runtime/GBoxed.java)
==============================================================================
--- /trunk/src/org/gnome/gir/runtime/GBoxed.java (original)
+++ trunk/src/gobject/runtime/GBoxed.java Sat Dec 20 01:27:31 2008
@@ -1,10 +1,11 @@
-package org.gnome.gir.runtime;
+package gobject.runtime;
+
+import gobject.internals.GBoxedAPI;
+import gobject.internals.GTypeMapper;
+import gobject.internals.RegisteredType;
import java.lang.reflect.Constructor;
-import org.gnome.gir.gobject.GBoxedAPI;
-import org.gnome.gir.gobject.GTypeMapper;
-import org.gnome.gir.gobject.RegisteredType;
import com.sun.jna.Pointer;
import com.sun.jna.PointerType;
Copied: trunk/src/gobject/runtime/GErrorException.java (from r151, /trunk/src/org/gnome/gir/gobject/GErrorException.java)
==============================================================================
--- /trunk/src/org/gnome/gir/gobject/GErrorException.java (original)
+++ trunk/src/gobject/runtime/GErrorException.java Sat Dec 20 01:27:31 2008
@@ -21,7 +21,9 @@
*
*/
-package org.gnome.gir.gobject;
+package gobject.runtime;
+
+import gobject.internals.GErrorStruct;
public class GErrorException extends Exception {
private static final long serialVersionUID = 1L;
Added: trunk/src/gobject/runtime/GFlags.java
==============================================================================
--- (empty file)
+++ trunk/src/gobject/runtime/GFlags.java Sat Dec 20 01:27:31 2008
@@ -0,0 +1,68 @@
+package gobject.runtime;
+
+import com.sun.jna.FromNativeContext;
+import com.sun.jna.NativeMapped;
+
+/**
+ * Base class for multi-valued bitfields, or flags. Converted
+ * between an integer type when passed to native code.
+ */
+public abstract class GFlags implements NativeMapped {
+ private int value = 0;
+
+ public GFlags() {
+ }
+
+ @SuppressWarnings("unused")
+ private GFlags(int value) {
+ this.value = value;
+ }
+
+ public GFlags(int...flags) {
+ add(flags);
+ }
+
+ public final void add(int...flags) {
+ for (int flag : flags)
+ value |= flag;
+ }
+
+ public final void remove(int...flags) {
+ int val = 0;
+ for (int flag : flags)
+ val += flag;
+ value &= ~val;
+ }
+
+ public final int getValue() {
+ return value;
+ }
+
+ public final boolean contains(int...flags) {
+ for (int flag : flags)
+ if ((value & flag) == 0)
+ return false;
+ return true;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public final Object fromNative(Object nativeValue, FromNativeContext context) {
+ try {
+ return context.getTargetType().getConstructor(new Class<?>[] { int[].class })
+ .newInstance(new Object[] { new int[] { (Integer) nativeValue } });
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public final Class<?> nativeType() {
+ return Integer.class;
+ }
+
+ @Override
+ public final Object toNative() {
+ return value;
+ }
+}
Copied: trunk/src/gobject/runtime/GInitiallyUnowned.java (from r151, /trunk/src/org/gnome/gir/runtime/GInitiallyUnowned.java)
==============================================================================
--- /trunk/src/org/gnome/gir/runtime/GInitiallyUnowned.java (original)
+++ trunk/src/gobject/runtime/GInitiallyUnowned.java Sat Dec 20 01:27:31 2008
@@ -1,4 +1,4 @@
-package org.gnome.gir.runtime;
+package gobject.runtime;
import java.util.Map;
Copied: trunk/src/gobject/runtime/GObject.java (from r151, /trunk/src/org/gnome/gir/runtime/GObject.java)
==============================================================================
--- /trunk/src/org/gnome/gir/runtime/GObject.java (original)
+++ trunk/src/gobject/runtime/GObject.java Sat Dec 20 01:27:31 2008
@@ -42,7 +42,17 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.runtime;
+package gobject.runtime;
+
+import gobject.internals.GObjectAPI;
+import gobject.internals.GSignalAPI;
+import gobject.internals.GTypeMapper;
+import gobject.internals.IntPtr;
+import gobject.internals.NativeObject;
+import gobject.internals.GObjectAPI.GObjectStruct;
+import gobject.internals.GObjectAPI.GParamSpec;
+import gobject.internals.GObjectAPI.GToggleNotify;
+import gobject.internals.GObjectAPI.GWeakNotify;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -50,15 +60,6 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.gnome.gir.gobject.GObjectAPI;
-import org.gnome.gir.gobject.GSignalAPI;
-import org.gnome.gir.gobject.GTypeMapper;
-import org.gnome.gir.gobject.IntPtr;
-import org.gnome.gir.gobject.NativeObject;
-import org.gnome.gir.gobject.GObjectAPI.GObjectStruct;
-import org.gnome.gir.gobject.GObjectAPI.GParamSpec;
-import org.gnome.gir.gobject.GObjectAPI.GToggleNotify;
-import org.gnome.gir.gobject.GObjectAPI.GWeakNotify;
import com.sun.jna.Callback;
import com.sun.jna.NativeLong;
Copied: trunk/src/gobject/runtime/GType.java (from r151, /trunk/src/org/gnome/gir/runtime/GType.java)
==============================================================================
--- /trunk/src/org/gnome/gir/runtime/GType.java (original)
+++ trunk/src/gobject/runtime/GType.java Sat Dec 20 01:27:31 2008
@@ -42,12 +42,13 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.runtime;
+package gobject.runtime;
+
+import gobject.internals.GObjectAPI;
import java.util.HashMap;
import java.util.Map;
-import org.gnome.gir.gobject.GObjectAPI;
import org.gnome.gir.repository.BaseInfo;
import org.gnome.gir.repository.Repository;
@@ -71,80 +72,85 @@
private static final Map<GType, Class<?>> classTypeMap = new HashMap<GType, Class<?>>();
- public static final String dynamicNamespace = "org/gnome/gir/dynamic/";
+ /* Namespace for generated classes - highly prominent, avoid changing */
+ public static final String dynamicNamespace = "gobject/introspection/";
+ /* Internals - not guaranteed public */
+ public static final String internalsNamespace = "gobject/internals/";
+ /* Prominent public API - should try very hard to avoid changing */
+ public static final String runtimeNamespace = "gobject/runtime/";
public static final Map<String, String> overrides = new HashMap<String, String>() {
private static final long serialVersionUID = 1L;
{
- put("GLib.Value", "org/gnome/gir/gobject/GValue");
+ put("GLib.Value", internalsNamespace + "GValue");
- put("GLib.MainContext", "org/gnome/gir/gobject/GMainContext");
- put("GLib.Closure", "org/gnome/gir/gobject/GClosure");
- put("GLib.Quark", "org/gnome/gir/gobject/GQuark");
- put("GLib.TimeVal", "org/gnome/gir/gobject/GTimeVal");
- put("GLib.Scanner", "org/gnome/gir/gobject/GScanner");
- put("GLib.OptionContext", "org/gnome/gir/gobject/GOptionContext");
- put("GLib.OptionGroup", "org/gnome/gir/gobject/GOptionGroup");
- put("GLib.OptionEntry", "org/gnome/gir/gobject/GOptionEntry");
- put("GLib.String", "org/gnome/gir/gobject/GString");
+ put("GLib.MainContext", internalsNamespace + "GMainContext");
+ put("GLib.Closure", internalsNamespace + "GClosure");
+ put("GLib.Quark", internalsNamespace + "GQuark");
+ put("GLib.TimeVal", internalsNamespace + "GTimeVal");
+ put("GLib.Scanner", internalsNamespace + "GScanner");
+ put("GLib.OptionContext", internalsNamespace + "GOptionContext");
+ put("GLib.OptionGroup", internalsNamespace + "GOptionGroup");
+ put("GLib.OptionEntry", internalsNamespace + "GOptionEntry");
+ put("GLib.String", internalsNamespace + "GString");
put("GLib.Callback", "com/sun/jna/Callback");
- put("GLib.Mutex", "org/gnome/gir/gobject/GlibAPI$GMutex");
- put("GLib.StaticRecMutex", "org/gnome/gir/gobject/GlibAPI$GStaticRecMutex");
- put("GLib.IOFunc", "org/gnome/gir/gobject/GIOFunc");
- put("GLib.SourceFunc", "org/gnome/gir/gobject/GSourceFunc");
+ put("GLib.Mutex", internalsNamespace + "GlibAPI$GMutex");
+ put("GLib.StaticRecMutex", internalsNamespace + "GlibAPI$GStaticRecMutex");
+ put("GLib.IOFunc", internalsNamespace + "GIOFunc");
+ put("GLib.SourceFunc", internalsNamespace + "GSourceFunc");
String[] glibPointerUnmapped = new String[] { "Mutex", "Cond", "FreeFunc", "DestroyNotify", "MarkupParser",
"SpawnChildSetupFunc", "Node", "CompareFunc", "KeyFile", "PtrArray", "Func", "ThreadPool",
"Source", "CompareDataFunc", "Array", "Data", "DataSet", "Date", "IOChannel", "Regex",
"MappedFile", "GList", "GSList" };
for (String unmapped : glibPointerUnmapped)
- put("GLib." + unmapped, "org/gnome/gir/gobject/UnmappedPointer");
+ put("GLib." + unmapped, internalsNamespace + "UnmappedPointer");
String[] glibIntegerUnmapped = new String[] { "SpawnFlags", "SeekType", "IOCondition", "RegexMatchFlags" };
for (String unmapped : glibIntegerUnmapped)
put("GLib." + unmapped, "java/lang/Integer");
- put("GObject.Object", "org/gnome/gir/runtime/GObject");
+ put("GObject.Object", runtimeNamespace + "GObject");
put("GObject.Callback", "com/sun/jna/Callback");
- put("GObject.InitiallyUnowned", "org/gnome/gir/runtime/GInitiallyUnowned");
- put("GObject.Type", "org/gnome/gir/runtime/GType");
- put("GObject.Value", "org/gnome/gir/runtime/GValue");
- put("GObject.ParamSpec", "org/gnome/gir/gobject/GObjectAPI$GParamSpec");
- put("GObject.Parameter", "org/gnome/gir/gobject/GObjectAPI$GParameter");
- put("GObject.TypePlugin", "org/gnome/gir/gobject/GTypePlugin");
- put("GObject.TypeModule", "org/gnome/gir/gobject/GTypeModule");
- put("GObject.TypeClass", "org/gnome/gir/gobject/GObjectAPI$GTypeClass");
- put("GObject.TypeQuery", "org/gnome/gir/gobject/GObjectAPI$GTypeQuery");
- put("GObject.TypeInfo", "org/gnome/gir/gobject/GObjectAPI$GTypeInfo");
- put("GObject.InterfaceInfo", "org/gnome/gir/gobject/GObjectAPI$GInterfaceInfo");
- put("GObject.TypeValueTable", "org/gnome/gir/gobject/GObjectAPI$GTypeValueTable");
- put("GObject.TypeFundamentalInfo", "org/gnome/gir/gobject/GObjectAPI$GTypeFundamentalInfo");
- put("GObject.ObjectClass", "org/gnome/gir/gobject/GObjectAPI$GObjectClass");
- put("GObject.InitiallyUnownedClass", "org/gnome/gir/gobject/GObjectAPI$GInitiallyUnownedClass");
- put("GObject.TypeDebugFlags", "org/gnome/gir/gobject/GObjectAPI$GTypeDebugFlags");
- put("GObject.TypeInstance", "org/gnome/gir/gobject/GObjectAPI$GTypeInstance");
- put("GObject.TypeInterface", "org/gnome/gir/gobject/GObjectAPI$GTypeInterface");
- put("GObject.String", "org/gnome/gir/gobject/GString");
- put("GObject.HashTable", "org/gnome/gir/gobject/GHashTable");
- put("GObject.Closure", "org/gnome/gir/gobject/GClosure");
- put("GObject.SignalInvocationHint", "org/gnome/gir/gobject/GSignalAPI$GSignalInvocationHint");
- put("GObject.EnumValue", "org/gnome/gir/gobject/GObjectAPI$GEnumValue");
- put("GObject.EnumClass", "org/gnome/gir/gobject/GObjectAPI$GEnumClass");
- put("GObject.FlagsValue", "org/gnome/gir/gobject/GObjectAPI$GFlagsValue");
- put("GObject.FlagsClass", "org/gnome/gir/gobject/GObjectAPI$GFlagsClass");
+ put("GObject.InitiallyUnowned", runtimeNamespace + "GInitiallyUnowned");
+ put("GObject.Type", runtimeNamespace + "GType");
+ put("GObject.Value", runtimeNamespace + "GValue");
+ put("GObject.ParamSpec", internalsNamespace + "GObjectAPI$GParamSpec");
+ put("GObject.Parameter", internalsNamespace + "GObjectAPI$GParameter");
+ put("GObject.TypePlugin", internalsNamespace + "GTypePlugin");
+ put("GObject.TypeModule", internalsNamespace + "GTypeModule");
+ put("GObject.TypeClass", internalsNamespace + "GObjectAPI$GTypeClass");
+ put("GObject.TypeQuery", internalsNamespace + "GObjectAPI$GTypeQuery");
+ put("GObject.TypeInfo", internalsNamespace + "GObjectAPI$GTypeInfo");
+ put("GObject.InterfaceInfo", internalsNamespace + "GObjectAPI$GInterfaceInfo");
+ put("GObject.TypeValueTable", internalsNamespace + "GObjectAPI$GTypeValueTable");
+ put("GObject.TypeFundamentalInfo", internalsNamespace + "GObjectAPI$GTypeFundamentalInfo");
+ put("GObject.ObjectClass", internalsNamespace + "GObjectAPI$GObjectClass");
+ put("GObject.InitiallyUnownedClass", internalsNamespace + "GObjectAPI$GInitiallyUnownedClass");
+ put("GObject.TypeDebugFlags", internalsNamespace + "GObjectAPI$GTypeDebugFlags");
+ put("GObject.TypeInstance", internalsNamespace + "GObjectAPI$GTypeInstance");
+ put("GObject.TypeInterface", internalsNamespace + "GObjectAPI$GTypeInterface");
+ put("GObject.String", internalsNamespace + "GString");
+ put("GObject.HashTable", internalsNamespace + "GHashTable");
+ put("GObject.Closure", internalsNamespace + "GClosure");
+ put("GObject.SignalInvocationHint", internalsNamespace + "GSignalAPI$GSignalInvocationHint");
+ put("GObject.EnumValue", internalsNamespace + "GObjectAPI$GEnumValue");
+ put("GObject.EnumClass", internalsNamespace + "GObjectAPI$GEnumClass");
+ put("GObject.FlagsValue", internalsNamespace + "GObjectAPI$GFlagsValue");
+ put("GObject.FlagsClass", internalsNamespace + "GObjectAPI$GFlagsClass");
String[] gobjectUnmapped = new String[] { "BaseInitFunc", "InstanceInitFunc", "SignalAccumulator",
"ClosureMarshal", "ClassInitFunc", "SignalEmissionHook", "IOChannel", "Date", "BaseFinalizeFunc",
"ClassFinalizeFunc", "ValueArray" };
for (String unmapped : gobjectUnmapped)
- put("GObject." + unmapped, "org/gnome/gir/gobject/UnmappedPointer");
+ put("GObject." + unmapped, internalsNamespace + "UnmappedPointer");
String[] gobjectIntegerUnmapped = new String[] { "SignalFlags", "ConnectFlags", "SignalMatchType",
"TypeFlags", "ParamFlags", "IOCondition" };
for (String unmapped : gobjectIntegerUnmapped)
put("GObject." + unmapped, "java/lang/Integer");
for (String name : new String[] { "Context" }) {
- put("Cairo." + name, "org/gnome/gir/gobject/UnmappedPointer");
+ put("Cairo." + name, internalsNamespace + "UnmappedPointer");
}
}
};
Copied: trunk/src/gobject/runtime/GValue.java (from r151, /trunk/src/org/gnome/gir/runtime/GValue.java)
==============================================================================
--- /trunk/src/org/gnome/gir/runtime/GValue.java (original)
+++ trunk/src/gobject/runtime/GValue.java Sat Dec 20 01:27:31 2008
@@ -43,10 +43,10 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.runtime;
+package gobject.runtime;
-import org.gnome.gir.gobject.EnumMapper;
-import org.gnome.gir.gobject.GValueAPI;
+import gobject.internals.EnumMapper;
+import gobject.internals.GValueAPI;
import com.sun.jna.NativeLong;
import com.sun.jna.Pointer;
Copied: trunk/src/gobject/runtime/MainLoop.java (from r151, /trunk/src/org/gnome/gir/runtime/MainLoop.java)
==============================================================================
--- /trunk/src/org/gnome/gir/runtime/MainLoop.java (original)
+++ trunk/src/gobject/runtime/MainLoop.java Sat Dec 20 01:27:31 2008
@@ -43,7 +43,13 @@
* Boston, MA 02111-1307 USA.
*/
-package org.gnome.gir.runtime;
+package gobject.runtime;
+
+import gobject.internals.GMainContext;
+import gobject.internals.GSourceFunc;
+import gobject.internals.GlibAPI;
+import gobject.internals.GlibRuntime;
+import gobject.internals.RefCountedObject;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
@@ -54,11 +60,6 @@
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicLong;
-import org.gnome.gir.gobject.GMainContext;
-import org.gnome.gir.gobject.GSourceFunc;
-import org.gnome.gir.gobject.GlibAPI;
-import org.gnome.gir.gobject.GlibRuntime;
-import org.gnome.gir.gobject.RefCountedObject;
import com.sun.jna.Pointer;
Modified: trunk/src/org/gnome/gir/compiler/ClassCompilation.java
==============================================================================
--- trunk/src/org/gnome/gir/compiler/ClassCompilation.java (original)
+++ trunk/src/org/gnome/gir/compiler/ClassCompilation.java Sat Dec 20 01:27:31 2008
@@ -5,8 +5,8 @@
import static org.objectweb.asm.Opcodes.ACC_STATIC;
import static org.objectweb.asm.Opcodes.RETURN;
+import gobject.runtime.GType;
-import org.gnome.gir.runtime.GType;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.MethodVisitor;
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 Sat Dec 20 01:27:31 2008
@@ -43,6 +43,23 @@
import static org.objectweb.asm.Opcodes.V1_6;
import static org.objectweb.asm.Type.getType;
+import gobject.internals.GErrorStruct;
+import gobject.internals.GList;
+import gobject.internals.GObjectAPI;
+import gobject.internals.GSList;
+import gobject.internals.GTypeMapper;
+import gobject.internals.GenericGList;
+import gobject.internals.GlibAPI;
+import gobject.internals.GlibRuntime;
+import gobject.internals.NativeEnum;
+import gobject.internals.NativeObject;
+import gobject.internals.RegisteredType;
+import gobject.runtime.GBoxed;
+import gobject.runtime.GErrorException;
+import gobject.runtime.GFlags;
+import gobject.runtime.GObject;
+import gobject.runtime.GType;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
@@ -69,18 +86,6 @@
import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
-import org.gnome.gir.gobject.GErrorException;
-import org.gnome.gir.gobject.GErrorStruct;
-import org.gnome.gir.gobject.GList;
-import org.gnome.gir.gobject.GObjectAPI;
-import org.gnome.gir.gobject.GSList;
-import org.gnome.gir.gobject.GTypeMapper;
-import org.gnome.gir.gobject.GenericGList;
-import org.gnome.gir.gobject.GlibAPI;
-import org.gnome.gir.gobject.GlibRuntime;
-import org.gnome.gir.gobject.NativeEnum;
-import org.gnome.gir.gobject.NativeObject;
-import org.gnome.gir.gobject.RegisteredType;
import org.gnome.gir.repository.ArgInfo;
import org.gnome.gir.repository.BaseInfo;
import org.gnome.gir.repository.BoxedInfo;
@@ -106,10 +111,6 @@
import org.gnome.gir.repository.TypeTag;
import org.gnome.gir.repository.UnionInfo;
import org.gnome.gir.repository.ValueInfo;
-import org.gnome.gir.runtime.GBoxed;
-import org.gnome.gir.runtime.GFlags;
-import org.gnome.gir.runtime.GObject;
-import org.gnome.gir.runtime.GType;
import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.FieldVisitor;
@@ -637,9 +638,9 @@
"(Ljava/lang/Class;[Ljava/lang/Object;Ljava/util/Map;)Ljava/lang/Object;");
mv.visitTypeInsn(CHECKCAST, "com/sun/jna/Pointer");
mv.visitMethodInsn(INVOKESTATIC, compilation.internalName, "initializer",
- "(Lcom/sun/jna/Pointer;)Lorg/gnome/gir/gobject/Handle$Initializer;");
+ "(Lcom/sun/jna/Pointer;)Lgobject/internals/Handle$Initializer;");
mv.visitMethodInsn(INVOKESPECIAL, compilation.internalName, "<init>",
- "(Lorg/gnome/gir/gobject/Handle$Initializer;)V");
+ "(Lgobject/internals/Handle$Initializer;)V");
mv.visitInsn(ARETURN);
Label l4 = new Label();
mv.visitLabel(l4);
@@ -692,10 +693,10 @@
"(Ljava/lang/Class;[Ljava/lang/Object;Ljava/util/Map;)Ljava/lang/Object;");
mv.visitTypeInsn(CHECKCAST, "com/sun/jna/Pointer");
mv.visitMethodInsn(INVOKESTATIC, compilation.internalName, "initializer",
- "(Lcom/sun/jna/Pointer;)Lorg/gnome/gir/gobject/Handle$Initializer;");
+ "(Lcom/sun/jna/Pointer;)Lgobject/internals/Handle$Initializer;");
mv
.visitMethodInsn(INVOKESPECIAL, parentInternalType, "<init>",
- "(Lorg/gnome/gir/gobject/Handle$Initializer;)V");
+ "(Lgobject/internals/Handle$Initializer;)V");
Label l3 = new Label();
mv.visitLabel(l3);
mv.visitInsn(RETURN);
@@ -759,7 +760,7 @@
private void writeHandleInitializer(ClassCompilation compilation, String parentInternalName) {
MethodVisitor mv = compilation.writer.visitMethod(ACC_PROTECTED, "<init>",
- "(Lorg/gnome/gir/gobject/Handle$Initializer;)V", null, null);
+ "(Lgobject/internals/Handle$Initializer;)V", null, null);
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
@@ -767,14 +768,14 @@
mv.visitVarInsn(ALOAD, 1);
mv
.visitMethodInsn(INVOKESPECIAL, parentInternalName, "<init>",
- "(Lorg/gnome/gir/gobject/Handle$Initializer;)V");
+ "(Lgobject/internals/Handle$Initializer;)V");
Label l1 = new Label();
mv.visitLabel(l1);
mv.visitInsn(RETURN);
Label l2 = new Label();
mv.visitLabel(l2);
mv.visitLocalVariable("this", "L" + compilation.internalName + ";", null, l0, l2, 0);
- mv.visitLocalVariable("init", "Lorg/gnome/gir/gobject/Handle$Initializer;", null, l0, l2, 1);
+ mv.visitLocalVariable("init", "Lgobject/internals/Handle$Initializer;", null, l0, l2, 1);
mv.visitMaxs(0, 0);
mv.visitEnd();
}
@@ -1531,7 +1532,7 @@
boolean hasFields = fields.length > 0;
if (isRegistered) {
if (hasFields)
- parentInternalName = "org/gnome/gir/runtime/Boxed" + type;
+ parentInternalName = "gobject/runtime/Boxed" + type;
else
parentInternalName = Type.getInternalName(GBoxed.class);
} else {
@@ -1765,8 +1766,8 @@
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
- mv.visitMethodInsn(INVOKESTATIC, "org/gnome/gir/gobject/GTypeMapper", "getInstance",
- "()Lorg/gnome/gir/gobject/GTypeMapper;");
+ mv.visitMethodInsn(INVOKESTATIC, "gobject/internals/GTypeMapper", "getInstance",
+ "()Lgobject/internals/GTypeMapper;");
mv.visitFieldInsn(PUTSTATIC, compilation.internalName, "TYPE_MAPPER", "Lcom/sun/jna/TypeMapper;");
Label l1 = new Label();
mv.visitLabel(l1);
@@ -1902,7 +1903,7 @@
fv.visitEnd();
fv = internals.writer.visitField(ACC_PUBLIC + ACC_FINAL + ACC_STATIC, "repo",
- "Lorg/gnome/gir/repository/Repository;", null, null);
+ getType(Repository.class).getDescriptor(), null, null);
fv.visitEnd();
fv = internals.writer.visitField(ACC_PUBLIC + ACC_FINAL + ACC_STATIC, "namespace", "Ljava/lang/String;", null,
@@ -1927,9 +1928,9 @@
mv.visitLabel(l1);
mv.visitVarInsn(ALOAD, 0);
mv.visitLdcInsn("type-mapper");
- mv.visitTypeInsn(NEW, "org/gnome/gir/gobject/GTypeMapper");
+ mv.visitTypeInsn(NEW, "gobject/internals/GTypeMapper");
mv.visitInsn(DUP);
- mv.visitMethodInsn(INVOKESPECIAL, "org/gnome/gir/gobject/GTypeMapper", "<init>", "()V");
+ mv.visitMethodInsn(INVOKESPECIAL, "gobject/internals/GTypeMapper", "<init>", "()V");
mv.visitMethodInsn(INVOKEVIRTUAL, internalsInner.internalName, "put",
"(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
mv.visitInsn(POP);
@@ -1975,14 +1976,15 @@
if (shlib == null)
shlib = namespaceShlibMapping.get(globals.namespace);
mv.visitLdcInsn(shlib);
- mv.visitMethodInsn(INVOKESTATIC, "com/sun/jna/NativeLibrary", "getInstance",
- "(Ljava/lang/String;)Lcom/sun/jna/NativeLibrary;");
+ mv.visitMethodInsn(INVOKESTATIC, getType(NativeLibrary.class).getInternalName(), "getInstance",
+ Type.getMethodDescriptor(getType(NativeLibrary.class), new Type[] { getType(String.class)}));
mv.visitFieldInsn(PUTSTATIC, internals.internalName, "library", "Lcom/sun/jna/NativeLibrary;");
l1 = new Label();
mv.visitLabel(l1);
- mv.visitMethodInsn(INVOKESTATIC, "org/gnome/gir/repository/Repository", "getDefault",
- "()Lorg/gnome/gir/repository/Repository;");
- mv.visitFieldInsn(PUTSTATIC, internals.internalName, "repo", "Lorg/gnome/gir/repository/Repository;");
+ mv.visitMethodInsn(INVOKESTATIC, getType(Repository.class).getInternalName(), "getDefault",
+ Type.getMethodDescriptor(getType(Repository.class), new Type[] {}));
+ mv.visitFieldInsn(PUTSTATIC, internals.internalName, "repo",
+ getType(Repository.class).getDescriptor());
l2 = new Label();
mv.visitLabel(l2);
mv.visitTypeInsn(NEW, internalsInner.internalName);
@@ -1990,11 +1992,11 @@
mv.visitMethodInsn(INVOKESPECIAL, internalsInner.internalName, "<init>", "()V");
mv.visitFieldInsn(PUTSTATIC, internals.internalName, "invocationOptions", "Ljava/util/Map;");
- mv.visitMethodInsn(INVOKESTATIC, "org/gnome/gir/repository/Repository", "getDefault",
- "()Lorg/gnome/gir/repository/Repository;");
+ mv.visitMethodInsn(INVOKESTATIC, getType(Repository.class).getInternalName(), "getDefault",
+ Type.getMethodDescriptor(getType(Repository.class), new Type[] {}));
mv.visitLdcInsn(globals.namespace);
mv.visitLdcInsn(globals.nsversion);
- mv.visitMethodInsn(INVOKEVIRTUAL, "org/gnome/gir/repository/Repository", "requireNoFail", Type
+ mv.visitMethodInsn(INVOKEVIRTUAL, getType(Repository.class).getInternalName(), "requireNoFail", Type
.getMethodDescriptor(Type.VOID_TYPE, new Type[] { getType(String.class), getType(String.class) }));
globals.clinit = mv;
Modified: trunk/src/org/gnome/gir/compiler/StubClassCompilation.java
==============================================================================
--- trunk/src/org/gnome/gir/compiler/StubClassCompilation.java (original)
+++ trunk/src/org/gnome/gir/compiler/StubClassCompilation.java Sat Dec 20 01:27:31 2008
@@ -3,10 +3,11 @@
*/
package org.gnome.gir.compiler;
+import gobject.runtime.GType;
+
import java.util.HashSet;
import java.util.Set;
-import org.gnome.gir.runtime.GType;
class StubClassCompilation extends ClassCompilation {
Set<InnerClassCompilation> innerClasses;
Modified: trunk/src/org/gnome/gir/compiler/TypeMap.java
==============================================================================
--- trunk/src/org/gnome/gir/compiler/TypeMap.java (original)
+++ trunk/src/org/gnome/gir/compiler/TypeMap.java Sat Dec 20 01:27:31 2008
@@ -1,5 +1,10 @@
package org.gnome.gir.compiler;
+import gobject.internals.GList;
+import gobject.internals.GSList;
+import gobject.internals.UnmappedPointer;
+import gobject.runtime.GType;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
@@ -8,9 +13,6 @@
import java.util.List;
import java.util.Map;
-import org.gnome.gir.gobject.GList;
-import org.gnome.gir.gobject.GSList;
-import org.gnome.gir.gobject.UnmappedPointer;
import org.gnome.gir.repository.ArgInfo;
import org.gnome.gir.repository.BaseInfo;
import org.gnome.gir.repository.BoxedInfo;
@@ -23,7 +25,6 @@
import org.gnome.gir.repository.TypeInfo;
import org.gnome.gir.repository.TypeTag;
import org.gnome.gir.repository.UnionInfo;
-import org.gnome.gir.runtime.GType;
import org.objectweb.asm.Type;
import org.objectweb.asm.signature.SignatureVisitor;
Modified: trunk/src/org/gnome/gir/repository/BaseInfo.java
==============================================================================
--- trunk/src/org/gnome/gir/repository/BaseInfo.java (original)
+++ trunk/src/org/gnome/gir/repository/BaseInfo.java Sat Dec 20 01:27:31 2008
@@ -1,6 +1,6 @@
package org.gnome.gir.repository;
-import org.gnome.gir.gobject.RefCountedObject;
+import gobject.internals.RefCountedObject;
import com.sun.jna.Pointer;
Modified: trunk/src/org/gnome/gir/repository/GIntrospectionAPI.java
==============================================================================
--- trunk/src/org/gnome/gir/repository/GIntrospectionAPI.java (original)
+++ trunk/src/org/gnome/gir/repository/GIntrospectionAPI.java Sat Dec 20 01:27:31 2008
@@ -25,10 +25,11 @@
*/
package org.gnome.gir.repository;
+import gobject.internals.GTypeMapper;
+import gobject.runtime.GType;
+
import java.util.HashMap;
-import org.gnome.gir.gobject.GTypeMapper;
-import org.gnome.gir.runtime.GType;
import com.sun.jna.Library;
import com.sun.jna.Native;
Modified: trunk/src/org/gnome/gir/repository/Repository.java
==============================================================================
--- trunk/src/org/gnome/gir/repository/Repository.java (original)
+++ trunk/src/org/gnome/gir/repository/Repository.java Sat Dec 20 01:27:31 2008
@@ -1,10 +1,11 @@
package org.gnome.gir.repository;
-import org.gnome.gir.gobject.GErrorException;
-import org.gnome.gir.gobject.GErrorStruct;
-import org.gnome.gir.gobject.GlibRuntime;
-import org.gnome.gir.gobject.NativeObject;
-import org.gnome.gir.runtime.GObject;
+import gobject.internals.GErrorStruct;
+import gobject.internals.GlibRuntime;
+import gobject.internals.NativeObject;
+import gobject.runtime.GErrorException;
+import gobject.runtime.GObject;
+
import com.sun.jna.NativeLong;
import com.sun.jna.ptr.PointerByReference;
Modified: trunk/src/org/gnome/gir/repository/VFuncInfoFlags.java
==============================================================================
--- trunk/src/org/gnome/gir/repository/VFuncInfoFlags.java (original)
+++ trunk/src/org/gnome/gir/repository/VFuncInfoFlags.java Sat Dec 20 01:27:31 2008
@@ -25,7 +25,7 @@
*/
package org.gnome.gir.repository;
-import org.gnome.gir.gobject.NativeEnum;
+import gobject.internals.NativeEnum;
public enum VFuncInfoFlags implements NativeEnum {
MUST_CHAIN_UP,
Modified: trunk/stub-examples/Test.java
==============================================================================
--- trunk/stub-examples/Test.java (original)
+++ trunk/stub-examples/Test.java Sat Dec 20 01:27:31 2008
@@ -1,20 +1,21 @@
+import gobject.internals.GErrorStruct;
+import gobject.internals.GList;
+import gobject.internals.GTypeMapper;
+import gobject.internals.GlibRuntime;
+import gobject.internals.NativeObject;
+import gobject.runtime.GErrorException;
+import gobject.runtime.GObject;
+import gobject.runtime.GType;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.gnome.gir.gobject.GErrorException;
-import org.gnome.gir.gobject.GErrorStruct;
-import org.gnome.gir.gobject.GList;
-import org.gnome.gir.gobject.GTypeMapper;
-import org.gnome.gir.gobject.GlibRuntime;
-import org.gnome.gir.gobject.NativeObject;
import org.gnome.gir.repository.Direction;
import org.gnome.gir.repository.Repository;
import org.gnome.gir.repository.Transfer;
-import org.gnome.gir.runtime.GObject;
-import org.gnome.gir.runtime.GType;
import com.sun.jna.Callback;
import com.sun.jna.Function;
Modified: trunk/stub-examples/TestAbs.java
==============================================================================
--- trunk/stub-examples/TestAbs.java (original)
+++ trunk/stub-examples/TestAbs.java Sat Dec 20 01:27:31 2008
@@ -1,6 +1,6 @@
-import org.gnome.gir.runtime.GObject.GObjectProxy;
+import gobject.runtime.GObject.GObjectProxy;
public interface TestAbs extends GObjectProxy {
Modified: trunk/stub-examples/TestCallback.java
==============================================================================
--- trunk/stub-examples/TestCallback.java (original)
+++ trunk/stub-examples/TestCallback.java Sat Dec 20 01:27:31 2008
@@ -1,6 +1,6 @@
-import org.gnome.gir.gobject.GTypeMapper;
+import gobject.internals.GTypeMapper;
import com.sun.jna.Callback;
import com.sun.jna.TypeMapper;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
