You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2014/03/04 18:46:17 UTC
svn commit: r1574153 - in /ace/trunk:
org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/
org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/
org.apache.ace.client.workspace/src/org/apache/ace/cl...
Author: marrs
Date: Tue Mar 4 17:46:16 2014
New Revision: 1574153
URL: http://svn.apache.org/r1574153
Log:
ACE-456 Moved from match() to matchCase().
Modified:
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/AssociationImpl.java
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ObjectRepositoryImpl.java
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java
ace/trunk/org.apache.ace.gogo/src/org/apache/ace/gogo/queue/QueueCommands.java
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java?rev=1574153&r1=1574152&r2=1574153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java Tue Mar 4 17:46:16 2014
@@ -101,6 +101,7 @@ public class ArtifactRepositoryImpl exte
public List<ArtifactObject> get() {
// Note that this excludes any Bundle artifacts which are resource processors.
try {
+ // ??? should we do that to that key?
return super.get(createFilter("(!(" + RepositoryUtil.escapeFilterValue(BundleHelper.KEY_RESOURCE_PROCESSOR_PID) + "=*))"));
}
catch (InvalidSyntaxException e) {
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/AssociationImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/AssociationImpl.java?rev=1574153&r1=1574152&r2=1574153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/AssociationImpl.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/AssociationImpl.java Tue Mar 4 17:46:16 2014
@@ -252,10 +252,10 @@ public class AssociationImpl<L extends R
// for now, we chop of the star, and check whether the topic starts with that.
RepositoryObject entity = (RepositoryObject) event.getProperty(RepositoryObject.EVENT_ENTITY);
if ((event.getTopic().endsWith("ADDED")) || event.getTopic().endsWith("REMOVED")) {
- if (m_leftClass.isInstance(entity) && m_filterLeft.match(entity.getDictionary())) {
+ if (m_leftClass.isInstance(entity) && m_filterLeft.matchCase(entity.getDictionary())) {
locateLeftEndpoint(true);
}
- if (m_rightClass.isInstance(entity) && m_filterRight.match(entity.getDictionary())) {
+ if (m_rightClass.isInstance(entity) && m_filterRight.matchCase(entity.getDictionary())) {
locateRightEndpoint(true);
}
}
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ObjectRepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ObjectRepositoryImpl.java?rev=1574153&r1=1574152&r2=1574153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ObjectRepositoryImpl.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ObjectRepositoryImpl.java Tue Mar 4 17:46:16 2014
@@ -20,6 +20,7 @@ package org.apache.ace.client.repository
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -109,7 +110,7 @@ abstract class ObjectRepositoryImpl<I ex
try {
List<T> result = new ArrayList<T>();
for (T entry : m_repo) {
- if (filter.match(entry.getDictionary())) {
+ if (filter.matchCase(entry.getDictionary())) {
result.add(entry);
}
}
@@ -353,3 +354,4 @@ abstract class ObjectRepositoryImpl<I ex
notifyChanged(topic, props, m_busy);
}
}
+
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java?rev=1574153&r1=1574152&r2=1574153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java Tue Mar 4 17:46:16 2014
@@ -107,7 +107,7 @@ public class StatefulTargetRepositoryImp
synchronized (m_repository) {
List<StatefulTargetObject> result = new ArrayList<StatefulTargetObject>();
for (StatefulTargetObject entry : m_repository.values()) {
- if (filter.match(entry.getDictionary())) {
+ if (filter.matchCase(entry.getDictionary())) {
result.add(entry);
}
}
Modified: ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java?rev=1574153&r1=1574152&r2=1574153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java (original)
+++ ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java Tue Mar 4 17:46:16 2014
@@ -465,7 +465,7 @@ public class WorkspaceImpl implements Wo
List<ArtifactObject> rps = m_artifactRepository.getResourceProcessors();
List<ArtifactObject> res = new LinkedList<ArtifactObject>();
for (ArtifactObject rp : rps) {
- if (f.match(rp.getDictionary())) {
+ if (f.matchCase(rp.getDictionary())) {
res.add(rp);
}
}
Modified: ace/trunk/org.apache.ace.gogo/src/org/apache/ace/gogo/queue/QueueCommands.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.gogo/src/org/apache/ace/gogo/queue/QueueCommands.java?rev=1574153&r1=1574152&r2=1574153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.gogo/src/org/apache/ace/gogo/queue/QueueCommands.java (original)
+++ ace/trunk/org.apache.ace.gogo/src/org/apache/ace/gogo/queue/QueueCommands.java Tue Mar 4 17:46:16 2014
@@ -101,7 +101,7 @@ public class QueueCommands {
Filter f = FrameworkUtil.createFilter(filter);
for (Dictionary<String, String> entry : copy) {
- if (f.match(entry)) {
+ if (f.matchCase(entry)) {
return true;
}
}
@@ -123,7 +123,7 @@ public class QueueCommands {
Filter f = FrameworkUtil.createFilter(filter);
for (Dictionary<String, String> entry : copy) {
- if (f.match(entry)) {
+ if (f.matchCase(entry)) {
result.add(toMap(entry));
m_queue.remove(entry);
}