[nbgriffonsuite~subversion:4] adding source packages node to the logical view of Griffon projects

[GWiel@kenai.com]

Project:    nbgriffonsuite
Repository: subversion
Revision:   4
Author:     GWiel
Date:       2009-07-28 18:46:12 UTC
Link:       

Log Message:
------------
adding source packages node to the logical view of Griffon projects


Revisions:
----------
4


Modified Paths:
---------------
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/GriffonSources.java
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/SourceCategory.java
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/classpath/SourceRoots.java
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/templates/GrailsArtifacts.java
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/Bundle.properties
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/ui/TemplatesImpl.java


Diffs:
------
Index: 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/classpath/SourceRoots.java
===================================================================
--- 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/classpath/SourceRoots.java
        (revision 3)
+++ 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/classpath/SourceRoots.java
        (revision 4)
@@ -98,8 +98,7 @@
         addRoot(projectRoot, SourceCategory.GRAILSAPP_TAGLIB, result);
         addRoot(projectRoot, SourceCategory.GRAILSAPP_UTILS, result);
         addRoot(projectRoot, SourceCategory.SCRIPTS, result);
-        addRoot(projectRoot, SourceCategory.SRC_GROOVY, result);
-        addRoot(projectRoot, SourceCategory.SRC_JAVA, result);
+        addRoot(projectRoot, SourceCategory.SRC, result);
         addRoot(projectRoot, SourceCategory.TEST_INTEGRATION, result);
         addRoot(projectRoot, SourceCategory.TEST_UNIT, result);
 // this may lead to OOME when plugin dir is in project root
Index: 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/templates/GrailsArtifacts.java
===================================================================
--- 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/templates/GrailsArtifacts.java
    (revision 3)
+++ 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/templates/GrailsArtifacts.java
    (revision 4)
@@ -77,10 +77,8 @@
             return SourceCategory.SCRIPTS;
         } else if 
(SourceCategory.GRAILSAPP_SERVICES.getRelativePath().equals(dirName)) {
             return SourceCategory.GRAILSAPP_SERVICES;
-        } else if 
(SourceCategory.SRC_GROOVY.getRelativePath().equals(dirName)) {
-            return SourceCategory.SRC_GROOVY;
-        } else if 
(SourceCategory.SRC_JAVA.getRelativePath().equals(dirName)) {
-            return SourceCategory.SRC_JAVA;
+        } else if (SourceCategory.SRC.getRelativePath().equals(dirName)) {
+            return SourceCategory.SRC;
         } else if 
(SourceCategory.GRAILSAPP_TAGLIB.getRelativePath().equals(dirName)) {
             return SourceCategory.GRAILSAPP_TAGLIB;
         } else if 
(SourceCategory.TEST_UNIT.getRelativePath().equals(dirName)) {
@@ -106,9 +104,10 @@
 //        if (TemplatesImpl.GANT_SCRIPT.equals(templatePath)) {
 //            return SourceCategory.SCRIPTS;
 //        } else
-        if (TemplatesImpl.GROOVY_CLASS.equals(templatePath)) {
-            return SourceCategory.SRC_GROOVY;
-        } else if (TemplatesImpl.GROOVY_SCRIPT.equals(templatePath)) {
+//        if (TemplatesImpl.SRC.equals(templatePath)) {
+//            return SourceCategory.SRC;
+//        } else
+            if (TemplatesImpl.GROOVY_SCRIPT.equals(templatePath)) {
             return SourceCategory.SCRIPTS;
         } else if (TemplatesImpl.MVC_GROUP.equals(templatePath)) {
             return SourceCategory.GRAILSAPP_MVCGROUP;
Index: 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/Bundle.properties
===================================================================
--- 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/Bundle.properties
 (revision 3)
+++ 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/Bundle.properties
 (revision 4)
@@ -44,6 +44,7 @@
 # Logical view
 LBL_griffon-app_lifecycle=Lifecycle
 LBL_griffon-app_conf=Configuration
+LBL_griffon-app_src=Source Packages
 LBL_griffon-app_controllers=Controllers
 LBL_griffon-app_domain=Models
 LBL_griffon-app_i18n=Message Bundles
Index: 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/ui/TemplatesImpl.java
===================================================================
--- 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/ui/TemplatesImpl.java
     (revision 3)
+++ 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/ui/TemplatesImpl.java
     (revision 4)
@@ -104,22 +104,22 @@
                 case GRAILSAPP_SERVICES:
                     return new String[] { SERVICE, GROOVY_CLASS };
                 case GRAILSAPP_UTILS:
-                case SRC_GROOVY:
+                case SRC:
                     return new String[] { GROOVY_CLASS, GROOVY_SCRIPT };
                 case GRAILSAPP_VIEWS:
 //                case WEBAPP:
 //                    return new String[] { GSP, FOLDER };
                 case GRAILSAPP_I18N:
                     return new String[] { PROPERTIES };
-                case SRC_JAVA:
-                    return new String[] {
-                        "Templates/Classes/Class.java",
-                        "Templates/Classes/Interface.java",
-                        "Templates/Classes/Enum.java",
-                        "Templates/Classes/AnnotationType.java",
-                        "Templates/Classes/Exception.java",
-                        "Templates/Classes/Package.java",
-                    };
+//                case SRC_JAVA:
+//                    return new String[] {
+//                        "Templates/Classes/Class.java",
+//                        "Templates/Classes/Interface.java",
+//                        "Templates/Classes/Enum.java",
+//                        "Templates/Classes/AnnotationType.java",
+//                        "Templates/Classes/Exception.java",
+//                        "Templates/Classes/Package.java",
+//                    };
             }
         }
         return new String[] {};
Index: 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/SourceCategory.java
===================================================================
--- 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/SourceCategory.java
       (revision 3)
+++ 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/SourceCategory.java
       (revision 4)
@@ -49,8 +49,7 @@
     TEST_INTEGRATION("test/integration", "create-integration-test", 
"Tests.groovy"),
     TEST_UNIT("test/unit", "create-unit-test", "Tests.groovy"),
     SCRIPTS("scripts", "create-script", null),
-    SRC_JAVA("src/java", null, null),
-    SRC_GROOVY("src/groovy", null, null),
+    SRC("src", null, null),
     //WEBAPP("web-app", null, null),
     LIB("lib", null, null);
 
Index: 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/GriffonSources.java
===================================================================
--- 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/GriffonSources.java
       (revision 3)
+++ 
GriffonSuite/groovy.griffonproject/src/org/netbeans/modules/groovy/griffonproject/GriffonSources.java
       (revision 4)
@@ -128,6 +128,7 @@
 //        } else if (JavaProjectConstants.SOURCES_TYPE_JAVA.equals(type)) {
 //            addGroup(projectDir.getFileObject("src/java"), 
NbBundle.getMessage(GriffonSources.class, "LBL_SrcJava"), result);
         } else if (GroovySources.SOURCES_TYPE_GROOVY.equals(type)) {
+            addGroup(SourceCategory.SRC, "LBL_griffon-app_src", result);
             addGroup(SourceCategory.GRAILSAPP_CONF, "LBL_griffon-app_conf", 
result);
             addGroup(SourceCategory.GRAILSAPP_LIFECYCLE, 
"LBL_griffon-app_lifecycle", result);
             addGroup(SourceCategory.GRAILSAPP_DOMAIN, 
"LBL_griffon-app_domain", result);