[Swift-commit] r5848 - trunk/src/org/griphyn/vdl/karajan/lib

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2012-07-17 13:48:00 -0500 (Tue, 17 Jul 2012)
New Revision: 5848

Modified:
   trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java
Log:
fix merge

Modified: trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java	2012-07-17 18:42:51 UTC (rev 5847)
+++ trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java	2012-07-17 18:48:00 UTC (rev 5848)
@@ -38,7 +38,6 @@
 import org.griphyn.vdl.mapping.InvalidPathException;
 import org.griphyn.vdl.mapping.Mapper;
 import org.griphyn.vdl.mapping.Path;
-import org.griphyn.vdl.type.Field;
 import org.griphyn.vdl.type.Type;
 
 public class SetFieldValue extends VDLFunction {
@@ -101,7 +100,6 @@
         }
     }
 
-    @SuppressWarnings("unchecked")
     private void log(DSHandle leaf, DSHandle value) {
 	    if (logger.isDebugEnabled()) {
 	        logger.debug("Setting " + leaf + " to " + value);
@@ -140,10 +138,10 @@
 	    StringBuilder sb = new StringBuilder();
 	    sb.append("{");
 	    synchronized(handle) {
-    	    Iterator<Map.Entry<String,DSHandle>> it = 
+    	    Iterator<Map.Entry<Comparable<?>, DSHandle>> it = 
     	        handles.entrySet().iterator();
     	    while (it.hasNext()) { 
-    	        Map.Entry<String,DSHandle> entry = it.next();
+    	        Map.Entry<Comparable<?>, DSHandle> entry = it.next();
     	        sb.append(entry.getKey());
     	        sb.append('=');
     	        sb.append(entry.getValue().getValue());
@@ -157,7 +155,6 @@
 	
     /** make dest look like source - if its a simple value, copy that
 	    and if its an array then recursively copy */
-	@SuppressWarnings("unchecked")
 	public static void deepCopy(DSHandle dest, DSHandle source, VariableStack stack, int level) throws ExecutionException {
 	    ((AbstractDataNode) source).waitFor();
 		if (source.getType().isPrimitive()) {
@@ -214,7 +211,7 @@
             if (logger.isDebugEnabled()) {
                 logger.debug("Remapping " + dest + " to " + source);
             }
-            dmapper.remap(dpath, source.getMapper().map(source.getPathFromRoot()));
+            dmapper.remap(dpath, source.getMapper(), source.getPathFromRoot());
             dest.closeShallow();
         }
         else {