You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2007/12/16 18:06:53 UTC

svn commit: r604651 - in /wicket/trunk/jdk-1.4: wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ wicket/src/main/java/org/apache/wicket/ wicket/src/main/java/org/apache/wicket/markup/html/form/ wicket/src/main/java/org/apa...

Author: jcompagner
Date: Sun Dec 16 09:06:51 2007
New Revision: 604651

URL: http://svn.apache.org/viewvc?rev=604651&view=rev
Log:
code cleanup WICKET-830

Modified:
    wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SimpleSynchronousFilePageStore.java
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java

Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java?rev=604651&r1=604650&r2=604651&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java Sun Dec 16 09:06:51 2007
@@ -87,7 +87,7 @@
 	public static final String TAB_PANEL_ID = "panel";
 
 
-	private List tabs;
+	private final List tabs;
 
 	/**
 	 * Constructor
@@ -139,7 +139,6 @@
 			{
 				final int index = item.getIteration();
 				final ITab tab = ((ITab)TabbedPanel.this.tabs.get(index));
-				final int selected = getSelectedTab();
 
 				final WebMarkupContainer titleLink = newLink("link", index);
 
@@ -296,17 +295,17 @@
 		if (panel == null)
 		{
 			throw new WicketRuntimeException("ITab.getPanel() returned null. TabbedPanel [" +
-					getPath() + "] ITab index [" + index + "]");
+				getPath() + "] ITab index [" + index + "]");
 
 		}
 
 		if (!panel.getId().equals(TAB_PANEL_ID))
 		{
 			throw new WicketRuntimeException(
-					"ITab.getPanel() returned a panel with invalid id [" +
-							panel.getId() +
-							"]. You must always return a panel with id equal to the provided panelId parameter. TabbedPanel [" +
-							getPath() + "] ITab index [" + index + "]");
+				"ITab.getPanel() returned a panel with invalid id [" +
+					panel.getId() +
+					"]. You must always return a panel with id equal to the provided panelId parameter. TabbedPanel [" +
+					getPath() + "] ITab index [" + index + "]");
 		}
 
 

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java?rev=604651&r1=604650&r2=604651&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java Sun Dec 16 09:06:51 2007
@@ -1223,9 +1223,6 @@
 	{
 		try
 		{
-			// get the processor
-			IRequestCycleProcessor processor = safeGetRequestProcessor();
-
 			// Arbitrary maximum number of steps
 			final int maxSteps = 100;
 

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java?rev=604651&r1=604650&r2=604651&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Button.java Sun Dec 16 09:06:51 2007
@@ -191,8 +191,6 @@
 		// Default handling for component tag
 		super.onComponentTag(tag);
 
-		String name = tag.getName();
-
 		try
 		{
 			String value = getModelObjectAsString();

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java?rev=604651&r1=604650&r2=604651&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java Sun Dec 16 09:06:51 2007
@@ -259,12 +259,11 @@
 		Locale l = component.getLocale();
 		String s = component.getStyle();
 		if (resourceKind == null &&
-			(!Objects.equal(locale, component.getLocale()) || !Objects.equal(style,
-				component.getStyle())))
+			(!Objects.equal(locale, l) || !Objects.equal(style, s)))
 		{
 			// Get new component locale and style
-			locale = component.getLocale();
-			style = component.getStyle();
+			locale = l;
+			style = s;
 
 			// Invalidate current resource so it will be reloaded/recomputed
 			resourceReference = null;

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java?rev=604651&r1=604650&r2=604651&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java Sun Dec 16 09:06:51 2007
@@ -121,12 +121,7 @@
 	 */
 	public boolean linksTo(final Page page)
 	{
-		int currentPage = pageable.getCurrentPage();
-		if (((increment < 0) && isFirst()) || ((increment > 0) && isLast()))
-		{
-			return true;
-		}
-
-		return false;
+		pageable.getCurrentPage();
+		return ((increment < 0) && isFirst()) || ((increment > 0) && isLast());
 	}
 }

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SimpleSynchronousFilePageStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SimpleSynchronousFilePageStore.java?rev=604651&r1=604650&r2=604651&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SimpleSynchronousFilePageStore.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SimpleSynchronousFilePageStore.java Sun Dec 16 09:06:51 2007
@@ -185,7 +185,6 @@
 					ajaxVersionNumber);
 			if (pageFile.exists())
 			{
-				long t1 = System.currentTimeMillis();
 				FileInputStream fis = null;
 				try
 				{

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java?rev=604651&r1=604650&r2=604651&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java Sun Dec 16 09:06:51 2007
@@ -394,7 +394,7 @@
 			}
 
 			// Get component
-			Component component = null;
+			Component component;
 			final String pageRelativeComponentPath = Strings.afterFirstPathComponent(componentPath,
 					Component.PATH_SEPARATOR);
 			if (Strings.isEmpty(pageRelativeComponentPath))
@@ -477,7 +477,6 @@
 	protected IRequestTarget resolveSharedResource(final RequestCycle requestCycle,
 			final RequestParameters requestParameters)
 	{
-		String resourceKey = requestParameters.getResourceKey();
 		return new SharedResourceRequestTarget(requestParameters);
 	}
 }