svn commit: rev 36150 - in incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime: assembly generator/apt

[kentam]

Author: kentam
Date: Mon Aug  9 19:33:38 2004
New Revision: 36150

Modified:
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/AssembleTask.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientAnnotationProcessor.java
Log:
Surface AssemblyTask attributes as "protected"
Fix check in ControlClientAnnotationProcessor



Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/AssembleTask.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/AssembleTask.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/AssembleTask.java
 Mon Aug  9 19:33:38 2004
@@ -198,10 +198,10 @@
     }
 
     // ant parameter values
-    private String  _contextFactoryClassName;
-    private File    _moduleDir;
-    private File    _srcOutputDir;
-    private File    _bindingFile;
-    private Path    _classPath;
-    private FileSet _clientManifestFileSet;
+    protected String  _contextFactoryClassName;
+    protected File    _moduleDir;
+    protected File    _srcOutputDir;
+    protected File    _bindingFile;
+    protected Path    _classPath;
+    protected FileSet _clientManifestFileSet;
 }

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientAnnotationProcessor.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientAnnotationProcessor.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientAnnotationProcessor.java
        Mon Aug  9 19:33:38 2004
@@ -194,15 +194,20 @@
                  printError( f, "control.field.bad.classtype" );
 
              // Valid generated beans should only "implement" the control 
interface/extension, and no others
+             classType = (ClassType)fieldType;
              Collection<InterfaceType> intfs = classType.getSuperinterfaces();
              if ( intfs.size() != 1 )
+             {
                  printError( f, "control.field.bad.classtype.badinterface" );
+             }
 
              for ( InterfaceType intfType : intfs )
              {
                  if ( 
intfType.getDeclaration().getAnnotation(ControlExtension.class) == null &&
                       
intfType.getDeclaration().getAnnotation(ControlInterface.class) == null)
+                 {
                      printError( f, 
"control.field.bad.classtype.badinterface");
+                 }
              }
          }
          else