From 6a9098a4471f197e110c9f8e817849b16fda7efa Mon Sep 17 00:00:00 2001
From: Shiva Kumar Ponnuraj <shivakponnuraj@in.ibm.com>
Date: Tue, 10 Jul 2018 17:29:44 +0530
Subject: [PATCH] Fixed Version and Export As Menu Button StoryBoard Issue,
 Modified the Swift Content Generator to include "objcMembers" and changed
 deprecated "flatMap" to "CompactMap"

---
 RealmModelGenerator/AttributeDetailView.swift   |  2 +-
 RealmModelGenerator/Base.lproj/Main.storyboard  | 12 ++++++------
 RealmModelGenerator/SwiftContentGenerator.swift |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/RealmModelGenerator/AttributeDetailView.swift b/RealmModelGenerator/AttributeDetailView.swift
index 4ed4821..27596c9 100644
--- a/RealmModelGenerator/AttributeDetailView.swift
+++ b/RealmModelGenerator/AttributeDetailView.swift
@@ -36,7 +36,7 @@ class AttributeDetailView: NibDesignableView, NSTextFieldDelegate {
     override func nibDidLoad() {
         super.nibDidLoad()
         self.attributeTypePopUpButton.removeAllItems()
-        self.attributeTypePopUpButton.addItems(withTitles: AttributeType.values.flatMap({$0.rawValue}))
+        self.attributeTypePopUpButton.addItems(withTitles: AttributeType.values.compactMap({$0.rawValue}))
     }
     
     @IBInspectable var name:String {
diff --git a/RealmModelGenerator/Base.lproj/Main.storyboard b/RealmModelGenerator/Base.lproj/Main.storyboard
index 98a50ea..c94333b 100644
--- a/RealmModelGenerator/Base.lproj/Main.storyboard
+++ b/RealmModelGenerator/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -91,19 +91,19 @@
                                                     <menuItem title="Java" id="gpd-D5-Q27" userLabel="Java">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
                                                         <connections>
-                                                            <action selector="exportToJava:" target="Ady-hI-5gd" id="AZc-YA-7YH"/>
+                                                            <action selector="exportToJavaWithSender:" target="Ady-hI-5gd" id="pWV-yZ-d49"/>
                                                         </connections>
                                                     </menuItem>
                                                     <menuItem title="Object C" id="633-EG-9O9" userLabel="Object C">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
                                                         <connections>
-                                                            <action selector="exportToObjectC:" target="Ady-hI-5gd" id="haX-oc-5fn"/>
+                                                            <action selector="exportToObjectCWithSender:" target="Ady-hI-5gd" id="2Io-3t-ehN"/>
                                                         </connections>
                                                     </menuItem>
                                                     <menuItem title="Swift" id="PFl-Zm-5MG" userLabel="Swift">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
                                                         <connections>
-                                                            <action selector="exportToSwift:" target="Ady-hI-5gd" id="Y3w-zj-iMV"/>
+                                                            <action selector="exportToSwiftWithSender:" target="Ady-hI-5gd" id="GO0-EB-Ied"/>
                                                         </connections>
                                                     </menuItem>
                                                 </items>
@@ -112,7 +112,7 @@
                                         <menuItem title="Version" id="YFC-YP-hiY">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
-                                                <action selector="versonMenuOnClick:" target="Ady-hI-5gd" id="cD9-BZ-A3D"/>
+                                                <action selector="versionMenuOnClickWithSender:" target="Ady-hI-5gd" id="iHf-HQ-2cK"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem title="Close" keyEquivalent="w" id="DVo-aG-piG">
diff --git a/RealmModelGenerator/SwiftContentGenerator.swift b/RealmModelGenerator/SwiftContentGenerator.swift
index 8ce6ce7..34e5d8a 100644
--- a/RealmModelGenerator/SwiftContentGenerator.swift
+++ b/RealmModelGenerator/SwiftContentGenerator.swift
@@ -34,8 +34,8 @@ class SwiftContentGenerator: BaseContentGenerator {
         content += getHeaderComments(entity: entity, fileExtension: "swift")
         
         content += "import RealmSwift\n\n"
-        content += "class " + entity.name + ": \(entity.superEntity?.name ?? "Object") {\n"
-        content += "\tstatic let TAG = NSStringFromClass(" + entity.name + ");\n"
+        content += "@objcMembers " + "class " + entity.name + ": \(entity.superEntity?.name ?? "Object") {\n"
+        content += "\tstatic let TAG = NSStringFromClass(" + entity.name + ".self" + ");\n"
     }
     
     // MARK: - Append RealmKeys