Skip to content

Fixed Version and Export As Menu Button StoryBoard Issue, Modified th… #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed Version and Export As Menu Button StoryBoard Issue, Modified th… #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RealmModelGenerator/AttributeDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions RealmModelGenerator/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions RealmModelGenerator/SwiftContentGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down