[CIShell-SVN] SF.net SVN: cishell:[1218] trunk/core/org.cishell.reference/src/org/cishell /reference

[<pat...@us...>]

Revision: 1218
          http://cishell.svn.sourceforge.net/cishell/?rev=1218&view=rev
Author:   pataphil
Date:     2011-02-18 03:29:48 +0000 (Fri, 18 Feb 2011)

Log Message:
-----------
* Changed implementing classes of Converter to reflect calculateLossiness() addition.
* DataMangerServiceImpl now uses LinkedHashMaps (to preserve order).

Modified Paths:
--------------
    trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/datamanager/DataManagerServiceImpl.java
    trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java
    trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/NullConverter.java

Modified: trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/datamanager/DataManagerServiceImpl.java
===================================================================
--- trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/datamanager/DataManagerServiceImpl.java	2011-02-18 03:21:21 UTC (rev 1217)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/datamanager/DataManagerServiceImpl.java	2011-02-18 03:29:48 UTC (rev 1218)
@@ -14,8 +14,8 @@
 package org.cishell.reference.app.service.datamanager;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -26,12 +26,12 @@
 
 
 public class DataManagerServiceImpl implements DataManagerService {
-    private Map<Data, String> datumToLabel = new HashMap<Data, String>();
-    private Map<String, Data> labelToDatum = new HashMap<String, Data>(); 
-    private Map<String, Integer> labelToOccurrenceCount = new HashMap<String, Integer>();
-    private Set<Data> data = new HashSet<Data>();
-    private Set<Data> selectedData = new HashSet<Data>();
-    private Set<DataManagerListener> listeners = new HashSet<DataManagerListener>();
+    private Map<Data, String> datumToLabel = new LinkedHashMap<Data, String>();
+    private Map<String, Data> labelToDatum = new LinkedHashMap<String, Data>(); 
+    private Map<String, Integer> labelToOccurrenceCount = new LinkedHashMap<String, Integer>();
+    private Set<Data> data = new LinkedHashSet<Data>();
+    private Set<Data> selectedData = new LinkedHashSet<Data>();
+    private Set<DataManagerListener> listeners = new LinkedHashSet<DataManagerListener>();
 
     public void addData(Data datum) {
     	if (datum == null) {

Modified: trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java
===================================================================
--- trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java	2011-02-18 03:21:21 UTC (rev 1217)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java	2011-02-18 03:29:48 UTC (rev 1218)
@@ -168,19 +168,19 @@
 	    	
 	    return equal;
     }
-    
-    /* The conversion chain (serviceReferences) is lossless
-	 * if and only if no conversion (ref) is lossy.
-	 */
-	private String calculateLossiness(ServiceReference[] refs) {
-		String lossiness = LOSSLESS;
-	    for (int i=0; i < refs.length; i++) {
-	        if (LOSSY.equals(refs[i].getProperty(CONVERSION))) {
-	            lossiness = LOSSY;
+
+    public String calculateLossiness() {
+    	return calculateLossiness(getConverterChain());
+    }
+
+	private static String calculateLossiness(ServiceReference[] serviceReferences) {
+		for (ServiceReference serviceReference : serviceReferences) {
+	        if (LOSSY.equals(serviceReference.getProperty(CONVERSION))) {
+	            return LOSSY;
 	        }
 	    }
 	    
-		return lossiness;
+		return LOSSLESS;
 	}
 
 	private class ConverterAlgorithm implements Algorithm {
@@ -287,7 +287,7 @@
         		return "Problem converting data from "
         				+ prettifyDataType(inType)
         				+ " to " + prettifyDataType(outType)
-        				+ " (See the logger file for more details).:\n        "
+        				+ " (See the log file for more details).:\n        "
         				+ e.getMessage();
         	}
         	else {        	
@@ -297,7 +297,7 @@
 			        	+ " during the necessary intermediate conversion from "
 			        	+ prettifyDataType(preProblemType) + " to "
 			        	+ prettifyDataType(postProblemType)
-			        	+ " (See the logger file for more details):\n        "
+			        	+ " (See the log file for more details):\n        "
 			        	+ e.getMessage();
         	}
         }

Modified: trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/NullConverter.java
===================================================================
--- trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/NullConverter.java	2011-02-18 03:21:21 UTC (rev 1217)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/NullConverter.java	2011-02-18 03:29:48 UTC (rev 1218)
@@ -73,6 +73,10 @@
         return props;
     }
 
+    public String calculateLossiness() {
+    	return getProperties().get(CONVERSION).toString();
+    }
+
     public Algorithm createAlgorithm(Data[] dm, Dictionary parameters, CIShellContext context) {
         return new ConverterAlgorithm(dm, parameters, context);
     }


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