mikeh 01/05/23 09:37:38
Modified: src/java/org/apache/turbine/modules GenericLoader.java
PageLoader.java
src/java/org/apache/turbine/modules/actions
FreeMarkerSiteCooker.java
src/java/org/apache/turbine/modules/actions/sessionvalidator
TemplateSecureSessionValidator.java
src/java/org/apache/turbine/modules/layouts
DefaultLayout.java FreeMarkerSiteLayout.java
VelocityOnlyLayout.java
src/java/org/apache/turbine/modules/navigations
BaseFreeMarkerNavigation.java
DefaultBottomNavigation.java
DefaultTopNavigation.java
WebMacroSiteNavigation.java
src/java/org/apache/turbine/modules/pages DefaultPage.java
FreeMarkerSitePage.java TemplatePage.java
VelocityPage.java
src/java/org/apache/turbine/modules/screens
BaseJspScreen.java Error.java
WebMacroSiteErrorScreen.java
src/java/org/apache/turbine/modules/screens/error
InvalidState.java
Log:
cleanup lines that wrap over 80 chars. still 109 files to do!
Revision Changes Path
1.7 +5 -3
jakarta-turbine/src/java/org/apache/turbine/modules/GenericLoader.java
Index: GenericLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/GenericLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GenericLoader.java 2001/05/05 15:55:31 1.6
+++ GenericLoader.java 2001/05/23 16:35:31 1.7
@@ -68,7 +68,7 @@
* that is required to be called a Loader.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: GenericLoader.java,v 1.6 2001/05/05 15:55:31 mpoeschl Exp $
+ * @version $Id: GenericLoader.java,v 1.7 2001/05/23 16:35:31 mikeh Exp $
*/
public abstract class GenericLoader extends Hashtable
{
@@ -85,7 +85,8 @@
public GenericLoader()
{
super ();
- CACHE = TurbineResources.getBoolean(TurbineConstants.MODULE_CACHE, true);
+ CACHE = TurbineResources
+ .getBoolean(TurbineConstants.MODULE_CACHE, true);
}
/**
@@ -94,7 +95,8 @@
public GenericLoader(int i)
{
super ( i );
- CACHE = TurbineResources.getBoolean(TurbineConstants.MODULE_CACHE, true);
+ CACHE = TurbineResources
+ .getBoolean(TurbineConstants.MODULE_CACHE, true);
}
/**
1.10 +3 -2
jakarta-turbine/src/java/org/apache/turbine/modules/PageLoader.java
Index: PageLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/PageLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PageLoader.java 2001/05/05 15:55:31 1.9
+++ PageLoader.java 2001/05/23 16:35:34 1.10
@@ -71,7 +71,7 @@
* modules.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: PageLoader.java,v 1.9 2001/05/05 15:55:31 mpoeschl Exp $
+ * @version $Id: PageLoader.java,v 1.10 2001/05/23 16:35:34 mikeh Exp $
*/
public class PageLoader extends GenericLoader
{
@@ -165,7 +165,8 @@
{
// If we did not find a screen we should try and give
// the user a reason for that...
- // FIX ME: The AssemblerFactories should each add it's own string
here...
+ // FIX ME: The AssemblerFactories should each add
+ // it's own string here...
Vector packages = TurbineResources.getVector(
TurbineConstants.MODULE_PACKAGES);
ObjectUtils.addOnce( packages,
1.7 +5 -3
jakarta-turbine/src/java/org/apache/turbine/modules/actions/FreeMarkerSiteCooker.java
Index: FreeMarkerSiteCooker.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/FreeMarkerSiteCooker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FreeMarkerSiteCooker.java 2001/05/05 16:34:21 1.6
+++ FreeMarkerSiteCooker.java 2001/05/23 16:35:47 1.7
@@ -85,7 +85,7 @@
* the urls with the static variation.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: FreeMarkerSiteCooker.java,v 1.6 2001/05/05 16:34:21 mpoeschl Exp $
+ * @version $Id: FreeMarkerSiteCooker.java,v 1.7 2001/05/23 16:35:47 mikeh Exp $
*/
public class FreeMarkerSiteCooker extends Action
{
@@ -104,7 +104,8 @@
Hashtable links = new Hashtable();
Vector files = new Vector();
Object value = new Object();
- String basePath =
TurbineResources.getString("services.freemarker.path");
+ String basePath;
+ basePath = TurbineResources.getString("services.freemarker.path");
// Add all files under basePath to the files Vector.
String[] templatePaths = {"layouts", "navigations", "screens"};
@@ -185,7 +186,8 @@
out[0] = new BufferedWriter(new FileWriter(cookedFile));
URL url = new URL(useUrl);
- in = new BufferedReader(new
InputStreamReader(url.openStream()));
+ in = new BufferedReader(
+ new InputStreamReader(url.openStream()));
parseFlatFile(uri, in, out);
System.out.println(fileCount + ": Successful");
1.8 +3 -2
jakarta-turbine/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java
Index: TemplateSecureSessionValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TemplateSecureSessionValidator.java 2001/05/05 17:45:46 1.7
+++ TemplateSecureSessionValidator.java 2001/05/23 16:35:55 1.8
@@ -79,7 +79,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: TemplateSecureSessionValidator.java,v 1.7 2001/05/05 17:45:46
mpoeschl Exp $
+ * @version $Id: TemplateSecureSessionValidator.java,v 1.8 2001/05/23 16:35:55
mikeh Exp $
*/
public class TemplateSecureSessionValidator extends SessionValidator
{
@@ -174,7 +174,8 @@
TurbineConstants.SCREEN_INVALID_STATE) );
data.getUser().setTemp( "prev_screen", data.getScreen() );
}
- data.getUser().setTemp( "prev_parameters", data.getParameters() );
+ data.getUser()
+ .setTemp( "prev_parameters", data.getParameters() );
data.setAction( "" );
}
}
1.6 +2 -2
jakarta-turbine/src/java/org/apache/turbine/modules/layouts/DefaultLayout.java
Index: DefaultLayout.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/layouts/DefaultLayout.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultLayout.java 2001/05/05 17:45:47 1.5
+++ DefaultLayout.java 2001/05/23 16:36:04 1.6
@@ -71,7 +71,7 @@
* This is an example Layout module that is executed by default.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: DefaultLayout.java,v 1.5 2001/05/05 17:45:47 mpoeschl Exp $
+ * @version $Id: DefaultLayout.java,v 1.6 2001/05/23 16:36:04 mikeh Exp $
*/
public class DefaultLayout extends Layout
{
@@ -85,7 +85,7 @@
{
// Execute the Top Navigation portion for this Layout.
ConcreteElement topNav =
- NavigationLoader.getInstance().eval ( data, "DefaultTopNavigation" );
+ NavigationLoader.getInstance().eval(data, "DefaultTopNavigation");
if ( topNav != null)
{
1.8 +9 -5
jakarta-turbine/src/java/org/apache/turbine/modules/layouts/FreeMarkerSiteLayout.java
Index: FreeMarkerSiteLayout.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/layouts/FreeMarkerSiteLayout.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FreeMarkerSiteLayout.java 2001/05/05 17:45:47 1.7
+++ FreeMarkerSiteLayout.java 2001/05/23 16:36:08 1.8
@@ -79,7 +79,7 @@
* relatively few reasons to subclass this Layout.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: FreeMarkerSiteLayout.java,v 1.7 2001/05/05 17:45:47 mpoeschl Exp $
+ * @version $Id: FreeMarkerSiteLayout.java,v 1.8 2001/05/23 16:36:08 mikeh Exp $
*/
public class FreeMarkerSiteLayout extends Layout
{
@@ -114,7 +114,8 @@
// TemplateInfo object ).
String templateName = data.getTemplateInfo().getLayoutTemplate();
- boolean isCache = data.getParameters().getBoolean("template_cache", true);
+ boolean isCache;
+ isCache = data.getParameters().getBoolean("template_cache", true);
data.getPage().getBody().addElement(
doBuildTemplate(context, "layouts" + templateName, isCache));
}
@@ -129,7 +130,8 @@
protected SimpleHash getContext(RunData data)
{
FreeMarkerService fm = (FreeMarkerService)
- TurbineServices.getInstance().getService(FreeMarkerService.SERVICE_NAME);
+ TurbineServices.getInstance()
+ .getService(FreeMarkerService.SERVICE_NAME);
return fm.getContext(data);
}
@@ -142,7 +144,8 @@
protected SimpleHash getContext()
{
FreeMarkerService fm = (FreeMarkerService)
- TurbineServices.getInstance().getService(FreeMarkerService.SERVICE_NAME);
+ TurbineServices.getInstance()
+ .getService(FreeMarkerService.SERVICE_NAME);
return fm.getContext();
}
@@ -160,7 +163,8 @@
throws Exception
{
FreeMarkerService fm = (FreeMarkerService)
-
TurbineServices.getInstance().getService(FreeMarkerService.SERVICE_NAME);
+ TurbineServices.getInstance()
+ .getService(FreeMarkerService.SERVICE_NAME);
StringElement output = new StringElement();
output.setFilterState(false);
output.addElement(fm.handleRequest(context,templateFile, cache));
1.9 +5 -3
jakarta-turbine/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java
Index: VelocityOnlyLayout.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VelocityOnlyLayout.java 2001/05/05 17:45:48 1.8
+++ VelocityOnlyLayout.java 2001/05/23 16:36:12 1.9
@@ -106,8 +106,9 @@
/* variable to reference the navigation screen in the layout template */
context.put("navigation", new TemplateNavigation( data ));
- /* Grab the layout template set in the WebMacroSitePage. If null, then use
- * the default layout template ( done by the TemplateInfo object )
+ /* Grab the layout template set in the WebMacroSitePage.
+ * If null, then use the default layout template
+ * (done by the TemplateInfo object )
*/
String templateName = data.getTemplateInfo().getLayoutTemplate();
@@ -116,6 +117,7 @@
data.getResponse().setContentType(data.getContentType());
/* Finally, generate the layout template and send it to the browser */
- data.getOut().print(TurbineVelocity.handleRequest(context, "layouts" +
templateName));
+ data.getOut().print(TurbineVelocity
+ .handleRequest(context, "layouts" + templateName));
}
}
1.7 +3 -2
jakarta-turbine/src/java/org/apache/turbine/modules/navigations/BaseFreeMarkerNavigation.java
Index: BaseFreeMarkerNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/navigations/BaseFreeMarkerNavigation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseFreeMarkerNavigation.java 2001/05/07 14:38:11 1.6
+++ BaseFreeMarkerNavigation.java 2001/05/23 16:36:22 1.7
@@ -75,7 +75,7 @@
* doBuildTemplate method to add more data to the context.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: BaseFreeMarkerNavigation.java,v 1.6 2001/05/07 14:38:11 mpoeschl
Exp $
+ * @version $Id: BaseFreeMarkerNavigation.java,v 1.7 2001/05/23 16:36:22 mikeh Exp $
*/
public class BaseFreeMarkerNavigation extends TemplateNavigation
{
@@ -145,7 +145,8 @@
SimpleHash context = getContext(data);
String templateName = data.getTemplateInfo().getNavigationTemplate();
FreeMarkerService fm = (FreeMarkerService)
-
TurbineServices.getInstance().getService(FreeMarkerService.SERVICE_NAME);
+ TurbineServices.getInstance()
+ .getService(FreeMarkerService.SERVICE_NAME);
StringElement output = new StringElement();
output.setFilterState(false);
1.10 +14 -7
jakarta-turbine/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java
Index: DefaultBottomNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultBottomNavigation.java 2001/05/07 14:38:14 1.9
+++ DefaultBottomNavigation.java 2001/05/23 16:36:26 1.10
@@ -88,11 +88,13 @@
* This is a sample navigation module.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: DefaultBottomNavigation.java,v 1.9 2001/05/07 14:38:14 mpoeschl
Exp $
+ * @version $Id: DefaultBottomNavigation.java,v 1.10 2001/05/23 16:36:26 mikeh Exp $
*/
public class DefaultBottomNavigation extends Navigation
{
private static final boolean DEBUG = false;
+ private static String txt =
+ "Turbine - A Servlet Framework for building Secure Dynamic Websites.";
/**
* Build the Navigation.
@@ -104,20 +106,25 @@
public ConcreteElement doBuild( RunData data )
throws Exception
{
+ Form form;
+ form = new Form(
+ new DynamicURI(data,"DefaultScreen","LogoutUser",true).toString(),
+ Form.POST)
+ .addElement(new Input("SUBMIT", "Logout", "Logout"));
ElementContainer body = new ElementContainer()
.addElement(new HR().setSize(1).setNoShade(true))
.addElement(new B().addElement(
- new Font().setColor(HtmlColor.green).setSize(2)
- .addElement("Turbine - A Servlet Framework for building Secure
Dynamic Websites.")))
- .addElement( new Form( new DynamicURI ( data, "DefaultScreen",
"LogoutUser", true ).toString(),
- Form.POST ).addElement(new Input("SUBMIT", "Logout",
"Logout") ) );
+ new Font().setColor(HtmlColor.green).setSize(2).addElement(txt)))
+ .addElement(form);
if (DEBUG && data.getUser() != null)
{
TD perm = new TD().setVAlign(AlignType.TOP);
TD temp = new TD().setVAlign(AlignType.TOP);
- java.util.Enumeration ePerm = data.getUser().getPermStorage().keys();
- java.util.Enumeration eTemp = data.getUser().getTempStorage().keys();
+ java.util.Enumeration ePerm =
+ data.getUser().getPermStorage().keys();
+ java.util.Enumeration eTemp =
+ data.getUser().getTempStorage().keys();
perm.addElement("Perm values:").addElement( new BR() );
temp.addElement("Temp values:").addElement( new BR() );
1.5 +4 -2
jakarta-turbine/src/java/org/apache/turbine/modules/navigations/DefaultTopNavigation.java
Index: DefaultTopNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/navigations/DefaultTopNavigation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultTopNavigation.java 2001/05/07 14:38:16 1.4
+++ DefaultTopNavigation.java 2001/05/23 16:36:30 1.5
@@ -70,11 +70,13 @@
* This is a sample navigation module.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: DefaultTopNavigation.java,v 1.4 2001/05/07 14:38:16 mpoeschl Exp $
+ * @version $Id: DefaultTopNavigation.java,v 1.5 2001/05/23 16:36:30 mikeh Exp $
*/
public class DefaultTopNavigation extends Navigation
{
private static final boolean DEBUG = false;
+ private static String txt =
+ "Turbine - A Servlet Framework for building Secure Dynamic Websites.";
/**
* Build the Navigation.
@@ -89,7 +91,7 @@
data.getPage().getBody()
.addElement(new B().addElement(
new Font().setColor(HtmlColor.green).setSize(2)
- .addElement("Turbine - A Servlet Framework for building Secure
Dynamic Websites."))
+ .addElement(txt))
.addElement(new HR().setSize(1).setNoShade(true)));
return null;
1.8 +3 -2
jakarta-turbine/src/java/org/apache/turbine/modules/navigations/WebMacroSiteNavigation.java
Index: WebMacroSiteNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/navigations/WebMacroSiteNavigation.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WebMacroSiteNavigation.java 2001/05/07 14:38:23 1.7
+++ WebMacroSiteNavigation.java 2001/05/23 16:36:32 1.8
@@ -75,7 +75,7 @@
* doBuildTemplate( data , context) method.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: WebMacroSiteNavigation.java,v 1.7 2001/05/07 14:38:23 mpoeschl Exp
$
+ * @version $Id: WebMacroSiteNavigation.java,v 1.8 2001/05/23 16:36:32 mikeh Exp $
*/
public class WebMacroSiteNavigation extends TemplateNavigation
{
@@ -124,7 +124,8 @@
StringElement output = new StringElement();
output.setFilterState(false);
- output.addElement(buildWMTemplate(context,"navigations/" + templateName));
+ output.addElement(
+ buildWMTemplate(context,"navigations/" + templateName));
return output;
}
1.13 +7 -4
jakarta-turbine/src/java/org/apache/turbine/modules/pages/DefaultPage.java
Index: DefaultPage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/pages/DefaultPage.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultPage.java 2001/05/07 14:38:39 1.12
+++ DefaultPage.java 2001/05/23 16:36:46 1.13
@@ -119,7 +119,7 @@
* written by John McNally. I've only modified it for WebMacro use.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: DefaultPage.java,v 1.12 2001/05/07 14:38:39 mpoeschl Exp $
+ * @version $Id: DefaultPage.java,v 1.13 2001/05/23 16:36:46 mikeh Exp $
*/
public class DefaultPage extends Page
{
@@ -225,7 +225,10 @@
private void setDefaultDoctype( RunData data )
throws Exception
{
- Vector doctypeProperty = TurbineResources.getVector("default.doctype",
null);
+ String errMsg =
+ "default.doctype property not set properly in TurbineResources.";
+ Vector doctypeProperty =
+ TurbineResources.getVector("default.doctype", null);
if (doctypeProperty != null && doctypeProperty.size() > 0)
{
if (doctypeProperty.size() == 1)
@@ -245,7 +248,7 @@
}
else
{
- throw new Exception("default.doctype property not set properly
in TurbineResources.");
+ throw new Exception(errMsg);
}
}
else if (doctypeProperty.size() == 2)
@@ -257,7 +260,7 @@
}
else
{
- throw new Exception("default.doctype property not set properly in
TurbineResources.");
+ throw new Exception(errMsg);
}
}
}
1.7 +3 -2
jakarta-turbine/src/java/org/apache/turbine/modules/pages/FreeMarkerSitePage.java
Index: FreeMarkerSitePage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/pages/FreeMarkerSitePage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FreeMarkerSitePage.java 2001/05/07 14:38:42 1.6
+++ FreeMarkerSitePage.java 2001/05/23 16:36:51 1.7
@@ -64,7 +64,7 @@
* Extends TemplatePage to set the template Context.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: FreeMarkerSitePage.java,v 1.6 2001/05/07 14:38:42 mpoeschl Exp $
+ * @version $Id: FreeMarkerSitePage.java,v 1.7 2001/05/23 16:36:51 mikeh Exp $
*/
public class FreeMarkerSitePage extends TemplatePage
{
@@ -79,7 +79,8 @@
protected void doBuildBeforeAction(RunData data) throws Exception
{
FreeMarkerService fm = (FreeMarkerService)
-
TurbineServices.getInstance().getService(FreeMarkerService.SERVICE_NAME);
+ TurbineServices.getInstance()
+ .getService(FreeMarkerService.SERVICE_NAME);
data.getTemplateInfo().setTemplateContext(
FreeMarkerService.CONTEXT, fm.getContext(data));
}
1.15 +5 -3
jakarta-turbine/src/java/org/apache/turbine/modules/pages/TemplatePage.java
Index: TemplatePage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/pages/TemplatePage.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TemplatePage.java 2001/05/07 14:38:46 1.14
+++ TemplatePage.java 2001/05/23 16:36:55 1.15
@@ -107,7 +107,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: TemplatePage.java,v 1.14 2001/05/07 14:38:46 mpoeschl Exp $
+ * @version $Id: TemplatePage.java,v 1.15 2001/05/23 16:36:55 mikeh Exp $
*/
public class TemplatePage extends DefaultPage
{
@@ -121,7 +121,8 @@
protected void doBuildAfterAction(RunData data) throws Exception
{
/*
- * Either template or screen should be guaranteed by the SessionValidator
+ * Either template or screen should be guaranteed by
+ * the SessionValidator
* It is occasionally better to specify the screen instead of template
* in cases where multiple Screens map to one template. The template
* is hardcoded into the Screen in this instance. In this case this
@@ -139,7 +140,8 @@
/*
* Get the layout template and the correct Screen.
*/
- String layoutTemplate = TurbineTemplate.getLayoutTemplateName(template);
+ String layoutTemplate =
+ TurbineTemplate.getLayoutTemplateName(template);
data.getTemplateInfo().setLayoutTemplate(layoutTemplate);
String screen = TurbineTemplate.getScreenName(template);
1.7 +3 -2
jakarta-turbine/src/java/org/apache/turbine/modules/pages/VelocityPage.java
Index: VelocityPage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/pages/VelocityPage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VelocityPage.java 2001/05/07 14:38:48 1.6
+++ VelocityPage.java 2001/05/23 16:36:59 1.7
@@ -68,7 +68,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: VelocityPage.java,v 1.6 2001/05/07 14:38:48 mpoeschl Exp $
+ * @version $Id: VelocityPage.java,v 1.7 2001/05/23 16:36:59 mikeh Exp $
*/
public class VelocityPage extends TemplatePage
{
@@ -82,7 +82,8 @@
protected void doBuildBeforeAction(RunData data) throws Exception
{
Context context = TurbineVelocity.getContext(data);
- data.getTemplateInfo().setTemplateContext(VelocityService.CONTEXT, context);
+ data.getTemplateInfo()
+ .setTemplateContext(VelocityService.CONTEXT, context);
}
/**
1.9 +3 -2
jakarta-turbine/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java
Index: BaseJspScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BaseJspScreen.java 2001/05/07 14:39:07 1.8
+++ BaseJspScreen.java 2001/05/23 16:37:12 1.9
@@ -68,7 +68,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author Frank Y. Kim
- * @version $Id: BaseJspScreen.java,v 1.8 2001/05/07 14:39:07 mpoeschl Exp $
+ * @version $Id: BaseJspScreen.java,v 1.9 2001/05/23 16:37:12 mikeh Exp $
*/
public class BaseJspScreen extends TemplateScreen
{
@@ -99,7 +99,8 @@
// let service know whether we are using a layout
JspService jsp = (JspService)
TurbineServices.getInstance().getService(JspService.SERVICE_NAME);
- jsp.handleRequest(data, "/screens" + templateName, getLayout(data) == null);
+ jsp.handleRequest(data, "/screens" + templateName,
+ getLayout(data) == null);
return null;
}
1.6 +6 -3
jakarta-turbine/src/java/org/apache/turbine/modules/screens/Error.java
Index: Error.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/Error.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Error.java 2001/05/07 14:39:11 1.5
+++ Error.java 2001/05/23 16:37:15 1.6
@@ -79,7 +79,7 @@
* This is a sample Error Screen module.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: Error.java,v 1.5 2001/05/07 14:39:11 mpoeschl Exp $
+ * @version $Id: Error.java,v 1.6 2001/05/23 16:37:15 mikeh Exp $
*/
public class Error extends Screen
{
@@ -128,13 +128,16 @@
if ( hasValues )
{
- data.getPage().getBody().addElement(new H4().addElement("Get/Post
Data:"));
+ data.getPage().getBody()
+ .addElement(new H4().addElement("Get/Post Data:"));
data.getPage().getBody().addElement(table);
}
if ( hasValues2 )
{
- data.getPage().getBody().addElement(new H4().addElement("Debugging
Data:"));
+ data.getPage()
+ .getBody().addElement(new H4()
+ .addElement("Debugging Data:"));
data.getPage().getBody().addElement(table2);
}
1.8 +3 -2
jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteErrorScreen.java
Index: WebMacroSiteErrorScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteErrorScreen.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WebMacroSiteErrorScreen.java 2001/05/07 14:39:24 1.7
+++ WebMacroSiteErrorScreen.java 2001/05/23 16:37:18 1.8
@@ -67,7 +67,7 @@
* error template defined in template.error.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
- * @version $Id: WebMacroSiteErrorScreen.java,v 1.7 2001/05/07 14:39:24 mpoeschl
Exp $
+ * @version $Id: WebMacroSiteErrorScreen.java,v 1.8 2001/05/23 16:37:18 mikeh Exp $
*/
public class WebMacroSiteErrorScreen extends WebMacroSiteScreen
{
@@ -81,7 +81,8 @@
protected void doBuildTemplate( RunData data, WebContext context )
throws Exception
{
- context.put("processingException",
data.getStackTraceException().toString());
+ context.put("processingException",
+ data.getStackTraceException().toString());
context.put("stackTrace", data.getStackTrace());
String errorTemplate = TurbineResources.getString("template.error",
"/error.wm");
1.5 +6 -7
jakarta-turbine/src/java/org/apache/turbine/modules/screens/error/InvalidState.java
Index: InvalidState.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/error/InvalidState.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InvalidState.java 2001/05/07 14:39:53 1.4
+++ InvalidState.java 2001/05/23 16:37:29 1.5
@@ -78,7 +78,7 @@
* value and redirect you to this screen.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: InvalidState.java,v 1.4 2001/05/07 14:39:53 mpoeschl Exp $
+ * @version $Id: InvalidState.java,v 1.5 2001/05/23 16:37:29 mikeh Exp $
*/
public class InvalidState extends Screen
{
@@ -104,13 +104,12 @@
.append( "Please click " );
message.addElement( sb.toString() );
- ParameterParser pp =
(ParameterParser)data.getUser().getTemp("prev_parameters");
+ ParameterParser pp;
+ pp = (ParameterParser)data.getUser().getTemp("prev_parameters");
pp.remove("_session_access_counter");
- message.addElement( new A()
- .setHref( new DynamicURI(data,
(String)data.getUser().getTemp("prev_screen"))
- .addPathInfo( pp ).toString() )
-
- .addElement("here") );
+ message.addElement( new A().setHref(
+ new DynamicURI(data,(String)data.getUser().getTemp("prev_screen"))
+ .addPathInfo( pp ).toString()).addElement("here") );
message.addElement( " to return the the screen you were working on." );
body.addElement( message );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
