Skip to content

Commit

Permalink
Replacing CompressedResourceReference with PackageResourceReference a…
Browse files Browse the repository at this point in the history 
…s the latter was removed from Apache Wicket.
  • Loading branch information
@akiraly
akiraly committed Apr 15, 2011
1 parent 147afd7 commit 41e1055
Show file tree
Hide file tree
Showing 18 changed files with 51 additions and 52 deletions.
6 changes: 3 additions & 3 deletions ...arent/console-parent/console/src/main/java/org/wicketstuff/console/ScriptEnginePanel.java
View file
Expand Up @@ -36,7 +36,7 @@
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.wicketstuff.console.engine.Engines;
import org.wicketstuff.console.engine.IScriptEngine;
Expand Down Expand Up @@ -113,10 +113,10 @@ public String getAjaxIndicatorMarkupId()

private static final long serialVersionUID = 1L;

private static final ResourceReference CSS = new CompressedResourceReference(
private static final ResourceReference CSS = new PackageResourceReference(
ScriptEnginePanel.class, "ScriptEnginePanel.css");

private static final ResourceReference JS = new CompressedResourceReference(
private static final ResourceReference JS = new PackageResourceReference(
ScriptEnginePanel.class, "ScriptEnginePanel.js");

private String input;
Expand Down
4 changes: 2 additions & 2 deletions ...le/src/main/java/org/wicketstuff/console/templates/ScriptTemplateSelectionTablePanel.java
View file
Expand Up @@ -26,7 +26,7 @@
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.data.IDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.wicketstuff.console.ScriptEnginePanel;

Expand Down Expand Up @@ -65,7 +65,7 @@ public class ScriptTemplateSelectionTablePanel extends Panel

private static final long serialVersionUID = 1L;

private static final ResourceReference CSS = new CompressedResourceReference(
private static final ResourceReference CSS = new PackageResourceReference(
ScriptTemplateSelectionTablePanel.class,
ScriptTemplateSelectionTablePanel.class.getSimpleName() + ".css");

Expand Down
6 changes: 3 additions & 3 deletions ...plete/src/main/java/org/wicketstuff/datatable_autocomplete/panel/AutoCompletingPanel.java
View file
Expand Up @@ -31,7 +31,7 @@
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.wicketstuff.datatable_autocomplete.selection.ITableRowSelectionHandler;
import org.wicketstuff.datatable_autocomplete.table.DTADataTable;
Expand All @@ -55,10 +55,10 @@ public class AutoCompletingPanel<T> extends Panel

private boolean initialRenderMode = false;

private static final ResourceReference CSS = new CompressedResourceReference(
private static final ResourceReference CSS = new PackageResourceReference(
AutoCompletingPanel.class, "dta_auto_complete_overlay.css");

private static final ResourceReference TABLE_CSS = new CompressedResourceReference(
private static final ResourceReference TABLE_CSS = new PackageResourceReference(
AutoCompletingPanel.class, "dta_autocomplete_table.css");

private Label theLabel;
Expand Down
8 changes: 4 additions & 4 deletions ...n/java/org/wicketstuff/datatable_autocomplete/table/AbstractSelectableTableViewPanel.java
View file
Expand Up @@ -32,7 +32,7 @@
import org.apache.wicket.markup.repeater.IItemReuseStrategy;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -64,7 +64,7 @@ public abstract class AbstractSelectableTableViewPanel<T> extends FormComponentP

protected final ISortableDataProvider<T> dataProvider;

private static final ResourceReference DEFAULT_CSS = new CompressedResourceReference(
private static final ResourceReference DEFAULT_CSS = new PackageResourceReference(
DTADataTable.class, "dta_table.css");

protected ButtonListView buttonView;
Expand Down Expand Up @@ -165,10 +165,10 @@ public void renderHead(Component c, IHeaderResponse response)

includingRadioColumnList.add(radioColumn);

for (int i = 0; i < columns.length; i++)
for (IColumn<?> column : columns)
{

includingRadioColumnList.add((IColumn<T>)columns[i]);
includingRadioColumnList.add((IColumn<T>)column);
}

dataTable = new DTADataTable<T>("dataTable", cssClassName, includingRadioColumnList,
Expand Down
4 changes: 2 additions & 2 deletions ...t-events-parent/input-events/src/main/java/wicket/contrib/input/events/InputBehavior.java
View file
Expand Up @@ -24,7 +24,7 @@
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.template.PackageTextTemplate;
import org.apache.wicket.util.template.TextTemplate;
Expand All @@ -45,7 +45,7 @@ public class InputBehavior extends Behavior
{

private static final long serialVersionUID = 1L;
private ResourceReference SHORTCUTS_JAVASCRIPT = new CompressedResourceReference(
private ResourceReference SHORTCUTS_JAVASCRIPT = new PackageResourceReference(
InputBehavior.class, "shortcuts.js");
private final KeyType[] keyCombo;
private EventType eventType;
Expand Down
4 changes: 2 additions & 2 deletions ...uery-parent/jquery-examples/src/main/java/org/wicketstuff/jquery/demo/lavalamp/APage.java
View file
@@ -1,7 +1,7 @@
package org.wicketstuff.jquery.demo.lavalamp;

import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.wicketstuff.jquery.lavalamp.LavaLampMenuPanel;

Expand All @@ -18,7 +18,7 @@ public APage()
@Override
protected ResourceReference getCssResourceReference()
{
return new CompressedResourceReference(APage.class, "apage.css");
return new PackageResourceReference(APage.class, "apage.css");
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions ...uery-parent/jquery-examples/src/main/java/org/wicketstuff/jquery/demo/lavalamp/BPage.java
View file
@@ -1,7 +1,7 @@
package org.wicketstuff.jquery.demo.lavalamp;

import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.wicketstuff.jquery.lavalamp.LavaLampMenuPanel;

Expand All @@ -19,7 +19,7 @@ public BPage()
@Override
protected ResourceReference getCssResourceReference()
{
return new CompressedResourceReference(BPage.class, "bpage.css");
return new PackageResourceReference(BPage.class, "bpage.css");
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions ...ent/jquery-examples/src/main/java/org/wicketstuff/jquery/demo/lavalamp/Page4LavaLamp.java
View file
Expand Up @@ -4,7 +4,7 @@

import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.wicketstuff.jquery.demo.PageSupport;
import org.wicketstuff.jquery.lavalamp.LavaLampMenuPanel;
Expand Down Expand Up @@ -36,7 +36,7 @@ public List<MenuItem> getObject()
@Override
protected ResourceReference getCssResourceReference()
{
return new CompressedResourceReference(Page4LavaLamp.class, "lavalamp.css");
return new PackageResourceReference(Page4LavaLamp.class, "lavalamp.css");
}
});
}
Expand Down
6 changes: 3 additions & 3 deletions ...jquery-parent/jquery/src/main/java/org/wicketstuff/jquery/lightbox/LightboxBehaviour.java
View file
Expand Up @@ -2,7 +2,7 @@

import org.apache.wicket.Component;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.wicketstuff.jquery.JQueryBehavior;

Expand All @@ -19,9 +19,9 @@
public class LightboxBehaviour extends JQueryBehavior
{
private static final long serialVersionUID = 1L;
private static final ResourceReference LIGHTBOX_JS = new CompressedResourceReference(
private static final ResourceReference LIGHTBOX_JS = new PackageResourceReference(
LightboxBehaviour.class, "jquery.lightbox-0.5.js");
private static final ResourceReference LIGHTBOX_CSS = new CompressedResourceReference(
private static final ResourceReference LIGHTBOX_CSS = new PackageResourceReference(
LightboxBehaviour.class, "jquery.lightbox-0.5.css");
private LightboxOptions options;
private String selector = "li a";
Expand Down
4 changes: 2 additions & 2 deletions ...parent/jquery-parent/jquery/src/main/java/org/wicketstuff/jquery/sparkline/Sparkline.java
View file
Expand Up @@ -26,14 +26,14 @@
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.wicketstuff.jquery.JQueryBehavior;

public class Sparkline extends WebComponent implements IHeaderContributor
{
private static final long serialVersionUID = 1L;

public static final CompressedResourceReference SPARKLINE_JS = new CompressedResourceReference(
public static final PackageResourceReference SPARKLINE_JS = new PackageResourceReference(
Sparkline.class, "jquery.sparkline-1.4.3.min.js");

final SparklineOptions options;
Expand Down
6 changes: 3 additions & 3 deletions ...t/jquery-parent/jquery/src/main/java/org/wicketstuff/jquery/ui/slider/SliderBehavior.java
View file
Expand Up @@ -5,7 +5,7 @@
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.wicketstuff.jquery.JQueryBehavior;
import org.wicketstuff.jquery.ui.UIResources;
Expand All @@ -20,10 +20,10 @@ public class SliderBehavior extends JQueryBehavior

private static final long serialVersionUID = 1L;

private static final ResourceReference UI_SLIDER_RESOURCE_REFERENCE = new CompressedResourceReference(
private static final ResourceReference UI_SLIDER_RESOURCE_REFERENCE = new PackageResourceReference(
SliderBehavior.class, "ui.slider.js");

public static final ResourceReference WICKET_SLIDER_JS = new CompressedResourceReference(
public static final ResourceReference WICKET_SLIDER_JS = new PackageResourceReference(
SliderBehavior.class, "wicket-jquery.slider.js");

public SliderBehavior()
Expand Down
8 changes: 4 additions & 4 deletions ...nis-parent/minis/src/main/java/org/wicketstuff/minis/behavior/mootip/MootipBehaviour.java
View file
Expand Up @@ -23,7 +23,7 @@
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.util.template.PackageTextTemplate;
import org.apache.wicket.util.template.TextTemplate;

Expand Down Expand Up @@ -179,12 +179,12 @@ public boolean isAjax()
@Override
public void renderHead(Component c, final IHeaderResponse response)
{
response.renderJavaScriptReference(new CompressedResourceReference(MootipBehaviour.class,
response.renderJavaScriptReference(new PackageResourceReference(MootipBehaviour.class,
"mootools.v1.11.js"));
response.renderJavaScriptReference(new CompressedResourceReference(MootipBehaviour.class,
response.renderJavaScriptReference(new PackageResourceReference(MootipBehaviour.class,
"mootips.v1.11.js"));
if (contributeCSS)
response.renderCSSReference(new CompressedResourceReference(MootipBehaviour.class,
response.renderCSSReference(new PackageResourceReference(MootipBehaviour.class,
"tip.css"));

response.renderOnLoadJavaScript(generateJS(mooTipTemplate));
Expand Down
8 changes: 4 additions & 4 deletions ...parent/minis/src/main/java/org/wicketstuff/minis/behavior/prototip/PrototipBehaviour.java
View file
Expand Up @@ -20,7 +20,7 @@
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;

/**
* Prototip behavior
Expand Down Expand Up @@ -101,16 +101,16 @@ public void renderHead(Component c, IHeaderResponse response)
}
if (!overrideHeaderContributor)
{
response.renderCSSReference(new CompressedResourceReference(PrototipBehaviour.class,
response.renderCSSReference(new PackageResourceReference(PrototipBehaviour.class,
"prototip.css"), "screen");
switch (selectedJsType)
{
case NORMAL :
response.renderJavaScriptReference(new CompressedResourceReference(
response.renderJavaScriptReference(new PackageResourceReference(
PrototipBehaviour.class, "prototip.js"));
break;
case MIN :
response.renderJavaScriptReference(new CompressedResourceReference(
response.renderJavaScriptReference(new PackageResourceReference(
PrototipBehaviour.class, "prototip-min.js"));
break;
}
Expand Down
7 changes: 3 additions & 4 deletions .../minis/src/main/java/org/wicketstuff/minis/behavior/styleswitcher/StyleSwitcherPanel.java
View file
Expand Up @@ -18,7 +18,6 @@

import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;

/**
Expand All @@ -36,11 +35,11 @@ public class StyleSwitcherPanel extends Panel
{
private static final long serialVersionUID = 1L;

private static final CompressedResourceReference SS_CSS_LARGE = new CompressedResourceReference(
private static final PackageResourceReference SS_CSS_LARGE = new PackageResourceReference(
StyleSwitcher.class, "large.css");
private static final CompressedResourceReference SS_CSS_MEDIUM = new CompressedResourceReference(
private static final PackageResourceReference SS_CSS_MEDIUM = new PackageResourceReference(
StyleSwitcher.class, "medium.css");
private static final CompressedResourceReference SS_CSS_SMALL = new CompressedResourceReference(
private static final PackageResourceReference SS_CSS_SMALL = new PackageResourceReference(
StyleSwitcher.class, "small.css");

/**
Expand Down
4 changes: 2 additions & 2 deletions ...progressbar-parent/progressbar/src/main/java/org/wicketstuff/progressbar/ProgressBar.java
View file
Expand Up @@ -26,7 +26,7 @@
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.time.Duration;
import org.wicketstuff.progressbar.support.DynamicAjaxSelfUpdatingTimerBehavior;
Expand Down Expand Up @@ -96,7 +96,7 @@ public class ProgressBar extends Panel

private int width = 400;

private static final ResourceReference CSS = new CompressedResourceReference(ProgressBar.class,
private static final ResourceReference CSS = new PackageResourceReference(ProgressBar.class,
"ProgressBar.css");


Expand Down
4 changes: 2 additions & 2 deletions jdk-1.5-parent/yav-parent/yav/src/main/java/org/wicketstuff/yav/YavBehavior.java
View file
Expand Up @@ -8,8 +8,8 @@
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.value.IValueMap;
import org.wicketstuff.yav.alerts.AlertType;
Expand Down Expand Up @@ -55,7 +55,7 @@ public void renderHead(Component c, IHeaderResponse response)
{
super.renderHead(c, response);

response.renderCSSReference(new CompressedResourceReference(YavBehavior.class,
response.renderCSSReference(new PackageResourceReference(YavBehavior.class,
"style/yav-style.css"));

addJavascriptReference(response, "yav.js");
Expand Down
12 changes: 6 additions & 6 deletions ...ent-jdk-1.6/push-cometd/src/main/java/org/wicketstuff/push/cometd/CometdPushBehavior.java
View file
Expand Up @@ -35,7 +35,7 @@
import org.apache.wicket.markup.parser.XmlPullParser;
import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.template.PackageTextTemplate;
import org.cometd.server.CometdServlet;
Expand Down Expand Up @@ -65,15 +65,15 @@ public class CometdPushBehavior extends AbstractDefaultAjaxBehavior

private static final String DEFAULT_COMETD_PATH = guessCometdServletPath();

private static final ResourceReference COMETD = new CompressedResourceReference(
private static final ResourceReference COMETD = new PackageResourceReference(
CometdPushBehavior.class, "org/cometd.js");
private static final ResourceReference COMETD_ACK = new CompressedResourceReference(
private static final ResourceReference COMETD_ACK = new PackageResourceReference(
CometdPushBehavior.class, "org/cometd/AckExtension.js");
private static final ResourceReference COMETD_RELOAD = new CompressedResourceReference(
private static final ResourceReference COMETD_RELOAD = new PackageResourceReference(
CometdPushBehavior.class, "org/cometd/ReloadExtension.js");
private static final ResourceReference COMETD_TIMESTAMP = new CompressedResourceReference(
private static final ResourceReference COMETD_TIMESTAMP = new PackageResourceReference(
CometdPushBehavior.class, "org/cometd/TimeStampExtension.js");
private static final ResourceReference COMETD_TIMESYNC = new CompressedResourceReference(
private static final ResourceReference COMETD_TIMESYNC = new PackageResourceReference(
CometdPushBehavior.class, "org/cometd/TimeSyncExtension.js");

private static final PackageTextTemplate TEMPLATE_INIT = new PackageTextTemplate(
Expand Down
4 changes: 2 additions & 2 deletions ...ket-html5-parent/wicket-html5/src/main/java/org/wicketstuff/html5/Html5UtilsBehavior.java
View file
Expand Up @@ -9,7 +9,7 @@
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;

/**
*
Expand All @@ -20,7 +20,7 @@ public class Html5UtilsBehavior extends Behavior

private static final long serialVersionUID = 1L;

private static final CompressedResourceReference H5UTILS_JS = new CompressedResourceReference(
private static final PackageResourceReference H5UTILS_JS = new PackageResourceReference(
Html5UtilsBehavior.class, "h5utils.js");

/**
Expand Down

0 comments on commit 41e1055

Please sign in to comment.