[email protected] wrote: > Author: adrianc > Date: Sun Apr 4 19:41:27 2010 > New Revision: 930740 > > URL: http://svn.apache.org/viewvc?rev=930740&view=rev > Log: > Fixed broken compile. > > Modified: > ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java > > ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java > > Modified: > ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=930740&r1=930739&r2=930740&view=diff > ============================================================================== > --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java > (original) > +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java > Sun Apr 4 19:41:27 2010 > @@ -42,6 +42,7 @@ import org.ofbiz.base.util.UtilDateTime; > import org.ofbiz.base.util.UtilFormatOut; > import org.ofbiz.base.util.UtilGenerics; > import org.ofbiz.base.util.UtilMisc; > +import org.ofbiz.base.util.UtilObject; > import org.ofbiz.base.util.UtilValidate; > import org.ofbiz.base.util.UtilXml; > import org.ofbiz.entity.cache.Cache; > > Modified: > ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java?rev=930740&r1=930739&r2=930740&view=diff > ============================================================================== > --- > ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java > (original) > +++ > ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java > Sun Apr 4 19:41:27 2010 > @@ -18,14 +18,13 @@ > > *******************************************************************************/ > package org.ofbiz.entityext.eca; > > -import java.util.Iterator; > +import java.util.HashSet; > import java.util.List; > import java.util.Map; > import java.util.Set; > > import javolution.util.FastList; > import javolution.util.FastMap; > -import javolution.util.FastSet; > > import org.ofbiz.base.util.Debug; > import org.ofbiz.base.util.UtilXml; > @@ -41,7 +40,7 @@ public class EntityEcaRule implements ja > > public static final String module = EntityEcaRule.class.getName(); > > - private static final Set<String> nameSet = HashSet<String>(2); > + private static final Set<String> nameSet = new HashSet<String>(2); > static { > nameSet.add("set"); > nameSet.add("action"); > >
Yeah, I screwed up here. The first problem with GenericDelegator was because I rebased and reordered the history. The second problem was because I had to retype part of the change, because git got confused when I switched my url from svn.eu.apache.org to svn.apache.org. Sorry about all this.
