You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cr...@apache.org on 2006/10/11 18:16:01 UTC
svn commit: r462841 - in /beehive/trunk/netui:
src/pageflow/org/apache/beehive/netui/pageflow/annotations/
test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/
test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/
Author: crogers
Date: Wed Oct 11 09:16:00 2006
New Revision: 462841
URL: http://svn.apache.org/viewvc?view=rev&rev=462841
Log:
Fix for Jpf.ValidatorVersion compiler warning, http://issues.apache.org/jira/browse/BEEHIVE-1150
This is a contribution from Tory Toupin.
Tests: NetUI BVT (WinXP pass)
Added:
beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.java
- copied, changed from r462540, beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.jpf
Removed:
beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.jpf
Modified:
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java?view=diff&rev=462841&r1=462840&r2=462841
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java Wed Oct 11 09:16:00 2006
@@ -64,7 +64,8 @@
/** Indicates that the previous action should be re-run. **/
previousAction,
- /** @deprecated Either {@link #currentPage} or {@link #previousPage} should be used instead. */
+ /** Either {@link #currentPage} or {@link #previousPage} should be used instead. */
+ @Deprecated
page
}
Copied: beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.java (from r462540, beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.jpf)
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.java?view=diff&rev=462841&p1=beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.jpf&r1=462540&p2=beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.java&r2=462841
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.jpf (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.java Wed Oct 11 09:16:00 2006
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
package Nested_NewReturnTo;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
@@ -17,13 +35,12 @@
*
*
******************************************************************************/
- @Jpf.Controller(
- nested = true)
+@Jpf.Controller(
+ nested = true)
public class Controller extends PageFlowController
- {
+{
/**
* This is valid.
- *
*/
@Jpf.Action(
forwards = {
@@ -32,12 +49,12 @@
path = "Page1.jsp")
})
protected Forward begin()
- {
+ {
return new Forward("page1");
- }
+ }
+
/**
* This is valid.
- *
*/
@Jpf.Action(
forwards = {
@@ -46,12 +63,12 @@
navigateTo = Jpf.NavigateTo.previousPage)
})
protected Forward action1()
- {
+ {
return new Forward("page1");
- }
+ }
+
/**
* This is valid.
- *
*/
@Jpf.Action(
forwards = {
@@ -60,12 +77,12 @@
navigateTo = Jpf.NavigateTo.currentPage)
})
protected Forward action2()
- {
+ {
return new Forward("page1");
- }
+ }
+
/**
* This is valid.
- *
*/
@Jpf.Action(
forwards = {
@@ -74,12 +91,12 @@
navigateTo = Jpf.NavigateTo.previousAction)
})
protected Forward action3()
- {
+ {
return new Forward("page1");
- }
+ }
+
/**
* This should be depricated.
- *
*/
@Jpf.Action(
forwards = {
@@ -88,12 +105,12 @@
navigateTo = Jpf.NavigateTo.previousAction)
})
protected Forward action4()
- {
+ {
return new Forward("page1");
- }
+ }
+
/**
* This is should be depricated.
- *
*/
@Jpf.Action(
forwards = {
@@ -102,12 +119,12 @@
navigateTo = Jpf.NavigateTo.page)
})
protected Forward action5()
- {
+ {
return new Forward("page1");
- }
+ }
+
/**
* This is invalid.
- *
*/
@Jpf.Action(
forwards = {
@@ -116,7 +133,7 @@
returnAction = "someAction")
})
protected Forward action8()
- {
+ {
return new Forward("callingJpf");
- }
}
+}
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected?view=diff&rev=462841&r1=462840&r2=462841
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected Wed Oct 11 09:16:00 2006
@@ -1,4 +1,8 @@
-[LOCAL_PATH]\WEB-INF\.tmpbeansrc\Nested_NewReturnTo\Controller.java:104: warning: The "page" value is deprecated.
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\Nested_NewReturnTo\Controller.java:121: warning: The "page" value is deprecated.
protected Forward action5()
^
+Note: [LOCAL_PATH]\WEB-INF\.tmpbeansrc\Nested_NewReturnTo\Controller.java uses or overrides a deprecated API.
+Note: Recompile with -Xlint:deprecation for details.
1 warning
+Note: [LOCAL_PATH]\WEB-INF\.tmpbeansrc\Nested_NewReturnTo\Controller.java uses or overrides a deprecated API.
+Note: Recompile with -Xlint:deprecation for details.