Merge branch 'master' of https://github.com/JMRI/JMRI into development

JMRI · Jan 22, 2020 · db0a46c · db0a46c
2 parents aa2e335 + 2c79d13
commit db0a46c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/java/src/jmri/jmrix/can/cbus/CbusOpCodes.java b/java/src/jmri/jmrix/can/cbus/CbusOpCodes.java
@@ -1,6 +1,5 @@
 package jmri.jmrix.can.cbus;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -12,6 +11,7 @@
 import javax.xml.parsers.ParserConfigurationException;
 import jmri.jmrix.AbstractMessage;
 import jmri.jmrix.can.CanFrame;
+import jmri.util.FileUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -328,8 +328,7 @@ private static Map<Integer, CbusOpc> createMainMap()  {
         try {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             DocumentBuilder builder = factory.newDocumentBuilder();
-            Document document = builder.parse(new File(
-                "java/src/jmri/jmrix/can/cbus/CbusOpcData.xml"));
+            Document document = builder.parse(FileUtil.getFile("program:xml/cbus/CbusOpcData.xml"));
             document.getDocumentElement().normalize();
 
             //Get all opcs

diff --git a/java/src/jmri/jmrix/can/cbus/CbusOpcData.xml → xml/cbus/CbusOpcData.xml b/java/src/jmri/jmrix/can/cbus/CbusOpcData.xml → xml/cbus/CbusOpcData.xml