You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/03/28 03:28:30 UTC
svn commit: r389348 - in
/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry: ./ html/
services/ services/impl/
Author: jkuhnert
Date: Mon Mar 27 17:28:27 2006
New Revision: 389348
URL: http://svn.apache.org/viewcvs?rev=389348&view=rev
Log:
Checkstyle fixes, small change to response
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IRender.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Describe.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/ExceptionDisplay.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Frame.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLMessages.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLStrings.properties
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Image.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertText.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertTextMode.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/RequestDisplay.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Rollover.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Script.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Shell.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/EngineFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/EngineManager.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ExpressionCache.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ExpressionEvaluator.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/Infrastructure.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/InjectedValueProvider.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/LinkFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/NamespaceResources.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ObjectPool.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestCycleFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestGlobals.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestLocaleManager.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ResetEventHub.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ResponseBuilder.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServiceConstants.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServletRequestServicer.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/DefaultResponseContributorImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseContributorImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java Mon Mar 27 17:28:27 2006
@@ -611,15 +611,15 @@
try
{
_rendering = true;
-
+
prepareForRender(cycle);
-
+
renderComponent(writer, cycle);
}
finally
{
_rendering = false;
-
+
cleanupAfterRender(cycle);
}
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IRender.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IRender.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IRender.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IRender.java Mon Mar 27 17:28:27 2006
@@ -40,5 +40,5 @@
*
**/
- public void render(IMarkupWriter writer, IRequestCycle cycle);
-}
\ No newline at end of file
+ void render(IMarkupWriter writer, IRequestCycle cycle);
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Describe.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Describe.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Describe.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Describe.java Mon Mar 27 17:28:27 2006
@@ -20,14 +20,16 @@
import org.apache.tapestry.describe.HTMLDescriber;
/**
- * Component that makes use of {@link org.apache.tapestry.describe.HTMLDescriber}to produce HTML
- * output that describes an object.
+ * Component that makes use of
+ * {@link org.apache.tapestry.describe.HTMLDescriber}to produce HTML output
+ * that describes an object.
*
* @author Howard M. Lewis Ship
* @since 4.0
*/
public abstract class Describe extends AbstractComponent
{
+
/**
* Parameter object: the object to be described.
*/
@@ -40,9 +42,8 @@
protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
{
- if (cycle.isRewinding())
- return;
+ if (cycle.isRewinding()) return;
getDescriber().describeObject(getObject(), writer);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/ExceptionDisplay.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/ExceptionDisplay.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/ExceptionDisplay.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/ExceptionDisplay.java Mon Mar 27 17:28:27 2006
@@ -22,15 +22,14 @@
/**
* Component used to display an already formatted exception. [ <a
- * href="../../../../../ComponentReference/ExceptionDisplay.html">Component Reference </a>]
+ * href="../../../../../ComponentReference/ExceptionDisplay.html">Component
+ * Reference </a>]
*
* @author Howard Lewis Ship
*/
public abstract class ExceptionDisplay extends BaseComponent
{
- public abstract ExceptionDescription[] getExceptions();
-
private ExceptionDescription _exception;
private EvenOdd _evenOdd;
@@ -41,9 +40,11 @@
public abstract void setCount(int count);
+ public abstract ExceptionDescription[] getExceptions();
+
/**
- * Each time the current exception is set, as a side effect, the evenOdd helper bean is reset to
- * even.
+ * Each time the current exception is set, as a side effect, the evenOdd
+ * helper bean is reset to even.
*/
public void setException(ExceptionDescription value)
@@ -81,4 +82,4 @@
{
return getIndex() == (getCount() - 1);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Frame.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Frame.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Frame.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Frame.java Mon Mar 27 17:28:27 2006
@@ -29,6 +29,7 @@
public abstract class Frame extends AbstractComponent
{
+
/**
* Injected engine service.
*
@@ -52,4 +53,4 @@
public abstract String getTargetPage();
public abstract void setTargetPage(String targetPage);
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLMessages.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLMessages.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLMessages.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLMessages.java Mon Mar 27 17:28:27 2006
@@ -21,22 +21,28 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-class HTMLMessages
+final class HTMLMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(HTMLMessages.class);
+ private static final MessageFormatter _formatter = new MessageFormatter(
+ HTMLMessages.class);
+
+ /* defeats instantiation */
+ private HTMLMessages() { }
+
static String textConversionError(Throwable cause)
{
return _formatter.format("text-conversion-error", cause);
}
-
+
static String multiAssetParameterError(IBinding asset, IBinding scriptPath)
{
- return _formatter.format("script-multiscript-error", new Object[] {asset, scriptPath});
+ return _formatter.format("script-multiscript-error", new Object[] {
+ asset, scriptPath });
}
-
+
static String noScriptPathError()
{
- return _formatter.getMessage("script-required-path-error");
+ return _formatter.getMessage("script-required-path-error");
}
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLStrings.properties
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLStrings.properties?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLStrings.properties (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLStrings.properties Mon Mar 27 17:28:27 2006
@@ -16,4 +16,4 @@
script-multiscript-error=Script component has both script IAsset parameter({0}) AND String scriptPath parameter({1}) set, \
only one of the two parameters is allowed.
script-required-path-error=Either the scriptAsset or the scriptPath parameter must be supplied, neither parameter \
-was set.
\ No newline at end of file
+was set.
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Image.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Image.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Image.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Image.java Mon Mar 27 17:28:27 2006
@@ -21,8 +21,8 @@
import org.apache.tapestry.Tapestry;
/**
- * Used to insert an image. To create a rollover image, use the {@link Rollover} class, which
- * integrates a link with the image assets used with the button. [<a
+ * Used to insert an image. To create a rollover image, use the {@link Rollover}
+ * class, which integrates a link with the image assets used with the button. [<a
* href="../../../../../ComponentReference/Image.html">Component Reference</a>]
*
* @author Howard Lewis Ship
@@ -30,17 +30,18 @@
public abstract class Image extends AbstractComponent
{
+
/**
* Renders the <img> element.
*/
protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
{
- // Doesn't contain a body so no need to do anything on rewind (assumes no
+ // Doesn't contain a body so no need to do anything on rewind (assumes
+ // no
// sideffects to accessor methods via bindings).
- if (cycle.isRewinding())
- return;
+ if (cycle.isRewinding()) return;
IAsset imageAsset = getImage();
@@ -59,4 +60,4 @@
}
public abstract IAsset getImage();
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertText.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertText.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertText.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertText.java Mon Mar 27 17:28:27 2006
@@ -25,29 +25,30 @@
import org.apache.tapestry.IRequestCycle;
/**
- * Inserts formatted text (possibly collected using a {@link org.apache.tapestry.form.TextArea}
- * component. [<a href="../../../../../ComponentReference/InsertText.html">Component Reference</a>]
+ * Inserts formatted text (possibly collected using a
+ * {@link org.apache.tapestry.form.TextArea} component. [<a
+ * href="../../../../../ComponentReference/InsertText.html">Component Reference</a>]
* <p>
- * To maintain the line breaks provided originally, this component will break the input into
- * individual lines and insert additional HTML to make each line seperate.
+ * To maintain the line breaks provided originally, this component will break
+ * the input into individual lines and insert additional HTML to make each line
+ * seperate.
* <p>
- * This can be down more simply, using the <pre> HTML element, but that usually renders the
- * text in a non-proportional font.
+ * This can be down more simply, using the <pre> HTML element, but that
+ * usually renders the text in a non-proportional font.
*
* @author Howard Lewis Ship
*/
public abstract class InsertText extends AbstractComponent
{
+
protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
{
- if (cycle.isRewinding())
- return;
+ if (cycle.isRewinding()) return;
String value = getValue();
- if (value == null)
- return;
+ if (value == null) return;
StringReader reader = null;
LineNumberReader lineReader = null;
@@ -62,14 +63,13 @@
int lineNumber = 0;
- while (true)
+ while(true)
{
String line = lineReader.readLine();
// Exit loop at end of file.
- if (line == null)
- break;
+ if (line == null) break;
mode.writeLine(lineNumber, line, writer, raw);
@@ -79,8 +79,8 @@
}
catch (IOException ex)
{
- throw new ApplicationRuntimeException(HTMLMessages.textConversionError(ex), this, null,
- ex);
+ throw new ApplicationRuntimeException(HTMLMessages
+ .textConversionError(ex), this, null, ex);
}
finally
{
@@ -92,8 +92,7 @@
private void close(Reader reader)
{
- if (reader == null)
- return;
+ if (reader == null) return;
try
{
@@ -104,21 +103,22 @@
}
}
- /** Parameter */
+ /** Parameter. */
public abstract InsertTextMode getMode();
public abstract void setMode(InsertTextMode mode);
- /** Parameter */
+ /** Parameter. */
public abstract String getValue();
-
- /** Parameter */
-
+
+ /** Parameter. */
+
public abstract boolean getRaw();
/**
- * Sets the mode parameter property to its default, {@link InsertTextMode#BREAK}.
+ * Sets the mode parameter property to its default,
+ * {@link InsertTextMode#BREAK}.
*
* @since 3.0
*/
@@ -127,4 +127,4 @@
setMode(InsertTextMode.BREAK);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertTextMode.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertTextMode.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertTextMode.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertTextMode.java Mon Mar 27 17:28:27 2006
@@ -24,6 +24,7 @@
public abstract class InsertTextMode
{
+
/**
* Mode where each line (after the first) is preceded by a <br> tag.
*/
@@ -52,7 +53,8 @@
* Invoked by the {@link InsertText} component to write the next line.
*
* @param lineNumber
- * the line number of the line, starting with 0 for the first line.
+ * the line number of the line, starting with 0 for the first
+ * line.
* @param line
* the String for the current line.
* @param writer
@@ -61,32 +63,44 @@
* if true, then the output should be unfiltered
*/
- public abstract void writeLine(int lineNumber, String line, IMarkupWriter writer, boolean raw);
+ public abstract void writeLine(int lineNumber, String line,
+ IMarkupWriter writer, boolean raw);
- private static class BreakMode extends InsertTextMode
+ /**
+ *
+ * @author hls
+ */
+ private static final class BreakMode extends InsertTextMode
{
+
private BreakMode()
{
super("BREAK");
}
- public void writeLine(int lineNumber, String line, IMarkupWriter writer, boolean raw)
+ public void writeLine(int lineNumber, String line,
+ IMarkupWriter writer, boolean raw)
{
- if (lineNumber > 0)
- writer.beginEmpty("br");
+ if (lineNumber > 0) writer.beginEmpty("br");
writer.print(line, raw);
}
}
- private static class ParagraphMode extends InsertTextMode
+ /**
+ *
+ * @author hls
+ */
+ private static final class ParagraphMode extends InsertTextMode
{
+
private ParagraphMode()
{
super("PARAGRAPH");
}
- public void writeLine(int lineNumber, String line, IMarkupWriter writer, boolean raw)
+ public void writeLine(int lineNumber, String line,
+ IMarkupWriter writer, boolean raw)
{
writer.begin("p");
@@ -96,4 +110,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/RequestDisplay.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/RequestDisplay.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/RequestDisplay.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/RequestDisplay.java Mon Mar 27 17:28:27 2006
@@ -28,14 +28,16 @@
import org.apache.tapestry.web.WebUtils;
/**
- * Supports the {@link org.apache.tapestry.pages.Exception} page by displaying the request,
- * session, servlet context and servlet object for the current request.
+ * Supports the {@link org.apache.tapestry.pages.Exception} page by
+ * displaying the request, session, servlet context and servlet object for the
+ * current request.
*
* @author Howard M. Lewis Ship
* @since 4.0
*/
public abstract class RequestDisplay extends BaseComponent
{
+
private boolean _even;
// Injected
@@ -61,7 +63,7 @@
Iterator i = WebUtils.toSortedList(p.keys()).iterator();
- while (i.hasNext())
+ while(i.hasNext())
{
String key = (String) i.next();
String value = p.getProperty(key);
@@ -72,12 +74,12 @@
writer.end();
}
- private void renderKeyAndValue(IMarkupWriter writer, String key, String value,
- String pathSeparator)
+ private void renderKeyAndValue(IMarkupWriter writer, String key,
+ String value, String pathSeparator)
{
String[] values = split(key, value, pathSeparator);
- for (int i = 0; i < values.length; i++)
+ for(int i = 0; i < values.length; i++)
{
writer.begin("tr");
@@ -87,8 +89,7 @@
writer.begin("th");
- if (i == 0)
- writer.print(key);
+ if (i == 0) writer.print(key);
writer.end();
writer.begin("td");
@@ -100,9 +101,7 @@
private String[] split(String key, String value, String pathSeparator)
{
- if (!key.endsWith(".path"))
- return new String[]
- { value };
+ if (!key.endsWith(".path")) return new String[] { value };
StringTokenizer tokenizer = new StringTokenizer(value, pathSeparator);
List values = Collections.list(tokenizer);
@@ -114,6 +113,7 @@
{
return new IRender()
{
+
public void render(IMarkupWriter writer, IRequestCycle cycle)
{
renderSystemProperties(writer);
@@ -125,10 +125,11 @@
{
return new IRender()
{
+
public void render(IMarkupWriter writer, IRequestCycle cycle)
{
getReportStatusHub().fireReportStatus(writer);
}
};
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Rollover.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Rollover.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Rollover.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Rollover.java Mon Mar 27 17:28:27 2006
@@ -30,36 +30,38 @@
import org.apache.tapestry.components.LinkEventType;
/**
- * Combines a link component (such as {@link org.apache.tapestry.link.DirectLink}) with an
- * <img> and JavaScript code to create a rollover effect that works with both Netscape
+ * Combines a link component (such as
+ * {@link org.apache.tapestry.link.DirectLink}) with an <img> and
+ * JavaScript code to create a rollover effect that works with both Netscape
* Navigator and Internet Explorer. [ <a
- * href="../../../../../ComponentReference/Rollover.html">Component Reference </a>]
+ * href="../../../../../ComponentReference/Rollover.html">Component Reference
+ * </a>]
*
* @author Howard Lewis Ship
*/
public abstract class Rollover extends AbstractComponent
{
+
/**
- * Converts an {@link IAsset}binding into a usable URL. Returns null if the binding does not
- * exist or the binding's value is null.
+ * Converts an {@link IAsset}binding into a usable URL. Returns null if the
+ * binding does not exist or the binding's value is null.
*/
protected String getAssetURL(IAsset asset)
{
- if (asset == null)
- return null;
+ if (asset == null) return null;
return asset.buildURL();
}
protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
{
- // No body, so we skip it all if not rewinding (assumes no side effects on
+ // No body, so we skip it all if not rewinding (assumes no side effects
+ // on
// accessors).
- if (cycle.isRewinding())
- return;
+ if (cycle.isRewinding()) return;
String imageURL = null;
String mouseOverURL = null;
@@ -67,14 +69,16 @@
boolean dynamic = false;
String imageId = null;
- PageRenderSupport pageRenderSupport = TapestryUtils.getPageRenderSupport(cycle, this);
+ PageRenderSupport pageRenderSupport = TapestryUtils
+ .getPageRenderSupport(cycle, this);
ILinkComponent serviceLink = (ILinkComponent) cycle
.getAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME);
if (serviceLink == null)
throw new ApplicationRuntimeException(Tapestry
- .getMessage("Rollover.must-be-contained-by-link"), this, null, null);
+ .getMessage("Rollover.must-be-contained-by-link"), this,
+ null, null);
boolean linkDisabled = serviceLink.isDisabled();
@@ -82,8 +86,7 @@
{
imageURL = getAssetURL(getDisabled());
- if (imageURL == null)
- imageURL = getAssetURL(getImage());
+ if (imageURL == null) imageURL = getAssetURL(getImage());
}
else
{
@@ -103,13 +106,12 @@
if (dynamic)
{
- if (mouseOverURL == null)
- mouseOverURL = imageURL;
+ if (mouseOverURL == null) mouseOverURL = imageURL;
- if (mouseOutURL == null)
- mouseOutURL = imageURL;
+ if (mouseOutURL == null) mouseOutURL = imageURL;
- imageId = writeScript(cycle, pageRenderSupport, serviceLink, mouseOverURL, mouseOutURL);
+ imageId = writeScript(cycle, pageRenderSupport, serviceLink,
+ mouseOverURL, mouseOutURL);
writer.attribute("id", imageId);
}
@@ -124,8 +126,9 @@
public abstract IScript getScript();
- private String writeScript(IRequestCycle cycle, PageRenderSupport pageRenderSupport,
- ILinkComponent link, String mouseOverImageURL, String mouseOutImageURL)
+ private String writeScript(IRequestCycle cycle,
+ PageRenderSupport pageRenderSupport, ILinkComponent link,
+ String mouseOverImageURL, String mouseOutImageURL)
{
String imageId = pageRenderSupport.getUniqueString(getId());
String preloadedMouseOverImageURL = pageRenderSupport
@@ -146,8 +149,10 @@
// there won't be any timing issues (such as cause
// bug #113893).
- link.addEventHandler(LinkEventType.MOUSE_OVER, (String) symbols.get("onMouseOverName"));
- link.addEventHandler(LinkEventType.MOUSE_OUT, (String) symbols.get("onMouseOutName"));
+ link.addEventHandler(LinkEventType.MOUSE_OVER, (String) symbols
+ .get("onMouseOverName"));
+ link.addEventHandler(LinkEventType.MOUSE_OUT, (String) symbols
+ .get("onMouseOutName"));
return imageId;
}
@@ -159,4 +164,4 @@
public abstract IAsset getMouseOver();
public abstract IAsset getImage();
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Script.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Script.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Script.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Script.java Mon Mar 27 17:28:27 2006
@@ -31,8 +31,9 @@
import org.apache.tapestry.engine.IScriptSource;
/**
- * Works with the {@link Body}component to add a script (and perhaps some initialization) to the
- * HTML response. [ <a href="../../../../../ComponentReference/Script.html">Component Reference
+ * Works with the {@link Body}component to add a script (and perhaps some
+ * initialization) to the HTML response. [ <a
+ * href="../../../../../ComponentReference/Script.html">Component Reference
* </a>]
*
* @author Howard Lewis Ship
@@ -41,26 +42,27 @@
public abstract class Script extends AbstractComponent
{
/**
- * Injected
+ * A Map of input and output symbols visible to the body of the Script.
*
- * @since 4.0
+ * @since 2.2
*/
- public abstract IScriptSource getScriptSource();
+ private Map _symbols;
/**
- * A Map of input and output symbols visible to the body of the Script.
+ * Injected.
*
- * @since 2.2
+ * @since 4.0
*/
- private Map _symbols;
-
+ public abstract IScriptSource getScriptSource();
+
/**
- * Constructs the symbols {@link Map}. This starts with the contents of the symbols parameter
- * (if specified) to which is added any informal parameters. If both a symbols parameter and
- * informal parameters are bound, then a copy of the symbols parameter's value is made (that is,
- * the {@link Map}provided by the symbols parameter is read, but not modified).
+ * Constructs the symbols {@link Map}. This starts with the contents of the
+ * symbols parameter (if specified) to which is added any informal
+ * parameters. If both a symbols parameter and informal parameters are
+ * bound, then a copy of the symbols parameter's value is made (that is, the
+ * {@link Map}provided by the symbols parameter is read, but not modified).
*/
private Map getInputSymbols()
@@ -69,22 +71,20 @@
Map baseSymbols = getBaseSymbols();
- if (baseSymbols != null)
- result.putAll(baseSymbols);
+ if (baseSymbols != null) result.putAll(baseSymbols);
// Now, iterate through all the binding names (which includes both
// formal and informal parmeters). Skip the formal ones and
// access the informal ones.
Iterator i = getBindingNames().iterator();
- while (i.hasNext())
+ while(i.hasNext())
{
String bindingName = (String) i.next();
// Skip formal parameters
- if (getSpecification().getParameter(bindingName) != null)
- continue;
+ if (getSpecification().getParameter(bindingName) != null) continue;
IBinding binding = getBinding(bindingName);
@@ -102,38 +102,43 @@
private IScript getParsedScript()
{
- IAsset scriptAsset = getScriptAsset();
+ IAsset scriptAsset = getScriptAsset();
String scriptPath = getScriptPath();
-
- //only one of the two is allowed
+
+ // only one of the two is allowed
if (scriptAsset != null && scriptPath != null)
- throw new ApplicationRuntimeException(HTMLMessages.multiAssetParameterError(getBinding("scriptAsset"),
- getBinding("scriptPath")));
-
+ throw new ApplicationRuntimeException(HTMLMessages
+ .multiAssetParameterError(getBinding("scriptAsset"),
+ getBinding("scriptPath")));
+
if (scriptPath == null && scriptAsset == null)
- throw new ApplicationRuntimeException(HTMLMessages.noScriptPathError());
-
+ throw new ApplicationRuntimeException(HTMLMessages
+ .noScriptPathError());
+
IScriptSource source = getScriptSource();
-
+
Resource scriptLocation = null;
- if (scriptPath != null) {
-
- // If the script path is relative, it should be relative to the Script component's
+ if (scriptPath != null)
+ {
+
+ // If the script path is relative, it should be relative to the
+ // Script component's
// container (i.e., relative to a page in the application).
-
- Resource rootLocation = getContainer().getSpecification().getSpecificationLocation();
- scriptLocation = rootLocation.getRelativeResource(scriptPath);
- } else
- scriptLocation = scriptAsset.getResourceLocation();
-
+
+ Resource rootLocation = getContainer().getSpecification()
+ .getSpecificationLocation();
+ scriptLocation = rootLocation.getRelativeResource(scriptPath);
+ }
+ else scriptLocation = scriptAsset.getResourceLocation();
+
try
{
return source.getScript(scriptLocation);
}
catch (RuntimeException ex)
{
- throw new ApplicationRuntimeException(ex.getMessage(), this, getBinding("script")
- .getLocation(), ex);
+ throw new ApplicationRuntimeException(ex.getMessage(), this,
+ getBinding("script").getLocation(), ex);
}
}
@@ -142,7 +147,8 @@
{
if (!cycle.isRewinding())
{
- PageRenderSupport pageRenderSupport = TapestryUtils.getPageRenderSupport(cycle, this);
+ PageRenderSupport pageRenderSupport = TapestryUtils
+ .getPageRenderSupport(cycle, this);
_symbols = getInputSymbols();
@@ -156,14 +162,15 @@
public abstract String getScriptPath();
public abstract IAsset getScriptAsset();
-
+
// Parameter
public abstract Map getBaseSymbols();
/**
- * Returns the complete set of symbols (input and output) from the script execution. This is
- * visible to the body of the Script, but is cleared after the Script finishes rendering.
+ * Returns the complete set of symbols (input and output) from the script
+ * execution. This is visible to the body of the Script, but is cleared
+ * after the Script finishes rendering.
*
* @since 2.2
*/
@@ -180,4 +187,4 @@
super.cleanupAfterRender(cycle);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Shell.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Shell.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Shell.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Shell.java Mon Mar 27 17:28:27 2006
@@ -74,17 +74,17 @@
if (getRenderContentType())
writeMetaTag(writer, "http-equiv", "Content-Type", writer.getContentType());
-
+
getBaseTagWriter().render(writer, cycle);
-
+
writer.begin("title");
-
+
writer.print(getTitle());
writer.end(); // title
writer.println();
-
+
IRender delegate = getDelegate();
-
+
if (delegate != null)
delegate.render(writer, cycle);
@@ -108,16 +108,16 @@
writeStylesheetLink(writer, cycle, stylesheet);
}
-
+
writeRefresh(writer, cycle);
-
+
writer.end(); // head
}
-
+
// Render the body, the actual page content
-
+
renderBody(writer, cycle);
-
+
if (!rewinding)
{
writer.end(); // html
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/EngineFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/EngineFactory.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/EngineFactory.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/EngineFactory.java Mon Mar 27 17:28:27 2006
@@ -20,14 +20,15 @@
/**
* Responsible for creating new instance of {@link org.apache.tapestry.IEngine}.
- *
+ *
* @author Howard Lewis Ship
* @since 4.0
*/
public interface EngineFactory
{
- /**
- * Creates and initializes a new engine instance for the specified locale.
- */
- public IEngine constructNewEngineInstance(Locale locale);
+
+ /**
+ * Creates and initializes a new engine instance for the specified locale.
+ */
+ IEngine constructNewEngineInstance(Locale locale);
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/EngineManager.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/EngineManager.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/EngineManager.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/EngineManager.java Mon Mar 27 17:28:27 2006
@@ -17,24 +17,26 @@
import org.apache.tapestry.IEngine;
/**
- * Service responsible for obtaining instances of {@link org.apache.tapestry.IEngine}
- * to service the current request. An engine service may be retrieved from a pool, or extracted
- * from the HttpSession. After the request is processed, the engine is re-stored into the
- * HttpSession (if stateful) or back into the pool (if not stateful).
- *
+ * Service responsible for obtaining instances of
+ * {@link org.apache.tapestry.IEngine} to service the current request. An engine
+ * service may be retrieved from a pool, or extracted from the HttpSession.
+ * After the request is processed, the engine is re-stored into the HttpSession
+ * (if stateful) or back into the pool (if not stateful).
+ *
* @author Howard Lewis Ship
* @since 4.0
*/
public interface EngineManager
{
- /**
- * Locates or creates an engine instance for the current request.
- */
- IEngine getEngineInstance();
-
- /**
- * Store the engine back at the end of the current request.
- */
-
- void storeEngineInstance(IEngine engine);
+
+ /**
+ * Locates or creates an engine instance for the current request.
+ */
+ IEngine getEngineInstance();
+
+ /**
+ * Store the engine back at the end of the current request.
+ */
+
+ void storeEngineInstance(IEngine engine);
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ExpressionCache.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ExpressionCache.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ExpressionCache.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ExpressionCache.java Mon Mar 27 17:28:27 2006
@@ -22,10 +22,12 @@
*/
public interface ExpressionCache
{
+
/**
- * Returns the compiled form of the OGNL expression.
+ * Returns the compiled form of the OGNL expression.
*
- * @throws org.apache.hivemind.ApplicationRuntimeException if the expression is not valid
+ * @throws org.apache.hivemind.ApplicationRuntimeException
+ * if the expression is not valid
*/
- public Object getCompiledExpression(String expression);
-}
\ No newline at end of file
+ Object getCompiledExpression(String expression);
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ExpressionEvaluator.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ExpressionEvaluator.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ExpressionEvaluator.java Mon Mar 27 17:28:27 2006
@@ -22,45 +22,51 @@
*/
public interface ExpressionEvaluator
{
+
/**
* Reads a property of the target, defined by the expression.
*
* @throws org.apache.hivemind.ApplicationRuntimeException
- * if the expression can not be parsed, or if some other error occurs during
- * evaluation of the expression.
+ * if the expression can not be parsed, or if some other error
+ * occurs during evaluation of the expression.
*/
- public Object read(Object target, String expression);
+ Object read(Object target, String expression);
/**
- * Reads a property of the target, defined by the (previously compiled) expression.
+ * Reads a property of the target, defined by the (previously compiled)
+ * expression.
*
* @throws org.apache.hivemind.ApplicationRuntimeException
- * if some other error occurs during evaluation of the expression.
+ * if some other error occurs during evaluation of the
+ * expression.
*/
- public Object readCompiled(Object target, Object expression);
+ Object readCompiled(Object target, Object expression);
/**
* Updates a property of the target, defined by the expression.
*
* @throws org.apache.hivemind.ApplicationRuntimeException
- * if the expression can not be parsed, or if some other error occurs during
- * evaluation of the expression.
+ * if the expression can not be parsed, or if some other error
+ * occurs during evaluation of the expression.
*/
- public void write(Object target, String expression, Object value);
+ void write(Object target, String expression, Object value);
/**
- * Updates a property of the target, defined by the (previously compiled) expression.
+ * Updates a property of the target, defined by the (previously compiled)
+ * expression.
*
* @throws org.apache.hivemind.ApplicationRuntimeException
- * if some other error occurs during evaluation of the expression.
+ * if some other error occurs during evaluation of the
+ * expression.
*/
- public void writeCompiled(Object target, Object expression, Object value);
+ void writeCompiled(Object target, Object expression, Object value);
/**
- * Returns true if the expression evaluates to a constant or other literal value.
+ * Returns true if the expression evaluates to a constant or other literal
+ * value.
*
* @throws org.apache.hivemind.ApplicationRuntimeException
* if the expression is not valid
*/
- public boolean isConstant(String expression);
-}
\ No newline at end of file
+ boolean isConstant(String expression);
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/Infrastructure.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/Infrastructure.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/Infrastructure.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/Infrastructure.java Mon Mar 27 17:28:27 2006
@@ -39,14 +39,15 @@
import org.apache.tapestry.web.WebResponse;
/**
- * Tapestry infrastructure ... key services required by the {@link org.apache.tapestry.IEngine}
- * instance.
+ * Tapestry infrastructure ... key services required by the
+ * {@link org.apache.tapestry.IEngine} instance.
*
* @author Howard Lewis Ship
* @since 4.0
*/
public interface Infrastructure
{
+
/**
* Initializes the Infrastructure for a particular mode.
*
@@ -54,7 +55,7 @@
* if the Infrastructure has already been initialized.
*/
- public void initialize(String mode);
+ void initialize(String mode);
/**
* Returns a named property.
@@ -65,164 +66,168 @@
* if no value has been contributed for specified property name.
*/
- public Object getProperty(String propertyName);
+ Object getProperty(String propertyName);
/**
- * Returns the {@link org.apache.tapestry.spec.IApplicationSpecification} for the current
- * application.
+ * Returns the {@link org.apache.tapestry.spec.IApplicationSpecification} for
+ * the current application.
*/
- public IApplicationSpecification getApplicationSpecification();
+ IApplicationSpecification getApplicationSpecification();
/**
- * Returns an {@link IPropertySource} configured to search the application specification,
- * etc. See <code>tapestry.ApplicationPropertySource</code>.
+ * Returns an {@link IPropertySource} configured to search the
+ * application specification, etc. See
+ * <code>tapestry.ApplicationPropertySource</code>.
*/
- public IPropertySource getApplicationPropertySource();
+ IPropertySource getApplicationPropertySource();
/**
- * Returns an {@link IPropertySource} configured to search the servlet, servlet context,
- * and factory defaults.
+ * Returns an {@link IPropertySource} configured to search the
+ * servlet, servlet context, and factory defaults.
*/
- public IPropertySource getGlobalPropertySource();
+ IPropertySource getGlobalPropertySource();
/**
- * Returns the coordinator to be notified of reset events (which will, in turn, notify other
- * services that they should discard cached data).
+ * Returns the coordinator to be notified of reset events (which will, in
+ * turn, notify other services that they should discard cached data).
*/
- public ResetEventHub getResetEventHub();
+ ResetEventHub getResetEventHub();
/**
* Returns the source of component message bundles.
*/
- public ComponentMessagesSource getComponentMessagesSource();
+ ComponentMessagesSource getComponentMessagesSource();
/**
* Returns component or page template contents.
*/
- public TemplateSource getTemplateSource();
+ TemplateSource getTemplateSource();
/**
- * Returns the source of all application, page, component and library specifications.
+ * Returns the source of all application, page, component and library
+ * specifications.
*/
- public ISpecificationSource getSpecificationSource();
+ ISpecificationSource getSpecificationSource();
/**
* Returns a generic, shared ObjectPool instance.
*/
- public ObjectPool getObjectPool();
+ ObjectPool getObjectPool();
/**
- * Returns the source for pages. The source is a cache of pages, but also can create new
- * instances when needed.
+ * Returns the source for pages. The source is a cache of pages, but also
+ * can create new instances when needed.
*/
- public IPageSource getPageSource();
+ IPageSource getPageSource();
/**
- * Returns the ClassResolver used by the Tapestry HiveMind module, which should be sufficient
- * for use throughout the application.
+ * Returns the ClassResolver used by the Tapestry HiveMind module, which
+ * should be sufficient for use throughout the application.
*/
- public ClassResolver getClassResolver();
+ ClassResolver getClassResolver();
/**
- * The DataSqueezer, used when constructing and decoding values stored in URLs (as query
- * parameters or hidden form fields).
+ * The DataSqueezer, used when constructing and decoding values stored in
+ * URLs (as query parameters or hidden form fields).
*/
- public DataSqueezer getDataSqueezer();
+ DataSqueezer getDataSqueezer();
/**
* The source for ready-to-execute versions of Tapestry script templates.
*/
- public IScriptSource getScriptSource();
+ IScriptSource getScriptSource();
/**
* The object from which engine services are obtained.
*/
- public ServiceMap getServiceMap();
+ ServiceMap getServiceMap();
/**
* Service used to report exceptions to the console.
*/
- public RequestExceptionReporter getRequestExceptionReporter();
+ RequestExceptionReporter getRequestExceptionReporter();
/**
* Renders the active page as the response.
*/
- public ResponseRenderer getResponseRenderer();
+ ResponseRenderer getResponseRenderer();
/**
* Constructs {@link org.apache.tapestry.engine.ILink} instances for
* {@link org.apache.tapestry.engine.IEngineService}s.
*/
- public LinkFactory getLinkFactory();
+ LinkFactory getLinkFactory();
/**
- * Used by the {@link org.apache.tapestry.IEngine} to create instances of
- * {@link org.apache.tapestry.IRequestCycle}.
+ * Used by the {@link org.apache.tapestry.IEngine} to create instances
+ * of {@link org.apache.tapestry.IRequestCycle}.
*/
- public RequestCycleFactory getRequestCycleFactory();
+ RequestCycleFactory getRequestCycleFactory();
/**
- * Accesses application state objects (Visit and Global from Tapestry 3.0, but now more can be
- * created).
+ * Accesses application state objects (Visit and Global from Tapestry 3.0,
+ * but now more can be created).
*/
- public ApplicationStateManager getApplicationStateManager();
+ ApplicationStateManager getApplicationStateManager();
/**
* Returns the request for the current request cycle.
*/
- public WebRequest getRequest();
+ WebRequest getRequest();
/**
* Returns the response for the current request cycle.
*/
- public WebResponse getResponse();
+ WebResponse getResponse();
/**
- * Returns the context path, which identifies the application within the application server.
- * Context path should be used as a prefix for any URLs generated. The context path may be the
- * empty string, and will not end in a slash (servlet paths should start with a slash).
+ * Returns the context path, which identifies the application within the
+ * application server. Context path should be used as a prefix for any URLs
+ * generated. The context path may be the empty string, and will not end in
+ * a slash (servlet paths should start with a slash).
*/
- public String getContextPath();
+ String getContextPath();
/**
- * Returns the application's id; a unique name that is incorporated into various session
- * attribute keys and into certain paths when searching for resources. For a servlet-based
- * Tapestry application, the id is the name of the servlet.
+ * Returns the application's id; a unique name that is incorporated into
+ * various session attribute keys and into certain paths when searching for
+ * resources. For a servlet-based Tapestry application, the id is the name
+ * of the servlet.
*/
- public String getApplicationId();
+ String getApplicationId();
/**
- * Returns the root context resource, which is the starting point when looking for resources
- * within the application.
+ * Returns the root context resource, which is the starting point when
+ * looking for resources within the application.
*/
- public Resource getContextRoot();
+ Resource getContextRoot();
/**
* Returns an object used to access component meta-data properties.
*/
- public ComponentPropertySource getComponentPropertySource();
+ ComponentPropertySource getComponentPropertySource();
/**
* Invoked when the locale for the current thread is changed.
@@ -230,74 +235,76 @@
* @see org.apache.tapestry.IEngine#setLocale(Locale)
*/
- public void setLocale(Locale value);
+ void setLocale(Locale value);
- public String getOutputEncoding();
+ String getOutputEncoding();
- public MarkupWriterSource getMarkupWriterSource();
+ MarkupWriterSource getMarkupWriterSource();
- public HTMLDescriber getHTMLDescriber();
+ HTMLDescriber getHTMLDescriber();
/**
* Responsible for presenting an exception error report to the user.
*/
- public ExceptionPresenter getExceptionPresenter();
+ ExceptionPresenter getExceptionPresenter();
/**
- * The source for {@link org.apache.tapestry.listener.ListenerMap}s, for components or other
- * objects.
+ * The source for {@link org.apache.tapestry.listener.ListenerMap}s, for
+ * components or other objects.
*/
- public ListenerMapSource getListenerMapSource();
+ ListenerMapSource getListenerMapSource();
/**
- * The service responsible for reporting {@link org.apache.tapestry.StaleSessionException}s.
+ * The service responsible for reporting
+ * {@link org.apache.tapestry.StaleSessionException}s.
*/
- public StaleSessionExceptionPresenter getStaleSessionExceptionPresenter();
+ StaleSessionExceptionPresenter getStaleSessionExceptionPresenter();
/**
- * The service responsible for reporting {@link org.apache.tapestry.StaleLinkException}s.
+ * The service responsible for reporting
+ * {@link org.apache.tapestry.StaleLinkException}s.
*/
- public StaleLinkExceptionPresenter getStaleLinkExceptionPresenter();
+ StaleLinkExceptionPresenter getStaleLinkExceptionPresenter();
/**
* Service used to convert and coerce types.
*/
- public ValueConverter getValueConverter();
+ ValueConverter getValueConverter();
/**
- * Service (possibly a pipeline) that will invoke {@link org.apache.tapestry.IActionListener}
- * objects.
+ * Service (possibly a pipeline) that will invoke
+ * {@link org.apache.tapestry.IActionListener} objects.
*/
- public ListenerInvoker getListenerInvoker();
+ ListenerInvoker getListenerInvoker();
/**
- * Service that is used to convert {@link org.apache.hivemind.Resource}s into
- * {@link org.apache.tapestry.IAsset}s.
+ * Service that is used to convert {@link org.apache.hivemind.Resource}s
+ * into {@link org.apache.tapestry.IAsset}s.
*/
- public AssetFactory getAssetFactory();
+ AssetFactory getAssetFactory();
/**
- * Service used to access HTTP Cookies. This is only available for Servlet Tapestry; a
- * placeholder will be provided for Portlet Tapestry.
+ * Service used to access HTTP Cookies. This is only available for Servlet
+ * Tapestry; a placeholder will be provided for Portlet Tapestry.
*/
- public CookieSource getCookieSource();
+ CookieSource getCookieSource();
/**
* Used to search for a class name within a list of packages.
*/
- public ClassFinder getClassFinder();
+ ClassFinder getClassFinder();
/**
* Returns the request cycle for the current thread.
*/
- public IRequestCycle getRequestCycle();
-}
\ No newline at end of file
+ IRequestCycle getRequestCycle();
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/InjectedValueProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/InjectedValueProvider.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/InjectedValueProvider.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/InjectedValueProvider.java Mon Mar 27 17:28:27 2006
@@ -35,5 +35,5 @@
* @return the value
*/
- public Object obtainValue(String objectReference, Location location);
-}
\ No newline at end of file
+ Object obtainValue(String objectReference, Location location);
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/LinkFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/LinkFactory.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/LinkFactory.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/LinkFactory.java Mon Mar 27 17:28:27 2006
@@ -22,52 +22,58 @@
import org.apache.tapestry.engine.ServiceEncoder;
/**
- * A source of {@link org.apache.tapestry.engine.ILink}instances. This is primarily used by
- * {@link org.apache.tapestry.engine.IEngineService}s.
+ * A source of {@link org.apache.tapestry.engine.ILink}instances. This is
+ * primarily used by {@link org.apache.tapestry.engine.IEngineService}s.
*
* @author Howard M. Lewis Ship
* @since 4.0
*/
public interface LinkFactory
{
+
/**
* Constructs an {@link org.apache.tapestry.engine.ILink}.
*
* @param service
* the service for which the link is being generated
* @param post
- * if true, then the link will be used for a post (not a get, i.e., for a HTML form);
- * this may affect what information is encoded into the link
+ * if true, then the link will be used for a post (not a get,
+ * i.e., for a HTML form); this may affect what information is
+ * encoded into the link
* @param parameters
- * A map; keys are strings and values are strings or string arrays (exception: key
- * {@link ServiceConstants#PARAMETER} is an array of objects. Certain keys, defined
- * in {@link ServiceConstants} may have special meaning. The map will typically be
- * modified internally. May not be null.
+ * A map; keys are strings and values are strings or string
+ * arrays (exception: key {@link ServiceConstants#PARAMETER} is
+ * an array of objects. Certain keys, defined in
+ * {@link ServiceConstants} may have special meaning. The map
+ * will typically be modified internally. May not be null.
* @param stateful
- * If true, then the final URL should be encoded (with the session id) if necessary.
- * If false, the session encoding should not occur. The latter case is useful for
- * services that will absolutely not need any access to user-specific state.
+ * If true, then the final URL should be encoded (with the
+ * session id) if necessary. If false, the session encoding
+ * should not occur. The latter case is useful for services that
+ * will absolutely not need any access to user-specific state.
*/
- public ILink constructLink(IEngineService service, boolean post, Map parameters,
- boolean stateful);
+ ILink constructLink(IEngineService service, boolean post,
+ Map parameters, boolean stateful);
/**
- * A secondary function of the service is to convert encoded (aka "squeezed") listener
- * parameters back into an array of Objects. This does (barely) makes sense .. the link factory
- * is responsible for encoding the listener parameters, it should be responsible for decoding
- * them.
+ * A secondary function of the service is to convert encoded (aka
+ * "squeezed") listener parameters back into an array of Objects. This does
+ * (barely) makes sense .. the link factory is responsible for encoding the
+ * listener parameters, it should be responsible for decoding them.
*
* @param cycle
* the current request cycle
- * @return an array of Object[]. May return an empty array, but won't return null.
+ * @return an array of Object[]. May return an empty array, but won't return
+ * null.
*/
- public Object[] extractListenerParameters(IRequestCycle cycle);
+ Object[] extractListenerParameters(IRequestCycle cycle);
/**
- * Returns an array of {@link org.apache.tapestry.engine.ServiceEncoder}, ordering into
- * execution order. May return an empty array, but won't return null.
+ * Returns an array of {@link org.apache.tapestry.engine.ServiceEncoder},
+ * ordering into execution order. May return an empty array, but won't
+ * return null.
*/
- public ServiceEncoder[] getServiceEncoders();
-}
\ No newline at end of file
+ ServiceEncoder[] getServiceEncoders();
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/NamespaceResources.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/NamespaceResources.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/NamespaceResources.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/NamespaceResources.java Mon Mar 27 17:28:27 2006
@@ -76,7 +76,7 @@
* if the specification doesn't exist, is unreadable or invalid.
*/
- public IComponentSpecification getComponentSpecification(Resource libraryResource,
+ IComponentSpecification getComponentSpecification(Resource libraryResource,
String specificationPath, Location location);
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ObjectPool.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ObjectPool.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ObjectPool.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ObjectPool.java Mon Mar 27 17:28:27 2006
@@ -14,24 +14,24 @@
package org.apache.tapestry.services;
-
/**
- * An pool for objects. Objects may be stored in a Pool for later reuse.
- *
+ * An pool for objects. Objects may be stored in a Pool for later reuse.
+ *
* @author Howard Lewis Ship
* @since 4.0
*/
public interface ObjectPool
{
- /**
- * Returns an object from the pool, previously stored with the given key. May
- * return null if no such object exists.
- */
- Object get(Object key);
-
- /**
- * Stores an object into the pool for later retrieval with the provided key.
- */
-
- void store(Object key, Object value);
+
+ /**
+ * Returns an object from the pool, previously stored with the given key.
+ * May return null if no such object exists.
+ */
+ Object get(Object key);
+
+ /**
+ * Stores an object into the pool for later retrieval with the provided key.
+ */
+
+ void store(Object key, Object value);
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestCycleFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestCycleFactory.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestCycleFactory.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestCycleFactory.java Mon Mar 27 17:28:27 2006
@@ -18,19 +18,20 @@
import org.apache.tapestry.IRequestCycle;
/**
- * A factory for creating instances of {@link org.apache.tapestry.IRequestCycle}for the current
- * request.
+ * A factory for creating instances of {@link org.apache.tapestry.IRequestCycle}for
+ * the current request.
*
* @author Howard M. Lewis Ship
* @since 4.0
*/
public interface RequestCycleFactory
{
+
/**
- * Constructs the new instance using the request context. This includes accessing
- * {@link org.apache.tapestry.engine.ServiceEncoder}s to restore any missing query parameters
- * (that were encoding into the URL).
+ * Constructs the new instance using the request context. This includes
+ * accessing {@link org.apache.tapestry.engine.ServiceEncoder}s to restore
+ * any missing query parameters (that were encoding into the URL).
*/
- public IRequestCycle newRequestCycle(IEngine engine);
-}
\ No newline at end of file
+ IRequestCycle newRequestCycle(IEngine engine);
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestGlobals.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestGlobals.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestGlobals.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestGlobals.java Mon Mar 27 17:28:27 2006
@@ -29,6 +29,7 @@
*/
public interface RequestGlobals
{
+
void store(HttpServletRequest request, HttpServletResponse response);
void store(WebRequest request, WebResponse response);
@@ -44,4 +45,4 @@
WebResponse getWebResponse();
IRequestCycle getRequestCycle();
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestLocaleManager.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestLocaleManager.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestLocaleManager.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/RequestLocaleManager.java Mon Mar 27 17:28:27 2006
@@ -17,25 +17,28 @@
import java.util.Locale;
/**
- * Used to determine what is the client-specified locale, if any, for the current request. This may
- * be stored in the request as an HTTP Cookie, or may be interpolated from request headers.
- * Additionally, the "raw" value provided by the client may be filtered down.
+ * Used to determine what is the client-specified locale, if any, for the
+ * current request. This may be stored in the request as an HTTP Cookie, or may
+ * be interpolated from request headers. Additionally, the "raw" value provided
+ * by the client may be filtered down.
*
* @author Howard Lewis Ship
* @since 4.0
*/
public interface RequestLocaleManager
{
+
/**
- * Determines the locale to use for processing the current request. The value is returned, but
- * also stored as {@link org.apache.tapestry.services.RequestGlobals#setIncomingLocale(Locale)}.
+ * Determines the locale to use for processing the current request. The
+ * value is returned, but also stored as
+ * {@link org.apache.tapestry.services.RequestGlobals#setIncomingLocale(Locale)}.
*/
- public Locale extractLocaleForCurrentRequest();
+ Locale extractLocaleForCurrentRequest();
/**
* Stores the thread's locale as a cookie for later use.
*/
- public void persistLocale();
-}
\ No newline at end of file
+ void persistLocale();
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ResetEventHub.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ResetEventHub.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ResetEventHub.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ResetEventHub.java Mon Mar 27 17:28:27 2006
@@ -19,18 +19,19 @@
/**
* Service interface for a source of <b>reset</b> events; this events are used
* to inform other services that they should discard any cached data.
- *
+ *
* @author Howard Lewis Ship
* @since 4.0
*/
public interface ResetEventHub
{
- public void addResetEventListener(ResetEventListener l);
- public void removeResetEventListener(ResetEventListener l);
+ void addResetEventListener(ResetEventListener l);
- /**
- * Notifies registered listeners.
- */
- public void fireResetEvent();
+ void removeResetEventListener(ResetEventListener l);
+
+ /**
+ * Notifies registered listeners.
+ */
+ void fireResetEvent();
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ResponseBuilder.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ResponseBuilder.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ResponseBuilder.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ResponseBuilder.java Mon Mar 27 17:28:27 2006
@@ -20,7 +20,7 @@
* Represents the class responsible for interacting
* with components for an ajax request library version and type.
*
- * @author jkuhenrt
+ * @author jkuhnert
*/
public interface ResponseBuilder {
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServiceConstants.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServiceConstants.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServiceConstants.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServiceConstants.java Mon Mar 27 17:28:27 2006
@@ -74,4 +74,4 @@
*/
public static final String[] RESERVED_IDS =
{ SERVICE, PAGE, COMPONENT, CONTAINER, SESSION, PARAMETER };
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServletRequestServicer.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServletRequestServicer.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServletRequestServicer.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServletRequestServicer.java Mon Mar 27 17:28:27 2006
@@ -31,6 +31,6 @@
*/
public interface ServletRequestServicer
{
- public void service(HttpServletRequest request, HttpServletResponse response)
+ void service(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException;
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/DefaultResponseContributorImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/DefaultResponseContributorImpl.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/DefaultResponseContributorImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/DefaultResponseContributorImpl.java Mon Mar 27 17:28:27 2006
@@ -41,11 +41,11 @@
public static final String ENCODING_KEY = "charset";
- private RequestLocaleManager _localeManager;
+ protected RequestLocaleManager _localeManager;
- private MarkupWriterSource _markupWriterSource;
+ protected MarkupWriterSource _markupWriterSource;
- private WebResponse _webResponse;
+ protected WebResponse _webResponse;
/**
* {@inheritDoc}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseContributorImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseContributorImpl.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseContributorImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseContributorImpl.java Mon Mar 27 17:28:27 2006
@@ -44,13 +44,13 @@
public static final String JSON_HEADER = "json";
- private RequestLocaleManager _localeManager;
+ protected RequestLocaleManager _localeManager;
- private MarkupWriterSource _markupWriterSource;
+ protected MarkupWriterSource _markupWriterSource;
- private WebResponse _webResponse;
+ protected WebResponse _webResponse;
- private WebRequest _webRequest;
+ protected WebRequest _webRequest;
/**
* {@inheritDoc}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java?rev=389348&r1=389347&r2=389348&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java Mon Mar 27 17:28:27 2006
@@ -29,7 +29,7 @@
*/
public class ResponseRendererImpl implements ResponseRenderer
{
- private ResponseDelegateFactory _responseDelegate;
+ protected ResponseDelegateFactory _responseDelegate;
public void renderResponse(IRequestCycle cycle) throws IOException
{
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org