You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2009/12/13 10:54:25 UTC
svn commit: r890037 - in
/wicket/trunk/wicket/src/main/java/org/apache/wicket: ./ markup/
markup/html/ markup/html/basic/ markup/html/internal/ markup/html/tree/
protocol/http/ util/io/ validation/validator/
Author: jdonnerstag
Date: Sun Dec 13 09:54:25 2009
New Revision: 890037
URL: http://svn.apache.org/viewvc?rev=890037&view=rev
Log:
a little bit of cleanup (unused code; unused imports ..)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java?rev=890037&r1=890036&r2=890037&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java Sun Dec 13 09:54:25 2009
@@ -178,23 +178,6 @@
}
/**
- * Find a child component. It may have been directly added to the container or to a transparent
- * child container. From a user's point of view, it was added to this container.
- *
- * @param child
- * @return The container the child was actually added to. Null if not found.
- */
- private MarkupContainer findChild(final Component child)
- {
- if (get(child.getId()) != null)
- {
- return this;
- }
-
- return null;
- }
-
- /**
* Replaces a child component of this container with another or just adds it in case no child
* with the same id existed yet.
*
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java?rev=890037&r1=890036&r2=890037&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java Sun Dec 13 09:54:25 2009
@@ -75,18 +75,6 @@
private String wicketId;
/**
- * Construct. Private by purpose.
- */
- private MarkupResourceStream()
- {
- resourceStream = null;
- markupClassName = null;
- containerInfo = null;
-
- setWicketNamespace(ComponentTag.DEFAULT_WICKET_NAMESPACE);
- }
-
- /**
* Construct.
*
* @param resourceStream
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java?rev=890037&r1=890036&r2=890037&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java Sun Dec 13 09:54:25 2009
@@ -16,12 +16,7 @@
*/
package org.apache.wicket.markup.html;
-import java.util.Enumeration;
-import java.util.List;
import java.util.Locale;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.regex.Pattern;
import javax.servlet.http.HttpServletResponse;
@@ -265,27 +260,6 @@
return new PackageResource(scope, path, locale, style, variation);
}
- /* removed in 2.0 */
- private static void scanJarFile(Class<?> scope, Pattern pattern, boolean recurse,
- final List<PackageResource> resources, String packageRef, JarFile jf)
- {
- Enumeration<JarEntry> enumeration = jf.entries();
- while (enumeration.hasMoreElements())
- {
- JarEntry je = enumeration.nextElement();
- String name = je.getName();
- if (name.startsWith(packageRef))
- {
- name = name.substring(packageRef.length() + 1);
- if (pattern.matcher(name).matches() && (recurse || (name.indexOf('/') == -1)))
- {
- // we add the entry as a package resource
- resources.add(get(scope, name, null, null, null));
- }
- }
- }
- }
-
/** The path to the resource */
private final String absolutePath;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java?rev=890037&r1=890036&r2=890037&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java Sun Dec 13 09:54:25 2009
@@ -18,8 +18,6 @@
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -48,8 +46,6 @@
{
private static final long serialVersionUID = 1L;
- private static final Logger log = LoggerFactory.getLogger(EnclosureContainer.class);
-
/** The child component to delegate the isVisible() call to */
private final Component child;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java?rev=890037&r1=890036&r2=890037&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java Sun Dec 13 09:54:25 2009
@@ -31,9 +31,7 @@
import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.parser.filter.TransparentWebMarkupContainer;
-import org.apache.wicket.markup.resolver.IComponentResolver;
import org.apache.wicket.ng.WicketRuntimeException;
import org.apache.wicket.response.StringResponse;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=890037&r1=890036&r2=890037&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java Sun Dec 13 09:54:25 2009
@@ -34,7 +34,6 @@
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.behavior.IBehavior;
-import org.apache.wicket.behavior.JavascriptReferenceHeaderContributor;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java?rev=890037&r1=890036&r2=890037&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java Sun Dec 13 09:54:25 2009
@@ -27,7 +27,6 @@
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AbstractBehavior;
-import org.apache.wicket.behavior.CssReferenceHeaderContributor;
import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java?rev=890037&r1=890036&r2=890037&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java Sun Dec 13 09:54:25 2009
@@ -98,7 +98,7 @@
}
/** log. */
- private static Logger log = LoggerFactory.getLogger(AbstractHttpSessionStore.class);
+ private final static Logger log = LoggerFactory.getLogger(AbstractHttpSessionStore.class);
/** The web application for this store. Is never null. */
protected final WebApplication application;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java?rev=890037&r1=890036&r2=890037&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java Sun Dec 13 09:54:25 2009
@@ -422,7 +422,6 @@
IRequestTarget currentTarget = cycle.getRequestTarget();
if (currentTarget instanceof IPageRequestTarget)
{
- Page currentPage = ((IPageRequestTarget)currentTarget).getPage();
pageMapName = "";
}
else
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java?rev=890037&r1=890036&r2=890037&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java Sun Dec 13 09:54:25 2009
@@ -98,8 +98,6 @@
private final Map<String, SessionData> liveSessions;
- private final ThreadLocal<RequestData> currentRequest = new ThreadLocal<RequestData>();
-
private final AtomicInteger active = new AtomicInteger();
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java?rev=890037&r1=890036&r2=890037&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java Sun Dec 13 09:54:25 2009
@@ -135,11 +135,6 @@
size = 0;
}
- boolean contains(Object obj)
- {
- return lookup(obj) != -1;
- }
-
/**
* Looks up and returns handle associated with given object, or -1 if no mapping found.
*
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java?rev=890037&r1=890036&r2=890037&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java Sun Dec 13 09:54:25 2009
@@ -573,20 +573,6 @@
}
/**
- * Just used for debugging purposes.<br>
- * Due to re-branding (e.g. Switch was re-branded as Maestro in mid 2007) some rules might
- * overlap, but those overlappings are not considered. So it might happen, that a Switch-card is
- * identified as a Maestro. <br>
- * So you shouldn't rely on the name which is returned here.
- *
- * @return the name of the credit card if it could be determined, else an empty string
- */
- private String getCardName()
- {
- return (cardId > -1 && cardId < creditCardNames.length ? creditCardNames[cardId] : "");
- }
-
- /**
* Calculates the checksum of a credit card number using the Luhn algorithm (the so-called
* "mod 10" algorithm).
*