Merge pull request #56 from OdNairy/class_in_object_source

Support Class object in ObjectSource
Legoless · Sep 27, 2015 · 47def92 · 47def92
2 parents f891080 + 7eaa22b
commit 47def92
Show file tree

Hide file tree

Showing 4 changed files with 294 additions and 270 deletions.
diff --git a/Alpha/Model/Object/ALPHAObjectModel.h b/Alpha/Model/Object/ALPHAObjectModel.h
@@ -28,6 +28,11 @@
  */
 @property (nonatomic, copy) NSString *objectClass;
 
+/*!
+ *  Check is the object is the Class structure
+ */
+@property (nonatomic, readonly) BOOL objectIsClass;
+
 /*!
  *  Contains the class name of Apple superclass - usually NSObject, but can be array, set,
  *  or UIKit. Nil if class or metaclass. This is to ensure we can handle view controller

diff --git a/Alpha/Model/Object/ALPHAObjectModel.m b/Alpha/Model/Object/ALPHAObjectModel.m
@@ -7,12 +7,15 @@
 //
 
 #import "ALPHAObjectModel.h"
+#import "ALPHARuntimeUtility.h"
 
 @implementation ALPHAObjectModel
 
 - (void)setObjectPointer:(NSString *)objectPointer
 {
     _objectPointer = objectPointer;
+    id<NSObject> object = [ALPHARuntimeUtility objectForPointerString:objectPointer className:nil];
+    self->_objectIsClass = [object class] == object;
 
     [self updateReferencesWithObjectPointer:objectPointer objectClass:nil];
 }

diff --git a/Alpha/Plugins/Global/Sources/ALPHAClassSource.m b/Alpha/Plugins/Global/Sources/ALPHAClassSource.m
@@ -13,6 +13,7 @@
 #import "ALPHARuntimeUtility.h"
 
 #import "ALPHAClassSource.h"
+#import "ALPHAObjectSource.h"
 
 NSString* const ALPHAClassDataIdentifier = @"com.unifiedsense.alpha.data.class";
 NSString* const ALPHAClassBinaryParameterKey = @"kALPHAClassBinaryParameterKey";
@@ -56,7 +57,9 @@ - (ALPHAModel *)modelForRequest:(ALPHARequest *)request
     {
         ALPHAScreenItem* item = [[ALPHAScreenItem alloc] init];
         item.title = class;
-        item.object = NSClassFromString(class);
+
+        ALPHARequest* request = [ALPHARequest requestForObject:NSClassFromString(class)];
+        item.object = request;
 
         [items addObject:item];
     }