You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/05/07 17:46:39 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/error InvalidState.java
henning 2003/05/07 08:46:39
Modified: src/java/org/apache/turbine/modules/navigations
DefaultBottomNavigation.java
src/java/org/apache/turbine/modules/screens/error
InvalidState.java
Log:
Replace DynamicURI usage with TurbineURI
Revision Changes Path
1.12 +10 -14 jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java
Index: DefaultBottomNavigation.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultBottomNavigation.java 11 Apr 2003 15:22:45 -0000 1.11
+++ DefaultBottomNavigation.java 7 May 2003 15:46:37 -0000 1.12
@@ -77,8 +77,8 @@
import org.apache.turbine.modules.Navigation;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
-import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.uri.TurbineURI;
/**
* This is a sample navigation module.
@@ -107,18 +107,14 @@
public ConcreteElement doBuild(RunData data) throws Exception
{
Form form;
- form =
- new Form(
- new DynamicURI(
- data,
- TurbineConstants.SCREEN_DEFAULT_DEFAULT,
- TurbineConstants.ACTION_LOGOUT_DEFAULT,
- true)
- .toString(),
- Form.POST).addElement(
- new Input("SUBMIT", "Logout", "Logout"));
- ElementContainer body =
- new ElementContainer()
+ form = new Form(
+ new TurbineURI(data,
+ TurbineConstants.SCREEN_DEFAULT_DEFAULT,
+ TurbineConstants.ACTION_LOGOUT_DEFAULT,
+ true).getRelativeLink(),
+ Form.POST).addElement(new Input("SUBMIT", "Logout", "Logout"));
+
+ ElementContainer body = new ElementContainer()
.addElement(new HR().setSize(1).setNoShade(true))
.addElement(
new B().addElement(
1.7 +4 -5 jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/error/InvalidState.java
Index: InvalidState.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/error/InvalidState.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InvalidState.java 11 Apr 2003 13:15:09 -0000 1.6
+++ InvalidState.java 7 May 2003 15:46:39 -0000 1.7
@@ -60,9 +60,9 @@
import org.apache.ecs.html.A;
import org.apache.turbine.modules.Screen;
-import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.parser.ParameterParser;
+import org.apache.turbine.util.uri.TurbineURI;
/**
* Users will get this screen if the screen on their browser is in an
@@ -108,10 +108,9 @@
pp = (ParameterParser) data.getUser().getTemp("prev_parameters");
pp.remove("_session_access_counter");
- DynamicURI back = new DynamicURI(data, (String) data.getUser().getTemp("prev_screen"));
+ TurbineURI back = new TurbineURI(data,(String) data.getUser().getTemp("prev_screen"));
back.addPathInfo(pp);
-
- message.addElement(new A().setHref(back.toString()).addElement("here"));
+ message.addElement(new A().setHref(back.getRelativeLink()).addElement("here"));
message.addElement(" to return the the screen you were working on.");
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org