Reformat all files with simon's new layout

4 files changed, 39 insertions, 31 deletions

diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java
index d57eb36..726b062 100644
--- a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java
+++ b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java
@@ -7,8 +7,9 @@ import org.apache.thrift.TException;
 import org.openslx.imagemaster.thrift.iface.AuthenticationException;
 import org.openslx.imagemaster.util.RandomString;
 
-public class ServerAuthenticator {
-	private static Logger log = Logger.getLogger(ServerAuthenticator.class);
+public class ServerAuthenticator
+{
+	private static Logger log = Logger.getLogger( ServerAuthenticator.class );
 	// map of currently authenticating servers
 	private static HashMap<String, String> authenticatingServers = new HashMap<String, String>();
 
@@ -16,16 +17,17 @@ public class ServerAuthenticator {
 	 * Start the server authentification.
 	 * 
 	 * @param organization
-	 *            the organization of the server
+	 *           the organization of the server
 	 * @return encrypted random string
 	 */
-	public static String startServerAuthentication(String organization) {
-		String secret = RandomString.generate(100, false);
-		synchronized (authenticatingServers) {
-			authenticatingServers.put(organization, secret);
-			log.info("Server of organinzation '" + organization
+	public static String startServerAuthentication( String organization )
+	{
+		String secret = RandomString.generate( 100, false );
+		synchronized ( authenticatingServers ) {
+			authenticatingServers.put( organization, secret );
+			log.info( "Server of organinzation '" + organization
 					+ "' starts to authenticate. And got string: '" + secret
-					+ "'");
+					+ "'" );
 		}
 		return secret;
 	}
@@ -40,23 +42,24 @@ public class ServerAuthenticator {
 	 * @throws AuthenticationException
 	 * @throws TException
 	 */
-	public static ServerUser serverAuthenticate(String organization,
-			String address, String challengeResponse)
-			throws AuthenticationException, TException {
+	public static ServerUser serverAuthenticate( String organization,
+			String address, String challengeResponse )
+			throws AuthenticationException, TException
+	{
 		/*
 		 * TODO: Decrypt the given challengeResponse and check whether it was
 		 * right or not. Authenticate server if so.
 		 */
-		if (!challengeResponse.equals(authenticatingServers.get(organization))) {
+		if ( !challengeResponse.equals( authenticatingServers.get( organization ) ) ) {
 			throw new AuthenticationException();
 		}
-		
-		log.info("Server of organinzation '" + organization
+
+		log.info( "Server of organinzation '" + organization
 				+ " authenticated. With response: '" + challengeResponse
-				+ "'");
+				+ "'" );
 
-		authenticatingServers.remove(organization);
+		authenticatingServers.remove( organization );
 
-		return new ServerUser(organization, address);
+		return new ServerUser( organization, address );
 	}
 }
diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerSession.java b/src/main/java/org/openslx/imagemaster/serversession/ServerSession.java
index 633788b..355fc0b 100644
--- a/src/main/java/org/openslx/imagemaster/serversession/ServerSession.java
+++ b/src/main/java/org/openslx/imagemaster/serversession/ServerSession.java
@@ -5,11 +5,10 @@ import org.openslx.imagemaster.Globals.PropInt;
 
 /**
  * Holds the session id of the server and manages the timeout.
- * @author nils
- *
+ * 
  */
-public class ServerSession {
-
+public class ServerSession
+{
 	private static final long TIMEOUT = Long.valueOf( Globals.getPropertyInt( PropInt.SESSIONTIMEOUTSERVER ) ) * 1000L;
 
 	private long timeOut = 0;
@@ -32,12 +31,14 @@ public class ServerSession {
 	{
 		return System.currentTimeMillis() > this.timeOut;
 	}
-	
-	public String getOrganization() {
+
+	public String getOrganization()
+	{
 		return serverUser.organization;
 	}
-	
-	public String getAddress() {
+
+	public String getAddress()
+	{
 		return serverUser.address;
 	}
 }
diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerSessionManager.java b/src/main/java/org/openslx/imagemaster/serversession/ServerSessionManager.java
index e88c1f9..cd0cfc9 100644
--- a/src/main/java/org/openslx/imagemaster/serversession/ServerSessionManager.java
+++ b/src/main/java/org/openslx/imagemaster/serversession/ServerSessionManager.java
@@ -12,11 +12,12 @@ import org.openslx.imagemaster.util.Hash;
 
 /**
  * Manages all server sessions and kicks timeouted sessions.
+ * 
  * @author nils
- *
+ * 
  */
-public class ServerSessionManager {
-
+public class ServerSessionManager
+{
 	private static Logger log = Logger.getLogger( SessionManager.class );
 
 	// Map of currently known sessions
@@ -47,6 +48,7 @@ public class ServerSessionManager {
 
 	static {
 		gcThread = new Thread( new Runnable() {
+
 			@Override
 			public void run()
 			{
diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerUser.java b/src/main/java/org/openslx/imagemaster/serversession/ServerUser.java
index 48815a8..d3a4d62 100644
--- a/src/main/java/org/openslx/imagemaster/serversession/ServerUser.java
+++ b/src/main/java/org/openslx/imagemaster/serversession/ServerUser.java
@@ -1,9 +1,11 @@
 package org.openslx.imagemaster.serversession;
 
-public class ServerUser {
+public class ServerUser
+{
 	public final String organization, address;
 
-	public ServerUser(String organization, String address) {
+	public ServerUser(String organization, String address)
+	{
 		this.organization = organization;
 		this.address = address;
 	}