@@ -45,7 +45,9 @@ class BasicObjcGenerator extends BasicGenerator {
45
45
" NSString" )
46
46
47
47
override def typeMapping = Map (
48
- " Date" -> " NIKDate" ,
48
+ " enum" -> " NSString" ,
49
+ " date" -> " SWGDate" ,
50
+ " Date" -> " SWGDate" ,
49
51
" boolean" -> " NSNumber" ,
50
52
" string" -> " NSString" ,
51
53
" integer" -> " NSNumber" ,
@@ -59,10 +61,9 @@ class BasicObjcGenerator extends BasicGenerator {
59
61
" object" -> " NSObject" )
60
62
61
63
override def importMapping = Map (
62
- " RVBDate" -> " NIKDate" ,
63
- " Date" -> " NIKDate" )
64
+ " Date" -> " SWGDate" )
64
65
65
- override def toModelFilename (name : String ) = " RVB " + name
66
+ override def toModelFilename (name : String ) = " SWG " + name
66
67
67
68
// naming for the models
68
69
override def toModelName (name : String ) = {
@@ -74,16 +75,24 @@ class BasicObjcGenerator extends BasicGenerator {
74
75
).toSet.contains(name) match {
75
76
case true => name(0 ).toUpper + name.substring(1 )
76
77
case _ => {
77
- " RVB " + name(0 ).toUpper + name.substring(1 )
78
+ " SWG " + name(0 ).toUpper + name.substring(1 )
78
79
}
79
80
}
80
81
}
81
82
83
+ // objective c doesn't like variables starting with "new"
84
+ override def toVarName (name : String ): String = {
85
+ if (name.startsWith(" new" ) || reservedWords.contains(name)) {
86
+ escapeReservedWord(name)
87
+ }
88
+ else name
89
+ }
90
+
82
91
// naming for the apis
83
- override def toApiName (name : String ) = " RVB " + name(0 ).toUpper + name.substring(1 ) + " Api"
92
+ override def toApiName (name : String ) = " SWG " + name(0 ).toUpper + name.substring(1 ) + " Api"
84
93
85
94
// location of templates
86
- override def templateDir = " src/main/resources/ objc"
95
+ override def templateDir = " objc"
87
96
88
97
// template used for models
89
98
modelTemplateFiles += " model-header.mustache" -> " .h"
@@ -110,7 +119,6 @@ class BasicObjcGenerator extends BasicGenerator {
110
119
responseClass match {
111
120
case " void" => None
112
121
case e : String => {
113
- println(responseClass)
114
122
if (responseClass.toLowerCase.startsWith(" array" ) || responseClass.toLowerCase.startsWith(" list" ))
115
123
Some (" NSArray" )
116
124
else
@@ -162,7 +170,6 @@ class BasicObjcGenerator extends BasicGenerator {
162
170
}
163
171
164
172
override def toDeclaration (obj : ModelProperty ) = {
165
- println(" getting declaration for " + obj)
166
173
var declaredType = toDeclaredType(obj.`type`)
167
174
declaredType.toLowerCase match {
168
175
case " list" => {
0 commit comments