Merge pull request #48 from insanoid/release/v1.1.0

Release/v1.1.0

README.md

@@ -5,6 +5,10 @@
 [![Build
 Status](https://travis-ci.org/insanoid/SwiftyJSONAccelerator.svg?branch=master)](https://travis-ci.org/insanoid/SwiftyJSONAccelerator) [![codecov](https://codecov.io/gh/insanoid/SwiftyJSONAccelerator/branch/master/graph/badge.svg)](https://codecov.io/gh/insanoid/SwiftyJSONAccelerator)
 
+**Version v1.1.0 Released!**
+
+- Now generates the correct option `struct` and `class` based on what was selected.
+
 **Version v1.0.0 Released!**
 
 - Now generates **Swift 3** and the software itself is upgraded to Swift 3.
@@ -13,8 +17,9 @@ Status](https://travis-ci.org/insanoid/SwiftyJSONAccelerator.svg?branch=master)]
 - Project upgraded with SwiftLint, Travis, CocoaPods etc.
 
 ## Download/Installing
+
 - Download the repo, install pods and run the project!
-- [Download the .app(v1.0.0)](https://github.com/insanoid/SwiftyJSONAccelerator/releases/download/v1.0.0/SwiftyJSONAccelerator.zip)
+- [Download the .app(v1.1.0)](https://github.com/insanoid/SwiftyJSONAccelerator/releases/download/v1.1.0/SwiftyJSONAccelerator.zip).0/SwiftyJSONAccelerator.zip)
 
 A swift model generator like the Objective-C [JSONAccelerator](http://nerdery.com/json-accelerator). Formats and generates models for the given JSON and also breaks them into files making it easy to manage and share between several models.
 

SwiftyJSONAccelerator/Support/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

SwiftyJSONAccelerator/UI/SJEditorViewController.swift

@@ -123,7 +123,7 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
     if object != nil {
 
         let nsCodingState = self.enableNSCodingSupportCheckbox.state == 1 && (modelTypeSelectorSegment.selectedSegment == 1)
-        let constructType = self.modelTypeSelectorSegment.selectedSegment == 0 ? ConstructType.ClassType : ConstructType.StructType
+        let constructType = self.modelTypeSelectorSegment.selectedSegment == 0 ? ConstructType.StructType : ConstructType.ClassType
         let libraryType = self.librarySelector.indexOfSelectedItem == 0 ? JSONMappingLibrary.SwiftyJSON : JSONMappingLibrary.ObjectMapper
         let configuration = ModelGenerationConfiguration.init(
             filePath: filePath!.appending("/"),
@@ -160,7 +160,7 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
         let notification = NSUserNotification()
         notification.title = "SwiftyJSONAccelerator"
         if completionState && fileCount > 0 {
-            notification.subtitle = "Completed - \(fileCount) Generated."
+            notification.subtitle = "Completed - \(fileCount) Files Generated"
         } else {
             notification.subtitle = "No files were generated, cannot model arrays inside arrays."
         }