Author: adietish
Date: 2011-02-03 06:54:41 -0500 (Thu, 03 Feb 2011)
New Revision: 28963
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/InstanceFilter.java
Log:
[JBIDE-8321]
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/InstanceFilter.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/InstanceFilter.java 2011-02-03
11:34:39 UTC (rev 28962)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/InstanceFilter.java 2011-02-03
11:54:41 UTC (rev 28963)
@@ -24,10 +24,10 @@
private IFieldMatcher aliasRule;
private IFieldMatcher imageIdRule;
- private IFieldMatcher realmRule;
- private IFieldMatcher profileRule;
private IFieldMatcher ownerIdRule;
private IFieldMatcher keyNameRule;
+ private IFieldMatcher realmRule;
+ private IFieldMatcher profileRule;
public InstanceFilter(DeltaCloud cloud) {
this(new AllMatcher(), new AllMatcher(), new AllMatcher(), new AllMatcher(), new
AllMatcher(),
@@ -35,11 +35,10 @@
}
public InstanceFilter(IFieldMatcher nameMatcher, IFieldMatcher idMatcher, IFieldMatcher
aliasMatcher,
- IFieldMatcher imageIdMatcher, IFieldMatcher realmMatcher, IFieldMatcher
profileMatcher,
- IFieldMatcher ownerIdMatcher, IFieldMatcher keyMatcher, DeltaCloud cloud) {
+ IFieldMatcher imageIdMatcher, IFieldMatcher ownerIdMatcher, IFieldMatcher keyMatcher,
+ IFieldMatcher realmMatcher, IFieldMatcher profileMatcher, DeltaCloud cloud) {
super(nameMatcher, idMatcher, cloud);
- setRules(aliasMatcher, imageIdMatcher, realmMatcher, profileMatcher, ownerIdMatcher,
- keyMatcher);
+ setRules(aliasMatcher, imageIdMatcher, ownerIdMatcher, keyMatcher, realmMatcher,
profileMatcher);
}
public InstanceFilter(String rulesString, DeltaCloud cloud) {
@@ -67,12 +66,12 @@
createRule(realmRule), createRule(profileRule));
}
- private void setRules(IFieldMatcher aliasMatcher, IFieldMatcher imageIdMatcher,
IFieldMatcher realmMatcher,
- IFieldMatcher profileMatcher, IFieldMatcher ownerIdMatcher, IFieldMatcher
keyNameMatcher) {
+ private void setRules(IFieldMatcher aliasMatcher, IFieldMatcher imageIdMatcher,
IFieldMatcher ownerIdMatcher,
+ IFieldMatcher keyNameMatcher, IFieldMatcher realmMatcher, IFieldMatcher
profileMatcher) {
this.aliasRule = aliasMatcher;
this.imageIdRule = imageIdMatcher;
- this.ownerIdRule = ownerIdMatcher;
this.keyNameRule = keyNameMatcher;
+ this.ownerIdRule = ownerIdMatcher;
this.realmRule = realmMatcher;
this.profileRule = profileMatcher;
}