[CIShell-SVN] SF.net SVN: cishell: [445] trunk/testing/org.cishell.testing. convertertester.core.new/src/org/cishell/testing/convertertester/core/ converter

[<tea...@us...>]

Revision: 445
          http://cishell.svn.sourceforge.net/cishell/?rev=445&view=rev
Author:   teakettle22
Date:     2007-07-30 10:54:45 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
fixed some errors, return cast arrays rather than ArrayLists.

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

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-30 17:28:26 UTC (rev 444)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java	2007-07-30 17:54:45 UTC (rev 445)
@@ -60,6 +60,7 @@
             ServiceReference[] refs = bContext.getServiceReferences(
                     AlgorithmFactory.class.getName(), filter);
             ConverterGraph g = new ConverterGraph(refs);
+            System.out.println("Blah!");
             System.out.println(g);
             if (refs != null) {
 				for (int i = 0; i < refs.length; ++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-30 17:28:26 UTC (rev 444)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java	2007-07-30 17:54:45 UTC (rev 445)
@@ -43,7 +43,8 @@
 	
 	private void createConverterPaths(Map algorithms, Map testPaths,
 			Map comparePaths){
-		String[] keySet = (String[])algorithms.keySet().toArray();
+		String[] keySet = new String[algorithms.keySet().size()];
+		keySet = (String[])algorithms.keySet().toArray(keySet);
 		for(int i = 0; i < keySet.length; i++){
 			String s = keySet[i];
 			if(s.startsWith("file-ext")){
@@ -155,7 +156,8 @@
 	
 	public String printTestConverterPaths(){
 		StringBuffer sb = new StringBuffer();
-		String[] keySet = (String[])this.fileExtensionTestConverters.keySet().toArray();
+		String[] keySet = new String[this.fileExtensionTestConverters.keySet().size()];
+		keySet =	(String[])this.fileExtensionTestConverters.keySet().toArray(keySet);
 		for(int i = 0; i < keySet.length; i++){
 			String s = keySet[i];
 			sb.append(printTestConverterPath(s));
@@ -183,7 +185,8 @@
 	
 	public String toString(){
 		StringBuffer str = new StringBuffer();
-		String[] keySet = (String[])this.inDataToAlgorithm.keySet().toArray();
+		String[] keySet = new String[this.inDataToAlgorithm.keySet().size()];
+			keySet = (String[])this.inDataToAlgorithm.keySet().toArray(keySet);
 		for(int i = 0; i < keySet.length; i++){
 			String s = keySet[i];
 			str.append(s + "\n");
@@ -201,29 +204,29 @@
 		return str.toString();
 	}
 	
-	public ArrayList getTestPath(String s){
-		return (ArrayList)this.fileExtensionTestConverters.get(s);
+	public ServiceReference[] getTestPath(String s){
+		return (ServiceReference[])((ArrayList)this.fileExtensionTestConverters.get(s)).toArray();
 	}
 	
-	public ArrayList getTestPaths(){
+	public ServiceReference[][] getTestPaths(){
 		String[] fileExtensions = (String[])this.fileExtensionTestConverters.keySet().toArray();
 		ArrayList graphs = new ArrayList();
 		for(int i = 0; i < fileExtensions.length; i++){
 			graphs.add(getTestPath(fileExtensions[i]));
 		}
-		return graphs;
+		return (ServiceReference[][])graphs.toArray();
 	}
 	
 	public ConverterPath getComparePath(String s){
 		return (ConverterPath)this.fileExtensionCompareConverters.get(s);
 	}
 	
-	public ArrayList getComparePaths(){
+	public ServiceReference[] getComparePaths(){
 		String[] fileExtensions = (String[])this.fileExtensionCompareConverters.keySet().toArray();
 		ArrayList graphs = new ArrayList();
 		for(int i = 0; i < fileExtensions.length; i++){
 			graphs.add(getComparePath(fileExtensions[i]));
 		}
-		return graphs;
+		return (ServiceReference[])graphs.toArray();
 	}
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.