Merge branch 'anettjakab/titan.EclipsePlug-ins-master'

org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/Base_Type.java

@@ -9,6 +9,8 @@ package org.eclipse.titan.runtime.core;
 
 import java.math.BigInteger;
 import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.eclipse.titan.runtime.core.BER.ASN_BER_TLV;
 import org.eclipse.titan.runtime.core.BER.ASN_BERdescriptor;
@@ -25,7 +27,6 @@ import org.eclipse.titan.runtime.core.TTCN_EncDec.error_type;
 import org.eclipse.titan.runtime.core.TTCN_EncDec.raw_order_t;
 import org.eclipse.titan.runtime.core.TTCN_Logger.Severity;
 
-import javafx.util.Pair;
 
 /**
  * The base class of all types.
@@ -693,16 +694,19 @@ public abstract class Base_Type {
 			
 		}
 		
-		public Pair<Boolean, TitanInteger> BER_decode_TLV_Integer(ASN_BER_TLV p_tlv, int p_unsigned, TitanInteger p_int_val) {
+		public Map<Boolean, TitanInteger> BER_decode_TLV_Integer(ASN_BER_TLV p_tlv, int p_unsigned, TitanInteger p_int_val) {
 			
 			p_tlv.chk_constructedFlag(false);
+			Map<Boolean, TitanInteger> result = new HashMap<Boolean, TitanInteger>();
 			if(!p_tlv.isComplete) {
-				return new Pair<Boolean, TitanInteger> (false, p_int_val);
+				result.put(false, p_int_val);
+				return result;
 			}
 			
 			if(p_tlv.Vlen == 0) {
 				TTCN_EncDec_ErrorContext.error(error_type.ET_INVAL_MSG, "Length of V-part is 0.");
-				return new Pair<Boolean, TitanInteger> (false, p_int_val);
+				result.put(false, p_int_val);
+				return result;
 			}
 			
 			int Vlen = p_tlv.Vlen;
@@ -711,8 +715,8 @@ public abstract class Base_Type {
 			if(Vlen >= Integer.BYTES) {
 				
 				BigInteger D = new BigInteger(p_tlv.Vstr);
-				
-				return new Pair<Boolean, TitanInteger> (true, new TitanInteger(D));
+				result.put(true, new TitanInteger(D));
+				return result;
 				
 			}
 			
@@ -737,7 +741,9 @@ public abstract class Base_Type {
 			
 			p_int_val = new TitanInteger(intVal);
 			
-			return new Pair<Boolean, TitanInteger> (true, p_int_val);
+			
+			result.put(true, p_int_val);
+			return result;
 		}
 		
 		public ASN_BER_TLV BER_encode_chk_bound(boolean p_isbound) {

org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/TitanInteger.java

@@ -9,6 +9,7 @@ package org.eclipse.titan.runtime.core;
 
 import java.math.BigInteger;
 import java.text.MessageFormat;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -37,8 +38,6 @@ import org.eclipse.titan.runtime.core.TTCN_EncDec.error_type;
 import org.eclipse.titan.runtime.core.TTCN_EncDec.raw_order_t;
 import org.eclipse.titan.runtime.core.TitanCharString.CharCoding;
 
-import javafx.util.Pair;
-
 
 /**
  * TTCN-3 integer
@@ -1346,7 +1345,6 @@ public class TitanInteger extends Base_Type {
 					TTCN_EncDec_ErrorContext.error_internal("No BER descriptor available for type '%s'.", p_td.name);
 				}
 				
-				//int L_form = flavour;
 				ASN_BER_TLV tlv = new ASN_BER_TLV();
 				
 				BER_decode_str2TLV(p_buf, tlv, flavour);
@@ -2354,7 +2352,7 @@ public class TitanInteger extends Base_Type {
 		else return null;
 	}
 	
-	public ASN_BER_TLV BER_encode_TLV (final TTCN_Typedescriptor p_td, int coding) {
+	public ASN_BER_TLV BER_encode_TLV(final TTCN_Typedescriptor p_td, int coding) {
 		
 		ASN_BER_TLV newTlv = BER_encode_chk_bound(is_bound());
 		
@@ -2371,37 +2369,40 @@ public class TitanInteger extends Base_Type {
 		return newTlv;	
 	}
 	
-	public boolean BER_decode_TLV (TTCN_Typedescriptor p_td, ASN_BER_TLV p_tlv, int L_form) {
+	public boolean BER_decode_TLV(TTCN_Typedescriptor p_td, ASN_BER_TLV p_tlv, int L_form) {
 		
 		boundFlag = false;
 		ASN_BER_TLV strippedTlv = new ASN_BER_TLV();
 		strippedTlv = BER_decode_strip_tags(p_td.ber, p_tlv, L_form, strippedTlv);
 		TitanInteger tmp = new TitanInteger();	
 		 
-		Pair <Boolean, TitanInteger> p = BER_decode_TLV_Integer(strippedTlv, L_form, tmp);
-		
-		boolean returnVal = p.getKey();
-		tmp = p.getValue();
+		Map<Boolean, TitanInteger> p = BER_decode_TLV_Integer(strippedTlv, L_form, tmp);
 		
-		if (tmp.is_native()) {
-			nativeFlag = true;
-			if(strippedTlv.getVstr()[0] >= 0 && tmp.nativeInt < 0) {
-				nativeInt = -tmp.nativeInt;
+		for (Map.Entry<Boolean, TitanInteger> me: p.entrySet()) {
+			boolean returnVal = me.getKey();
+			tmp = me.getValue();
+			
+			if (tmp.is_native()) {
+				nativeFlag = true;
+				if(strippedTlv.getVstr()[0] >= 0 && tmp.nativeInt < 0) {
+					nativeInt = -tmp.nativeInt;
+				} else {
+					nativeInt = tmp.nativeInt;
+				}
 			} else {
-				nativeInt = tmp.nativeInt;
+				nativeFlag = false;
+				if(strippedTlv.getVstr()[0] < 0 && tmp.openSSL.compareTo(BigInteger.ZERO) < 0) {
+					openSSL = tmp.openSSL.negate();
+				}
+				openSSL = tmp.openSSL;
 			}
-		} else {
-			nativeFlag = false;
-			if(strippedTlv.getVstr()[0] < 0 && tmp.openSSL.compareTo(BigInteger.ZERO) < 0) {
-				openSSL = tmp.openSSL.negate();
+			
+			if (returnVal) {
+				boundFlag = true;
 			}
-			openSSL = tmp.openSSL;
+			
+			return returnVal;
 		}
-		
-		if (returnVal) {
-			boundFlag = true;
-		}
-		
-		return returnVal;
+		return false;
 	}
 }