few more test cases and some work on to string... still not working.

kiniry · Aug 23, 2010 · 1991b80 · 1991b80
1 parent d27a358
commit 1991b80
Show file tree

Hide file tree

Showing 11 changed files with 596 additions and 376 deletions.
diff --git a/...tic_properties_plugin/semantic_properties_plugin/resources/examples/concurrency_full.yaml b/...tic_properties_plugin/semantic_properties_plugin/resources/examples/concurrency_full.yaml
@@ -3,12 +3,12 @@ name: concurrency
 level: bon
 format: 
   - choice: 
-    - SEQUENTIAL
-    - GUARDED
-    - CONCURRENT
-    - [TIMEOUT, <to=nat=0>, <e=throwable=java.lang.EXCEPTION>]
-    - [FAILURE, <f=throwable=java.lang.ERROR>]
-    - SPECIAL
+    - <c1=SEQUENTIAL>
+    - <c1=GUARDED>
+    - <c1=CONCURRENT>
+    - [<c1=TIMEOUT>, <to=nat=0>, <e=throwable=java.lang.EXCEPTION>]
+    - [<c1=FAILURE>, <f=throwable=java.lang.ERROR>]
+    - <c1=SPECIAL>
   - optional: <description=string=''>
 scope: 
   - Module
@@ -21,12 +21,12 @@ name: concurrency
 level: java
 format: 
   - choice: 
-    - SEQ
-    - GUARD
-    - PARALLEL
-    - [TO, <to=nat=0>, <e=throwable=java.lang.Exception>]
-    - [FAILURE, <f=throwable=java.lang.Error>]
-    - SPECIAL
+    - <c1=SEQ>
+    - <c1=GUARD>
+    - <c1=PARALLEL>
+    - [<c1=TO>, <to=nat=0>, <e=throwable=java.lang.Exception>]
+    - [<c1=FAILURE>, <f=throwable=java.lang.Error>]
+    - <c1=SPECIAL>
   - optional: <description=string='No information.'>
   #- optional: <owner=string='unknown'>
 scope: 
@@ -39,6 +39,7 @@ description: |
 property: concurrency
 relation(bon,java):
   - keyword:
+    - c1: c1
     - SEQUENTIAL: SEQ
     - CONCURRENT: PARALLEL
     - GUARDED: GUARD

diff --git a/...erties_plugin/src/main/ie/ucd/semanticproperties/plugin/api/SemanticPropertyInstance.java b/...erties_plugin/src/main/ie/ucd/semanticproperties/plugin/api/SemanticPropertyInstance.java
@@ -110,12 +110,11 @@ public ArrayList<ScopeId> getScope() {
    * of the semantic property's format.
    */
   public String toString() {
-    StringTemplate temp = pp;
-    for(String r :captured.keySet()){
-      temp.setAttribute(r, captured.get(r));
-    }
-    return temp.toString();
 
+    for(String i:captured.keySet()){
+      pp.setAttribute(i, captured.get(i).toString());
+    }
+    return pp.toString();
   }
 
 

diff --git a/...ic_properties_plugin/src/main/ie/ucd/semanticproperties/plugin/customobjects/Keyword.java b/...ic_properties_plugin/src/main/ie/ucd/semanticproperties/plugin/customobjects/Keyword.java
@@ -0,0 +1,28 @@
+package ie.ucd.semanticproperties.plugin.customobjects;
+
+public class Keyword {
+	protected String keyword;
+	protected String value;
+	public Keyword() {
+		keyword = "";
+		value = "";
+	}
+
+	public Keyword(String key, String val) {
+	  keyword = key;
+    value = val;
+	}
+
+  public String getKeyword() {
+    return keyword;
+  }
+
+  public String getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+      return getKeyword()+"="+getValue();
+  }
+}