svn commit: r344380 - in /beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime: generator/apt/ControlSecondaryAnnotationProcessor.java generator/apt/strings.properties servlet/ServletServiceProvider.java

[ek...@apache.org]

Author: ekoneil
Date: Tue Nov 15 07:43:08 2005
New Revision: 344380

URL: http://svn.apache.org/viewcvs?rev=344380&view=rev
Log:
Couple of controls changes:

- remove duplicated message
- remove some unused imports

Just stuff I ran across while looking at the ServletBeanContext thing in the dev@ list.

BB: self
Test: Controls pass


Modified:
    beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlSecondaryAnnotationProcessor.java
    beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/strings.properties
    beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletServiceProvider.java

Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlSecondaryAnnotationProcessor.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlSecondaryAnnotationProcessor.java?rev=344380&r1=344379&r2=344380&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlSecondaryAnnotationProcessor.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlSecondaryAnnotationProcessor.java Tue Nov 15 07:43:08 2005
@@ -47,7 +47,7 @@
 public class ControlSecondaryAnnotationProcessor extends TwoPhaseAnnotationProcessor
 {
     public ControlSecondaryAnnotationProcessor(Set<AnnotationTypeDeclaration> atds,
-                                      AnnotationProcessorEnvironment env)
+                                               AnnotationProcessorEnvironment env)
     {
         super(atds, env);
     }

Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/strings.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/strings.properties?rev=344380&r1=344379&r2=344380&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/strings.properties (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/strings.properties Tue Nov 15 07:43:08 2005
@@ -10,10 +10,6 @@
 If a control field's type is a class, that class must implement the control's public interface/extension and no other interface. \
 Verify the type of the control field declaration implements only the public interface/extension.
 
-control.field.bad.type=\
-A control field must be of a class or interface type. \
-Verify the type of the control field declaration is a class or interface.
-
 control.field.type.malformed=\
 The type of the control field is malformed.  Verify that the source of the type has no errors.
 
@@ -164,7 +160,8 @@
 @Context field type must be an interface.
 
 control.field.bad.type=\
-@Control field type must be a valid ControlBean class or control interface.
+@Control field type must be a valid ControlBean class or control interface. \
+Verify that the type of the field declaration is a control class or interface.
 
 control.field.bad.type.2=\
 Unable to identify control type of field.

Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletServiceProvider.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletServiceProvider.java?rev=344380&r1=344379&r2=344380&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletServiceProvider.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletServiceProvider.java Tue Nov 15 07:43:08 2005
@@ -23,13 +23,9 @@
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestWrapper;
 import javax.servlet.ServletResponse;
-import javax.servlet.ServletResponseWrapper;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
 
 /**
  * The ServletContextProvider helper class acts at the BeanContextServiceProvider provides