safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
James Muehlner
2014-03-02 22:38:19 -08:00
parent 4982971fec
commit 3a91dfbb68
10 changed files with 143 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java
View File

@@ -99,10 +99,11 @@ public class MySQLConnection extends AbstractConnection {
/**
* Sets the ID of the parent connection group for this connection.
* @param connectionID The ID of the parent connection group for this connection.
* @param parentID The ID of the parent connection group for this connection.
*/
public void setParentID(Integer parentID) {
this.parentID = parentID;
this.setParentIdentifier(String.valueOf(parentID));
}
/**
@@ -120,7 +121,7 @@ public class MySQLConnection extends AbstractConnection {
List<? extends ConnectionRecord> history, int userID) {
this.connectionID = connectionID;
this.parentID = parentID;
this.setParentID(parentID);
setName(name);
setIdentifier(identifier);
setConfiguration(config);

8
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java
View File

@@ -104,7 +104,7 @@ public class MySQLConnectionGroup extends AbstractConnectionGroup {
/**
* Sets the ID of the corresponding connection group record.
* @param connectionID The ID to assign to this connection group.
* @param connectionGroupID The ID to assign to this connection group.
*/
public void setConnectionID(Integer connectionGroupID) {
this.connectionGroupID = connectionGroupID;
@@ -120,10 +120,11 @@ public class MySQLConnectionGroup extends AbstractConnectionGroup {
/**
* Sets the ID of the parent connection group for this connection group.
* @param connectionID The ID of the parent connection group for this connection group.
* @param parentID The ID of the parent connection group for this connection group.
*/
public void setParentID(Integer parentID) {
this.parentID = parentID;
this.setParentIdentifier(String.valueOf(parentID));
}
/**
@@ -131,6 +132,7 @@ public class MySQLConnectionGroup extends AbstractConnectionGroup {
*
* @param connectionGroupID The ID of the associated database record, if any.
* @param parentID The ID of the parent connection group for this connection group, if any.
* @param name The name of this connection group.
* @param identifier The unique identifier associated with this connection group.
* @param type The type of this connection group.
* @param userID The IID of the user who queried this connection.
@@ -138,7 +140,7 @@ public class MySQLConnectionGroup extends AbstractConnectionGroup {
public void init(Integer connectionGroupID, Integer parentID, String name,
String identifier, ConnectionGroup.Type type, int userID) {
this.connectionGroupID = connectionGroupID;
this.parentID = parentID;
this.setParentID(parentID);
setName(name);
setIdentifier(identifier);
setType(type);