GRIFFON-487 wrong MVc members set in Application.groovy if a redundan…

…t suffix was purged
griffon · Mar 31, 2012 · d9800f7 · d9800f7
1 parent 79e3b41
commit d9800f7
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/subprojects/griffon-scripts/src/main/groovy/CreateMvc.groovy b/subprojects/griffon-scripts/src/main/groovy/CreateMvc.groovy
@@ -59,31 +59,37 @@ Type in griffon create-addon then execute this command again."""
         controllerTemplate = argsMap.group + controllerTemplate
     }
 
+    String modelClassName = ''
     if (!argsMap['skip-model'] && !argsMap['with-model']) {
         createArtifact(
                 name:     mvcFullQualifiedClassName,
                 suffix:   'Model',
                 type:     'Model',
                 template: modelTemplate,
                 path:     'griffon-app/models')
+        modelClassName = fullyQualifiedClassName
     }
 
+    String viewClassName = ''
     if (!argsMap['skip-view'] && !argsMap['with-view']) {
         createArtifact(
                 name:     mvcFullQualifiedClassName,
                 suffix:   'View',
                 type:     'View',
                 template: viewTemplate,
                 path:     'griffon-app/views')
+        viewClassName = fullyQualifiedClassName
     }
 
+    String controllerClassName = ''
     if (!argsMap['skip-controller'] && !argsMap['with-controller']) {
         createArtifact(
                 name:     mvcFullQualifiedClassName,
                 suffix:   'Controller',
                 type:     'Controller',
                 template: controllerTemplate,
                 path:     'griffon-app/controllers')
+        controllerClassName = fullyQualifiedClassName
 
         doCreateIntegrationTest(
                 name:   mvcFullQualifiedClassName,
@@ -110,9 +116,9 @@ Type in griffon create-addon then execute this command again."""
             }
 
             List parts = []
-            if (!argsMap['skip-model'])      parts << """            {"model",      "${(argsMap['with-model'] ?: mvcFullQualifiedClassName + 'Model')}"}"""
-            if (!argsMap['skip-view'])       parts << """            {"view",       "${(argsMap['with-view'] ?: mvcFullQualifiedClassName + 'View')}"}"""
-            if (!argsMap['skip-controller']) parts << """            {"controller", "${(argsMap['with-controller'] ?: mvcFullQualifiedClassName + 'Controller')}"}"""
+            if (!argsMap['skip-model'])      parts << """            {"model",      "${(argsMap['with-model'] ?: modelClassName)}"}"""
+            if (!argsMap['skip-view'])       parts << """            {"view",       "${(argsMap['with-view'] ?: viewClassName)}"}"""
+            if (!argsMap['skip-controller']) parts << """            {"controller", "${(argsMap['with-controller'] ?: controllerClassName)}"}"""
 
             addonFile.withWriter {
                 it.write addonText.replaceAll(/\s*Map<String, Map<String, String>> groups = new LinkedHashMap<String, Map<String, String>>\(\);/, """
@@ -133,9 +139,9 @@ Type in griffon create-addon then execute this command again."""
 """)
             }
             List parts = []
-            if (!argsMap['skip-model'])      parts << "            model     : '${(argsMap['with-model'] ?: mvcFullQualifiedClassName + 'Model')}'"
-            if (!argsMap['skip-view'])       parts << "            view      : '${(argsMap['with-view'] ?: mvcFullQualifiedClassName + 'View')}'"
-            if (!argsMap['skip-controller']) parts << "            controller: '${(argsMap['with-controller'] ?: mvcFullQualifiedClassName + 'Controller')}'"
+            if (!argsMap['skip-model'])      parts << "            model     : '${(argsMap['with-model'] ?: modelClassName)}'"
+            if (!argsMap['skip-view'])       parts << "            view      : '${(argsMap['with-view'] ?: viewClassName)}'"
+            if (!argsMap['skip-controller']) parts << "            controller: '${(argsMap['with-controller'] ?: controllerClassName)}'"
 
             addonFile.withWriter {
                 it.write addonText.replaceAll(/\s*def\s*mvcGroups\s*=\s*\[/, """
@@ -159,9 +165,9 @@ mvcGroups {
         }
 
         List parts = []
-        if (!argsMap['skip-model'])      parts << "        model      = '${(argsMap['with-model'] ?: mvcFullQualifiedClassName + 'Model')}'"
-        if (!argsMap['skip-view'])       parts << "        view       = '${(argsMap['with-view'] ?: mvcFullQualifiedClassName + 'View')}'"
-        if (!argsMap['skip-controller']) parts << "        controller = '${(argsMap['with-controller'] ?: mvcFullQualifiedClassName + 'Controller')}'"
+        if (!argsMap['skip-model'])      parts << "        model      = '${(argsMap['with-model'] ?: modelClassName)}'"
+        if (!argsMap['skip-view'])       parts << "        view       = '${(argsMap['with-view'] ?: viewClassName)}'"
+        if (!argsMap['skip-controller']) parts << "        controller = '${(argsMap['with-controller'] ?: controllerClassName)}'"
 
         applicationConfigFile.withWriter {
             it.write configText.replaceAll(/\s*mvcGroups\s*\{/, """