Fixed issue with Library selector dropdown

insanoid · insanoid · commit 2740179135a1 · 2016-12-05T00:02:15.000+01:00
diff --git a/SwiftyJSONAccelerator/Storyboard/Base.lproj/Main.storyboard b/SwiftyJSONAccelerator/Storyboard/Base.lproj/Main.storyboard
@@ -753,12 +753,13 @@
                             </box>
                             <popUpButton verticalHuggingPriority="750" springLoaded="YES" translatesAutoresizingMaskIntoConstraints="NO" id="r5l-Lv-rfg">
                                 <rect key="frame" x="10" y="35" width="348" height="26"/>
-                                <popUpButtonCell key="cell" type="push" title="SwiftyJSON" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" pullsDown="YES" arrowPosition="arrowAtCenter" autoenablesItems="NO" altersStateOfSelectedItem="NO" id="l4o-yX-zdG">
+                                <popUpButtonCell key="cell" type="push" title="SwiftyJSON (Default)" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" pullsDown="YES" arrowPosition="arrowAtCenter" autoenablesItems="NO" id="l4o-yX-zdG">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="menu"/>
                                     <menu key="menu" autoenablesItems="NO" id="QJi-PT-im1">
                                         <items>
-                                            <menuItem title="SwiftyJSON" state="on" id="0QP-u9-O6V"/>
+                                            <menuItem title="SwiftyJSON (Default)" id="0QP-u9-O6V"/>
+                                            <menuItem title="SwiftyJSON" id="mkQ-rW-3gF"/>
                                             <menuItem title="ObjectMapper" id="FPc-o9-hXy"/>
                                             <menuItem title="Marshal" id="7Q8-u2-Yfm"/>
                                         </items>
diff --git a/SwiftyJSONAccelerator/UI/SJEditorViewController.swift b/SwiftyJSONAccelerator/UI/SJEditorViewController.swift
@@ -155,9 +155,9 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
   }
 
     func libraryForIndex(_ index: Int) -> JSONMappingLibrary {
-        if index == 1 {
+        if index == 2 {
             return JSONMappingLibrary.ObjectMapper
-        } else if index == 2 {
+        } else if index == 3 {
             return JSONMappingLibrary.Marshal
         }
         return JSONMappingLibrary.SwiftyJSON

Original file line number	Diff line number	Diff line change
`@@ -155,9 +155,9 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`func libraryForIndex(_ index: Int) -> JSONMappingLibrary {`
`158`		`- if index == 1 {`
	`158`	`+ if index == 2 {`
`159`	`159`	`return JSONMappingLibrary.ObjectMapper`
`160`		`- } else if index == 2 {`
	`160`	`+ } else if index == 3 {`
`161`	`161`	`return JSONMappingLibrary.Marshal`
`162`	`162`	`}`
`163`	`163`	`return JSONMappingLibrary.SwiftyJSON`