Ticket #362: Added parentID property for connection and group.

guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/APIConnection.java

@@ -46,6 +46,11 @@ public class APIConnection {
      */
     private String identifier;
     
+    /**
+     * The identifier of the parent connection group for this connection.
+     */
+    private String parentIdentifier;
+    
     /**
      * The history records associated with this connection.
      */
@@ -71,6 +76,7 @@ public class APIConnection {
             throws GuacamoleException {
         this.name = connection.getName();
         this.identifier = connection.getIdentifier();
+        this.parentIdentifier = connection.getParentIdentifier();
         this.history = connection.getHistory();
     }
 
@@ -99,10 +105,27 @@ public class APIConnection {
     }
     /**
      * Sets the unique identifier for this connection.
+     * @param identifier The unique identifier for this connection.
      */
     public void setIdentifier(String identifier) {
         this.identifier = identifier;
     }
+    
+    /**
+     * Returns the unique identifier for this connection.
+     * @return The unique identifier for this connection.
+     */
+    public String getParentIdentifier() {
+        return parentIdentifier;
+    }
+    /**
+     * Sets the parent connection group identifier for this connection.
+     * @param parentIdentifier The parent connection group identifier 
+     *                         for this connection.
+     */
+    public void setParentIdentifier(String parentIdentifier) {
+        this.parentIdentifier = parentIdentifier;
+    }
 
     /**
      * Returns the history records associated with this connection.

guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/APIConnectionWrapper.java

@@ -66,6 +66,16 @@ public class APIConnectionWrapper implements Connection {
         apiConnection.setIdentifier(identifier);
     }
 
+    @Override
+    public String getParentIdentifier() {
+        return apiConnection.getParentIdentifier();
+    }
+
+    @Override
+    public void setParentIdentifier(String parentIdentifier) {
+        apiConnection.setParentIdentifier(parentIdentifier);
+    }
+
     @Override
     public GuacamoleConfiguration getConfiguration() {
         

guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java

@@ -42,6 +42,11 @@ public class APIConnectionGroup {
      */
     private String identifier;
     
+    /**
+     * The identifier of the parent connection group for this connection group.
+     */
+    private String parentIdentifier;
+    
     /**
      * The type of this connection group.
      */
@@ -60,6 +65,7 @@ public class APIConnectionGroup {
      */
     public APIConnectionGroup(ConnectionGroup connectionGroup) {
         this.identifier = connectionGroup.getIdentifier();
+        this.parentIdentifier = connectionGroup.getParentIdentifier();
         this.name = connectionGroup.getName();
         this.type = connectionGroup.getType();
     }
@@ -95,6 +101,22 @@ public class APIConnectionGroup {
     public void setIdentifier(String identifier) {
         this.identifier = identifier;
     }
+    
+    /**
+     * Returns the unique identifier for this connection group.
+     * @return The unique identifier for this connection group.
+     */
+    public String getParentIdentifier() {
+        return parentIdentifier;
+    }
+    /**
+     * Sets the parent connection group identifier for this connection group.
+     * @param parentIdentifier The parent connection group identifier 
+     *                         for this connection group.
+     */
+    public void setParentIdentifier(String parentIdentifier) {
+        this.parentIdentifier = parentIdentifier;
+    }
 
     /**
      * Returns the type of this connection group.

guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/APIConnectionGroupWrapper.java

@@ -71,6 +71,16 @@ public class APIConnectionGroupWrapper implements ConnectionGroup {
         apiConnectionGroup.setIdentifier(identifier);
     }
 
+    @Override
+    public String getParentIdentifier() {
+        return apiConnectionGroup.getParentIdentifier();
+    }
+
+    @Override
+    public void setParentIdentifier(String parentIdentifier) {
+        apiConnectionGroup.setParentIdentifier(parentIdentifier);
+    }
+
     @Override
     public void setType(Type type) {
         apiConnectionGroup.setType(type);