Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [441] trunk/testing/org.cishell.testing. convertertester.core.new/src/org/cishell/testing/convertertester/core/ converter
|
From: <tea...@us...> - 2007-07-30 16:11:40
|
Revision: 441
http://cishell.svn.sourceforge.net/cishell/?rev=441&view=rev
Author: teakettle22
Date: 2007-07-30 09:11:36 -0700 (Mon, 30 Jul 2007)
Log Message:
-----------
Refactored code to 1.4
Modified Paths:
--------------
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterPath.java
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java 2007-07-26 20:57:48 UTC (rev 440)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java 2007-07-30 16:11:36 UTC (rev 441)
@@ -9,6 +9,7 @@
import org.cishell.framework.algorithm.AlgorithmProperty;
import org.cishell.service.conversion.Converter;
import org.cishell.service.conversion.DataConversionService;
+import org.cishell.testing.convertertester.core.converter.graph.ConverterGraph;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceEvent;
@@ -58,7 +59,8 @@
ServiceReference[] refs = bContext.getServiceReferences(
AlgorithmFactory.class.getName(), filter);
-
+ ConverterGraph g = new ConverterGraph(refs);
+ System.out.println(g);
if (refs != null) {
for (int i = 0; i < refs.length; ++i) {
//System.out.println(refs[i]);
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java 2007-07-26 20:57:48 UTC (rev 440)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java 2007-07-30 16:11:36 UTC (rev 441)
@@ -9,41 +9,43 @@
public class ConverterGraph {
prefuse.data.Graph converterGraph;
- Map<String, ArrayList<ServiceReference>> inDataToAlgorithm;
- Map<String, ArrayList<ConverterPath>> fileExtensionTestConverters;
- Map<String, ConverterPath> fileExtensionCompareConverters;
+ Map inDataToAlgorithm;
+ Map fileExtensionTestConverters;
+ Map fileExtensionCompareConverters;
ServiceReference[] converters;
private static final String testOutData = "prefuse.data.Graph";
public ConverterGraph(ServiceReference[] converters){
this.converters = converters;
- inDataToAlgorithm = new HashMap<String, ArrayList<ServiceReference>>();
- fileExtensionTestConverters = new ConcurrentHashMap<String, ArrayList<ConverterPath>>();
- fileExtensionCompareConverters = new ConcurrentHashMap<String, ConverterPath>();
+ inDataToAlgorithm = new HashMap();//<String, ArrayList<ServiceReference>>();
+ fileExtensionTestConverters = new ConcurrentHashMap();//<String, ArrayList<ConverterPath>>();
+ fileExtensionCompareConverters = new ConcurrentHashMap();//<String, ConverterPath>();
associateAlgorithms(this.converters, this.inDataToAlgorithm);
createConverterPaths(this.inDataToAlgorithm, this.fileExtensionTestConverters, this.fileExtensionCompareConverters);
//System.out.println("And here");
}
- private void associateAlgorithms(ServiceReference[] sr, Map<String, ArrayList<ServiceReference>> hm){
- for(ServiceReference srv : sr){
+ private void associateAlgorithms(ServiceReference[] sr, Map hm){
+ for(int i = 0; i < sr.length; i++){
+ ServiceReference srv = sr[i];
String s = srv.getProperty("in_data").toString();
if(hm.get(s) == null){
- ArrayList<ServiceReference> al = new ArrayList<ServiceReference>();
+ ArrayList al = new ArrayList();
al.add(srv);
hm.put(s, al);
}
else{
- hm.get(s).add(srv);
+ ((ArrayList)hm.get(s)).add(srv);
}
}
}
- private void createConverterPaths(Map<String, ArrayList<ServiceReference>> algorithms, Map<String, ArrayList<ConverterPath>> testPaths,
- Map<String, ConverterPath> comparePaths){
-
- for(String s : algorithms.keySet()){
+ private void createConverterPaths(Map algorithms, Map testPaths,
+ Map comparePaths){
+ String[] keySet = (String[])algorithms.keySet().toArray();
+ for(int i = 0; i < keySet.length; i++){
+ String s = keySet[i];
if(s.startsWith("file-ext")){
@@ -51,14 +53,14 @@
//ConverterPath
test.setInData(s);
//createPaths(algorithms, testPaths, comparePaths, test, s);
- createPaths(algorithms.get(s), test, s);
+ createPaths((ArrayList)algorithms.get(s), test, s);
//System.out.println("I've got here");
}
}
}
- private ConverterPath createPaths(ArrayList<ServiceReference> algorithms, ConverterPath path, String dataType){
- ArrayList<ServiceReference> refs = removeReferences(algorithms, path);
+ private ConverterPath createPaths(ArrayList algorithms, ConverterPath path, String dataType){
+ ArrayList refs = removeReferences(algorithms, path);
addCompareCycle(path);
@@ -68,9 +70,9 @@
}
while(!refs.isEmpty()){
ConverterPath p = new ConverterPath(path);
- p.addAlgoritm(refs.get(0));
+ p.addAlgoritm((ServiceReference)refs.get(0));
refs.remove(0);
- createPaths(this.inDataToAlgorithm.get(p.getOutData()), p, p.getOutData());
+ createPaths((ArrayList)this.inDataToAlgorithm.get(p.getOutData()), p, p.getOutData());
}
return null;
@@ -78,8 +80,8 @@
private void addTestCycle(ConverterPath cp){
String firstOutData, lastInData;
- firstOutData = cp.getPath().get(0).getProperty("out_data").toString();
- lastInData = cp.getPath().get(cp.getPath().size()-1).getProperty("in_data").toString();
+ firstOutData = ((ServiceReference)cp.getPath().get(0)).getProperty("out_data").toString();
+ lastInData = ((ServiceReference)cp.getPath().get(cp.getPath().size()-1)).getProperty("in_data").toString();
if(firstOutData.equals(lastInData)){
addPath(cp);
}
@@ -88,16 +90,17 @@
private void addCompareCycle(ConverterPath cp){
if(cp.getOutData() != null){
if(cp.getOutData().equals(ConverterGraph.testOutData)){
- String key = cp.getInData() + " " + cp.getPath().get(0).getProperty("out_data").toString();
+ String key = cp.getInData() + " " + ((ServiceReference)cp.getPath().get(0)).getProperty("out_data").toString();
if(this.fileExtensionCompareConverters.get(key) == null){
System.out.println("Adding a new Comparison Path:\n" + cp);
this.fileExtensionCompareConverters.put(key, new ConverterPath(cp));
}
else {
- int pathSize = this.fileExtensionCompareConverters.get(key).getPath().size();
+ ConverterPath tempPath = (ConverterPath)this.fileExtensionCompareConverters.get(key);
+ int pathSize = tempPath.getPath().size();
if(pathSize > cp.getPath().size()){
- ConverterPath oldPath = this.fileExtensionCompareConverters.get(key);
+ ConverterPath oldPath = (ConverterPath)this.fileExtensionCompareConverters.get(key);
System.out.println("Replacing Comparision Path:\n" + oldPath + "with\n"
+ cp);
this.fileExtensionCompareConverters.put(key, new ConverterPath(cp));
@@ -107,11 +110,12 @@
}
}
- private static ArrayList<ServiceReference> removeReferences(ArrayList<ServiceReference> al, ConverterPath cp){
- ArrayList<ServiceReference> srs = new ArrayList<ServiceReference>(al);
+ private static ArrayList removeReferences(ArrayList al, ConverterPath cp){
+ ArrayList srs = new ArrayList(al);
srs.removeAll(cp.getPath());
- ArrayList<ServiceReference> forbidden = new ArrayList<ServiceReference>();
- for(ServiceReference sr: srs){
+ ArrayList forbidden = new ArrayList();
+ for(int i = 0; i < srs.size(); i++){
+ ServiceReference sr = (ServiceReference)srs.get(i);
String ss = sr.getProperty("out_data").toString();
if(ss.startsWith("file-ext") && (!ss.equals(cp.getInData()))){
System.out.println(sr.getProperty("service.pid") + " yes");
@@ -125,14 +129,14 @@
private void addPath(ConverterPath p){
if(this.fileExtensionTestConverters.get(p.getInData()) == null){
System.out.println("Adding a new path");
- ArrayList<ConverterPath> paths = new ArrayList<ConverterPath>();
+ ArrayList paths = new ArrayList();
paths.add(p);
this.fileExtensionTestConverters.put(p.getInData(), paths);
System.out.println("Successfully Added");
}
else{
System.out.println("Adding a path");
- this.fileExtensionTestConverters.get(p.getInData()).add(p);
+ ((ArrayList)this.fileExtensionTestConverters.get(p.getInData())).add(p);
System.out.println("Successfully Added");
}
}
@@ -140,7 +144,9 @@
public String printTestConverterPath(String s){
StringBuffer sb = new StringBuffer();
- for(ConverterPath cp : this.fileExtensionTestConverters.get(s)){
+ ArrayList al = (ArrayList)this.fileExtensionTestConverters.get(s);
+ for(int i = 0; i < al.size(); i++){
+ ConverterPath cp = (ConverterPath)al.get(i);
sb.append(cp.toString());
}
sb.trimToSize();
@@ -149,7 +155,9 @@
public String printTestConverterPaths(){
StringBuffer sb = new StringBuffer();
- for(String s : this.fileExtensionTestConverters.keySet()){
+ String[] keySet = (String[])this.fileExtensionTestConverters.keySet().toArray();
+ for(int i = 0; i < keySet.length; i++){
+ String s = keySet[i];
sb.append(printTestConverterPath(s));
}
sb.trimToSize();
@@ -163,8 +171,10 @@
public String printComparisonConverterPaths(){
StringBuffer sb = new StringBuffer();
- for(String s: this.fileExtensionCompareConverters.keySet()){
- sb.append(printComparisonConverterPath(s));
+ String[] keySet = (String[])this.fileExtensionTestConverters.keySet().toArray();
+ for(int i = 0; i < keySet.length; i++){
+ String s = keySet[i];
+ sb.append(printTestConverterPath(s));
}
sb.trimToSize();
return sb.toString();
@@ -173,9 +183,13 @@
public String toString(){
StringBuffer str = new StringBuffer();
- for(String s : this.inDataToAlgorithm.keySet()){
+ String[] keySet = (String[])this.inDataToAlgorithm.keySet().toArray();
+ for(int i = 0; i < keySet.length; i++){
+ String s = keySet[i];
str.append(s + "\n");
- for(ServiceReference sr : this.inDataToAlgorithm.get(s)){
+ ArrayList al = (ArrayList)this.inDataToAlgorithm.get(s);
+ for(int j = 0; j < al.size(); j++){
+ ServiceReference sr = (ServiceReference)al.get(j);
str.append("\t" + sr.getProperty("service.pid") + "\n");
}
}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterPath.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterPath.java 2007-07-26 20:57:48 UTC (rev 440)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterPath.java 2007-07-30 16:11:36 UTC (rev 441)
@@ -8,17 +8,17 @@
public class ConverterPath {
String in_data;
String out_data = null;
- ArrayList<ServiceReference> path;
+ ArrayList path;
public ConverterPath(){
- path = new ArrayList<ServiceReference>();
+ path = new ArrayList();
}
public ConverterPath(ConverterPath p){
in_data = p.getInData();
out_data = p.getOutData();
- this.path = new ArrayList<ServiceReference>(p.getPath());
+ this.path = new ArrayList(p.getPath());
}
@@ -52,14 +52,15 @@
return this.out_data;
}
- public List<ServiceReference> getPath(){
+ public List getPath(){
return this.path;
}
public String toString(){
String val = this.in_data +" -->\n";
- for(ServiceReference sr : this.path){
+ for(int i = 0; i < this.path.size(); i++){
+ ServiceReference sr = (ServiceReference)this.path.get(i);
val += "\t" + sr.getProperty("service.pid") + "\n";
}
val += "--> " + this.out_data + "\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
