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/04/15 21:30:08 UTC
svn commit: r765319 - in
/wicket/trunk/wicket/src/main/java/org/apache/wicket: RequestCycle.java
markup/html/ServerAndClientTimeFilter.java
markup/html/tree/AbstractTree.java markup/html/tree/BaseTree.java
util/template/PackagedTextTemplate.java
Author: jdonnerstag
Date: Wed Apr 15 19:30:08 2009
New Revision: 765319
URL: http://svn.apache.org/viewvc?rev=765319&view=rev
Log:
removed some more warnings
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.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/util/template/PackagedTextTemplate.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java?rev=765319&r1=765318&r2=765319&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java Wed Apr 15 19:30:08 2009
@@ -1032,7 +1032,9 @@
* @param id
* page id
* @return url pointing to the page
+ * @deprecated PageIdRequestTarget will be removed in 1.5
*/
+ @Deprecated
public final CharSequence urlFor(final PageReference id)
{
return urlFor(new PageIdRequestTarget(id));
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java?rev=765319&r1=765318&r2=765319&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java Wed Apr 15 19:30:08 2009
@@ -64,7 +64,7 @@
defaultValue.append("s, Client parsetime: ' + (new Date().getTime() - clientTimeVariable)/1000 + 's");
String txt = Application.get().getResourceSettings().getLocalizer().getString(
- "ServerAndClientTimeFilter.statustext", null, Model.of(map),
+ "ServerAndClientTimeFilter.statustext", null, Model.ofMap(map),
defaultValue.toString());
AppendingStringBuffer endScript = new AppendingStringBuffer(150);
endScript.append("\n").append(JavascriptUtils.SCRIPT_OPEN_TAG);
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=765319&r1=765318&r2=765319&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 Wed Apr 15 19:30:08 2009
@@ -32,10 +32,10 @@
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.html.JavascriptPackageResource;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
import org.apache.wicket.markup.html.panel.Panel;
@@ -680,7 +680,8 @@
}
/**
- * @see org.apache.wicket.markup.html.tree.ITreeStateListener#nodeExpanded(javax.swing.tree.TreeNode )
+ * @see org.apache.wicket.markup.html.tree.ITreeStateListener#nodeExpanded(javax.swing.tree.TreeNode
+ * )
*/
public final void nodeExpanded(Object node)
{
@@ -691,7 +692,8 @@
}
/**
- * @see org.apache.wicket.markup.html.tree.ITreeStateListener#nodeSelected(javax.swing.tree.TreeNode )
+ * @see org.apache.wicket.markup.html.tree.ITreeStateListener#nodeSelected(javax.swing.tree.TreeNode
+ * )
*/
public final void nodeSelected(Object node)
{
@@ -1296,7 +1298,7 @@
itemContainer = new TreeItemContainer("i");
add(itemContainer);
- add(HeaderContributor.forJavaScript(JAVASCRIPT));
+ add(JavascriptPackageResource.getHeaderContribution(JAVASCRIPT));
checkModel();
}
@@ -1574,7 +1576,7 @@
// go through dirty items
for (Iterator<TreeItem> i = dirtyItems.iterator(); i.hasNext();)
{
- TreeItem item = (TreeItem)i.next();
+ TreeItem item = i.next();
// item children need to be rebuilt
if (item.getChildren() == null)
{
@@ -1657,7 +1659,7 @@
{
for (Iterator<TreeItem> i = item.getChildren().iterator(); i.hasNext();)
{
- TreeItem child = (TreeItem)i.next();
+ TreeItem child = i.next();
visitItemAndChildren(child, callback);
}
}
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=765319&r1=765318&r2=765319&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 Wed Apr 15 19:30:08 2009
@@ -29,8 +29,8 @@
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.HeaderContributor;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.CSSPackageResource;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.resources.CompressedResourceReference;
@@ -71,7 +71,7 @@
ResourceReference css = getCSS();
if (css != null)
{
- add(HeaderContributor.forCss(css));
+ add(CSSPackageResource.getHeaderContribution(css));
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java?rev=765319&r1=765318&r2=765319&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java Wed Apr 15 19:30:08 2009
@@ -23,12 +23,12 @@
import org.apache.wicket.Application;
import org.apache.wicket.MetaDataKey;
+import org.apache.wicket.javascript.IJavascriptCompressor;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.lang.Packages;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.resource.locator.ResourceStreamLocator;
-import org.apache.wicket.util.string.JavascriptStripper;
import org.apache.wicket.util.string.interpolator.MapVariableInterpolator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -206,9 +206,13 @@
@Override
public String getString()
{
- if (Application.get().getResourceSettings().getStripJavascriptCommentsAndWhitespace())
+ IJavascriptCompressor compressor = Application.get()
+ .getResourceSettings()
+ .getJavascriptCompressor();
+
+ if (compressor != null)
{
- return JavascriptStripper.stripCommentsAndWhitespace(buffer.toString());
+ return compressor.compress(buffer.toString());
}
else
{