CATTY-524 Convert Util methods to Swift 3/3

Author: dwildr

src/Catty/Helpers/Util/Util.h

@@ -121,14 +121,6 @@ if (__functor) __functor(__VA_ARGS__);  \
 
 + (BOOL)isEqual:(id _Nullable)object toObject:(id _Nullable)objectToCompare;
 
-+ (SpriteObject* _Nullable)objectWithName:(NSString* _Nullable)objectName forScene:(Scene* _Nullable)scene;
-
-+ (Sound* _Nullable)soundWithName:(NSString* _Nullable)objectName forObject:(SpriteObject* _Nullable)object;
-
-+ (Look* _Nullable)lookWithName:(NSString* _Nullable)objectName forObject:(SpriteObject* _Nullable)object;
-
-+ (NSMutableOrderedSet* _Nullable)allMessagesForProject:(Project* _Nonnull)project;
-
 + (BOOL)isNetworkError:(NSError* _Nullable)error;
 
 + (NSDictionary* _Nullable)getBrickInsertionDictionaryFromUserDefaults;

src/Catty/Helpers/Util/Util.m

@@ -475,60 +475,6 @@ + (BOOL)isEqual:(id)object toObject:(id)objectToCompare
     return NO;
 }
 
-+ (SpriteObject*)objectWithName:(NSString*)objectName forScene:(Scene*)scene
-{
-    for(SpriteObject *object in scene.objects) {
-        if([object.name isEqualToString:objectName]) {
-            return object;
-        }
-    }
-    return nil;
-}
-
-+ (Sound*)soundWithName:(NSString*)objectName forObject:(SpriteObject*)object
-{
-    for(Sound *sound in object.soundList) {
-        if([sound.name isEqualToString:objectName]) {
-            return sound;
-        }
-    }
-    return nil;
-}
-
-+ (Look*)lookWithName:(NSString*)objectName forObject:(SpriteObject*)object
-{
-    for(Look *look in object.lookList) {
-        if([look.name isEqualToString:objectName]) {
-            return look;
-        }
-    }
-    return nil;
-}
-
-+ (NSMutableOrderedSet*)allMessagesForProject:(Project*)project
-{
-    NSMutableOrderedSet* messages = [[NSMutableOrderedSet alloc] init];
-    [messages addObjectsFromArray:project.allBroadcastMessages.array];
-    for(SpriteObject *object in project.allObjects) {
-        for(Script *script in object.scriptList) {
-            if([script isKindOfClass:[BroadcastScript class]]) {
-                BroadcastScript *broadcastScript = (BroadcastScript*)script;
-                [messages addObject:broadcastScript.receivedMessage];
-            }
-            for(Brick *brick in script.brickList) {
-                if([brick isKindOfClass:[BroadcastBrick class]]) {
-                    BroadcastBrick *broadcastBrick = (BroadcastBrick*)brick;
-                    [messages addObject:broadcastBrick.broadcastMessage];
-                } else if([brick isKindOfClass:[BroadcastWaitBrick class]]) {
-                    BroadcastWaitBrick *broadcastBrick = (BroadcastWaitBrick*)brick;
-                    [messages addObject:broadcastBrick.broadcastMessage];
-                }
-            }
-        }
-    }
-    return messages;
-}
-
 + (BOOL)isNetworkError:(NSError*)error
 {
     return error && error.code != kCFURLErrorCancelled;

src/Catty/Helpers/Util/Util.swift

@@ -62,6 +62,36 @@ func synchronized(lock: AnyObject, closure: () -> Void) {
             .build().showWithController(Util.topmostViewController())
     }
 
+    @objc(allMessagesForProject:)
+    class func allMessages(for project: Project) -> NSOrderedSet {
+        guard let allBroadcastMessages = project.allBroadcastMessages?.array else {
+            return []
+        }
+        let messages = NSMutableOrderedSet(array: allBroadcastMessages)
+
+        for object in project.allObjects() {
+            for script in object.scriptList {
+                if let broadcastScript = script as? BroadcastScript {
+                    if let receivedMessage = broadcastScript.receivedMessage {
+                        messages.add(receivedMessage)
+                    }
+                }
+                if let script = script as? Script {
+                    for brick in script.brickList {
+                        if let broadcastBrick = brick as? BroadcastBrick {
+                            messages.add(broadcastBrick.broadcastMessage)
+                        } else if let broadcastBrick = brick as? BroadcastWaitBrick {
+                            messages.add(broadcastBrick.broadcastMessage)
+                        }
+                    }
+                }
+            }
+        }
+
+        // Return immutable set, because adding items afterwards would have no effect
+        return NSOrderedSet(orderedSet: messages)
+    }
+
     class func catrobatLanguageVersion() -> String {
         let catrobatLanguageVersion = Bundle.main.infoDictionary?["CatrobatLanguageVersion"] as! String
         return catrobatLanguageVersion
@@ -102,6 +132,30 @@ func synchronized(lock: AnyObject, closure: () -> Void) {
         }
     }
 
+    @objc(lookWithName:forObject:)
+    class func look(with name: String, for object: SpriteObject) -> Look? {
+        guard let lookList = object.lookList else {
+            return nil
+        }
+
+        for look in lookList {
+            if let look = look as? Look, look.name == name {
+                return look
+            }
+        }
+
+        return nil
+    }
+
+    @objc(objectWithName:forScene:)
+    class func object(with name: String, for scene: Scene) -> SpriteObject? {
+        for object in scene.objects() where object.name == name {
+            return object
+        }
+
+        return nil
+    }
+
     class func platformName() -> String? {
         let platformName = Bundle.main.infoDictionary?["CatrobatPlatformName"] as? String
         return platformName
@@ -211,4 +265,19 @@ func synchronized(lock: AnyObject, closure: () -> Void) {
                         hud.removeFromSuperview()
                     })
     }
+
+    @objc(soundWithName:forObject:)
+    class func sound(with name: String, for object: SpriteObject) -> Sound? {
+        guard let soundList = object.soundList else {
+            return nil
+        }
+
+        for sound in soundList {
+            if let sound = sound as? Sound, sound.name == name {
+                return sound
+            }
+        }
+
+        return nil
+    }
 }

src/Catty/Views/Custom/CollectionViewCells/BrickCellData/BrickCellMessageData.m

@@ -47,7 +47,7 @@ - (instancetype)initWithFrame:(CGRect)frame andBrickCell:(BrickCell*)brickCell a
             if ([brickCell.scriptOrBrick conformsToProtocol:@protocol(BrickMessageProtocol)]) {
                 Brick<BrickMessageProtocol> *messageBrick = (Brick<BrickMessageProtocol>*)brickCell.scriptOrBrick;
                 NSString *currentMessage = [messageBrick messageForLineNumber:line andParameterNumber:parameter];
-                NSMutableOrderedSet *messages;
+                NSOrderedSet *messages;
                 if ([brickCell.scriptOrBrick isKindOfClass:[Script class]]) {
                     messages = [Util allMessagesForProject: ((Script*)brickCell.scriptOrBrick).object.scene.project];
                 } else {

src/CattyTests/Utils/UtilTests.swift

@@ -168,7 +168,7 @@ final class UtilTests: XCTestCase {
 
         let messages = Util.allMessages(for: project)
 
-        XCTAssertEqual(messages?.count, 0)
+        XCTAssertEqual(messages.count, 0)
     }
 
     func testAllMessagesForProjectWithValues() {
@@ -194,7 +194,7 @@ final class UtilTests: XCTestCase {
 
         let messages = Util.allMessages(for: project)
 
-        XCTAssertEqual(messages?.count, 4)
+        XCTAssertEqual(messages.count, 4)
     }
 
     func testAllMessagesForProjectWithDuplicatedValues() {
@@ -215,4 +215,36 @@ final class UtilTests: XCTestCase {
             XCTAssertEqual(statusBarFrame.height, Util.statusBarHeight())
         }
     }
+
+    func testLookWithNameForObject() {
+        let look = Look(name: "TestLook", filePath: "/test/path")
+        spriteObject = SpriteObject()
+        project.scene.add(object: spriteObject!)
+        spriteObject.lookList.add(look)
+
+        let utilLook = Util.look(with: "TestLook", for: spriteObject)
+
+        XCTAssertEqual(utilLook, look)
+    }
+
+    func testObjectWithNameForScene() {
+        spriteObject = SpriteObject()
+        spriteObject.name = "TestSpriteObject"
+        project.scene.add(object: spriteObject!)
+
+        let utilSpriteObject = Util.object(with: "TestSpriteObject", for: project.scene)
+
+        XCTAssertEqual(utilSpriteObject, spriteObject)
+    }
+
+    func testSoundWithNameForObject() {
+        let sound = Sound(name: "TestSound", fileName: "/test/path")
+        spriteObject = SpriteObject()
+        project.scene.add(object: spriteObject!)
+        spriteObject.soundList.add(sound)
+
+        let utilSound = Util.sound(with: "TestSound", for: spriteObject)
+
+        XCTAssertEqual(utilSound, sound)
+    }
 }