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 [1/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...
Author: rich
Date: Wed Dec 21 09:20:30 2005
New Revision: 358330
URL: http://svn.apache.org/viewcvs?rev=358330&view=rev
Log:
Refactoring to make our core typesystem/processor class names more easily distinguishable from apt/Mirror class names.
tests: bvt in netui (WinXP)
BB: same (linux)
Added:
beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/typesystem/impl/env/CoreAnnotationProcessorEnvImpl.java (contents, props changed)
- copied, changed from r358086, beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/typesystem/impl/env/AnnotationProcessorEnvironmentImpl.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/BaseCoreAnnotationProcessor.java (contents, props changed)
- copied, changed from r358086, beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/BaseAnnotationProcessor.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/FormBeanCoreAnnotationProcessor.java (contents, props changed)
- copied, changed from r358086, beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/FormBeanAnnotationProcessor.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/PageFlowCoreAnnotationProcessor.java (contents, props changed)
- copied, changed from r358086, beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/PageFlowAnnotationProcessor.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/TwoPhaseCoreAnnotationProcessor.java (contents, props changed)
- copied, changed from r358086, beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/TwoPhaseAnnotationProcessor.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/CoreAnnotationProcessor.java (contents, props changed)
- copied, changed from r358086, beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/AnnotationProcessor.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/CoreAnnotationProcessorEnv.java (contents, props changed)
- copied, changed from r358086, beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/AnnotationProcessorEnvironment.java
beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/CoreAnnotationProcessorEnvImpl.java (contents, props changed)
- copied, changed from r358086, beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/AnnotationProcessorEnvironmentImpl.java
Removed:
beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/apt/FormBeanAnnotationProcessorFactory.java
beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/typesystem/impl/env/AnnotationProcessorEnvironmentImpl.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/BaseAnnotationProcessor.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/FormBeanAnnotationProcessor.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/PageFlowAnnotationProcessor.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/TwoPhaseAnnotationProcessor.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/AnnotationProcessor.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/AnnotationProcessorEnvironment.java
beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/AnnotationProcessorEnvironmentImpl.java
Modified:
beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/apt/BaseAnnotationProcessorFactory.java
beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationMemberType.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationToXML.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseChecker.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseGenerator.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/Diagnostics.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FacesBackingChecker.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FacesBackingGenerator.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerGenerator.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerInfo.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FormBeanChecker.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/PageFlowChecker.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/PageFlowGenerator.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/SharedFlowChecker.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/SharedFlowGenerator.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenSharedFlowStrutsApp.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenValidationModel.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionOutputGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseFlowControllerGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CommandHandlerGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatableBeanGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatablePropertyGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateURLGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/xdoclet/NetuiSubTask.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/BaseHandler.java
Modified: beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/apt/BaseAnnotationProcessorFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/apt/BaseAnnotationProcessorFactory.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/apt/BaseAnnotationProcessorFactory.java (original)
+++ beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/apt/BaseAnnotationProcessorFactory.java Wed Dec 21 09:20:30 2005
@@ -17,54 +17,69 @@
*/
package org.apache.beehive.netui.compiler.apt;
-import org.apache.beehive.netui.compiler.typesystem.impl.env.AnnotationProcessorEnvironmentImpl;
+import org.apache.beehive.netui.compiler.typesystem.impl.env.CoreAnnotationProcessorEnvImpl;
import org.apache.beehive.netui.compiler.typesystem.impl.DelegatingImpl;
import org.apache.beehive.netui.compiler.typesystem.impl.WrapperFactory;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeDeclaration;
-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 java.util.Set;
import java.util.Iterator;
import com.sun.mirror.apt.AnnotationProcessorFactory;
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+/**
+ * Slim Sun apt annotation processor factory that delegates to our "core" (apt-independent) layer.
+ */
public abstract class BaseAnnotationProcessorFactory
implements AnnotationProcessorFactory
{
- public final com.sun.mirror.apt.AnnotationProcessor
- getProcessorFor( Set annotationTypeDeclarations, com.sun.mirror.apt.AnnotationProcessorEnvironment aptEnv )
+ /**
+ * Get a Sun annotation processor for the given annotation type declarations. This just wraps the type declarations
+ * in our wrapper types, and returns an annotation processor that delegates to our "core" (apt-independent)
+ * processor to do the real work.
+ */
+ public final AnnotationProcessor getProcessorFor(Set annotationTypeDeclarations, AnnotationProcessorEnvironment env)
{
-
- AnnotationProcessorEnvironment env = AnnotationProcessorEnvironmentImpl.get( aptEnv );
+
+ CoreAnnotationProcessorEnv coreEnv = CoreAnnotationProcessorEnvImpl.get( env );
AnnotationTypeDeclaration[] atds = new AnnotationTypeDeclaration[ annotationTypeDeclarations.size() ];
int j = 0;
for ( Iterator i = annotationTypeDeclarations.iterator(); i.hasNext(); )
{
+ // Wrap each Sun/Mirror annotation type declaration with our core AnnotationTypeDeclaration.
com.sun.mirror.declaration.AnnotationTypeDeclaration decl =
( com.sun.mirror.declaration.AnnotationTypeDeclaration ) i.next();
atds[ j++ ] = WrapperFactory.get().getAnnotationTypeDeclaration( decl );
}
-
- AnnotationProcessor ap = getProcessorFor( atds, env );
+
+ CoreAnnotationProcessor ap = getCoreProcessorFor( atds, coreEnv );
return ap != null ? new DelegatingAnnotationProcessor( ap ) : null;
}
-
+
private static class DelegatingAnnotationProcessor
extends DelegatingImpl
- implements com.sun.mirror.apt.AnnotationProcessor
+ implements AnnotationProcessor
{
- public DelegatingAnnotationProcessor( AnnotationProcessor delegate )
+ public DelegatingAnnotationProcessor( CoreAnnotationProcessor delegate )
{
super( delegate );
}
public void process()
{
- ( ( AnnotationProcessor ) getDelegate() ).process();
+ ( ( CoreAnnotationProcessor ) getDelegate() ).process();
}
}
-
- protected abstract AnnotationProcessor getProcessorFor( AnnotationTypeDeclaration[] annotationTypeDeclarations,
- AnnotationProcessorEnvironment env );
+
+ /**
+ * Get the core annotation processor which is appropriate for the given annotations. Note that this is "our"
+ * annotation processor, not a Sun apt annotation processor. See
+ * {@link BaseAnnotationProcessorFactory#getProcessorFor} for the place where a Sun annotation processor is returned.
+ */
+ protected abstract CoreAnnotationProcessor getCoreProcessorFor( AnnotationTypeDeclaration[] annotationTypeDecls,
+ CoreAnnotationProcessorEnv env );
}
Modified: beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java (original)
+++ beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java Wed Dec 21 09:20:30 2005
@@ -18,10 +18,10 @@
package org.apache.beehive.netui.compiler.apt;
import org.apache.beehive.netui.compiler.JpfLanguageConstants;
-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.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 java.util.ArrayList;
import java.util.Collection;
@@ -89,8 +89,13 @@
return Collections.EMPTY_LIST;
}
- public AnnotationProcessor getProcessorFor( AnnotationTypeDeclaration[] atds, AnnotationProcessorEnvironment env )
+ /**
+ * Get the core annotation processor which is appropriate for the given annotations. Note that this is "our"
+ * annotation processor, not a Sun apt annotation processor. See
+ * {@link BaseAnnotationProcessorFactory#getProcessorFor} for the place where a Sun annotation processor is returned.
+ */
+ public CoreAnnotationProcessor getCoreProcessorFor( AnnotationTypeDeclaration[] atds, CoreAnnotationProcessorEnv env )
{
- return new PageFlowAnnotationProcessor( atds, env );
+ return new PageFlowCoreAnnotationProcessor( atds, env );
}
}
Copied: beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/typesystem/impl/env/CoreAnnotationProcessorEnvImpl.java (from r358086, beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/typesystem/impl/env/AnnotationProcessorEnvironmentImpl.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/typesystem/impl/env/CoreAnnotationProcessorEnvImpl.java?p2=beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/typesystem/impl/env/CoreAnnotationProcessorEnvImpl.java&p1=beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/typesystem/impl/env/AnnotationProcessorEnvironmentImpl.java&r1=358086&r2=358330&rev=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/typesystem/impl/env/AnnotationProcessorEnvironmentImpl.java (original)
+++ beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/typesystem/impl/env/CoreAnnotationProcessorEnvImpl.java Wed Dec 21 09:20:30 2005
@@ -20,33 +20,32 @@
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.typesystem.impl.DelegatingImpl;
import org.apache.beehive.netui.compiler.typesystem.impl.WrapperFactory;
import org.apache.beehive.netui.compiler.typesystem.impl.declaration.AnnotationTypeDeclarationImpl;
-import org.apache.beehive.netui.compiler.Diagnostics;
import java.util.Collection;
import java.util.Map;
import java.util.HashMap;
-public class AnnotationProcessorEnvironmentImpl
+public class CoreAnnotationProcessorEnvImpl
extends DelegatingImpl
- implements AnnotationProcessorEnvironment
+ implements CoreAnnotationProcessorEnv
{
private TypeDeclaration[] _specifiedTypeDeclarations;
private Map _attributes;
- protected AnnotationProcessorEnvironmentImpl( com.sun.mirror.apt.AnnotationProcessorEnvironment delegate )
+ protected CoreAnnotationProcessorEnvImpl( com.sun.mirror.apt.AnnotationProcessorEnvironment delegate )
{
super( delegate );
}
- public static AnnotationProcessorEnvironment get( com.sun.mirror.apt.AnnotationProcessorEnvironment delegate )
+ public static CoreAnnotationProcessorEnv get( com.sun.mirror.apt.AnnotationProcessorEnvironment delegate )
{
- return delegate != null ? new AnnotationProcessorEnvironmentImpl( delegate ) : null;
+ return delegate != null ? new CoreAnnotationProcessorEnvImpl( delegate ) : null;
}
public Map getOptions()
Propchange: beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/typesystem/impl/env/CoreAnnotationProcessorEnvImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java Wed Dec 21 09:20:30 2005
@@ -22,7 +22,7 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
import org.apache.beehive.netui.compiler.typesystem.declaration.Declaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import java.util.HashMap;
import java.util.HashSet;
@@ -45,7 +45,7 @@
*/
private String _requiredRuntimeVersion = null;
private RuntimeVersionChecker _runtimeVersionChecker;
- private AnnotationProcessorEnvironment _env;
+ private CoreAnnotationProcessorEnv _env;
private Diagnostics _diagnostics;
private Map _memberGrammars = new HashMap();
private Map _memberArrayGrammars = new HashMap();
@@ -56,7 +56,7 @@
* @param requiredRuntimeVersion causes an error to be produced if the version in the manifest of beehive-netui-pageflow.jar
* is not high enough.
*/
- protected AnnotationGrammar( AnnotationProcessorEnvironment env, Diagnostics diags, String requiredRuntimeVersion,
+ protected AnnotationGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags, String requiredRuntimeVersion,
RuntimeVersionChecker runtimeVersionChecker )
{
_env = env;
@@ -65,7 +65,7 @@
_requiredRuntimeVersion = requiredRuntimeVersion;
}
- public final AnnotationProcessorEnvironment getEnv()
+ public final CoreAnnotationProcessorEnv getEnv()
{
return _env;
}
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationMemberType.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationMemberType.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationMemberType.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationMemberType.java Wed Dec 21 09:20:30 2005
@@ -22,7 +22,7 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
import org.apache.beehive.netui.compiler.typesystem.declaration.Declaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
public class AnnotationMemberType
@@ -239,7 +239,7 @@
return _parentGrammar;
}
- protected final AnnotationProcessorEnvironment getEnv()
+ protected final CoreAnnotationProcessorEnv getEnv()
{
return _parentGrammar.getEnv();
}
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationToXML.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationToXML.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationToXML.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationToXML.java Wed Dec 21 09:20:30 2005
@@ -23,7 +23,7 @@
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.type.TypeInstance;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import org.apache.beehive.netui.compiler.model.StrutsApp;
import org.apache.beehive.netui.compiler.model.XmlModelWriter;
import org.apache.beehive.netui.compiler.model.XmlModelWriterException;
@@ -107,7 +107,7 @@
}
}
- public void writeXml( Diagnostics diagnostics, AnnotationProcessorEnvironment env )
+ public void writeXml( Diagnostics diagnostics, CoreAnnotationProcessorEnv env )
throws IOException, XmlModelWriterException
{
String outputFilePath = getFilePath(_typeDecl);
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseChecker.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseChecker.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseChecker.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseChecker.java Wed Dec 21 09:20:30 2005
@@ -18,19 +18,18 @@
package org.apache.beehive.netui.compiler;
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;
import java.util.Map;
public abstract class BaseChecker
{
- private AnnotationProcessorEnvironment _env;
+ private CoreAnnotationProcessorEnv _env;
private Diagnostics _diagnostics;
private RuntimeVersionChecker _runtimeVersionChecker;
private SourceFileInfo _sourceFileInfo;
- protected BaseChecker( AnnotationProcessorEnvironment env, SourceFileInfo sourceFileInfo, Diagnostics diagnostics )
+ protected BaseChecker( CoreAnnotationProcessorEnv env, SourceFileInfo sourceFileInfo, Diagnostics diagnostics )
{
_env = env;
_diagnostics = diagnostics;
@@ -47,7 +46,7 @@
public abstract Map onCheck( ClassDeclaration jclass )
throws FatalCompileTimeException;
- protected AnnotationProcessorEnvironment getEnv()
+ protected CoreAnnotationProcessorEnv getEnv()
{
return _env;
}
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseGenerator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseGenerator.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseGenerator.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseGenerator.java Wed Dec 21 09:20:30 2005
@@ -18,16 +18,16 @@
package org.apache.beehive.netui.compiler;
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 abstract class BaseGenerator
{
- private AnnotationProcessorEnvironment _env;
+ private CoreAnnotationProcessorEnv _env;
private Diagnostics _diagnostics;
private SourceFileInfo _sourceFileInfo;
- protected BaseGenerator( AnnotationProcessorEnvironment env, SourceFileInfo sourceFileInfo, Diagnostics diagnostics )
+ protected BaseGenerator( CoreAnnotationProcessorEnv env, SourceFileInfo sourceFileInfo, Diagnostics diagnostics )
{
_env = env;
_diagnostics = diagnostics;
@@ -37,7 +37,7 @@
public abstract void generate( ClassDeclaration publicClass )
throws FatalCompileTimeException;
- protected AnnotationProcessorEnvironment getEnv()
+ protected CoreAnnotationProcessorEnv getEnv()
{
return _env;
}
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=358330&r1=358329&r2=358330&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 09:20:30 2005
@@ -18,7 +18,7 @@
package org.apache.beehive.netui.compiler;
import org.apache.beehive.netui.compiler.typesystem.declaration.*;
-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.typesystem.type.ArrayType;
@@ -545,7 +545,7 @@
/**
* Get a Class.forName-able string for the given type signature.
*/
- public static String getFormClassName( TypeDeclaration jclass, AnnotationProcessorEnvironment env )
+ public static String getFormClassName( TypeDeclaration jclass, CoreAnnotationProcessorEnv env )
{
if ( isAssignableFrom( STRUTS_FORM_CLASS_NAME, jclass, env ) )
{
@@ -565,7 +565,7 @@
}
}
- public static String getFormClassName( DeclaredType jclass, AnnotationProcessorEnvironment env )
+ public static String getFormClassName( DeclaredType jclass, CoreAnnotationProcessorEnv env )
{
return getFormClassName( getDeclaration( jclass ), env );
}
@@ -582,7 +582,7 @@
}
}
- public static boolean isAssignableFrom( String className, TypeInstance type, AnnotationProcessorEnvironment env )
+ public static boolean isAssignableFrom( String className, TypeInstance type, CoreAnnotationProcessorEnv env )
{
if ( ! ( type instanceof DeclaredType ) ) return false;
return isAssignableFrom( className, getDeclaration( ( DeclaredType ) type ), env );
@@ -623,13 +623,13 @@
return isAssignableFrom( base, getDeclaration( ( DeclaredType ) cl ) );
}
- public static boolean isAssignableFrom( String className, TypeDeclaration cl, AnnotationProcessorEnvironment env )
+ public static boolean isAssignableFrom( String className, TypeDeclaration cl, CoreAnnotationProcessorEnv env )
{
TypeDeclaration base = env.getTypeDeclaration( className );
return isAssignableFrom( base, cl );
}
- public static boolean isOfClass( TypeInstance type, String className, AnnotationProcessorEnvironment env )
+ public static boolean isOfClass( TypeInstance type, String className, CoreAnnotationProcessorEnv env )
{
if ( ! ( type instanceof DeclaredType ) ) return false;
return typesAreEqual( getDeclaration( ( DeclaredType ) type ), env.getTypeDeclaration( className ) );
@@ -737,15 +737,15 @@
return position != null ? position.file() : null;
}
- public static class ExtendedAnnotationProcessorEnvironment
- implements AnnotationProcessorEnvironment
+ public static class ExtendedCoreAnnotationProcessorEnv
+ implements CoreAnnotationProcessorEnv
{
- private AnnotationProcessorEnvironment _env;
+ private CoreAnnotationProcessorEnv _env;
private boolean _useEqualsToCompareAnnotations;
private HashMap _attributes;
- public ExtendedAnnotationProcessorEnvironment( AnnotationProcessorEnvironment env,
- boolean useEqualsToCompareAnnotations )
+ public ExtendedCoreAnnotationProcessorEnv( CoreAnnotationProcessorEnv env,
+ boolean useEqualsToCompareAnnotations )
{
_env = env;
_useEqualsToCompareAnnotations = useEqualsToCompareAnnotations;
@@ -799,7 +799,7 @@
}
public static boolean annotationsAreEqual( AnnotationInstance a1, AnnotationInstance a2, boolean allowExactDuplicates,
- AnnotationProcessorEnvironment env )
+ CoreAnnotationProcessorEnv env )
{
assert a1 != null;
if ( a2 == null ) return false;
@@ -810,8 +810,8 @@
// and wrong if the two annotations 'look' exactly the same.
//
if ( ! allowExactDuplicates
- && env instanceof ExtendedAnnotationProcessorEnvironment
- && ( ( ExtendedAnnotationProcessorEnvironment ) env ).useEqualsToCompareAnnotations() )
+ && env instanceof ExtendedCoreAnnotationProcessorEnv
+ && ( ( ExtendedCoreAnnotationProcessorEnv ) env ).useEqualsToCompareAnnotations() )
{
return a1.equals( a2 );
}
@@ -975,7 +975,7 @@
return ret;
}
- public static boolean isPageFlowClass( ClassDeclaration jclass, AnnotationProcessorEnvironment env )
+ public static boolean isPageFlowClass( ClassDeclaration jclass, CoreAnnotationProcessorEnv env )
{
return getAnnotation( jclass, CONTROLLER_TAG_NAME ) != null && isAssignableFrom( JPF_BASE_CLASS, jclass, env );
}
@@ -986,7 +986,7 @@
return uri.substring( 0, lastDot );
}
- public static TypeDeclaration inferTypeFromPath( String webappRelativePath, AnnotationProcessorEnvironment env )
+ public static TypeDeclaration inferTypeFromPath( String webappRelativePath, CoreAnnotationProcessorEnv env )
{
assert webappRelativePath.startsWith( "/" ) : webappRelativePath;
String className = removeFileExtension( webappRelativePath.substring( 1 ) );
@@ -1179,7 +1179,7 @@
}
public static File getFileRelativeToSourceFile( TypeDeclaration outerClass, String relativePath,
- AnnotationProcessorEnvironment env )
+ CoreAnnotationProcessorEnv env )
throws FatalCompileTimeException
{
assert relativePath.length() > 0;
@@ -1220,7 +1220,7 @@
}
public static File getWebappRelativeFile( String webappRelativePath, boolean lookInSourceRoots,
- AnnotationProcessorEnvironment env )
+ CoreAnnotationProcessorEnv env )
throws FatalCompileTimeException
{
//
@@ -1254,7 +1254,7 @@
return null;
}
- public static String[] getWebSourceRoots( AnnotationProcessorEnvironment env )
+ public static String[] getWebSourceRoots( CoreAnnotationProcessorEnv env )
throws FatalCompileTimeException
{
String[] legacyOption = getOption( "-Aweb.source.roots", false, env ); // deprecated - TODO: deprecation message
@@ -1262,13 +1262,13 @@
return getOption( "-sourcepath", true, env );
}
- public static String[] getWebContentRoots( AnnotationProcessorEnvironment env )
+ public static String[] getWebContentRoots( CoreAnnotationProcessorEnv env )
throws FatalCompileTimeException
{
return getOption( "-Aweb.content.root", true, env );
}
- private static String[] getOption( String optionName, boolean required, AnnotationProcessorEnvironment env )
+ private static String[] getOption( String optionName, boolean required, CoreAnnotationProcessorEnv env )
throws MissingOptionException
{
String[] cached = ( String[] ) env.getAttribute( optionName );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/Diagnostics.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/Diagnostics.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/Diagnostics.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/Diagnostics.java Wed Dec 21 09:20:30 2005
@@ -17,17 +17,17 @@
*/
package org.apache.beehive.netui.compiler;
-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.Declaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
public abstract class Diagnostics
{
- private AnnotationProcessorEnvironment _env;
+ private CoreAnnotationProcessorEnv _env;
private boolean _hasErrors = false;
- protected Diagnostics( AnnotationProcessorEnvironment env )
+ protected Diagnostics( CoreAnnotationProcessorEnv env )
{
_env = env;
}
@@ -202,7 +202,7 @@
_hasErrors = hadErrors;
}
- protected AnnotationProcessorEnvironment getAnnotationProcessorEnvironment()
+ protected CoreAnnotationProcessorEnv getAnnotationProcessorEnvironment()
{
return _env;
}
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FacesBackingChecker.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FacesBackingChecker.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FacesBackingChecker.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FacesBackingChecker.java Wed Dec 21 09:20:30 2005
@@ -20,7 +20,7 @@
import org.apache.beehive.netui.compiler.grammar.CommandHandlerGrammar;
import org.apache.beehive.netui.compiler.typesystem.declaration.ClassDeclaration;
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 java.util.HashMap;
import java.util.Map;
@@ -30,7 +30,7 @@
extends BaseChecker
implements JpfLanguageConstants
{
- public FacesBackingChecker( AnnotationProcessorEnvironment env, FacesBackingInfo fbInfo, Diagnostics diags )
+ public FacesBackingChecker( CoreAnnotationProcessorEnv env, FacesBackingInfo fbInfo, Diagnostics diags )
{
super( env, fbInfo, diags );
}
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FacesBackingGenerator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FacesBackingGenerator.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FacesBackingGenerator.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FacesBackingGenerator.java Wed Dec 21 09:20:30 2005
@@ -20,13 +20,13 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.ClassDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
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;
public class FacesBackingGenerator
extends BaseGenerator
implements JpfLanguageConstants
{
- public FacesBackingGenerator( AnnotationProcessorEnvironment env, SourceFileInfo sourceFileInfo, Diagnostics diagnostics )
+ public FacesBackingGenerator( CoreAnnotationProcessorEnv env, SourceFileInfo sourceFileInfo, Diagnostics diagnostics )
{
super( env, sourceFileInfo, diagnostics );
}
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java Wed Dec 21 09:20:30 2005
@@ -30,7 +30,7 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.PackageDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.ParameterDeclaration;
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.type.ClassType;
import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance;
import org.apache.beehive.netui.compiler.processor.SilentDiagnostics;
@@ -60,7 +60,7 @@
private FormBeanChecker _formBeanChecker;
private Map _checkResultMap;
- protected FlowControllerChecker( AnnotationProcessorEnvironment env, FlowControllerInfo fcInfo, Diagnostics diags )
+ protected FlowControllerChecker( CoreAnnotationProcessorEnv env, FlowControllerInfo fcInfo, Diagnostics diags )
{
super( env, fcInfo, diags );
}
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerGenerator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerGenerator.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerGenerator.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerGenerator.java Wed Dec 21 09:20:30 2005
@@ -23,8 +23,7 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
import org.apache.beehive.netui.compiler.typesystem.declaration.FieldDeclaration;
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.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import org.apache.beehive.netui.compiler.model.XmlModelWriterException;
import java.io.File;
@@ -41,7 +40,7 @@
private static final boolean ALWAYS_GENERATE = true; // TODO: this turns stale checking off. Do we need it?
private static final String CONTROL_ANNOTATION = JpfLanguageConstants.BEEHIVE_PACKAGE + ".controls.api.bean.Control";
- protected FlowControllerGenerator( AnnotationProcessorEnvironment env, FlowControllerInfo fcInfo,
+ protected FlowControllerGenerator( CoreAnnotationProcessorEnv env, FlowControllerInfo fcInfo,
Diagnostics diagnostics )
{
super( env, fcInfo, diagnostics );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerInfo.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerInfo.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerInfo.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerInfo.java Wed Dec 21 09:20:30 2005
@@ -23,7 +23,7 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.FieldDeclaration;
import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance;
import org.apache.beehive.netui.compiler.typesystem.type.DeclaredType;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import java.util.*;
import java.io.File;
@@ -108,7 +108,7 @@
super( CompilerUtils.getSourceFile( jclass, true ), jclass.getQualifiedName() );
}
- void startBuild( AnnotationProcessorEnvironment env, ClassDeclaration jclass )
+ void startBuild( CoreAnnotationProcessorEnv env, ClassDeclaration jclass )
{
_isBuilding = true;
_mergedControllerAnnotation = new MergedControllerAnnotation( jclass );
@@ -199,7 +199,7 @@
}
}
- private void setSharedFlowInfo( AnnotationProcessorEnvironment env )
+ private void setSharedFlowInfo( CoreAnnotationProcessorEnv env )
{
//
// First, find all referenced Shared Flow types.
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FormBeanChecker.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FormBeanChecker.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FormBeanChecker.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FormBeanChecker.java Wed Dec 21 09:20:30 2005
@@ -27,7 +27,7 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.Modifier;
import org.apache.beehive.netui.compiler.typesystem.declaration.ParameterDeclaration;
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.type.DeclaredType;
import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance;
@@ -38,7 +38,7 @@
extends BaseChecker
implements JpfLanguageConstants
{
- public FormBeanChecker( AnnotationProcessorEnvironment env, Diagnostics diags )
+ public FormBeanChecker( CoreAnnotationProcessorEnv env, Diagnostics diags )
{
super( env, null, diags );
}
@@ -73,7 +73,7 @@
*/
}
- AnnotationProcessorEnvironment env = getEnv();
+ CoreAnnotationProcessorEnv env = getEnv();
// Make sure ActionForm subclasses are public static, and that they have default constructors.
if ( isFormBeanClass || CompilerUtils.isAssignableFrom( STRUTS_FORM_CLASS_NAME, jclass, env ) )
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/PageFlowChecker.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/PageFlowChecker.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/PageFlowChecker.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/PageFlowChecker.java Wed Dec 21 09:20:30 2005
@@ -26,7 +26,7 @@
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.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.type.DeclaredType;
import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance;
@@ -40,7 +40,7 @@
extends FlowControllerChecker
implements JpfLanguageConstants
{
- public PageFlowChecker( AnnotationProcessorEnvironment env, Diagnostics diagnostics, FlowControllerInfo fcInfo )
+ public PageFlowChecker( CoreAnnotationProcessorEnv env, Diagnostics diagnostics, FlowControllerInfo fcInfo )
{
super( env, fcInfo, diagnostics );
}
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/PageFlowGenerator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/PageFlowGenerator.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/PageFlowGenerator.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/PageFlowGenerator.java Wed Dec 21 09:20:30 2005
@@ -19,7 +19,7 @@
import org.apache.beehive.netui.compiler.genmodel.GenStrutsApp;
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;
import java.io.IOException;
@@ -28,7 +28,7 @@
public class PageFlowGenerator
extends FlowControllerGenerator
{
- public PageFlowGenerator( AnnotationProcessorEnvironment env, FlowControllerInfo fcInfo, Diagnostics diags )
+ public PageFlowGenerator( CoreAnnotationProcessorEnv env, FlowControllerInfo fcInfo, Diagnostics diags )
{
super( env, fcInfo, diags );
}
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/SharedFlowChecker.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/SharedFlowChecker.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/SharedFlowChecker.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/SharedFlowChecker.java Wed Dec 21 09:20:30 2005
@@ -22,7 +22,7 @@
import org.apache.beehive.netui.compiler.grammar.ControllerGrammar;
import org.apache.beehive.netui.compiler.grammar.InvalidAttributeType;
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;
import java.io.IOException;
@@ -31,7 +31,7 @@
public class SharedFlowChecker
extends FlowControllerChecker
{
- public SharedFlowChecker( AnnotationProcessorEnvironment env, FlowControllerInfo fcInfo, Diagnostics diagnostics )
+ public SharedFlowChecker( CoreAnnotationProcessorEnv env, FlowControllerInfo fcInfo, Diagnostics diagnostics )
{
super( env, fcInfo, diagnostics );
}
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/SharedFlowGenerator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/SharedFlowGenerator.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/SharedFlowGenerator.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/SharedFlowGenerator.java Wed Dec 21 09:20:30 2005
@@ -20,7 +20,7 @@
import org.apache.beehive.netui.compiler.genmodel.GenSharedFlowStrutsApp;
import org.apache.beehive.netui.compiler.genmodel.GenStrutsApp;
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;
import java.io.IOException;
@@ -29,7 +29,7 @@
public class SharedFlowGenerator
extends FlowControllerGenerator
{
- public SharedFlowGenerator( AnnotationProcessorEnvironment env, FlowControllerInfo fcInfo, Diagnostics diags )
+ public SharedFlowGenerator( CoreAnnotationProcessorEnv env, FlowControllerInfo fcInfo, Diagnostics diags )
{
super( env, fcInfo, diags );
}
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenSharedFlowStrutsApp.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenSharedFlowStrutsApp.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenSharedFlowStrutsApp.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenSharedFlowStrutsApp.java Wed Dec 21 09:20:30 2005
@@ -18,7 +18,7 @@
package org.apache.beehive.netui.compiler.genmodel;
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.FlowControllerInfo;
import org.apache.beehive.netui.compiler.JpfLanguageConstants;
import org.apache.beehive.netui.compiler.Diagnostics;
@@ -32,7 +32,7 @@
extends GenStrutsApp
implements JpfLanguageConstants
{
- public GenSharedFlowStrutsApp( File sourceFile, ClassDeclaration jclass, AnnotationProcessorEnvironment env,
+ public GenSharedFlowStrutsApp( File sourceFile, ClassDeclaration jclass, CoreAnnotationProcessorEnv env,
FlowControllerInfo fcInfo, boolean checkOnly, Diagnostics diagnostics )
throws IOException, FatalCompileTimeException
{
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java Wed Dec 21 09:20:30 2005
@@ -33,7 +33,7 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.MethodDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.Modifier;
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 java.io.File;
import java.io.FileNotFoundException;
@@ -55,7 +55,7 @@
private String _containingPackage;
private File _strutsConfigFile;
private File _sourceFile;
- private AnnotationProcessorEnvironment _env;
+ private CoreAnnotationProcessorEnv _env;
private FlowControllerInfo _fcInfo;
protected void recalculateStrutsConfigFile()
@@ -69,7 +69,7 @@
return _fcInfo;
}
- public GenStrutsApp( File sourceFile, ClassDeclaration jclass, AnnotationProcessorEnvironment env,
+ public GenStrutsApp( File sourceFile, ClassDeclaration jclass, CoreAnnotationProcessorEnv env,
FlowControllerInfo fcInfo, boolean checkOnly, Diagnostics diagnostics )
throws IOException, FatalCompileTimeException
{
@@ -498,7 +498,7 @@
return file.toString();
}
- AnnotationProcessorEnvironment getEnv()
+ CoreAnnotationProcessorEnv getEnv()
{
return _env;
}
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenValidationModel.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenValidationModel.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenValidationModel.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenValidationModel.java Wed Dec 21 09:20:30 2005
@@ -36,7 +36,7 @@
import org.apache.beehive.netui.compiler.typesystem.type.DeclaredType;
import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance;
import org.apache.beehive.netui.compiler.typesystem.type.ClassType;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import java.io.File;
import java.io.FileNotFoundException;
@@ -58,10 +58,10 @@
private GenStrutsApp _strutsApp;
private File _mergeFile;
- private AnnotationProcessorEnvironment _env;
+ private CoreAnnotationProcessorEnv _env;
- public GenValidationModel( ClassDeclaration jclass, GenStrutsApp strutsApp, AnnotationProcessorEnvironment env )
+ public GenValidationModel( ClassDeclaration jclass, GenStrutsApp strutsApp, CoreAnnotationProcessorEnv env )
throws FatalCompileTimeException
{
MergedControllerAnnotation mca = strutsApp.getFlowControllerInfo().getMergedControllerAnnotation();
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java Wed Dec 21 09:20:30 2005
@@ -25,7 +25,7 @@
import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
import org.apache.beehive.netui.compiler.FatalCompileTimeException;
import org.apache.beehive.netui.compiler.typesystem.declaration.*;
-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.DeclaredType;
import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance;
@@ -34,7 +34,7 @@
extends BaseFlowControllerGrammar
implements JpfLanguageConstants
{
- public ActionGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
+ public ActionGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags,
RuntimeVersionChecker rvc, FlowControllerInfo fcInfo )
{
super( env, diags, null, rvc, fcInfo );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionOutputGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionOutputGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionOutputGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionOutputGrammar.java Wed Dec 21 09:20:30 2005
@@ -21,7 +21,7 @@
import org.apache.beehive.netui.compiler.Diagnostics;
import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
import org.apache.beehive.netui.compiler.CompilerUtils;
-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;
@@ -34,7 +34,7 @@
{
private static final String[][] REQUIRED_ATTRS = { { NAME_ATTR }, { TYPE_ATTR } };
- public ActionOutputGrammar( AnnotationProcessorEnvironment env, Diagnostics diags, RuntimeVersionChecker rvc )
+ public ActionOutputGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags, RuntimeVersionChecker rvc )
{
super( env, diags, null, rvc );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseFlowControllerGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseFlowControllerGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseFlowControllerGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseFlowControllerGrammar.java Wed Dec 21 09:20:30 2005
@@ -21,14 +21,14 @@
import org.apache.beehive.netui.compiler.Diagnostics;
import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
import org.apache.beehive.netui.compiler.FlowControllerInfo;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
public class BaseFlowControllerGrammar
extends AnnotationGrammar
{
private FlowControllerInfo _flowControllerInfo;
- public BaseFlowControllerGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
+ public BaseFlowControllerGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags,
String requiredRuntimeVersion, RuntimeVersionChecker runtimeVersionChecker,
FlowControllerInfo flowControllerInfo )
{
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java Wed Dec 21 09:20:30 2005
@@ -24,11 +24,10 @@
import org.apache.beehive.netui.compiler.FatalCompileTimeException;
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.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import java.util.List;
import java.util.Iterator;
-import java.util.ArrayList;
public class BaseValidationRuleGrammar
@@ -38,7 +37,7 @@
{
{ MESSAGE_KEY_ATTR, MESSAGE_ATTR }
};
-
+
private static final String[][] ATTR_DEPENDENCIES =
{
{ BUNDLE_NAME_ATTR, MESSAGE_KEY_ATTR }
@@ -46,21 +45,21 @@
private String[][] _requiredAttrs = null;
- public BaseValidationRuleGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
+ public BaseValidationRuleGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags,
RuntimeVersionChecker rvc )
{
super( env, diags, VERSION_9_0_STRING, rvc );
-
+
addMemberType( MESSAGE_KEY_ATTR, new MessageKeyType( null, this ) );
addMemberArrayGrammar( MESSAGE_ARGS_ATTR, new ValidationMessageArgsGrammar( env, diags, rvc ) );
addMemberType( BUNDLE_NAME_ATTR, new BundleNameType( null, this ) );
}
-
- public BaseValidationRuleGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
+
+ public BaseValidationRuleGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags,
RuntimeVersionChecker rvc, String[][] requiredAttrs )
{
this( env, diags, rvc );
-
+
_requiredAttrs = requiredAttrs;
}
@@ -73,13 +72,13 @@
{
return MUTUALLY_EXCLUSIVE_ATTRS;
}
-
+
public String[][] getAttrDependencies()
{
return ATTR_DEPENDENCIES;
}
-
+
protected boolean onBeginCheck( AnnotationInstance annotation, AnnotationInstance[] parentAnnotations,
MemberDeclaration classMember )
throws FatalCompileTimeException
@@ -91,7 +90,7 @@
//
assert parentAnnotations.length > 0;
AnnotationInstance immediateParent = parentAnnotations[parentAnnotations.length - 1];
-
+
if ( CompilerUtils.getString( immediateParent, DISPLAY_NAME_ATTR, true ) == null
&& CompilerUtils.getString( immediateParent, DISPLAY_NAME_KEY_ATTR, true ) == null
&& CompilerUtils.getString( annotation, MESSAGE_KEY_ATTR, true ) == null
@@ -105,7 +104,7 @@
{
boolean firstArg = true;
- for ( Iterator ii = messageArgs.iterator(); ii.hasNext(); )
+ for ( Iterator ii = messageArgs.iterator(); ii.hasNext(); )
{
AnnotationInstance messageArg = ( AnnotationInstance ) ii.next();
Integer position = CompilerUtils.getInteger( messageArg, POSITION_ATTR, true );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java Wed Dec 21 09:20:30 2005
@@ -29,7 +29,7 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.MethodDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.ParameterDeclaration;
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.type.DeclaredType;
import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance;
@@ -48,7 +48,7 @@
private String _annotationRootName;
- public CatchGrammar( AnnotationProcessorEnvironment env, Diagnostics diags, String requiredRuntimeVersion,
+ public CatchGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags, String requiredRuntimeVersion,
RuntimeVersionChecker runtimeVersionChecker, String annotationRootName,
FlowControllerInfo fcInfo )
{
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CommandHandlerGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CommandHandlerGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CommandHandlerGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CommandHandlerGrammar.java Wed Dec 21 09:20:30 2005
@@ -21,13 +21,13 @@
import org.apache.beehive.netui.compiler.FlowControllerInfo;
import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
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 CommandHandlerGrammar
extends BaseFlowControllerGrammar
{
- public CommandHandlerGrammar( AnnotationProcessorEnvironment env, Diagnostics diags, RuntimeVersionChecker rvc,
+ public CommandHandlerGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags, RuntimeVersionChecker rvc,
ClassDeclaration jpfClass, FlowControllerInfo fcInfo )
{
super( env, diags, null, rvc, fcInfo );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java Wed Dec 21 09:20:30 2005
@@ -21,15 +21,13 @@
import org.apache.beehive.netui.compiler.AnnotationMemberType;
import org.apache.beehive.netui.compiler.FlowControllerInfo;
import org.apache.beehive.netui.compiler.Diagnostics;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
-
-import java.net.URL;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
public class ControllerGrammar
extends BaseFlowControllerGrammar
{
- public ControllerGrammar( AnnotationProcessorEnvironment env, Diagnostics diags, RuntimeVersionChecker rvc,
+ public ControllerGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags, RuntimeVersionChecker rvc,
FlowControllerInfo fcInfo )
{
super( env, diags, null, rvc, fcInfo );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java Wed Dec 21 09:20:30 2005
@@ -28,13 +28,13 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.MethodDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.Modifier;
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;
public class ExceptionHandlerGrammar
extends BaseFlowControllerGrammar
{
- public ExceptionHandlerGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
+ public ExceptionHandlerGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags,
RuntimeVersionChecker runtimeVersionChecker, FlowControllerInfo fcInfo )
{
super( env, diags, null, runtimeVersionChecker, fcInfo );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java Wed Dec 21 09:20:30 2005
@@ -28,7 +28,7 @@
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.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.type.DeclaredType;
import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance;
@@ -75,7 +75,7 @@
};
- public ForwardGrammar( AnnotationProcessorEnvironment env, Diagnostics diags, String requiredRuntimeVersion,
+ public ForwardGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags, String requiredRuntimeVersion,
RuntimeVersionChecker runtimeVersionChecker, FlowControllerInfo fcInfo )
{
super( env, diags, requiredRuntimeVersion, runtimeVersionChecker, fcInfo );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java Wed Dec 21 09:20:30 2005
@@ -26,7 +26,7 @@
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.MemberDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
public class LocaleRulesGrammar
@@ -44,7 +44,7 @@
{ VARIANT_ATTR, LANGUAGE_ATTR }
};
- public LocaleRulesGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
+ public LocaleRulesGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags,
RuntimeVersionChecker rvc )
{
super( env, diags, rvc );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java Wed Dec 21 09:20:30 2005
@@ -21,7 +21,7 @@
import org.apache.beehive.netui.compiler.Diagnostics;
import org.apache.beehive.netui.compiler.CompilerUtils;
import org.apache.beehive.netui.compiler.FlowControllerInfo;
-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;
@@ -36,7 +36,7 @@
private static final String[][] REQUIRED_ATTRS = { { BUNDLE_PATH_ATTR } };
- public MessageBundleGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
+ public MessageBundleGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags,
String requiredRuntimeVersion, RuntimeVersionChecker runtimeVersionChecker,
FlowControllerInfo fcInfo )
{
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java Wed Dec 21 09:20:30 2005
@@ -27,7 +27,7 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
import org.apache.beehive.netui.compiler.typesystem.declaration.ClassDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
public class RaiseActionGrammar
@@ -35,7 +35,7 @@
{
private static final String[][] REQUIRED_ATTRS = { { ACTION_ATTR } };
- public RaiseActionGrammar( AnnotationProcessorEnvironment env, Diagnostics diags, String requiredRuntimeVersion,
+ public RaiseActionGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags, String requiredRuntimeVersion,
RuntimeVersionChecker runtimeVersionChecker, ClassDeclaration jpfClass,
FlowControllerInfo fcInfo )
{
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java Wed Dec 21 09:20:30 2005
@@ -22,7 +22,7 @@
import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
import org.apache.beehive.netui.compiler.CompilerUtils;
import org.apache.beehive.netui.compiler.FatalCompileTimeException;
-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.TypeDeclaration;
@@ -32,7 +32,7 @@
{
private static final String[][] REQUIRED_ATTRS = { { NAME_ATTR }, { TYPE_ATTR } };
- public SharedFlowRefGrammar( AnnotationProcessorEnvironment env, Diagnostics diags, RuntimeVersionChecker rvc )
+ public SharedFlowRefGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags, RuntimeVersionChecker rvc )
{
super( env, diags, null, rvc );
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java Wed Dec 21 09:20:30 2005
@@ -28,7 +28,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.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.type.TypeInstance;
import java.util.Collection;
@@ -53,7 +53,7 @@
private ForwardGrammar _forwardGrammar;
- public SimpleActionGrammar( AnnotationProcessorEnvironment env, Diagnostics diags, RuntimeVersionChecker rvc,
+ public SimpleActionGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags, RuntimeVersionChecker rvc,
FlowControllerInfo fcInfo )
{
super( env, diags, rvc, fcInfo );
@@ -117,7 +117,7 @@
{ PATH_ATTR, TILES_DEFINITION_ATTR, RETURN_ACTION_ATTR, NAVIGATE_TO_ATTR, ACTION_ATTR }
};
- public SimpleActionForwardGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
+ public SimpleActionForwardGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags,
String requiredRuntimeVersion, RuntimeVersionChecker runtimeVersionChecker,
FlowControllerInfo fcInfo )
{
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java Wed Dec 21 09:20:30 2005
@@ -24,7 +24,7 @@
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.MemberDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
import java.util.List;
import java.util.HashSet;
@@ -175,7 +175,7 @@
}
static boolean alreadyAddedErrorForValue( MemberDeclaration classMember, AnnotationInstance parentAnn,
- Object memberValue, AnnotationProcessorEnvironment env )
+ Object memberValue, CoreAnnotationProcessorEnv env )
{
// Map of String class-member-name ->
// [ Map of String annotation name -> Set of values for which errors were added ]
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatableBeanGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatableBeanGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatableBeanGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatableBeanGrammar.java Wed Dec 21 09:20:30 2005
@@ -20,14 +20,14 @@
import org.apache.beehive.netui.compiler.AnnotationGrammar;
import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
import org.apache.beehive.netui.compiler.Diagnostics;
-import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
+import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
public class ValidatableBeanGrammar
extends AnnotationGrammar
{
private static final String[][] REQUIRED_ATTRS = { { VALIDATABLE_PROPERTIES_ATTR }, { TYPE_ATTR } };
- public ValidatableBeanGrammar( AnnotationProcessorEnvironment env, Diagnostics diags, RuntimeVersionChecker rvc )
+ public ValidatableBeanGrammar( 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/ValidatablePropertyGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatablePropertyGrammar.java?rev=358330&r1=358329&r2=358330&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatablePropertyGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatablePropertyGrammar.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.RuntimeVersionChecker;
@@ -34,7 +34,7 @@
private static String[][] MUTUALLY_EXCLUSIVE_ATTRS = { { DISPLAY_NAME_ATTR, DISPLAY_NAME_KEY_ATTR } };
- public ValidatablePropertyGrammar( AnnotationProcessorEnvironment env, Diagnostics diags, RuntimeVersionChecker rvc )
+ public ValidatablePropertyGrammar( CoreAnnotationProcessorEnv env, Diagnostics diags, RuntimeVersionChecker rvc )
{
super( env, diags, rvc );