Static annotation for factory methods

src/main/java/org/bridj/MethodCallInfo.java

@@ -73,6 +73,7 @@
 import org.bridj.ann.DisableDirect;
 import org.bridj.ann.Ptr;
 import org.bridj.ann.SetsLastError;
+import org.bridj.ann.Static;
 import org.bridj.ann.Virtual;
 import org.bridj.dyncall.DyncallLibrary.DCstruct;
 import org.bridj.util.Utils;
@@ -143,7 +144,8 @@ public MethodCallInfo(Method method, Method definition) {
         symbolName = methodName;
 
         int modifiers = method.getModifiers();
-        isStatic = Modifier.isStatic(modifiers);
+        isStatic = method.getAnnotation(Static.class) != null 
+            || Modifier.isStatic(modifiers);
         isVarArgs = method.isVarArgs();
         boolean isNative = Modifier.isNative(modifiers);
         boolean isVirtual = isAnnotationPresent(Virtual.class, definition);

src/main/java/org/bridj/StructFieldDeclaration.java

@@ -43,6 +43,7 @@
 import org.bridj.ann.Array;
 import org.bridj.ann.Bits;
 import org.bridj.ann.Field;
+import org.bridj.ann.Static;
 import org.bridj.ann.Union;
 
 class StructFieldDeclaration {
@@ -69,7 +70,8 @@ protected static boolean acceptFieldGetter(Member member, boolean getter) {
 
         int modifiers = member.getModifiers();
 
-        return !Modifier.isStatic(modifiers);
+        return !(((AnnotatedElement) member).getAnnotation(Static.class) != null
+            || Modifier.isStatic(modifiers));
     }
 
     /**

src/main/java/org/bridj/ann/Static.java

@@ -0,0 +1,15 @@
+package org.bridj.ann;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Applies to native methods to indicate that they should be treated as
+ * static.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+public @interface Static {
+}

src/main/java/org/bridj/objc/ObjectiveCRuntime.java

@@ -58,7 +58,9 @@
 import org.bridj.Pointer;
 import org.bridj.Pointer.Releaser;
 import org.bridj.ann.Library;
+import org.bridj.ann.Name;
 import org.bridj.ann.Ptr;
+import org.bridj.ann.Static;
 import org.bridj.demangling.Demangler;
 import org.bridj.util.Utils;
 
@@ -283,7 +285,7 @@ protected void registerNativeMethod(
 
         try {
             MethodCallInfo mci = methodCallInfoBuilder.apply(method);
-            boolean isStatic = Modifier.isStatic(method.getModifiers());
+            boolean isStatic = method.getAnnotation(Static.class) != null || Modifier.isStatic(method.getModifiers());
 
             if (isStatic) {
                 Pointer<ObjCClass> pObjcClass = getObjCClass((Class) type).as(ObjCClass.class);
@@ -416,6 +418,7 @@ private Pointer<? extends ObjCObject> getObjCClass(Class<? extends NativeObject>
             return getObjCClass("NSObject", false);
         }
 
-        return getObjCClass(cls.getSimpleName(), false);
+        Name name = cls.getAnnotation(Name.class);
+        return getObjCClass(name == null ? cls.getSimpleName() : name.value(), false);
     }
 }