svn commit: r358366 - in /beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler: CompilerUtils.java MergedControllerAnnotation.java genmodel/DelegatingActionModel.java genmodel/DelegatingExceptionModel.java

[ri...@apache.org]

Author: rich
Date: Wed Dec 21 12:32:25 2005
New Revision: 358366

URL: http://svn.apache.org/viewcvs?rev=358366&view=rev
Log:
Added a method for inferring a Struts module path from a controller class.

BB: bvt in netui (linux)


Modified:
    beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java
    beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java
    beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingActionModel.java
    beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingExceptionModel.java

Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java?rev=358366&r1=358365&r2=358366&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java Wed Dec 21 12:32:25 2005
@@ -992,6 +992,14 @@
         String className = removeFileExtension( webappRelativePath.substring( 1 ) );
         return env.getTypeDeclaration( className.replace( '/', '.' ) );
     }
+
+    /**
+     * Infers the Struts module path from the given controller class.
+     */
+    public static String inferModulePathFromType(TypeDeclaration type) {
+        PackageDeclaration pkg = type.getPackage();
+        return pkg != null ? '/' + pkg.getQualifiedName().replace('.', '/') : "/";
+    }
     
     public static TypeDeclaration getDeclaration( DeclaredType type )
     {

Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java?rev=358366&r1=358365&r2=358366&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java Wed Dec 21 12:32:25 2005
@@ -27,6 +27,9 @@
 import java.util.List;
 import java.util.Iterator;
 
+/**
+ * 
+ */
 public class MergedControllerAnnotation
         implements JpfLanguageConstants
 {

Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingActionModel.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingActionModel.java?rev=358366&r1=358365&r2=358366&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingActionModel.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingActionModel.java Wed Dec 21 12:32:25 2005
@@ -22,6 +22,7 @@
 import org.apache.beehive.netui.compiler.model.XmlModelWriter;
 import org.apache.beehive.netui.compiler.typesystem.declaration.TypeDeclaration;
 import org.apache.beehive.netui.compiler.typesystem.declaration.PackageDeclaration;
+import org.apache.beehive.netui.compiler.CompilerUtils;
 import org.w3c.dom.Element;
 
 /**
@@ -36,8 +37,7 @@
         setActionName(actionName);
         setClassName(ACTION_MAPPING_CLASSNAME);
         setParameter(parent.getFlowControllerClass().getQualifiedName());
-        PackageDeclaration pkg = containingType.getPackage();
-        String modulePath = pkg != null ? '/' + pkg.getQualifiedName().replace('.', '/') : "/";
+        String modulePath = CompilerUtils.inferModulePathFromType(containingType);
         addSetProperty("delegateModulePath", modulePath);
 
         if (parent.getFlowControllerInfo().getMergedControllerAnnotation().isInheritLocalPaths()) {

Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingExceptionModel.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingExceptionModel.java?rev=358366&r1=358365&r2=358366&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingExceptionModel.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingExceptionModel.java Wed Dec 21 12:32:25 2005
@@ -38,8 +38,7 @@
         super(parentApp);
         setType(CompilerUtils.getLoadableName(CompilerUtils.getDeclaredType(ann, TYPE_ATTR, true)));
         setClassName(EXCEPTION_CONFIG_CLASSNAME);
-        PackageDeclaration pkg = containingType.getPackage();
-        String modulePath = pkg != null ? '/' + pkg.getQualifiedName().replace('.', '/') : "/";
+        String modulePath = CompilerUtils.inferModulePathFromType(containingType);
         addSetProperty("delegateModulePath", modulePath);
         addSetProperty("delegateActionPath", container.getActionPath());