Skip to content
Snippets Groups Projects
Commit 9f4e47cf authored by helene ortiz's avatar helene ortiz
Browse files

modifications to test Nomad GUI configuration with Jenkins

parent c10177f4
No related branches found
No related tags found
No related merge requests found
......@@ -20,6 +20,7 @@ package fr.ill.ics.core.property;
import fr.ill.ics.nscclient.command.AtomicCommandBoxAccessorProxy;
import fr.ill.ics.nscclient.dataprovider.DataAccessor;
import fr.ill.ics.util.ConfigManager;
public class Float32Property extends FloatProperty {
......@@ -53,6 +54,7 @@ public class Float32Property extends FloatProperty {
return ok;
} catch (NumberFormatException nfe) {
System.err.println("Number format exception while setting property " + getName() + " to " + value);
ConfigManager.CONFIGURATION_ERROR = true;
return false;
}
}
......
......@@ -20,6 +20,7 @@ package fr.ill.ics.core.property;
import fr.ill.ics.nscclient.command.AtomicCommandBoxAccessorProxy;
import fr.ill.ics.nscclient.dataprovider.DataAccessor;
import fr.ill.ics.util.ConfigManager;
public class Float64Property extends FloatProperty {
......@@ -53,6 +54,7 @@ public class Float64Property extends FloatProperty {
return ok;
} catch (NumberFormatException nfe) {
System.err.println("Number format exception while setting property " + getName() + " to " + value);
ConfigManager.CONFIGURATION_ERROR = true;
return false;
}
}
......
......@@ -20,6 +20,7 @@ package fr.ill.ics.core.property;
import fr.ill.ics.nscclient.command.AtomicCommandBoxAccessorProxy;
import fr.ill.ics.nscclient.dataprovider.DataAccessor;
import fr.ill.ics.util.ConfigManager;
public class Int16Property extends IntegerProperty {
......@@ -53,6 +54,7 @@ public class Int16Property extends IntegerProperty {
return ok;
} catch (NumberFormatException nfe) {
System.err.println("Number format exception while setting property " + getName() + " to " + value);
ConfigManager.CONFIGURATION_ERROR = true;
return false;
}
}
......
......@@ -20,6 +20,7 @@ package fr.ill.ics.core.property;
import fr.ill.ics.nscclient.command.AtomicCommandBoxAccessorProxy;
import fr.ill.ics.nscclient.dataprovider.DataAccessor;
import fr.ill.ics.util.ConfigManager;
public class Int32Property extends IntegerProperty {
......@@ -53,6 +54,7 @@ public class Int32Property extends IntegerProperty {
return ok;
} catch (NumberFormatException nfe) {
System.err.println("Number format exception while setting property " + getName() + " to " + value);
ConfigManager.CONFIGURATION_ERROR = true;
return false;
}
}
......
......@@ -20,6 +20,7 @@ package fr.ill.ics.core.property;
import fr.ill.ics.nscclient.command.AtomicCommandBoxAccessorProxy;
import fr.ill.ics.nscclient.dataprovider.DataAccessor;
import fr.ill.ics.util.ConfigManager;
public class Int64Property extends IntegerProperty {
......@@ -53,6 +54,7 @@ public class Int64Property extends IntegerProperty {
return ok;
} catch (NumberFormatException nfe) {
System.err.println("Number format exception while setting property " + getName() + " to " + value);
ConfigManager.CONFIGURATION_ERROR = true;
return false;
}
}
......
/*
} catch (NumberFormatException nfe) {
System.err.println("Number format exception while setting property " + getName() + " to " + value);
return false;
}
* Nomad Instrument Control Software
*
* Copyright 2011 Institut Laue-Langevin
......
......@@ -433,6 +433,7 @@ public class PropertyManager {
int id = PropertyDatabase.getInstance().getPropertyIdForServant(servant.getId(), propertyName);
if (id < 0) {
System.err.println("Cannot get property " + propertyName + " from " + servant.getName());
ConfigManager.CONFIGURATION_ERROR = true;
return null;
}
......@@ -461,6 +462,7 @@ public class PropertyManager {
int propertyId = PropertyDatabase.getInstance().getPropertyIdForServant(command.getServantId(), propertyName);
if (propertyId < 0) {
System.err.println("Cannot get property " + propertyName + " from servant " + command.getServantId());
ConfigManager.CONFIGURATION_ERROR = true;
return null;
}
......
......@@ -86,7 +86,8 @@ public class ConfigManager {
private Set<String> instrumentsAllowingPALFiles;
public static boolean CONFIGURATION_ERROR = false;
/**
* @return the unique instance of this class
*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment