You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/12/21 18:20:55 UTC
svn commit: r358330 [2/2] - in /beehive/trunk/netui/src:
compiler-apt/org/apache/beehive/netui/compiler/apt/
compiler-apt/org/apache/beehive/netui/compiler/typesystem/impl/env/
compiler-core/org/apache/beehive/netui/compiler/
compiler-core/org/apache/b...
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java Wed Dec 21 09:20:30 2005
@@ -17,7 +17,7 @@
*/
package org.apache.beehive.netui.compiler.grammar;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import org.apache.beehive.netui.compiler.Diagnostics;
import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
import org.apache.beehive.netui.compiler.AnnotationGrammar;
@@ -28,7 +28,7 @@
private static final String[][] REQUIRED_ATTRS = { { RULE_ATTR }, { MESSAGE_ATTR, MESSAGE_KEY_ATTR } };
private static final String[][] VARIABLE_REQUIRED_ATTRS = { { NAME_ATTR }, { VALUE_ATTR } };
- public ValidateCustomGrammar( AnnotationProcessorEnvironment env, Diagnostics diagnostics,
+ public ValidateCustomGrammar( CoreAnnotationProcessorEnv env, Diagnostics diagnostics,
RuntimeVersionChecker rvc )
{
super( env, diagnostics, rvc );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java Wed Dec 21 09:20:30 2005
@@ -20,7 +20,7 @@
import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
import org.apache.beehive.netui.compiler.Diagnostics;
import org.apache.beehive.netui.compiler.AnnotationMemberType;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
@@ -41,7 +41,7 @@
{ MAX_FLOAT_ATTR, MIN_FLOAT_ATTR }
};
- public ValidateRangeGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
+ public ValidateRangeGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags,
RuntimeVersionChecker runtimeVersionChecker )
{
super( env, diags, runtimeVersionChecker );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java Wed Dec 21 09:20:30 2005
@@ -17,7 +17,7 @@
*/
package org.apache.beehive.netui.compiler.grammar;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.MethodDeclaration;
@@ -31,7 +31,7 @@
public class ValidateRequiredGrammar
extends BaseValidationRuleGrammar
{
- public ValidateRequiredGrammar( AnnotationProcessorEnvironment env, Diagnostics diags, RuntimeVersionChecker rvc )
+ public ValidateRequiredGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags, RuntimeVersionChecker rvc )
{
super( env, diags, rvc );
}
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java Wed Dec 21 09:20:30 2005
@@ -25,7 +25,7 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.MethodDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import org.apache.beehive.netui.compiler.typesystem.type.PrimitiveType;
import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance;
@@ -35,7 +35,7 @@
{
private static final String[][] REQUIRED_ATTRS = { { TYPE_ATTR } };
- public ValidateTypeGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
+ public ValidateTypeGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags,
RuntimeVersionChecker runtimeVersionChecker )
{
super( env, diags, runtimeVersionChecker );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateURLGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateURLGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateURLGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateURLGrammar.java Wed Dec 21 09:20:30 2005
@@ -19,14 +19,14 @@
import org.apache.beehive.netui.compiler.Diagnostics;
import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
public class ValidateURLGrammar
extends BaseValidationRuleGrammar
{
private static String[][] MUTUALLY_EXCLUSIVE_ATTRS = {{ALLOW_ALL_SCHEMES_ATTR, SCHEMES_ATTR}};
- public ValidateURLGrammar(AnnotationProcessorEnvironment env, Diagnostics diags, RuntimeVersionChecker rvc)
+ public ValidateURLGrammar(CoreAnnotationProcessorEnv env, Diagnostics diags, RuntimeVersionChecker rvc)
{
super(env, diags, rvc);
// no custom types needed
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java Wed Dec 21 09:20:30 2005
@@ -17,7 +17,7 @@
*/
package org.apache.beehive.netui.compiler.grammar;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import org.apache.beehive.netui.compiler.Diagnostics;
import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
@@ -27,7 +27,7 @@
{
private static final String[][] REQUIRED_ATTRS = { { CONDITION_ATTR }, { MESSAGE_ATTR, MESSAGE_KEY_ATTR } };
- public ValidateValidWhenGrammar( AnnotationProcessorEnvironment env, Diagnostics diagnostics,
+ public ValidateValidWhenGrammar( CoreAnnotationProcessorEnv env, Diagnostics diagnostics,
RuntimeVersionChecker rvc )
{
super( env, diagnostics, rvc );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java Wed Dec 21 09:20:30 2005
@@ -21,7 +21,7 @@
import org.apache.beehive.netui.compiler.CompilerUtils;
import org.apache.beehive.netui.compiler.Diagnostics;
import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration;
@@ -47,7 +47,7 @@
};
- public ValidationMessageArgsGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
+ public ValidationMessageArgsGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags,
RuntimeVersionChecker rvc )
{
super( env, diags, VERSION_9_0_STRING, rvc );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java Wed Dec 21 09:20:30 2005
@@ -20,12 +20,12 @@
import org.apache.beehive.netui.compiler.AnnotationGrammar;
import org.apache.beehive.netui.compiler.Diagnostics;
import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
public abstract class ValidationRulesContainerGrammar
extends AnnotationGrammar
{
- protected ValidationRulesContainerGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
+ protected ValidationRulesContainerGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags,
RuntimeVersionChecker rvc )
{
super( env, diags, VERSION_9_0_STRING, rvc );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java Wed Dec 21 09:20:30 2005
@@ -20,7 +20,6 @@
import org.apache.beehive.netui.compiler.CompilerUtils;
import org.apache.beehive.netui.compiler.FlowControllerInfo;
import org.apache.beehive.netui.compiler.AnnotationGrammar;
-import org.apache.beehive.netui.compiler.MergedControllerAnnotation;
import org.apache.beehive.netui.compiler.FatalCompileTimeException;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
@@ -29,7 +28,7 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.MethodDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.ClassDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import org.apache.beehive.netui.compiler.typesystem.type.ClassType;
import java.util.Collection;
@@ -119,7 +118,7 @@
}
public static boolean actionExists( String actionName, TypeDeclaration type, AnnotationInstance annotationToIgnore,
- AnnotationProcessorEnvironment env, FlowControllerInfo fcInfo,
+ CoreAnnotationProcessorEnv env, FlowControllerInfo fcInfo,
boolean checkInheritedActions )
{
if ( ! ( type instanceof ClassDeclaration ) )
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java Wed Dec 21 09:20:30 2005
@@ -29,7 +29,7 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.TypeDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.Modifier;
import org.apache.beehive.netui.compiler.typesystem.declaration.PackageDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import java.net.URISyntaxException;
import java.net.URI;
@@ -174,7 +174,7 @@
}
public static boolean relativePathExists( String filePath, TypeDeclaration outerClass,
- AnnotationProcessorEnvironment env )
+ CoreAnnotationProcessorEnv env )
throws FatalCompileTimeException
{
assert filePath.charAt( 0 ) != '/' : filePath + " is not a relative path";
@@ -185,7 +185,7 @@
private static boolean checkRelativePath( String filePath, TypeDeclaration outerClass,
CompilerUtils.Mutable retFileToCheck,
boolean ignoreDirectories, boolean allowFileInPageFlowSourceDir,
- AnnotationProcessorEnvironment env )
+ CoreAnnotationProcessorEnv env )
throws FatalCompileTimeException
{
Copied: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/BaseCoreAnnotationProcessor.java (from r358086, beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/BaseAnnotationProcessor.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/BaseCoreAnnotationProcessor.java?p2=beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/BaseCoreAnnotationProcessor.java&p1=beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/BaseAnnotationProcessor.java&r1=358086&r2=358330&rev=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/BaseAnnotationProcessor.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/BaseCoreAnnotationProcessor.java Wed Dec 21 09:20:30 2005
@@ -28,15 +28,15 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.ClassDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.Declaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.Modifier;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import org.apache.beehive.netui.compiler.typesystem.type.ClassType;
import java.text.MessageFormat;
import java.util.HashMap;
import java.util.ResourceBundle;
-public abstract class BaseAnnotationProcessor
- extends TwoPhaseAnnotationProcessor
+public abstract class BaseCoreAnnotationProcessor
+ extends TwoPhaseCoreAnnotationProcessor
implements JpfLanguageConstants
{
private HashMap _sourceFileInfo;
@@ -44,8 +44,8 @@
private ResourceBundle _messages;
- protected BaseAnnotationProcessor( AnnotationTypeDeclaration[] annotationTypeDecls,
- AnnotationProcessorEnvironment env )
+ protected BaseCoreAnnotationProcessor( AnnotationTypeDeclaration[] annotationTypeDecls,
+ CoreAnnotationProcessorEnv env )
{
super( annotationTypeDecls, env );
_messages = ResourceBundle.getBundle( "org.apache.beehive.netui.compiler.diagnostics" );
Propchange: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/BaseCoreAnnotationProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/FormBeanCoreAnnotationProcessor.java (from r358086, beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/FormBeanAnnotationProcessor.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/FormBeanCoreAnnotationProcessor.java?p2=beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/FormBeanCoreAnnotationProcessor.java&p1=beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/FormBeanAnnotationProcessor.java&r1=358086&r2=358330&rev=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/FormBeanAnnotationProcessor.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/FormBeanCoreAnnotationProcessor.java Wed Dec 21 09:20:30 2005
@@ -24,13 +24,13 @@
import org.apache.beehive.netui.compiler.BaseGenerator;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.ClassDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
-public class FormBeanAnnotationProcessor
- extends BaseAnnotationProcessor
+public class FormBeanCoreAnnotationProcessor
+ extends BaseCoreAnnotationProcessor
{
- public FormBeanAnnotationProcessor( AnnotationTypeDeclaration[] annotationTypeDecls, AnnotationProcessorEnvironment env )
+ public FormBeanCoreAnnotationProcessor( AnnotationTypeDeclaration[] annotationTypeDecls, CoreAnnotationProcessorEnv env )
{
super( annotationTypeDecls, env );
}
Propchange: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/FormBeanCoreAnnotationProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/PageFlowCoreAnnotationProcessor.java (from r358086, beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/PageFlowAnnotationProcessor.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/PageFlowCoreAnnotationProcessor.java?p2=beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/PageFlowCoreAnnotationProcessor.java&p1=beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/PageFlowAnnotationProcessor.java&r1=358086&r2=358330&rev=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/PageFlowAnnotationProcessor.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/PageFlowCoreAnnotationProcessor.java Wed Dec 21 09:20:30 2005
@@ -21,24 +21,24 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.ClassDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import java.io.File;
-public class PageFlowAnnotationProcessor
- extends BaseAnnotationProcessor
+public class PageFlowCoreAnnotationProcessor
+ extends BaseCoreAnnotationProcessor
implements JpfLanguageConstants
{
- public PageFlowAnnotationProcessor( AnnotationTypeDeclaration[] annotationTypeDecls,
- AnnotationProcessorEnvironment env )
+ public PageFlowCoreAnnotationProcessor( AnnotationTypeDeclaration[] annotationTypeDecls,
+ CoreAnnotationProcessorEnv env )
{
super( annotationTypeDecls, env );
}
public BaseChecker getChecker( ClassDeclaration classDecl, Diagnostics diagnostics )
{
- AnnotationProcessorEnvironment env = getAnnotationProcessorEnvironment();
+ CoreAnnotationProcessorEnv env = getAnnotationProcessorEnvironment();
if ( CompilerUtils.isAssignableFrom( JPF_BASE_CLASS, classDecl, env ) )
{
@@ -106,7 +106,7 @@
public BaseGenerator getGenerator( ClassDeclaration classDecl, Diagnostics diags )
{
- AnnotationProcessorEnvironment env = getAnnotationProcessorEnvironment();
+ CoreAnnotationProcessorEnv env = getAnnotationProcessorEnvironment();
SourceFileInfo sourceFileInfo = getSourceFileInfo( classDecl );
if ( CompilerUtils.isAssignableFrom( JPF_BASE_CLASS, classDecl, env ) )
Propchange: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/PageFlowCoreAnnotationProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/TwoPhaseCoreAnnotationProcessor.java (from r358086, beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/TwoPhaseAnnotationProcessor.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/TwoPhaseCoreAnnotationProcessor.java?p2=beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/TwoPhaseCoreAnnotationProcessor.java&p1=beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/TwoPhaseAnnotationProcessor.java&r1=358086&r2=358330&rev=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/TwoPhaseAnnotationProcessor.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/TwoPhaseCoreAnnotationProcessor.java Wed Dec 21 09:20:30 2005
@@ -20,18 +20,18 @@
import java.util.*;
import java.text.MessageFormat;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessor;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessor;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.Declaration;
import org.apache.beehive.netui.compiler.Diagnostics;
import org.apache.beehive.netui.compiler.FatalCompileTimeException;
/**
- * The TwoPhaseAnnotationProcessor class is an abstract class that implements the APT
- * AnnotationProcessor interface. It breaks the work of the process() method of the
- * AnnotationProcessor down into two distinct phases, represented as abstract method
- * of TwoPhaseAnnotationProcessor that are to be implemented by concrete subclasses.
+ * The TwoPhaseCoreAnnotationProcessor class is an abstract class that implements the APT
+ * CoreAnnotationProcessor interface. It breaks the work of the process() method of the
+ * CoreAnnotationProcessor down into two distinct phases, represented as abstract method
+ * of TwoPhaseCoreAnnotationProcessor that are to be implemented by concrete subclasses.
* <p/>
* The two phases of processing are:
*
@@ -39,7 +39,7 @@
* annotated with annotations claimed by the processor to ensure that it
* is semantically valid. If the presence of the input Declaration implies the need
* to add new files, and those files need to be visible during the check phase for
- * other Declarations, then the AnnotationProcessorEnvironment's Filer API should be
+ * other Declarations, then the CoreAnnotationProcessorEnv's Filer API should be
* used to add those files in this phase. The adding of such files at this point
* should typically not result in their emission to persistent storage (i.e. disk),
* but rather be kept in memory to be referenced by the check phase of other
@@ -57,18 +57,18 @@
* necessarily resulting in code generation.
* Provides a clearer association between input Declarations and generator output.
* </ol>
- * TwoPhaseAnnotationProcessor is intended provide a uniform mechanism for writing
- * AnnotationProcessor implementations that can be used in tooling environments more
+ * TwoPhaseCoreAnnotationProcessor is intended provide a uniform mechanism for writing
+ * CoreAnnotationProcessor implementations that can be used in tooling environments more
* sophisticated than command-line tools (that may not do all their work on source
* in a single pass). Such environments will typically also provide implementations
- * of the AnnotationProcessorEnvironment and associated interfaces (Messager,
+ * of the CoreAnnotationProcessorEnv and associated interfaces (Messager,
* Filer etc).
*/
-public abstract class TwoPhaseAnnotationProcessor
+public abstract class TwoPhaseCoreAnnotationProcessor
extends Diagnostics
- implements AnnotationProcessor
+ implements CoreAnnotationProcessor
{
- protected TwoPhaseAnnotationProcessor( AnnotationTypeDeclaration[] atds, AnnotationProcessorEnvironment env )
+ protected TwoPhaseCoreAnnotationProcessor( AnnotationTypeDeclaration[] atds, CoreAnnotationProcessorEnv env )
{
super( env );
_atds = atds;
@@ -76,7 +76,7 @@
}
/**
- * Implements AnnotationProcessor.process() as two phases, "check" and "generate".
+ * Implements CoreAnnotationProcessor.process() as two phases, "check" and "generate".
* "generate" will not be called if "check" emitted any errors (via printError()).
*/
public void process()
@@ -96,7 +96,7 @@
/**
* Performs semantic validation of input Declarations that are annotated with
- * annotations claimed by this AnnotationProcessor.
+ * annotations claimed by this CoreAnnotationProcessor.
*/
public void check()
throws FatalCompileTimeException
@@ -128,7 +128,7 @@
/**
* Emits additional artifacts for input Declarations that are annotated with
- * annotations claimed by this AnnotationProcessor.
+ * annotations claimed by this CoreAnnotationProcessor.
*/
public void generate()
{
@@ -163,7 +163,7 @@
* <p/>
* If the presence of the input Declaration implies the need to add new files,
* and those files need to be visible during the check phase for
- * other Declarations, then the AnnotationProcessorEnvironment's Filer API should be
+ * other Declarations, then the CoreAnnotationProcessorEnv's Filer API should be
* used to add those files in this phase. The adding of such files at this point
* should typically not result in their emission to persistent storage (i.e. disk),
* but rather be kept in memory to be referenced by the check phase of other
Propchange: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/TwoPhaseCoreAnnotationProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/CoreAnnotationProcessor.java (from r358086, beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/AnnotationProcessor.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/CoreAnnotationProcessor.java?p2=beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/CoreAnnotationProcessor.java&p1=beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/AnnotationProcessor.java&r1=358086&r2=358330&rev=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/AnnotationProcessor.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/CoreAnnotationProcessor.java Wed Dec 21 09:20:30 2005
@@ -17,7 +17,10 @@
*/
package org.apache.beehive.netui.compiler.typesystem.env;
-public interface AnnotationProcessor
+/**
+ * Annotation processor; "core" to differentiate from Sun's <code>AnnotationProcessor</code>.
+ */
+public interface CoreAnnotationProcessor
{
void process();
}
Propchange: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/CoreAnnotationProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/CoreAnnotationProcessorEnv.java (from r358086, beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/AnnotationProcessorEnvironment.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/CoreAnnotationProcessorEnv.java?p2=beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/CoreAnnotationProcessorEnv.java&p1=beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/AnnotationProcessorEnvironment.java&r1=358086&r2=358330&rev=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/AnnotationProcessorEnvironment.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/CoreAnnotationProcessorEnv.java Wed Dec 21 09:20:30 2005
@@ -26,7 +26,10 @@
import java.util.Map;
import java.util.Collection;
-public interface AnnotationProcessorEnvironment
+/**
+ * Annotation processor environment. "Core" to distinguish from Sun's AnnotationProcessorEnvironment.
+ */
+public interface CoreAnnotationProcessorEnv
{
/** Map of String -> String */
Map getOptions();
Propchange: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/CoreAnnotationProcessorEnv.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/CoreAnnotationProcessorEnvImpl.java (from r358086, beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/AnnotationProcessorEnvironmentImpl.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/CoreAnnotationProcessorEnvImpl.java?p2=beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/CoreAnnotationProcessorEnvImpl.java&p1=beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/AnnotationProcessorEnvironmentImpl.java&r1=358086&r2=358330&rev=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/AnnotationProcessorEnvironmentImpl.java (original)
+++ beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/CoreAnnotationProcessorEnvImpl.java Wed Dec 21 09:20:30 2005
@@ -20,7 +20,7 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.Declaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.TypeDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import org.apache.beehive.netui.compiler.typesystem.env.Filer;
import org.apache.beehive.netui.compiler.typesystem.env.Messager;
import org.apache.beehive.netui.compiler.xdoclet.typesystem.impl.DelegatingImpl;
@@ -36,9 +36,9 @@
import java.util.Map;
import java.util.HashMap;
-public class AnnotationProcessorEnvironmentImpl
+public class CoreAnnotationProcessorEnvImpl
extends DelegatingImpl
- implements AnnotationProcessorEnvironment
+ implements CoreAnnotationProcessorEnv
{
private static final Declaration[] EMPTY_DECLARATION_ARRAY = new Declaration[0];
@@ -46,16 +46,16 @@
private SourceClass _sourceClass;
private HashMap _attributes;
- protected AnnotationProcessorEnvironmentImpl( DocletContext delegate, NetuiSubTask subtask, SourceClass sourceClass )
+ protected CoreAnnotationProcessorEnvImpl( DocletContext delegate, NetuiSubTask subtask, SourceClass sourceClass )
{
super( delegate );
_subtask = subtask;
_sourceClass = sourceClass;
}
- public static AnnotationProcessorEnvironment get( DocletContext delegate, NetuiSubTask subtask, SourceClass sc )
+ public static CoreAnnotationProcessorEnv get( DocletContext delegate, NetuiSubTask subtask, SourceClass sc )
{
- return delegate != null ? new AnnotationProcessorEnvironmentImpl( delegate, subtask, sc ) : null;
+ return delegate != null ? new CoreAnnotationProcessorEnvImpl( delegate, subtask, sc ) : null;
}
public Map getOptions()
Propchange: beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/CoreAnnotationProcessorEnvImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/xdoclet/NetuiSubTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/xdoclet/NetuiSubTask.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/xdoclet/NetuiSubTask.java (original)
+++ beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/xdoclet/NetuiSubTask.java Wed Dec 21 09:20:30 2005
@@ -1,10 +1,10 @@
package org.apache.beehive.netui.xdoclet;
-import org.apache.beehive.netui.compiler.processor.PageFlowAnnotationProcessor;
+import org.apache.beehive.netui.compiler.processor.PageFlowCoreAnnotationProcessor;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import org.apache.beehive.netui.compiler.xdoclet.typesystem.impl.declaration.DeclarationImpl;
-import org.apache.beehive.netui.compiler.xdoclet.typesystem.impl.env.AnnotationProcessorEnvironmentImpl;
+import org.apache.beehive.netui.compiler.xdoclet.typesystem.impl.env.CoreAnnotationProcessorEnvImpl;
import xdoclet.DocletContext;
import xdoclet.SubTask;
import xdoclet.XDocletException;
@@ -54,10 +54,10 @@
while ( iter.hasNext() )
{
SourceClass sourceClass = ( SourceClass ) iter.next();
- AnnotationProcessorEnvironment env = AnnotationProcessorEnvironmentImpl.get( getContext(), this, sourceClass );
+ CoreAnnotationProcessorEnv env = CoreAnnotationProcessorEnvImpl.get( getContext(), this, sourceClass );
AnnotationTypeDeclaration[] decls = DeclarationImpl.getAllAnnotations(); // TODO: filter appropriately
- PageFlowAnnotationProcessor pfap = new PageFlowAnnotationProcessor( decls, env );
+ PageFlowCoreAnnotationProcessor pfap = new PageFlowCoreAnnotationProcessor( decls, env );
try
{
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/BaseHandler.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/BaseHandler.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/BaseHandler.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/BaseHandler.java Wed Dec 21 09:20:30 2005
@@ -22,7 +22,9 @@
/**
- * Default implementation of the base Handler interface. Simply stores a reference to the ServletContext.
+ * Default implementation of the base Handler interface. Simply stores a reference to the ServletContext and offers
+ * access to the previously-registered Handler of the same type (the one that comes before the current one in the
+ * list under <code><pageflow-handlers></code> in beehive-netui-config.xml).
*/
public abstract class BaseHandler
implements Handler, Serializable