[Smartfrog-checkins] SF.net SVN: smartfrog:[6976] trunk/core/smartfrog/src/org/smartfrog/sfcore/ common/ContextImpl.java

[<an...@us...>]

Revision: 6976
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6976&view=rev
Author:   anfarr
Date:     2008-08-20 17:03:13 +0000 (Wed, 20 Aug 2008)

Log Message:
-----------
SFOS-944 as part of SFOS-922.  Change to ofType to remove casting of attributes to String

Modified Paths:
--------------
    trunk/core/smartfrog/src/org/smartfrog/sfcore/common/ContextImpl.java

Modified: trunk/core/smartfrog/src/org/smartfrog/sfcore/common/ContextImpl.java
===================================================================
--- trunk/core/smartfrog/src/org/smartfrog/sfcore/common/ContextImpl.java	2008-08-20 17:01:44 UTC (rev 6975)
+++ trunk/core/smartfrog/src/org/smartfrog/sfcore/common/ContextImpl.java	2008-08-20 17:03:13 UTC (rev 6976)
@@ -732,7 +732,7 @@
 		attributeTags.remove(key);
 		attributeTagsWrappers.remove(key);
 		
-		CoreSolver.getInstance().addUndo(this, key, r);
+		CoreSolver.getInstance().addUndoPut(this, key, r);
 		return r;
 	}
 
@@ -880,7 +880,7 @@
     public Object put(Object key, Object value) {
     	Object oldValue = super.put(key, value);
  
-    	CoreSolver.getInstance().addUndo(this, key, oldValue);
+    	CoreSolver.getInstance().addUndoPut(this, key, oldValue);
         return oldValue;
     }
 
@@ -913,12 +913,13 @@
     	Iterator comp_iter = comp_cxt.orderedAttributes();
     	Iterator my_iter = orderedAttributes();
     	
-    	while(my_iter.hasNext()){
-    		if (!comp_iter.hasNext()) return false;
-    		String akey = (String) my_iter.next();
-    		String ckey = (String) comp_iter.next();
-    		if (!akey.equals(ckey)) return false;
+    	while(my_iter.hasNext()) {
+    		if (!comp_iter.hasNext() //Absence of any attribute in sub to reflect attribute in super  
+    				|| 
+    				//Attribute in sub not in common with super
+    				!my_iter.next().equals(comp_iter.next())) return false;
     	}
+    	
     	return true;
     }
     


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