Author: rich
Date: Sun Apr 17 18:19:39 2005
New Revision: 161705
URL: http://svn.apache.org/viewcvs?view=rev&rev=161705
Log:
This is a fix to my fix for http://issues.apache.org/jira/browse/BEEHIVE-452 :
No compiler error when strutsMerge file is missing in the extending page flow .
The error checking got overzealous -- it added errors for any non-relative
Struts merge file inherited from @Jpf.Controller in the superclass, e.g.,
@Jpf.Controller(strutsMerge="/foo/bar.xml")
tests: bvt in netui (WinXP)
BB: self (linux)
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java?view=diff&r1=161704&r2=161705
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java
Sun Apr 17 18:19:39 2005
@@ -181,17 +181,17 @@
protected void addError( Declaration element, String key, Object arg )
{
- getDiagnostics().addError( element, key, new Object[]{ arg } );
+ getDiagnostics().addError( element, key, arg );
}
protected void addError( Declaration element, String key, Object arg1,
Object arg2 )
{
- getDiagnostics().addError( element, key, new Object[]{ arg1, arg2 } );
+ getDiagnostics().addError( element, key, arg1, arg2 );
}
protected void addError( Declaration element, String key, Object arg1,
Object arg2, Object arg3 )
{
- getDiagnostics().addError( element, key, new Object[]{ arg1, arg2,
arg3 } );
+ getDiagnostics().addError( element, key, arg1, arg2, arg3 );
}
protected void addError( AnnotationValue element, String key )
@@ -206,17 +206,17 @@
protected void addError( AnnotationValue element, String key, Object arg1 )
{
- getDiagnostics().addError( element, key, new Object[]{ arg1 } );
+ getDiagnostics().addError( element, key, arg1 );
}
protected void addError( AnnotationValue element, String key, Object arg1,
Object arg2 )
{
- getDiagnostics().addError( element, key, new Object[]{ arg1, arg2 } );
+ getDiagnostics().addError( element, key, arg1, arg2 );
}
protected void addError( AnnotationValue element, String key, Object arg1,
Object arg2, Object arg3 )
{
- getDiagnostics().addError( element, key, new Object[]{ arg1, arg2,
arg3 } );
+ getDiagnostics().addError( element, key, arg1, arg2, arg3 );
}
protected void addError( AnnotationInstance element, String key )
@@ -231,17 +231,17 @@
protected void addError( AnnotationInstance element, String key, Object
arg1 )
{
- getDiagnostics().addError( element, key, new Object[]{ arg1 } );
+ getDiagnostics().addError( element, key, arg1 );
}
protected void addError( AnnotationInstance element, String key, Object
arg1, Object arg2 )
{
- getDiagnostics().addError( element, key, new Object[]{ arg1, arg2 } );
+ getDiagnostics().addError( element, key, arg1, arg2 );
}
protected void addError( AnnotationInstance element, String key, Object
arg1, Object arg2, Object arg3 )
{
- getDiagnostics().addError( element, key, new Object[]{ arg1, arg2,
arg3 } );
+ getDiagnostics().addError( element, key, arg1, arg2, arg3 );
}
protected void addWarning( Declaration element, String key )
@@ -256,17 +256,17 @@
protected void addWarning( Declaration element, String key, Object arg )
{
- getDiagnostics().addWarning( element, key, new Object[]{ arg } );
+ getDiagnostics().addWarning( element, key, arg );
}
protected void addWarning( Declaration element, String key, Object arg1,
Object arg2 )
{
- getDiagnostics().addWarning( element, key, new Object[]{ arg1, arg2 }
);
+ getDiagnostics().addWarning( element, key, arg1, arg2 );
}
protected void addWarning( Declaration element, String key, Object arg1,
Object arg2, Object arg3 )
{
- getDiagnostics().addWarning( element, key, new Object[]{ arg1, arg2,
arg3 } );
+ getDiagnostics().addWarning( element, key, arg1, arg2, arg3 );
}
protected void addWarning( AnnotationValue element, String key )
@@ -281,17 +281,17 @@
protected void addWarning( AnnotationValue element, String key, Object
arg1 )
{
- getDiagnostics().addWarning( element, key, new Object[]{ arg1 } );
+ getDiagnostics().addWarning( element, key, arg1 );
}
protected void addWarning( AnnotationValue element, String key, Object
arg1, Object arg2 )
{
- getDiagnostics().addWarning( element, key, new Object[]{ arg1, arg2 }
);
+ getDiagnostics().addWarning( element, key, arg1, arg2 );
}
protected void addWarning( AnnotationValue element, String key, Object
arg1, Object arg2, Object arg3 )
{
- getDiagnostics().addWarning( element, key, new Object[]{ arg1, arg2,
arg3 } );
+ getDiagnostics().addWarning( element, key, arg1, arg2, arg3 );
}
protected void addWarning( AnnotationInstance element, String key )
@@ -306,17 +306,17 @@
protected void addWarning( AnnotationInstance element, String key, Object
arg1 )
{
- getDiagnostics().addWarning( element, key, new Object[]{ arg1 } );
+ getDiagnostics().addWarning( element, key, arg1 );
}
protected void addWarning( AnnotationInstance element, String key, Object
arg1, Object arg2 )
{
- getDiagnostics().addWarning( element, key, new Object[]{ arg1, arg2 }
);
+ getDiagnostics().addWarning( element, key, arg1, arg2 );
}
protected void addWarning( AnnotationInstance element, String key, Object
arg1, Object arg2, Object arg3 )
{
- getDiagnostics().addWarning( element, key, new Object[]{ arg1, arg2,
arg3 } );
+ getDiagnostics().addWarning( element, key, arg1, arg2, arg3 );
}
/**
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java?view=diff&r1=161704&r2=161705
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
Sun Apr 17 18:19:39 2005
@@ -446,7 +446,7 @@
{
String path = ( String ) pathVal.getValue();
- if ( ! WebappPathType.relativePathExists( path, jclass,
getEnv() ) )
+ if ( path.charAt( 0 ) != '/' && !
WebappPathType.relativePathExists( path, jclass, getEnv() ) )
{
String[] args = {
path,
@@ -478,7 +478,7 @@
{
String path = ( String ) pathVal.getValue();
- if ( ! WebappPathType.relativePathExists( path, jclass,
getEnv() ) )
+ if ( path.charAt( 0 ) != '/' && !
WebappPathType.relativePathExists( path, jclass, getEnv() ) )
{
String[] args = {
path,
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java?view=diff&r1=161704&r2=161705
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
Sun Apr 17 18:19:39 2005
@@ -185,6 +185,7 @@
public static boolean relativePathExists( String filePath, TypeDeclaration
outerClass,
AnnotationProcessorEnvironment
env )
{
+ assert filePath.charAt( 0 ) != '/' : filePath + " is not a relative
path";
return checkRelativePath( filePath, outerClass, null, true, false, env
);
}
