Whitespace fixes and removal of change to java's AbstractTester

This commit is contained in:
A.J. Beamon 2018-01-05 13:21:54 -08:00
parent 9f2e6bfbd1
commit 30067d2f53
2 changed files with 22 additions and 23 deletions

View File

@ -92,8 +92,7 @@ public abstract class AbstractTester {
if (!args.useExternalClient()) {
throw new IllegalArgumentException("Cannot enable callbacks on external thread without using external client");
}
throw new IllegalArgumentException("Cannot enable callbacks on external thread in Java");
//fdb.options().setCallbacksOnExternalThreads();
fdb.options().setCallbacksOnExternalThreads();
}
if (args.useExternalClient()) {
fdb.options().setDisableLocalClient();

View File

@ -132,28 +132,28 @@ namespace vexillographer
{
var paramTypeStr = oDoc.AttributeOrNull("paramType");
ParamType p = paramTypeStr == null ? ParamType.None : (ParamType)Enum.Parse(typeof(ParamType), paramTypeStr);
bool hidden = oDoc.AttributeOrNull("hidden") == "true";
string disableOn = oDoc.AttributeOrNull("disableOn");
bool disabled = false;
if(disableOn != null)
{
string[] disabledBindings = disableOn.Split(',');
disabled = disabledBindings.Contains(binding);
}
bool hidden = oDoc.AttributeOrNull("hidden") == "true";
string disableOn = oDoc.AttributeOrNull("disableOn");
bool disabled = false;
if(disableOn != null)
{
string[] disabledBindings = disableOn.Split(',');
disabled = disabledBindings.Contains(binding);
}
if (!disabled)
{
list.Add(new Option
{
scope = s,
name = oDoc.AttributeNonNull("name"),
code = int.Parse(oDoc.AttributeNonNull("code")),
paramType = p,
paramDesc = oDoc.AttributeOrNull("paramDescription"),
comment = oDoc.AttributeOrNull("description"),
hidden = hidden
});
}
if (!disabled)
{
list.Add(new Option
{
scope = s,
name = oDoc.AttributeNonNull("name"),
code = int.Parse(oDoc.AttributeNonNull("code")),
paramType = p,
paramDesc = oDoc.AttributeOrNull("paramDescription"),
comment = oDoc.AttributeOrNull("description"),
hidden = hidden
});
}
}
}
options = list;