You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jb...@apache.org on 2007/04/12 11:30:14 UTC
svn commit: r527851 [1/2] - in /incubator/wicket/branches/wicket-1.x/jdk-1.4:
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/
wic...
Author: jbq
Date: Thu Apr 12 02:30:08 2007
New Revision: 527851
URL: http://svn.apache.org/viewvc?view=rev&rev=527851
Log:
org.apache.wicket -> wicket
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/WicketAjaxIndicatorAppender.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/AbortWithHttpStatusException.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/RestartResponseException.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/IAjaxCallDecorator.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkup.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IScopedComponent.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/WicketTag.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IComponentAssignedModel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponseWithCryptedUrl.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestCycleProcessor.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/RequestParameters.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategy.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IMarkupSettings.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/WicketTestCase.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/WicketAjaxIndicatorAppender.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/WicketAjaxIndicatorAppender.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/WicketAjaxIndicatorAppender.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/WicketAjaxIndicatorAppender.java Thu Apr 12 02:30:08 2007
@@ -24,7 +24,7 @@
import org.apache.wicket.behavior.AbstractBehavior;
/**
- * A behavior that adds a span with org.apache.wicket's default indicator gif to the end of
+ * A behavior that adds a span with wicket's default indicator gif to the end of
* the component's markup. This span can be used as an ajax busy indicator. For
* an example usage see {@link IndicatingAjaxLink}
* <p>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java Thu Apr 12 02:30:08 2007
@@ -49,7 +49,7 @@
protected void onBind()
{
// add empty AbstractDefaultAjaxBehavior to the component, to force
- // rendering org.apache.wicket-ajax.js reference if no other ajax behavior is on
+ // rendering wicket-ajax.js reference if no other ajax behavior is on
// page
getComponent().add(new AbstractDefaultAjaxBehavior()
{
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java Thu Apr 12 02:30:08 2007
@@ -59,7 +59,7 @@
* shown (method <code>{@link #show(AjaxRequestTarget)})</code>. In case the
* content is another page, you can set the desired pagemap name using
* <code>{@link #setPageMapName(String)}</code>. Setting pagemap is only
- * needed when org.apache.wicket multiwindow support is on.
+ * needed when wicket multiwindow support is on.
* <p>
* The window can be made visible from an ajax handler using
* <code>{@link #show(AjaxRequestTarget)}</code>.
@@ -212,7 +212,7 @@
/**
* Sets the name of the page ma for the content page. This makes only sense
- * when the content is a page, not a component and if org.apache.wicket multiwindow
+ * when the content is a page, not a component and if wicket multiwindow
* support is turned on.
*
* @param pageMapName
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java Thu Apr 12 02:30:08 2007
@@ -26,7 +26,7 @@
/**
* Ajaxified version of the tabbed panel. Uses AjaxFallbackLink instead of
- * regular org.apache.wicket links so it can update itself inplace.
+ * regular wicket links so it can update itself inplace.
*
* @author Igor Vaynberg (ivaynberg)
*
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java Thu Apr 12 02:30:08 2007
@@ -25,7 +25,7 @@
/**
* A convinience implementation of column that adds a label to the cell whose
- * model is determined by the provided org.apache.wicket property expression (same as used
+ * model is determined by the provided wicket property expression (same as used
* by {@link PropertyModel}) that is evaluated against the current row's model
* object
* <p>
@@ -57,7 +57,7 @@
* @param sortProperty
* sort property
* @param propertyExpression
- * org.apache.wicket property expression used by PropertyModel
+ * wicket property expression used by PropertyModel
*/
public PropertyColumn(IModel displayModel, String sortProperty, String propertyExpression)
{
@@ -71,7 +71,7 @@
* @param displayModel
* display model
* @param propertyExpressions
- * org.apache.wicket property expression
+ * wicket property expression
* @see PropertyModel
*/
public PropertyColumn(IModel displayModel, String propertyExpressions)
@@ -98,7 +98,7 @@
}
/**
- * @return org.apache.wicket property expression
+ * @return wicket property expression
*/
public String getPropertyExpression()
{
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java Thu Apr 12 02:30:08 2007
@@ -70,7 +70,7 @@
* </p>
*
* <p>
- * For a complete example see the component references in org.apache.wicket-examples
+ * For a complete example see the component references in wicket-examples
* project
* </p>
*
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/AbortWithHttpStatusException.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/AbortWithHttpStatusException.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/AbortWithHttpStatusException.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/AbortWithHttpStatusException.java Thu Apr 12 02:30:08 2007
@@ -67,7 +67,7 @@
if (!(r instanceof WebResponse))
{
throw new IllegalStateException(
- "This exception can only be thrown when org.apache.wicket is processing an http request");
+ "This exception can only be thrown when wicket is processing an http request");
}
WebResponse wr = (WebResponse)r;
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java Thu Apr 12 02:30:08 2007
@@ -291,7 +291,7 @@
* Adds a component instantiation listener. This method should typicaly only
* be called during application startup; it is not thread safe.
* <p>
- * Note: org.apache.wicket does not guarantee the execution order of added listeners
+ * Note: wicket does not guarantee the execution order of added listeners
*
* @param listener
* the listener to add
@@ -341,9 +341,9 @@
* The configuration type. Must currently be either DEVELOPMENT
* or DEPLOYMENT. Currently, if the configuration type is
* DEVELOPMENT, resources are polled for changes, component usage
- * is checked, org.apache.wicket tags are not stripped from ouput and a
+ * is checked, wicket tags are not stripped from ouput and a
* detailed exception page is used. If the type is DEPLOYMENT,
- * component usage is not checked, org.apache.wicket tags are stripped from
+ * component usage is not checked, wicket tags are stripped from
* output and a non-detailed exception page is used to display
* errors.
* @param resourceFinder
@@ -617,11 +617,11 @@
/**
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL.
*
- * Initializes org.apache.wicket components.
+ * Initializes wicket components.
*/
public final void initializeComponents()
{
- // Load any org.apache.wicket properties files we can find
+ // Load any wicket properties files we can find
try
{
// Load properties files used by all libraries
@@ -816,7 +816,7 @@
}
/**
- * Called when org.apache.wicket servlet is destroyed. Overrides do not have to call
+ * Called when wicket servlet is destroyed. Overrides do not have to call
* super.
*/
protected void destroy()
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java Thu Apr 12 02:30:08 2007
@@ -903,7 +903,7 @@
* Retrieves id by which this component is represented within the markup.
* <p>
* The point of this function is to generate a unique id to make it easy to
- * locate this component in the generated markup for post-org.apache.wicket processing
+ * locate this component in the generated markup for post-wicket processing
* such as javascript or an xslt transform.
* <p>
* Note: This method should only be called after the component or its parent
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/RestartResponseException.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/RestartResponseException.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/RestartResponseException.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/RestartResponseException.java Thu Apr 12 02:30:08 2007
@@ -17,7 +17,7 @@
package org.apache.wicket;
/**
- * Causes org.apache.wicket to interrupt current request processing and immediately respond
+ * Causes wicket to interrupt current request processing and immediately respond
* with the specified page.
*
* @author Igor Vaynberg (ivaynberg)
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/IAjaxCallDecorator.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/IAjaxCallDecorator.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/IAjaxCallDecorator.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/IAjaxCallDecorator.java Thu Apr 12 02:30:08 2007
@@ -19,7 +19,7 @@
import org.apache.wicket.IClusterable;
/**
- * Interface used to decorate a org.apache.wicket generated javascript that performs an
+ * Interface used to decorate a wicket generated javascript that performs an
* ajax callback
* <p>
* The returned scripts are rendered in the HTML as follow:
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java Thu Apr 12 02:30:08 2007
@@ -35,7 +35,7 @@
* stack traces like: java.lang.LinkageError: duplicate class definition:
*
* <pre>
- * org.apache.wicket/examples/repeater/RepeatingPage at java.lang.ClassLoader.defineClass1(Native Method)
+ * wicket/examples/repeater/RepeatingPage at java.lang.ClassLoader.defineClass1(Native Method)
* </pre>
*
* This problem has gone since we synchronize the access.
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkup.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkup.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkup.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkup.java Thu Apr 12 02:30:08 2007
@@ -45,7 +45,7 @@
/**
* For Wicket it would be sufficient for this method to be package
- * protected. However to allow org.apache.wicket-bench easy access to the information
+ * protected. However to allow wicket-bench easy access to the information
* ...
*
* @param index
@@ -71,9 +71,9 @@
MarkupResourceStream getResource();
/**
- * Get the org.apache.wicket namespace valid for this specific markup
+ * Get the wicket namespace valid for this specific markup
*
- * @return org.apache.wicket namespace
+ * @return wicket namespace
*/
String getWicketNamespace();
@@ -86,7 +86,7 @@
/**
* For Wicket it would be sufficient for this method to be package
- * protected. However to allow org.apache.wicket-bench easy access to the information
+ * protected. However to allow wicket-bench easy access to the information
* ...
*
* @return Number of markup elements
@@ -102,4 +102,4 @@
* @return String representation of markup list
*/
String toString();
-}
\ No newline at end of file
+}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IScopedComponent.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IScopedComponent.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IScopedComponent.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IScopedComponent.java Thu Apr 12 02:30:08 2007
@@ -18,11 +18,11 @@
/**
* To be implemented by Components which walks up the component tree until a
- * Page or Panel and tries to find a component with a matching org.apache.wicket id if the
+ * Page or Panel and tries to find a component with a matching wicket id if the
* component itself does not contain it.
* <p>
* Note: MarkupContainer.isTransparent() in combination with ParentResolver
- * tries to resolve the org.apache.wicket id with the parent only and shall be used to
+ * tries to resolve the wicket id with the parent only and shall be used to
* implement transparent containers.
*
* @see org.apache.wicket.markup.resolver.ScopedComponentResolver
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java Thu Apr 12 02:30:08 2007
@@ -157,7 +157,7 @@
/**
* For Wicket it would be sufficient for this method to be package
- * protected. However to allow org.apache.wicket-bench easy access to the
+ * protected. However to allow wicket-bench easy access to the
* information ...
*
* @param index
@@ -181,7 +181,7 @@
/**
* For Wicket it would be sufficient for this method to be package
- * protected. However to allow org.apache.wicket-bench easy access to the
+ * protected. However to allow wicket-bench easy access to the
* information ...
*
* @return Number of markup elements
@@ -214,9 +214,9 @@
}
/**
- * Get the org.apache.wicket namespace valid for this specific markup
+ * Get the wicket namespace valid for this specific markup
*
- * @return org.apache.wicket namespace
+ * @return wicket namespace
*/
public String getWicketNamespace()
{
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java Thu Apr 12 02:30:08 2007
@@ -449,7 +449,7 @@
/**
* Check if markup contains <wicket:extend> which tells us that we
* need to read the inherited markup as well. <wicket:extend> MUST BE
- * the first org.apache.wicket tag in the markup. Skip raw markup
+ * the first wicket tag in the markup. Skip raw markup
*
* @param markup
* @return == 0, if no wicket:extend was found
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java Thu Apr 12 02:30:08 2007
@@ -83,7 +83,7 @@
/**
* For Wicket it would be sufficient for this method to be package
- * protected. However to allow org.apache.wicket-bench easy access to the information
+ * protected. However to allow wicket-bench easy access to the information
* ...
*
* @param index
@@ -107,7 +107,7 @@
/**
* For Wicket it would be sufficient for this method to be package
- * protected. However to allow org.apache.wicket-bench easy access to the information
+ * protected. However to allow wicket-bench easy access to the information
* ...
*
* @return Number of markup elements
@@ -157,7 +157,7 @@
}
/**
- * Reset the markup to its defaults, except for the org.apache.wicket namespace which
+ * Reset the markup to its defaults, except for the wicket namespace which
* remains unchanged.
*/
final void reset()
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java Thu Apr 12 02:30:08 2007
@@ -191,7 +191,7 @@
// Initialize the xml parser
this.xmlParser.parse(resource.getInputStream(), this.markupSettings.getDefaultMarkupEncoding());
- // parse the xml markup and tokenize it into org.apache.wicket relevant markup
+ // parse the xml markup and tokenize it into wicket relevant markup
// elements
parseMarkup();
@@ -219,7 +219,7 @@
// Initialize the xml parser
this.xmlParser.parse(string);
- // parse the xml markup and tokenize it into org.apache.wicket relevant markup
+ // parse the xml markup and tokenize it into wicket relevant markup
// elements
parseMarkup();
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java Thu Apr 12 02:30:08 2007
@@ -290,9 +290,9 @@
}
/**
- * Get the org.apache.wicket namespace valid for this specific markup
+ * Get the wicket namespace valid for this specific markup
*
- * @return org.apache.wicket namespace
+ * @return wicket namespace
*/
public final String getWicketNamespace()
{
@@ -399,11 +399,11 @@
}
/**
- * Skips any markup at the current position until the org.apache.wicket tag
+ * Skips any markup at the current position until the wicket tag
* name is found.
*
* @param wicketTagName
- * org.apache.wicket tag name to seek
+ * wicket tag name to seek
*/
public void skipUntil(final String wicketTagName)
{
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/WicketTag.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/WicketTag.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/WicketTag.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/WicketTag.java Thu Apr 12 02:30:08 2007
@@ -20,14 +20,14 @@
/**
* WicketTag extends ComponentTag and will be created by a MarkupParser whenever
- * it parses a tag in the org.apache.wicket namespace. By default, this namespace is
- * "wicket", so org.apache.wicket tags are then of the form <wicket:*>
+ * it parses a tag in the wicket namespace. By default, this namespace is
+ * "wicket", so wicket tags are then of the form <wicket:*>
* <p>
* Note 1: you need to add an XHTML doctype to your markup and use <html
* xmlns:wicket> to create a XHTML conformant namespace for such tags.
* <p>
* Note 2: The namespace name is configurable. E.g. <html
- * xmlns:wcn="http://org.apache.wicket">
+ * xmlns:wcn="http://wicket">
*
* @author Juergen Donnerstag
*/
@@ -186,4 +186,4 @@
return tag;
}
}
-}
\ No newline at end of file
+}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java Thu Apr 12 02:30:08 2007
@@ -363,7 +363,7 @@
// Automatically expand <wicket:body/> to
// <wicket:body>...</wicket:body>
// in order for the html to look right: insert the body in between
- // the org.apache.wicket tags instead of behind the open-close tag.
+ // the wicket tags instead of behind the open-close tag.
bodyTag = tag.mutable();
bodyTag.setType(XmlTag.OPEN);
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java Thu Apr 12 02:30:08 2007
@@ -93,7 +93,7 @@
* </p>
*
* Form for handling (file) uploads with multipart requests is supported by
- * callign setMultiPart(true) ( although org.apache.wicket will try to automatically detect
+ * callign setMultiPart(true) ( although wicket will try to automatically detect
* this for you ). Use this with
* {@link org.apache.wicket.markup.html.form.upload.FileUploadField} components. You can
* attach mutliple FileUploadField components for muliple file uploads.
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java Thu Apr 12 02:30:08 2007
@@ -148,7 +148,7 @@
}
/**
- * Check the associated markup file for a org.apache.wicket header tag
+ * Check the associated markup file for a wicket header tag
*
* @see org.apache.wicket.Component#renderHead(org.apache.wicket.markup.html.internal.HtmlHeaderContainer)
*/
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java Thu Apr 12 02:30:08 2007
@@ -56,7 +56,7 @@
* For customizing caption text see {@link #RESOURCE_LIMITED} and
* {@link #RESOURCE_UNLIMITED}
*
- * For an example of styling using CSS see the upload example in org.apache.wicket-examples
+ * For an example of styling using CSS see the upload example in wicket-examples
*
* @author Igor Vaynberg (ivaynberg)
*/
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java Thu Apr 12 02:30:08 2007
@@ -43,7 +43,7 @@
* something to contribute to the <head> section of the html response. If
* yes, it must <b>immediately</b> be rendered.
* <p>
- * <head> regions may contain additional org.apache.wicket components, which can be
+ * <head> regions may contain additional wicket components, which can be
* added by means of add(Component) as usual.
* <p>
* <wicket:head> tags are handled by simple WebMarkupContainers also
@@ -51,7 +51,7 @@
* <p>
* <ul>
* <li> <head> will be inserted in output automatically if required</li>
- * <li> <head> is <b>not</b> a org.apache.wicket specific tag and you must use add()
+ * <li> <head> is <b>not</b> a wicket specific tag and you must use add()
* to add components referenced in body of the head tag</li>
* <li> <head> is supported by panels, borders and inherited markup, but
* is <b>not</b> copied to the output. They are for previewability only (except
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java Thu Apr 12 02:30:08 2007
@@ -115,7 +115,7 @@
}
/**
- * Check the associated markup file for a org.apache.wicket header tag
+ * Check the associated markup file for a wicket header tag
*
* @see org.apache.wicket.Component#renderHead(org.apache.wicket.markup.html.internal.HtmlHeaderContainer)
*/
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java Thu Apr 12 02:30:08 2007
@@ -1,158 +1,158 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.markup.parser.filter;
-
-import java.text.ParseException;
-import java.util.Stack;
-
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.MarkupElement;
-import org.apache.wicket.markup.WicketTag;
-import org.apache.wicket.markup.html.internal.Enclosure;
-import org.apache.wicket.markup.parser.AbstractMarkupFilter;
-import org.apache.wicket.markup.resolver.EnclosureResolver;
-
-
-/**
- * This is a markup inline filter. It identifies <wicket:enclosure> tags.
- * If the 'child' attribute is empty it determines the wicket:id of the child
- * component automatically by analysing the org.apache.wicket component (in this case on
- * one org.apache.wicket component is allowed) in between the open and close tags. If the
- * enclosure tag has a 'child' attribute like
- * <code><wicket:enclosure child="xxx"></code> than more than just one
- * org.apache.wicket component inside the enclosure tags are allowed and the child
- * component which determines the visibility of the enclosure is identified by
- * the 'child' attribute value which must be equal to the relative child id
- * path.
- *
- * @see EnclosureResolver
- * @see Enclosure
- *
- * @author Juergen Donnerstag
- */
-public final class EnclosureHandler extends AbstractMarkupFilter
-{
- /** The child attribute */
- public static final String CHILD_ATTRIBUTE = "child";
-
- static
- {
- // register "wicket:enclosure"
- WicketTagIdentifier.registerWellKnownTagName("enclosure");
- }
-
- /** Stack of <wicket:enclosure> tags */
- private Stack/* <ComponentTag> */stack;
-
- /** The id of the first org.apache.wicket tag inside the enclosure */
- private String childId;
-
- /**
- * Construct.
- */
- public EnclosureHandler()
- {
- }
-
- /**
- * @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
- */
- public final MarkupElement nextTag() throws ParseException
- {
- // Get the next tag from the next MarkupFilter in the chain.
- // If null, no more tags are available
- final ComponentTag tag = nextComponentTag();
- if (tag == null)
- {
- return tag;
- }
-
- final boolean isWicketTag = tag instanceof WicketTag;
- final boolean isEnclosureTag = isWicketTag && ((WicketTag)tag).isEnclosureTag();
-
- // If wicket:enclosure
- if (isEnclosureTag)
- {
- // If open tag, than put the tag onto the stack
- if (tag.isOpen())
- {
- if (this.stack == null)
- {
- this.stack = new Stack/* <ComponentTag> */();
- }
- this.stack.push(tag);
- }
- // If close tag, than remove the tag from the stack and update
- // the child attribute of the open tag if required
- else if (tag.isClose())
- {
- if (this.stack == null)
- {
- throw new ParseException("Missing open tag for Enclosure: " + tag.toString(),
- tag.getPos());
- }
-
- // Remove the open tag from the stack
- ComponentTag lastEnclosure = (ComponentTag)this.stack.pop();
-
- // If the child attribute has not been given by the user,
- // than ...
- if (this.childId != null)
- {
- lastEnclosure.put(CHILD_ATTRIBUTE, this.childId);
- lastEnclosure.setModified(true);
- this.childId = null;
- }
-
- if (this.stack.size() == 0)
- {
- this.stack = null;
- }
- }
- else
- {
- throw new ParseException("Open-close tag not allowed for Enclosure: "
- + tag.toString(), tag.getPos());
- }
- }
- // Are we inside a wicket:enclosure tag?
- else if ((tag.getId() != null) && (isWicketTag == false) && (stack != null))
- {
- ComponentTag lastEnclosure = (ComponentTag)this.stack.lastElement();
-
- // If the enclosure tag has NO child attribute, than ...
- if (lastEnclosure.getString(CHILD_ATTRIBUTE) == null)
- {
- // We encountered more than one child component inside
- // the enclosure and are not able to automatically
- // determine the child component to delegate the
- // isVisible() to => Exception
- if (this.childId != null)
- {
- throw new ParseException(
- "Use <wicket:enclosure child='xxx'> to name the child component", tag
- .getPos());
- }
- // Remember the child id. The open tag will be updated
- // once the close tag is found. See above.
- this.childId = tag.getId();
- }
- }
-
- return tag;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.markup.parser.filter;
+
+import java.text.ParseException;
+import java.util.Stack;
+
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupElement;
+import org.apache.wicket.markup.WicketTag;
+import org.apache.wicket.markup.html.internal.Enclosure;
+import org.apache.wicket.markup.parser.AbstractMarkupFilter;
+import org.apache.wicket.markup.resolver.EnclosureResolver;
+
+
+/**
+ * This is a markup inline filter. It identifies <wicket:enclosure> tags.
+ * If the 'child' attribute is empty it determines the wicket:id of the child
+ * component automatically by analysing the wicket component (in this case on
+ * one wicket component is allowed) in between the open and close tags. If the
+ * enclosure tag has a 'child' attribute like
+ * <code><wicket:enclosure child="xxx"></code> than more than just one
+ * wicket component inside the enclosure tags are allowed and the child
+ * component which determines the visibility of the enclosure is identified by
+ * the 'child' attribute value which must be equal to the relative child id
+ * path.
+ *
+ * @see EnclosureResolver
+ * @see Enclosure
+ *
+ * @author Juergen Donnerstag
+ */
+public final class EnclosureHandler extends AbstractMarkupFilter
+{
+ /** The child attribute */
+ public static final String CHILD_ATTRIBUTE = "child";
+
+ static
+ {
+ // register "wicket:enclosure"
+ WicketTagIdentifier.registerWellKnownTagName("enclosure");
+ }
+
+ /** Stack of <wicket:enclosure> tags */
+ private Stack/* <ComponentTag> */stack;
+
+ /** The id of the first wicket tag inside the enclosure */
+ private String childId;
+
+ /**
+ * Construct.
+ */
+ public EnclosureHandler()
+ {
+ }
+
+ /**
+ * @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
+ */
+ public final MarkupElement nextTag() throws ParseException
+ {
+ // Get the next tag from the next MarkupFilter in the chain.
+ // If null, no more tags are available
+ final ComponentTag tag = nextComponentTag();
+ if (tag == null)
+ {
+ return tag;
+ }
+
+ final boolean isWicketTag = tag instanceof WicketTag;
+ final boolean isEnclosureTag = isWicketTag && ((WicketTag)tag).isEnclosureTag();
+
+ // If wicket:enclosure
+ if (isEnclosureTag)
+ {
+ // If open tag, than put the tag onto the stack
+ if (tag.isOpen())
+ {
+ if (this.stack == null)
+ {
+ this.stack = new Stack/* <ComponentTag> */();
+ }
+ this.stack.push(tag);
+ }
+ // If close tag, than remove the tag from the stack and update
+ // the child attribute of the open tag if required
+ else if (tag.isClose())
+ {
+ if (this.stack == null)
+ {
+ throw new ParseException("Missing open tag for Enclosure: " + tag.toString(),
+ tag.getPos());
+ }
+
+ // Remove the open tag from the stack
+ ComponentTag lastEnclosure = (ComponentTag)this.stack.pop();
+
+ // If the child attribute has not been given by the user,
+ // than ...
+ if (this.childId != null)
+ {
+ lastEnclosure.put(CHILD_ATTRIBUTE, this.childId);
+ lastEnclosure.setModified(true);
+ this.childId = null;
+ }
+
+ if (this.stack.size() == 0)
+ {
+ this.stack = null;
+ }
+ }
+ else
+ {
+ throw new ParseException("Open-close tag not allowed for Enclosure: "
+ + tag.toString(), tag.getPos());
+ }
+ }
+ // Are we inside a wicket:enclosure tag?
+ else if ((tag.getId() != null) && (isWicketTag == false) && (stack != null))
+ {
+ ComponentTag lastEnclosure = (ComponentTag)this.stack.lastElement();
+
+ // If the enclosure tag has NO child attribute, than ...
+ if (lastEnclosure.getString(CHILD_ATTRIBUTE) == null)
+ {
+ // We encountered more than one child component inside
+ // the enclosure and are not able to automatically
+ // determine the child component to delegate the
+ // isVisible() to => Exception
+ if (this.childId != null)
+ {
+ throw new ParseException(
+ "Use <wicket:enclosure child='xxx'> to name the child component", tag
+ .getPos());
+ }
+ // Remember the child id. The open tag will be updated
+ // once the close tag is found. See above.
+ this.childId = tag.getId();
+ }
+ }
+
+ return tag;
+ }
+}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java Thu Apr 12 02:30:08 2007
@@ -43,7 +43,7 @@
*
* The purpose of the filter is to prepend the web apps context path to all href
* and src attributes found in the markup which contain a relative URL like
- * "myDir/myPage.gif". It is applied to all non org.apache.wicket component tags (attributes).
+ * "myDir/myPage.gif". It is applied to all non wicket component tags (attributes).
*
* @author Juergen Donnerstag
*/
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java Thu Apr 12 02:30:08 2007
@@ -98,7 +98,7 @@
if (tag.getId() == null)
{
// if this is a raw tag we need to set the id to something so
- // that org.apache.wicket will not merge this as raw markup and instead
+ // that wicket will not merge this as raw markup and instead
// pass it on to a resolver
tag.setId(WICKET_MESSAGE_CONTAINER_ID);
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java Thu Apr 12 02:30:08 2007
@@ -92,7 +92,7 @@
}
/**
- * Determine org.apache.wicket namespace from xmlns:wicket or
+ * Determine wicket namespace from xmlns:wicket or
* xmlns:wicket="http://wicket.apache.org"
*
* @param tag
@@ -117,7 +117,7 @@
if ((xmlnsUrl == null) || (xmlnsUrl.trim().length() == 0)
|| xmlnsUrl.startsWith(WICKET_URI))
{
- // Set the Wicket namespace for org.apache.wicket tags (e.g.
+ // Set the Wicket namespace for wicket tags (e.g.
// <wicket:panel>) and attributes (e.g. wicket:id)
final String namespace = attributeName.substring(XMLNS.length());
if (Application.get().getMarkupSettings().getStripWicketTags())
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java Thu Apr 12 02:30:08 2007
@@ -44,7 +44,7 @@
*/
public final class WicketTagIdentifier extends AbstractMarkupFilter
{
- /** List of well known org.apache.wicket tag namses */
+ /** List of well known wicket tag namses */
private static List wellKnownTagNames;
/** The current markup needed to get the markups namespace */
@@ -141,7 +141,7 @@
}
/**
- * Register a new well known org.apache.wicket tag name (e.g. panel)
+ * Register a new well known wicket tag name (e.g. panel)
*
* @param name
*/
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java Thu Apr 12 02:30:08 2007
@@ -146,7 +146,7 @@
* rendered.
*
* Child component are rendered in the order they are in the iterator. Since
- * we use the iterator returned by org.apache.wicket's
+ * we use the iterator returned by wicket's
* <code>MarkupContainer#iterator()</code> method and that method does not
* guarantee any kind of ordering neither do we. This method can be
* overridden by subclasses to create an ordering scheme, see
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java Thu Apr 12 02:30:08 2007
@@ -188,37 +188,37 @@
catch (NoSuchMethodException e)
{
throw new MarkupException(
- "Unable to create Component from org.apache.wicket tag: Cause: "
+ "Unable to create Component from wicket tag: Cause: "
+ e.getMessage());
}
catch (InvocationTargetException e)
{
throw new MarkupException(
- "Unable to create Component from org.apache.wicket tag: Cause: "
+ "Unable to create Component from wicket tag: Cause: "
+ e.getMessage());
}
catch (IllegalAccessException e)
{
throw new MarkupException(
- "Unable to create Component from org.apache.wicket tag: Cause: "
+ "Unable to create Component from wicket tag: Cause: "
+ e.getMessage());
}
catch (InstantiationException e)
{
throw new MarkupException(
- "Unable to create Component from org.apache.wicket tag: Cause: "
+ "Unable to create Component from wicket tag: Cause: "
+ e.getMessage());
}
catch (ClassCastException e)
{
throw new MarkupException(
- "Unable to create Component from org.apache.wicket tag: Cause: "
+ "Unable to create Component from wicket tag: Cause: "
+ e.getMessage());
}
catch (SecurityException e)
{
throw new MarkupException(
- "Unable to create Component from org.apache.wicket tag: Cause: "
+ "Unable to create Component from wicket tag: Cause: "
+ e.getMessage());
}
@@ -321,4 +321,4 @@
+ ". Cause: " + ex);
}
}
-}
\ No newline at end of file
+}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java Thu Apr 12 02:30:08 2007
@@ -45,7 +45,7 @@
/**
* The AutoLinkResolver is responsible to handle automatic link resolution. Tags
* are marked "autolink" by the MarkupParser for all tags with href attribute,
- * such as anchor and link tags with no explicit org.apache.wicket id. E.g. <a
+ * such as anchor and link tags with no explicit wicket id. E.g. <a
* href="Home.html">
* <p>
* If href points to a *.html file, a BookmarkablePageLink will automatically be
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java Thu Apr 12 02:30:08 2007
@@ -26,8 +26,8 @@
/**
* Implement a component resolver which walks up the component tree until a Page
- * or Panel and tries to find a component with a matching org.apache.wicket id, effectivly
- * providing something like scoping for org.apache.wicket id resolution.
+ * or Panel and tries to find a component with a matching wicket id, effectivly
+ * providing something like scoping for wicket id resolution.
* <p>
* Note: This resolver is not activated by default. It has to be added by means of
* <code>Application.getComponentResolvers().add(new InheritComponentResolver())
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java Thu Apr 12 02:30:08 2007
@@ -1,96 +1,96 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.markup.resolver;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
-
-
-/**
- * This is a tag resolver which handles <wicket:container>
- *
- * Sometimes adding components in certain ways may lead to output of invalid
- * markup. For example, lets pretend we output table rows two at a time using a
- * repeater. The markup would look something like this:
- *
- * <code>
- * <table>
- * <span wicket:id="repeater">
- * <tr><td>...</td></tr>
- * <tr><td>...</td></tr>
- * </span>
- * </table>
- * </code>
- *
- * Notice that we had to attach the repeater to a component tag - in this case a
- * <code>span</code>, but a span is not a legal tag to nest under
- * <code>table</code>. So we can rewrite the example as following:
- *
- * <code>
- * <table>
- * <wicket:container wicket:id="repeater">
- * <tr><td>...</td></tr>
- * <tr><td>...</td></tr>
- * </wicket:container>
- * </table>
- * </code>
- *
- * The above is valid markup because org.apache.wicket namespaced tags are allowed anywhere
- *
- * @author Igor Vaynberg (ivaynberg)
- */
-public class WicketContainerResolver implements IComponentResolver
-{
- private static final Log log = LogFactory.getLog(WicketContainerResolver.class);
-
- static
- {
- // register "wicket:container"
- WicketTagIdentifier.registerWellKnownTagName("container");
- }
-
-
- private static final long serialVersionUID = 1L;
-
- /**
- * Try to resolve the tag, then create a component, add it to the container
- * and render it.
- *
- * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
- * MarkupStream, ComponentTag)
- *
- * @param container
- * The container parsing its markup
- * @param markupStream
- * The current markupStream
- * @param tag
- * The current component tag while parsing the markup
- * @return true, if componentId was handle by the resolver. False, otherwise
- */
- public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
- final ComponentTag tag)
- {
- // this is only here so we register wicket:container tag, this resolver
- // does not actually do anything special to the tag
- return false;
- }
-
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.markup.resolver;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
+
+
+/**
+ * This is a tag resolver which handles <wicket:container>
+ *
+ * Sometimes adding components in certain ways may lead to output of invalid
+ * markup. For example, lets pretend we output table rows two at a time using a
+ * repeater. The markup would look something like this:
+ *
+ * <code>
+ * <table>
+ * <span wicket:id="repeater">
+ * <tr><td>...</td></tr>
+ * <tr><td>...</td></tr>
+ * </span>
+ * </table>
+ * </code>
+ *
+ * Notice that we had to attach the repeater to a component tag - in this case a
+ * <code>span</code>, but a span is not a legal tag to nest under
+ * <code>table</code>. So we can rewrite the example as following:
+ *
+ * <code>
+ * <table>
+ * <wicket:container wicket:id="repeater">
+ * <tr><td>...</td></tr>
+ * <tr><td>...</td></tr>
+ * </wicket:container>
+ * </table>
+ * </code>
+ *
+ * The above is valid markup because wicket namespaced tags are allowed anywhere
+ *
+ * @author Igor Vaynberg (ivaynberg)
+ */
+public class WicketContainerResolver implements IComponentResolver
+{
+ private static final Log log = LogFactory.getLog(WicketContainerResolver.class);
+
+ static
+ {
+ // register "wicket:container"
+ WicketTagIdentifier.registerWellKnownTagName("container");
+ }
+
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Try to resolve the tag, then create a component, add it to the container
+ * and render it.
+ *
+ * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
+ * MarkupStream, ComponentTag)
+ *
+ * @param container
+ * The container parsing its markup
+ * @param markupStream
+ * The current markupStream
+ * @param tag
+ * The current component tag while parsing the markup
+ * @return true, if componentId was handle by the resolver. False, otherwise
+ */
+ public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
+ final ComponentTag tag)
+ {
+ // this is only here so we register wicket:container tag, this resolver
+ // does not actually do anything special to the tag
+ return false;
+ }
+
+}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java Thu Apr 12 02:30:08 2007
@@ -31,7 +31,7 @@
* transformation to ensure the xml data are well formed (single root element).
* In addition the attribute
* <code>xmlns:wicket="http://wicket.apache.org"</code> is added to the
- * root element to allow the XSL processor to handle the org.apache.wicket namespace.
+ * root element to allow the XSL processor to handle the wicket namespace.
* <p>
* Similar to this container, a <code>IBehavior</code> is available which does
* the same, but does not require an additional Container.
@@ -70,7 +70,7 @@
setTransformBodyOnly(false);
// Make the XSLT processor happy and allow him to handle the org.apache.wicket
- // tags and attributes which are in the org.apache.wicket namespace
+ // tags and attributes which are in the wicket namespace
add(new AttributeModifier("xmlns:wicket", true, new Model("http://wicket.apache.org")));
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java Thu Apr 12 02:30:08 2007
@@ -77,7 +77,7 @@
// Make the XSLT processor happy and allow it to handle the
// org.apache.wicket
- // tags and attributes that are in the org.apache.wicket namespace
+ // tags and attributes that are in the wicket namespace
super.onComponentTag(component, tag);
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IComponentAssignedModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IComponentAssignedModel.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IComponentAssignedModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IComponentAssignedModel.java Thu Apr 12 02:30:08 2007
@@ -25,7 +25,7 @@
* One reason for a model to want to do this is if it needs to be aware of the
* component it is bound to.
*
- * The algorithm org.apache.wicket employes is similar to this:
+ * The algorithm wicket employes is similar to this:
*
* <pre>
* void Component.setModel(IModel model)
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java Thu Apr 12 02:30:08 2007
@@ -17,7 +17,7 @@
package org.apache.wicket.protocol.http;
/**
- * A factory interface used by org.apache.wicket filter to create application objects.
+ * A factory interface used by wicket filter to create application objects.
* Configure your webapplication to use this factory in web.xml like:
*
* <pre>
@@ -36,7 +36,7 @@
* Create application object
*
* @param filter
- * the org.apache.wicket filter
+ * the wicket filter
* @return application object instance
*/
WebApplication createApplication(WicketFilter filter);
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java Thu Apr 12 02:30:08 2007
@@ -130,7 +130,7 @@
* Create the mock http tester that can be used for testing.
*
* @param application
- * The org.apache.wicket application object
+ * The wicket application object
* @param path
* The absolute path on disk to the web tester contents (e.g. war
* root) - may be null
@@ -221,7 +221,7 @@
// markup.
// Disabling this also helps test suites with many test cases
// (problems has been noticed with >~300 test cases). The problem
- // is that even if the org.apache.wicket tester is GC'ed the modification
+ // is that even if the wicket tester is GC'ed the modification
// watcher still runs, taking up file handles and memory, leading
// to "Too many files opened" or a regular OutOfMemoryException
this.application.getResourceSettings().setResourcePollFrequency(null);
@@ -303,9 +303,9 @@
}
/**
- * Get the org.apache.wicket request object.
+ * Get the wicket request object.
*
- * @return The org.apache.wicket request object
+ * @return The wicket request object
*/
public WebRequest getWicketRequest()
{
@@ -313,9 +313,9 @@
}
/**
- * Get the org.apache.wicket response object.
+ * Get the wicket response object.
*
- * @return The org.apache.wicket response object
+ * @return The wicket response object
*/
public WebResponse getWicketResponse()
{
@@ -323,9 +323,9 @@
}
/**
- * Get the org.apache.wicket session.
+ * Get the wicket session.
*
- * @return The org.apache.wicket session object
+ * @return The wicket session object
*/
public WebSession getWicketSession()
{
@@ -479,7 +479,7 @@
/**
* Reset the request and the response back to a starting state and recreate
- * the necessary org.apache.wicket request, response and session objects. The request
+ * the necessary wicket request, response and session objects. The request
* and response objects can be accessed and initialised at this point.
*/
public void setupRequestAndResponse()
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java Thu Apr 12 02:30:08 2007
@@ -27,7 +27,7 @@
* Custom WicketFilter that reloads the web applications when classes are
* modified. In order to reload your own classes, use include and exclude
* patterns using wildcards. And in web.xml, point to your custom reloading
- * org.apache.wicket filter instead of the original org.apache.wicket filter.
+ * wicket filter instead of the original wicket filter.
*
* <p>
* The built-in patterns are:
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java Thu Apr 12 02:30:08 2007
@@ -200,7 +200,7 @@
return wicketFilter.getFilterConfig().getServletContext();
}
throw new IllegalStateException("servletContext is not set yet. Any code in your"
- + " Application object that uses the org.apache.wicket filter instance should be put"
+ + " Application object that uses the wicket filter instance should be put"
+ " in the init() method instead of your constructor");
}
@@ -412,7 +412,7 @@
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL IT.
*
* @param wicketFilter
- * The org.apache.wicket filter instance for this application
+ * The wicket filter instance for this application
*/
public final void setWicketFilter(final WicketFilter wicketFilter)
{
@@ -489,11 +489,11 @@
}
/**
- * Initialize; if you need the org.apache.wicket servlet for initialization, e.g.
+ * Initialize; if you need the wicket servlet for initialization, e.g.
* because you want to read an initParameter from web.xml or you want to
* read a resource from the servlet's context path, you can override this
* method and provide custom initialization. This method is called right
- * after this application class is constructed, and the org.apache.wicket servlet is
+ * after this application class is constructed, and the wicket servlet is
* set. <strong>Use this method for any application setup instead of the
* constructor.</strong>
*/
@@ -624,7 +624,7 @@
}
/**
- * Create a WebResponse. Subclasses of WebRequest could e.g. encode org.apache.wicket's
+ * Create a WebResponse. Subclasses of WebRequest could e.g. encode wicket's
* default URL and hide the details from the user. A appropriate WebRequest
* must be implemented and configured to decode the encoded URL.
*
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java Thu Apr 12 02:30:08 2007
@@ -186,7 +186,7 @@
// if we get here, we have no regconized Wicket target, and thus
- // regard this as a external (non-org.apache.wicket) resource request on
+ // regard this as a external (non-wicket) resource request on
// this server
return resolveExternalResource(requestCycle);
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java Thu Apr 12 02:30:08 2007
@@ -194,7 +194,7 @@
{
/*
* By reaching this point, make sure the HTTP response
- * status code is set to 200, otherwise org.apache.wicket-ajax.js
+ * status code is set to 200, otherwise wicket-ajax.js
* will not process the Ajax-Location header
*/
httpServletResponse.addHeader("Ajax-Location", url);
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponseWithCryptedUrl.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponseWithCryptedUrl.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponseWithCryptedUrl.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponseWithCryptedUrl.java Thu Apr 12 02:30:08 2007
@@ -31,7 +31,7 @@
/**
- * It extends WebResponse and encodes (encrypt) org.apache.wicket's URL
+ * It extends WebResponse and encodes (encrypt) wicket's URL
* query string. Thus it hides the details from the user.
*
* @author Juergen Donnerstag
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java Thu Apr 12 02:30:08 2007
@@ -82,7 +82,7 @@
/**
* This is the filter path that can be specified in the filter config. Or it
- * is the servlet path if the org.apache.wicket servlet it used. both are without any /
+ * is the servlet path if the wicket servlet it used. both are without any /
* (start or end)
*/
private String filterPath;
@@ -175,7 +175,7 @@
// If the request does not provide information about the encoding of
// its body (which includes POST parameters), than assume the
- // default encoding as defined by the org.apache.wicket application. Bear in
+ // default encoding as defined by the wicket application. Bear in
// mind that the encoding of the request usually is equal to the
// previous response.
// However it is a known bug of IE that it does not provide this
@@ -185,7 +185,7 @@
{
try
{
- // The encoding defined by the org.apache.wicket settings is used to
+ // The encoding defined by the wicket settings is used to
// encode the responses. Thus, it is reasonable to assume
// the request has the same encoding. This is especially
// important for forms and form parameters.
@@ -230,7 +230,7 @@
Application.set(webApplication);
// Create a response object and set the output encoding according to
- // org.apache.wicket's application setttings.
+ // wicket's application setttings.
final WebResponse response = webApplication.newWebResponse(servletResponse);
response.setAjax(request.isAjax());
response.setCharacterEncoding(webApplication.getRequestCycleSettings()
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java?view=diff&rev=527851&r1=527850&r2=527851
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java Thu Apr 12 02:30:08 2007
@@ -33,7 +33,7 @@
*
* Please use {@link WicketFilter} if you require advanced chaining of resources.
*
- * Servlet class for all org.apache.wicket applications. The specific application class to
+ * Servlet class for all wicket applications. The specific application class to
* instantiate should be specified to the application server via an init-params
* argument named "applicationClassName" in the servlet declaration, which is
* typically in a <i>web.xml </i> file. The servlet declaration may vary from
@@ -72,7 +72,7 @@
* <p>
* When GET/POST requests are made via HTTP, a WebRequestCycle object is
* created from the request, response and session objects (after wrapping them
- * in the appropriate org.apache.wicket wrappers). The RequestCycle's render() method is
+ * in the appropriate wicket wrappers). The RequestCycle's render() method is
* then called to produce a response to the HTTP request.
* <p>
* If you want to use servlet specific configuration, e.g. using init parameters
@@ -191,7 +191,7 @@
}
/**
- * @return The org.apache.wicket filter
+ * @return The wicket filter
*/
protected WicketFilter newWicketFilter()
{