From 5e294dbd586034b23484adb3c0c4de0f6acd901c Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 16 Sep 2014 08:49:21 +0200
Subject: Abstract properties. Activities cannot be instantiated unless the
 slot overrides them. Fixes #190

---
 .../java/com/c2kernel/utils/CastorHashMap.java     | 33 ++++++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com/c2kernel/utils/CastorHashMap.java')

diff --git a/src/main/java/com/c2kernel/utils/CastorHashMap.java b/src/main/java/com/c2kernel/utils/CastorHashMap.java
index 25e5ab4..2ec64fe 100644
--- a/src/main/java/com/c2kernel/utils/CastorHashMap.java
+++ b/src/main/java/com/c2kernel/utils/CastorHashMap.java
@@ -1,5 +1,6 @@
 package com.c2kernel.utils;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 
@@ -12,6 +13,8 @@ public class CastorHashMap extends HashMap<String,Object>
     {
         clear();
     }
+    
+    ArrayList<String> abstractPropNames = new ArrayList<String>();
 
     public KeyValuePair[] getKeyValuePairs()
     {
@@ -24,8 +27,8 @@ public class CastorHashMap extends HashMap<String,Object>
         for(i=0; i<numKeys; i++)
             if (keyIter.hasNext())
             {
-                String tmp = keyIter.next();
-                keyValuePairs[i]   = new KeyValuePair(tmp,get(tmp));
+                String name = keyIter.next();
+                keyValuePairs[i]   = new KeyValuePair(name ,get(name), abstractPropNames.contains(name));
             }
 
         return keyValuePairs;
@@ -46,9 +49,33 @@ public class CastorHashMap extends HashMap<String,Object>
         }
     }
 
-    public void setKeyValuePair(KeyValuePair keyValuePair)
+    @Override
+	public void clear() {
+		super.clear();
+		abstractPropNames = new ArrayList<String>();
+	}
+
+
+	public void setKeyValuePair(KeyValuePair keyValuePair)
     {
 	    put(keyValuePair.getKey(), keyValuePair.getValue());
+	    if (keyValuePair.isAbstract())
+	    	abstractPropNames.add(keyValuePair.getKey());
+	    else
+	    	abstractPropNames.remove(keyValuePair.getKey());
     }
 
+	public ArrayList<String> getAbstract() {
+		return abstractPropNames;
+	}
+
+
+	public void put(String key, Object value, boolean isAbstract) {
+		super.put(key, value);
+		if (isAbstract) 
+			abstractPropNames.add(key);
+		else 
+			abstractPropNames.remove(key);
+		
+	}
 }
-- 
cgit v1.2.3