Author: rwesten
Date: Fri May 10 09:44:33 2013
New Revision: 1480967
URL: http://svn.apache.org/r1480967
Log:
fixes STANBOL-1062 by applying the patch provided by Sergio. Also applied the
code provided by Sergio to sort EnhancementChains alphabetically
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java?rev=1480967&r1=1480966&r2=1480967&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
Fri May 10 09:44:33 2013
@@ -29,11 +29,13 @@ import static org.apache.stanbol.commons
import static
org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.addActiveChains;
import static
org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.buildChainsMap;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Set;
import javax.servlet.ServletContext;
import javax.ws.rs.GET;
@@ -102,10 +104,16 @@ public class ChainsRootResource extends
public Collection<Chain> getChains(){
- Set<Chain> chains = new HashSet<Chain>();
+ List<Chain> chains = new ArrayList<Chain>();
for(Entry<ServiceReference,Chain> entry : this.chains.values()){
chains.add(entry.getValue());
}
+ Collections.sort(chains, new Comparator<Chain>() {
+ @Override
+ public int compare(Chain o1, Chain o2) {
+ return o1.getName().compareTo(o2.getName());
+ }
+ });
return chains;
}
public String getServicePid(String name){
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java?rev=1480967&r1=1480966&r2=1480967&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java
Fri May 10 09:44:33 2013
@@ -29,11 +29,13 @@ import static org.apache.stanbol.commons
import static
org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.addActiveEngines;
import static
org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.buildEnginesMap;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Set;
import javax.servlet.ServletContext;
import javax.ws.rs.GET;
@@ -100,10 +102,16 @@ public class EnhancementEnginesRootResou
}
public Collection<EnhancementEngine> getEngines(){
- Set<EnhancementEngine> engines = new HashSet<EnhancementEngine>();
+ List<EnhancementEngine> engines = new ArrayList<EnhancementEngine>();
for(Entry<ServiceReference,EnhancementEngine> entry :
this.engines.values()){
engines.add(entry.getValue());
}
+ Collections.sort(engines, new Comparator<EnhancementEngine>() {
+ @Override
+ public int compare(EnhancementEngine o1, EnhancementEngine o2) {
+ return o1.getName().compareTo(o2.getName());
+ }
+ });
return engines;
}
public String getServicePid(String name){
