Merge pull request #9505 from danielb987/LogixNG_release_1

LogixNG - Update release notes

help/en/releasenotes/current-draft-warnings.shtml

@@ -1,7 +1,40 @@
 
     <!-- contains new warnings for the release under development -->
     <li>
-        None yet
+        <h4>LogixNG</h4>
+            <ul>
+                <li>
+                This version of LogixNG is not backward compatible with previous versions.
+                If anyone has a panel file with LogixNG that doesn't load with this new version,
+                request help for it on the JMRI developers list or the JMRI users list and the author
+                of LogixNG, Daniel Bergqvist, will fix it.
+                <br>
+                An updated tutorial profile due to this: <a href="http://jmri.bergqvist.se/Tutorial/PreviewLogixNG.jmri.zip">Tutorial/PreviewLogixNG.jmri.zip</a>
+                </li>
+                <li>
+                The action <i>If Then Else</i> now has the options <i>Trigger action</i> and <i>Continuous action</i>.
+                If <i>Trigger action</i>, the child actions will only be executed if the expression changes
+                its result. If <i>Continuous action</i>, the child actions will always get executed.
+                </li>
+                <li>
+                Menu item <i>Tools -> LogixNG -> Import Logix</i> now supports importing Logix to LogixNG.
+                The user can select whenether import system Logixs or not (SYS and RTX). Currently,
+                the import Logix dialog doesn't support importing a subset of Logixs. It will be a
+                later feature. Note that the import tool allows the user to import the same Logix
+                multiple times since it doesn't remember which Logixs that has already been imported.
+                </li>
+                <li>
+                There are a couple of actions not implemented yet. <i>Warrant</i>, <i>OBlock</i>, <i>Clock</i>,
+                <i>Audio</i> and <i>Set Light Intensity</i>. If you try to import Logixs that uses any of
+                these actions, the import will fail and an error dialog will be shown. No Logixs will be
+                imported in this case.
+                </li>
+                <li>
+                If you are using local variables, the action <i>Log local variables</i> may be useful. When
+                it's executed, it logs all the current local variables and their values as WARN messages
+                to the log.
+                </li>
+            </ul>
     </li>
     <li>
     </li>

java/src/apps/Apps.java

@@ -16,6 +16,8 @@
 import javax.swing.text.DefaultEditorKit;
 import javax.swing.text.JTextComponent;
 
+import jmri.jmrit.logixng.LogixNGPreferences;
+
 import jmri.*;
 
 import apps.jmrit.DebugMenu;
@@ -25,7 +27,6 @@
 import jmri.jmrit.decoderdefn.PrintDecoderListAction;
 import jmri.jmrit.display.PanelMenu;
 import jmri.jmrit.jython.*;
-import jmri.jmrit.logixng.LogixNGPreferences;
 import jmri.jmrit.operations.OperationsMenu;
 import jmri.jmrit.revhistory.FileHistory;
 import jmri.jmrit.roster.swing.RosterMenu;

java/src/jmri/configurexml/LoadXmlConfigAction.java

@@ -6,8 +6,10 @@
 
 import jmri.ConfigureManager;
 import jmri.InstanceManager;
-import jmri.JmriException;
 import jmri.jmrit.logixng.LogixNGPreferences;
+import jmri.JmriException;
+import jmri.jmrit.display.Editor;
+import jmri.jmrit.display.EditorManager;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

release.properties

@@ -10,7 +10,7 @@ release.build=2
 # additional release descriptor for a long-running expermimental difference
 # from what is produced by building JMRI/master (e.g. "pjc"). Should not contain
 # dashes (-) or plus signs (+) since these are delimiters in the JMRI version
-release.modifier=logixng
+release.modifier=
 
 # set this to true if this is a JMRI-project official release candidate build
 # (normally, this is only set true by the CI build engine)