You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/11/30 02:23:09 UTC
svn commit: r1040380 - in /wicket/trunk:
wicket-request/src/main/java/org/apache/wicket/request/http/handler/
wicket-util/src/main/java/org/apache/wicket/util/resource/
wicket/src/main/java/org/apache/wicket/
wicket/src/main/java/org/apache/wicket/mark...
Author: ivaynberg
Date: Tue Nov 30 01:23:09 2010
New Revision: 1040380
URL: http://svn.apache.org/viewvc?rev=1040380&view=rev
Log:
cleanup
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java?rev=1040380&r1=1040379&r2=1040380&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java Tue Nov 30 01:23:09 2010
@@ -75,8 +75,6 @@ public class RedirectRequestHandler impl
}
/**
- * FIXME javadoc - what's special about this implementation?
- *
* @see org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
*/
public void respond(IRequestCycle requestCycle)
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java?rev=1040380&r1=1040379&r2=1040380&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java Tue Nov 30 01:23:09 2010
@@ -32,8 +32,8 @@ import org.apache.wicket.util.time.Time;
* to the XSL stylesheet.
*
* <p>
- * FIXME experimental feature, does not implement any kind of caching, use with care, running an XSL
- * transformation for every request is very expensive! Please have a look at
+ * NOTE: this is an experimental feature which does not implement any kind of caching, use with
+ * care, running an XSL transformation for every request is very expensive! Please have a look at
* {@link ZipResourceStream} for an in-depth explanation of what needs to be done with respect to
* caching.
* </p>
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=1040380&r1=1040379&r2=1040380&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Tue Nov 30 01:23:09 2010
@@ -3505,8 +3505,8 @@ public abstract class Component
}
/**
- * Gets the subset of the currently coupled {@link Behavior}s that are of the provided type as
- * a unmodifiable list. Returns an empty list rather than null if there are no behaviors coupled
+ * Gets the subset of the currently coupled {@link Behavior}s that are of the provided type as a
+ * unmodifiable list. Returns an empty list rather than null if there are no behaviors coupled
* to this component.
*
* @param type
@@ -3705,27 +3705,6 @@ public abstract class Component
}
/**
- * Override this method if you want onBeforeRender to be called even when your component is not
- * visible. default this returns false.
- *
- * @return boolean, if true then onBeforeRender is called even for none visible components,
- * default false.
- *
- * @see Component#onBeforeRender()
- *
- *
- * @deprecated this was only useful for controlling visibility from inside
- * {@link #onBeforeRender()}, with the addition of {@link #onConfigure()} this is
- * now obsolete.
- */
- // TODO remove in 1.5
- @Deprecated
- protected boolean callOnBeforeRenderIfNotVisible()
- {
- return false;
- }
-
- /**
* Processes the component tag.
* <p/>
* Overrides of this method most likely should call the super implementation.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java?rev=1040380&r1=1040379&r2=1040380&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java Tue Nov 30 01:23:09 2010
@@ -773,33 +773,6 @@ public abstract class Session implements
}
}
- // TODO remove after deprecation release
-
- /**
- * INTERNAL API. The request cycle when detached will call this.
- *
- * FIXME javadoc - does what?
- */
- final void requestDetached()
- {
- // If state is dirty
- if (dirty)
- {
- // State is no longer dirty
- dirty = false;
-
- // Set attribute.
- setAttribute(SESSION_ATTRIBUTE_NAME, this);
- }
- else
- {
- if (log.isDebugEnabled())
- {
- log.debug("update: Session not dirty.");
- }
- }
- }
-
/**
* Retrieves the next available session-unique value
*
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java?rev=1040380&r1=1040379&r2=1040380&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java Tue Nov 30 01:23:09 2010
@@ -33,9 +33,9 @@ import org.apache.wicket.request.cycle.R
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.IResource;
+import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.parse.metapattern.Group;
import org.apache.wicket.util.parse.metapattern.MetaPattern;
@@ -121,11 +121,9 @@ public final class LocalizedImageResourc
private static final Group specification = new Group(MetaPattern.ANYTHING_NON_EMPTY);
/** Meta pattern. */
- private static final MetaPattern pattern = new MetaPattern(
- factoryName,
- MetaPattern.COLON,
- new OptionalMetaPattern(new MetaPattern[] { imageReferenceName }),
- MetaPattern.COLON, specification);
+ private static final MetaPattern pattern = new MetaPattern(factoryName, MetaPattern.COLON,
+ new OptionalMetaPattern(new MetaPattern[] { imageReferenceName }), MetaPattern.COLON,
+ specification);
/**
* Construct.
@@ -296,9 +294,6 @@ public final class LocalizedImageResourc
resource = (IResource)modelObject;
}
- // FIXME NG
- // Not yet supported
-
// Need to load image resource for this component?
if (resource == null && resourceReference == null)
{
@@ -342,8 +337,11 @@ public final class LocalizedImageResourc
}
// Set the SRC attribute to point to the component or shared resource
- tag.put("src", RequestCycle.get().getOriginalResponse().encodeURL(
- Strings.replaceAll(url, "&", "&")));
+ tag.put(
+ "src",
+ RequestCycle.get()
+ .getOriginalResponse()
+ .encodeURL(Strings.replaceAll(url, "&", "&")));
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java?rev=1040380&r1=1040379&r2=1040380&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java Tue Nov 30 01:23:09 2010
@@ -158,32 +158,28 @@ public class ServletWebResponse extends
@Override
public String encodeURL(CharSequence url)
{
- if (url != null)
+ Args.notNull(url, "url");
+ if (url.length() > 0 && url.charAt(0) == '?')
{
- if (url.length() > 0 && url.charAt(0) == '?')
+ // there is a bug in apache tomcat 5.5 where tomcat doesn't put sessionid to url
+ // when the URL starts with '?'. So we prepend the URL with ./ and remove it
+ // afterwards (unless some container prepends session id before './' or mangles
+ // the URL otherwise
+
+ String encoded = httpServletResponse.encodeURL("./" + url.toString());
+ if (encoded.startsWith("./"))
{
- // there is a bug in apache tomcat 5.5 where tomcat doesn't put sessionid to url
- // when the URL starts with '?'. So we prepend the URL with ./ and remove it
- // afterwards (unless some container prepends session id before './' or mangles
- // the URL otherwise
-
- String encoded = httpServletResponse.encodeURL("./" + url.toString());
- if (encoded.startsWith("./"))
- {
- return encoded.substring(2);
- }
- else
- {
- return encoded;
- }
+ return encoded.substring(2);
}
else
{
- return httpServletResponse.encodeURL(url.toString());
+ return encoded;
}
}
- // FIXME NULL? Really?
- return httpServletResponse.encodeURL(null);
+ else
+ {
+ return httpServletResponse.encodeURL(url.toString());
+ }
}
private String getAbsolutePrefix()
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1040380&r1=1040379&r2=1040380&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Tue Nov 30 01:23:09 2010
@@ -1360,8 +1360,6 @@ public class BaseWicketTester
/**
* Asserts the last rendered <code>Page</code> class.
*
- * FIXME explain why the code is so complicated to compare two classes, or simplify
- *
* @param <C>
*
* @param expectedRenderedPageClass
@@ -1377,8 +1375,7 @@ public class BaseWicketTester
}
if (!page.getClass().isAssignableFrom(expectedRenderedPageClass))
{
- return isEqual(Classes.simpleName(expectedRenderedPageClass),
- Classes.simpleName(page.getClass()));
+ return Result.fail("classes not the same");
}
return Result.pass();
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java?rev=1040380&r1=1040379&r2=1040380&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java Tue Nov 30 01:23:09 2010
@@ -504,10 +504,6 @@ public class PropertyResolverTest extend
{
Address address = new Address();
- // FIXME: We shouldn't need to run this first in order for the getName() stuff to work.
- // See WICKET-668 for details.
- // PropertyResolver.setValue("number", address, new Integer(1), CONVERTER);
-
Method method = PropertyResolver.getPropertySetter("number", address);
assertEquals(method.getName(), "setNumber");