GUAC-1132: For consistency, rename getActiveSocket() to getSocket().

This commit is contained in:
Michael Jumper
2015-03-17 12:13:58 -07:00
parent f9bb25fdb2
commit 129bb688f4
4 changed files with 5 additions and 5 deletions

View File

@@ -84,7 +84,7 @@ public class ModeledConnectionRecord implements ConnectionRecord {
}
@Override
public GuacamoleSocket getActiveSocket() {
public GuacamoleSocket getSocket() {
return null;
}

View File

@@ -389,7 +389,7 @@ public abstract class AbstractGuacamoleSocketService implements GuacamoleSocketS
);
// Assign and return new socket
activeConnection.setActiveSocket(socket);
activeConnection.setSocket(socket);
return socket;
}

View File

@@ -194,7 +194,7 @@ public class ActiveConnectionRecord implements ConnectionRecord {
}
@Override
public GuacamoleSocket getActiveSocket() {
public GuacamoleSocket getSocket() {
return socket;
}
@@ -204,7 +204,7 @@ public class ActiveConnectionRecord implements ConnectionRecord {
* @param socket
* The GuacamoleSocket to associate with this connection record.
*/
public void setActiveSocket(GuacamoleSocket socket) {
public void setSocket(GuacamoleSocket socket) {
this.socket = socket;
}