Merged master

ChangeLog

-3.1.10 DD/MM/YYYY
+3.2.1 DD/MM/YYYY
 ------
+* Overwritten equals method in Property class.
+
+3.2.0 11/02/2019
+------
+* Implementation of expressions and variables.
 
 3.1.9 12/10/2018
 -----

src/main/java/fr/ill/ics/core/property/Int32Property.java

@@ -33,6 +33,9 @@ public class Int32Property extends IntegerProperty {
 			return true;
 		}
 		catch (NumberFormatException e) {
+			if (getPropertyFormat().acceptsValue(value)) { // Case of hexadecimal integer value
+				return true;
+			}
 			return false;
 		}
 	}

src/main/java/fr/ill/ics/core/property/Property.java

@@ -902,6 +902,18 @@ public abstract class Property implements ServerPropertyChangeListener, ICommand
 	}
 
 	
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == null) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
+		final Property other = (Property)obj;
+		return id == other.getPropertyID();
+	}
+	
 	
 	public abstract String getType();
 

src/main/java/fr/ill/ics/nscclient/command/CommandZoneAccessor.java

@@ -2688,6 +2688,45 @@ public class CommandZoneAccessor {
 		
 		return 1;
 	}
+	
+	public String[] getVariableList(int commandBoxID) {
+		
+		// Create the message type.
+		CommandZoneRequests.Message type = CommandZoneRequests.Message.newBuilder()
+													.setType(CommandZoneRequests.Message.Type.GetVariableList)
+													.build();
+
+		// Create the request.
+		CommandZoneRequests.CommandBoxRequest request = CommandZoneRequests.CommandBoxRequest.newBuilder()
+													.setCommandBoxID(commandBoxID)
+													.build();
+		
+		commandBoxRequester.sendTwoParts(type.toByteArray(), request.toByteArray());
+		
+		try {
+			Common.StringArrayResponse response = Common.StringArrayResponse.parseFrom(commandBoxRequester.receive());
+			
+			// Test the error.
+			if (response.hasError()) {
+				processError(response.getError(), commandBoxID);
+			}
+			else {
+				int size = response.getValueCount();
+				String[] result = new String[size];
+				
+				for (int i = 0; i < size; ++i) {
+					result[i] = response.getValue(i);
+				}
+				
+				return result;
+			}
+		}
+		catch (InvalidProtocolBufferException e) {
+			LOGGER.logp(Level.WARNING, this.getClass().getName(), "getVariableList", "error in parsing response for command box " + commandBoxID);
+		}
+		
+		return null;
+	}
 
 	public int create() {