You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by pa...@apache.org on 2019/01/22 18:58:29 UTC
svn commit: r1851850 - in /turbine/core/trunk: ./
src/java/org/apache/turbine/modules/screens/error/
src/java/org/apache/turbine/util/ src/java/org/apache/turbine/util/template/
Author: painter
Date: Tue Jan 22 18:58:29 2019
New Revision: 1851850
URL: http://svn.apache.org/viewvc?rev=1851850&view=rev
Log:
Remove code and dependencies on retired ecs module
Removed:
turbine/core/trunk/src/java/org/apache/turbine/util/DateSelector.java
turbine/core/trunk/src/java/org/apache/turbine/util/TimeSelector.java
turbine/core/trunk/src/java/org/apache/turbine/util/template/SelectorBox.java
Modified:
turbine/core/trunk/pom.xml
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java
Modified: turbine/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1851850&r1=1851849&r2=1851850&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Tue Jan 22 18:58:29 2019
@@ -905,11 +905,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>ecs</groupId>
- <artifactId>ecs</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
<groupId>net.sf.uadetector</groupId>
<artifactId>uadetector-resources</artifactId>
<version>2014.10</version>
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java?rev=1851850&r1=1851849&r2=1851850&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java Tue Jan 22 18:58:29 2019
@@ -21,8 +21,6 @@ package org.apache.turbine.modules.scree
*/
-import org.apache.ecs.ElementContainer;
-import org.apache.ecs.html.A;
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.turbine.modules.Screen;
import org.apache.turbine.pipeline.PipelineData;
@@ -59,9 +57,10 @@ public class InvalidState
throws Exception
{
RunData data = getRunData(pipelineData);
- ElementContainer body = new ElementContainer();
- ElementContainer message = new ElementContainer();
-
+ StringBuilder body = new StringBuilder();
+ body.append("<body>");
+
+ StringBuilder message = new StringBuilder();
StringBuilder sb = new StringBuilder();
sb.append("<b>There has been an error.</b>")
.append("<p>")
@@ -71,18 +70,18 @@ public class InvalidState
.append("<p>")
.append("Please click ");
- message.addElement(sb.toString());
+ message.append(sb.toString());
ParameterParser pp;
pp = (ParameterParser) data.getUser().getTemp("prev_parameters");
pp.remove("_session_access_counter");
TurbineURI back = new TurbineURI(data,(String) data.getUser().getTemp("prev_screen"));
back.addPathInfo(pp);
- message.addElement(new A().setHref(back.getRelativeLink()).addElement("here"));
-
- message.addElement(" to return the the screen you were working on.");
+ message.append( "<a href=\"" ).append(back.getRelativeLink()).append("\">here</a>");
+ message.append(" to return the the screen you were working on.");
- body.addElement(message);
+ body.append(message);
+ body.append("</body>");
return body.toString();
}
}