Fixing program structure; now accepting multiple policy files; cross-checking referen...

[iot2.git] / iotjava / iotpolicy / tree / CapabilityDecl.java

diff --git a/iotjava/iotpolicy/tree/CapabilityDecl.java b/iotjava/iotpolicy/tree/CapabilityDecl.java
index 71ec2ca2046f430104c468cf96c47b17b639f448..a55f30a04f6dd77ad4b475f578183552259b325a 100644 (file)
--- a/iotjava/iotpolicy/tree/CapabilityDecl.java
+++ b/iotjava/iotpolicy/tree/CapabilityDecl.java
@@ -10,12 +10,7 @@ import java.util.List;
  * @version     1.0
  * @since       2016-09-20
  */
-public final class CapabilityDecl {
-
-       /**
-        * Class properties
-        */
-       private String origInt;
+public class CapabilityDecl extends Declaration {
 
        /**
         * A "capability" statement:
@@ -28,6 +23,10 @@ public final class CapabilityDecl {
         * In this data structure we will record its capability name, i.e. ImageCapture
         *              and its descriptions and methods.
         */
+
+       /**
+        * Class properties
+        */
        private List<String> listCapabs;                // list of capabilities
        private List<List<String>> listDescs;   // list of descriptions
        private List<List<String>> listMethods; // list of methods
@@ -37,7 +36,7 @@ public final class CapabilityDecl {
         */
        public CapabilityDecl() {
 
-               origInt = null;
+               super();
                listCapabs = new ArrayList<String>();
                listDescs = new ArrayList<List<String>>();
                listMethods = new ArrayList<List<String>>();
@@ -46,7 +45,7 @@ public final class CapabilityDecl {
 
        public CapabilityDecl(String _origInt) {
 
-               origInt = _origInt;
+               super(_origInt);
                listCapabs = new ArrayList<String>();
                listDescs = new ArrayList<List<String>>();
                listMethods = new ArrayList<List<String>>();