From: <rh...@us...> - 2014-08-31 11:08:30
|
Revision: 27118 http://sourceforge.net/p/jmri/code/27118 Author: rhwood Date: 2014-08-31 11:08:26 +0000 (Sun, 31 Aug 2014) Log Message: ----------- Fix logic error preventing F28 from being included in JSON roster entry results. Modified Paths: -------------- trunk/jmri/java/src/jmri/jmris/json/JsonUtil.java Modified: trunk/jmri/java/src/jmri/jmris/json/JsonUtil.java =================================================================== --- trunk/jmri/java/src/jmri/jmris/json/JsonUtil.java 2014-08-31 09:57:14 UTC (rev 27117) +++ trunk/jmri/java/src/jmri/jmris/json/JsonUtil.java 2014-08-31 11:08:26 UTC (rev 27118) @@ -780,7 +780,7 @@ entry.put(IMAGE_ICON_NAME, file.getName()); entry.put(SHUNTING_FUNCTION, re.getShuntingFunction()); ArrayNode labels = entry.putArray(FUNCTION_KEYS); - for (int i = 0; i < re.getMAXFNNUM(); i++) { + for (int i = 0; i <= re.getMAXFNNUM(); i++) { ObjectNode label = mapper.createObjectNode(); label.put(NAME, F + i); label.put(LABEL, re.getFunctionLabel(i)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |