And by the way there are two commits in 1.4.x which are not yet in 1.5: r1049685 r1050058
On Sat, Dec 18, 2010 at 9:58 AM, Martin Grigorov <[email protected]>wrote: > I think it is fine in this particular case. > There is no ticket about it, i.e. no changelog entry, and since yesterday > it was not clear even to the rest of us how to use it. > > I think this is not a good practice too ;-) > > On Sat, Dec 18, 2010 at 4:39 AM, Jeremy Thomerson < > [email protected]> wrote: > >> Any objections to me making this same change in 1.4.x? It would be an API >> break, but on code that only appeared in the last release (1.4.14), and I >> highly doubt anyone is using it yet. >> >> I could, of course, add a backwards-compatible method, but it seems like >> that's overkill for this brand new thing. >> >> >> >> On Fri, Dec 17, 2010 at 9:32 PM, <[email protected]> wrote: >> >> > Author: jrthomerson >> > Date: Sat Dec 18 03:32:37 2010 >> > New Revision: 1050581 >> > >> > URL: http://svn.apache.org/viewvc?rev=1050581&view=rev >> > Log: >> > slight improvement to api of >> AbstractResourceAggregatingHeaderResponse.java >> > >> > Modified: >> > >> > >> >> wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractDependencyRespectingResourceAggregatingHeaderResponse.java >> > >> > >> >> wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java >> > >> > Modified: >> > >> wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractDependencyRespectingResourceAggregatingHeaderResponse.java >> > URL: >> > >> http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractDependencyRespectingResourceAggregatingHeaderResponse.java?rev=1050581&r1=1050580&r2=1050581&view=diff >> > >> > >> ============================================================================== >> > --- >> > >> wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractDependencyRespectingResourceAggregatingHeaderResponse.java >> > (original) >> > +++ >> > >> wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractDependencyRespectingResourceAggregatingHeaderResponse.java >> > Sat Dec 18 03:32:37 2010 >> > @@ -66,7 +66,7 @@ public abstract class AbstractDependency >> > if (ref instanceof >> > AbstractResourceDependentResourceReference) >> > { >> > >> AbstractResourceDependentResourceReference >> > parent = (AbstractResourceDependentResourceReference)ref; >> > - R childColl = >> > newResourceReferenceCollection(); >> > + R childColl = >> > newResourceReferenceCollection(key); >> > for >> > (AbstractResourceDependentResourceReference child : >> > parent.getDependentResourceReferences()) >> > { >> > childColl.add(toData(child)); >> > >> > Modified: >> > >> wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java >> > URL: >> > >> http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java?rev=1050581&r1=1050580&r2=1050581&view=diff >> > >> > >> ============================================================================== >> > --- >> > >> wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java >> > (original) >> > +++ >> > >> wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java >> > Sat Dec 18 03:32:37 2010 >> > @@ -46,10 +46,10 @@ import org.apache.wicket.resource.Resour >> > * @author Jeremy Thomerson >> > * @param <R> >> > * the type of ResourceReferenceCollection returned by >> > - * {...@link #newResourceReferenceCollection()} and passed to >> all >> > the methods that take a >> > - * ResourceReferenceCollection. You will typically just use >> > ResourceReferenceCollection >> > - * for this param, unless you are returning a specific type >> of >> > - * ResourceReferenceCollection from your subclass. >> > + * {...@link #newResourceReferenceCollection(Object)} and >> passed >> > to all the methods that >> > + * take a ResourceReferenceCollection. You will typically >> just >> > use >> > + * ResourceReferenceCollection for this param, unless you >> are >> > returning a specific type >> > + * of ResourceReferenceCollection from your subclass. >> > * @param <K> >> > * the class of the key that you will create from >> > * {...@link #newGroupingKey(ResourceReferenceAndStringData)} >> > @@ -107,7 +107,7 @@ public abstract class AbstractResourceAg >> > R coll = map.get(key); >> > if (coll == null) >> > { >> > - map.put(key, coll = >> > newResourceReferenceCollection()); >> > + map.put(key, coll = >> > newResourceReferenceCollection(key)); >> > } >> > coll.add(ref); >> > } >> > @@ -135,10 +135,13 @@ public abstract class AbstractResourceAg >> > * parameter used when creating your subclass defining the type >> of >> > ResourceReferenceCollection >> > * this returns and is passed into all methods that take a >> > ResourceReferenceCollection >> > * >> > + * @param key >> > + * the grouping key that will be used for this >> > collection. all references added to it >> > + * will have the same key >> > * @return a newly created collection to contain resource >> references >> > */ >> > @SuppressWarnings("unchecked") >> > - protected R newResourceReferenceCollection() >> > + protected R newResourceReferenceCollection(K key) >> > { >> > return (R)new ResourceReferenceCollection(); >> > } >> > >> > >> > >> >> >> -- >> Jeremy Thomerson >> http://wickettraining.com >> *Need a CMS for Wicket? Use Brix! http://brixcms.org* >> > >
