From 5a017c3b1ce7c65728ac354ebc138838e9db3320 Mon Sep 17 00:00:00 2001
From: Michael Petretti
Date: Thu, 19 Jun 2014 15:11:07 +0200
Subject: Finished Debug for Uploads.

---
 src/main/java/org/openslx/satellitedaemon/Globals.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/main/java/org/openslx/satellitedaemon/Globals.java')

diff --git a/src/main/java/org/openslx/satellitedaemon/Globals.java b/src/main/java/org/openslx/satellitedaemon/Globals.java
index f120abc..3bfd5cb 100644
--- a/src/main/java/org/openslx/satellitedaemon/Globals.java
+++ b/src/main/java/org/openslx/satellitedaemon/Globals.java
@@ -20,12 +20,12 @@ public class Globals
 	 */
 	public static enum PropInt
 	{
-		FTPPORT		// More int's? Add them separated with ","
+		FTPPORT, THRIFTPORT		// More int's? Add them separated with ","
 	}
 
 	public static enum PropString
 	{ // More strings's? Add them separated with ","
-		FTPSERVERIP, KEYSTORETYPE, FTPSKEYSTOREPATH, FTPSKEYSTOREPWD, THRIFTORGANIZATIONNAME, 
+		FTPSERVERIP, KEYSTORETYPE, FTPSKEYSTOREPATH, FTPSKEYSTOREPWD, THRIFTORGANIZATIONNAME,
 		RNDSTRINGENCRYPTALIAS, RNDSTRINGENCRYPTPASSWORD, RNDSTRINGENCRYPTPATH
 	}
 
@@ -51,6 +51,9 @@ public class Globals
 		case FTPPORT:
 			result = properties.getProperty( "ftp_port" );
 			break;
+		case THRIFTPORT:
+			result = properties.getProperty( "ThriftPort" );
+			break;
 		default:
 			result = "0";
 			break;
@@ -100,6 +103,7 @@ public class Globals
 	public static boolean propertiesValid()
 	{
 		if ( Globals.getPropertyInt( PropInt.FTPPORT ) == 0
+				|| Globals.getPropertyInt( PropInt.THRIFTPORT ) == 0
 				|| Globals.getPropertyString( PropString.FTPSERVERIP ).isEmpty()
 				|| Globals.getPropertyString( PropString.FTPSERVERIP ) == null
 				|| Globals.getPropertyString( PropString.KEYSTORETYPE ).isEmpty()
@@ -107,7 +111,7 @@ public class Globals
 				|| Globals.getPropertyString( PropString.FTPSKEYSTOREPATH ).isEmpty()
 				|| Globals.getPropertyString( PropString.FTPSKEYSTOREPATH ) == null
 				|| Globals.getPropertyString( PropString.FTPSKEYSTOREPWD ).isEmpty()
-				|| Globals.getPropertyString( PropString.FTPSKEYSTOREPWD ) == null 
+				|| Globals.getPropertyString( PropString.FTPSKEYSTOREPWD ) == null
 				|| Globals.getPropertyString( PropString.THRIFTORGANIZATIONNAME ).isEmpty()
 				|| Globals.getPropertyString( PropString.THRIFTORGANIZATIONNAME ) == null
 				|| Globals.getPropertyString( PropString.RNDSTRINGENCRYPTALIAS ).isEmpty()
@@ -115,7 +119,7 @@ public class Globals
 				|| Globals.getPropertyString( PropString.RNDSTRINGENCRYPTPASSWORD ).isEmpty()
 				|| Globals.getPropertyString( PropString.RNDSTRINGENCRYPTPASSWORD ) == null
 				|| Globals.getPropertyString( PropString.RNDSTRINGENCRYPTPATH ).isEmpty()
-				|| Globals.getPropertyString( PropString.RNDSTRINGENCRYPTPATH ) == null) {
+				|| Globals.getPropertyString( PropString.RNDSTRINGENCRYPTPATH ) == null ) {
 			return false;
 		}
 		else {
-- 
cgit v1.2.3-55-g7522