add varargs constructors

wocommunity · Aug 14, 2012 · db907cc · db907cc
1 parent 6276b4f
commit db907cc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/batching/ERXBatchingDisplayGroup.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/batching/ERXBatchingDisplayGroup.java
@@ -4,7 +4,6 @@
 
 import com.webobjects.appserver.WODisplayGroup;
 import com.webobjects.eoaccess.EODatabaseDataSource;
-import com.webobjects.eocontrol.EOAndQualifier;
 import com.webobjects.eocontrol.EODataSource;
 import com.webobjects.eocontrol.EOEditingContext;
 import com.webobjects.eocontrol.EOFetchSpecification;
@@ -23,6 +22,7 @@
 import er.extensions.eof.ERXEOControlUtilities;
 import er.extensions.eof.ERXKey;
 import er.extensions.foundation.ERXArrayUtilities;
+import er.extensions.qualifiers.ERXAndQualifier;
 
 /**
  * Extends {@link WODisplayGroup} in order to provide real batching. This is
@@ -308,9 +308,8 @@ protected EOFetchSpecification fetchSpecification() {
 		EOQualifier qualifier = spec.qualifier();
 		if (dgQualifier != null) {
 			if (qualifier != null) {
-				qualifier = new EOAndQualifier(new NSArray<EOQualifier>(new EOQualifier[] { dgQualifier, qualifier }));
-			}
-			else {
+				qualifier = new ERXAndQualifier(dgQualifier, qualifier);
+			} else {
 				qualifier = dgQualifier;
 			}
 			spec.setQualifier(qualifier);

diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/qualifiers/ERXAndQualifier.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/qualifiers/ERXAndQualifier.java
@@ -23,6 +23,10 @@ public class ERXAndQualifier extends EOAndQualifier implements IERXChainableQual
 	public ERXAndQualifier(NSArray<? extends EOQualifier> qualifiers) {
 		super((NSArray<EOQualifier>) qualifiers);
 	}
+
+	public ERXAndQualifier(EOQualifier... qualifiers) {
+		super(new NSArray<EOQualifier>(qualifiers));
+	}
 
 	@SuppressWarnings("unchecked")
 	public ERXAndQualifier and(EOQualifier... qualifiers) {

diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/qualifiers/ERXOrQualifier.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/qualifiers/ERXOrQualifier.java
@@ -24,6 +24,10 @@ public ERXOrQualifier(NSArray<? extends EOQualifier> qualifiers) {
 		super((NSArray<EOQualifier>) qualifiers);
 	}
 
+	public ERXOrQualifier(EOQualifier... qualifiers) {
+		super(new NSArray<EOQualifier>(qualifiers));
+	}
+
 	public ERXAndQualifier and(EOQualifier... qualifiers) {
 		return ERXChainedQualifierUtils.and(this, qualifiers);
 	}