Merge branch 'bugfix' (issue fesch#967) into issue800

Resolved conflicts:
- src/lu/fisch/structorizer/gui/Diagram.java
- src/lu/fisch/utils/StringList.java

LIC-NOTE-libraries

@@ -23,9 +23,6 @@ http://www.beanshell.org/license.html
 Copyright 2016 jjYBdx4IL (https://github.com/jjYBdx4IL)
 http://www.apache.org/licenses/LICENSE-2.0
 
-* FlatLaf > Apache License
-http://www.apache.org/licenses/LICENSE-2.0
-
 --------------------------------------------------------------------------------
 AppleJavaExtensions
 v 1.2

Structorizer.1

@@ -180,6 +180,8 @@ Accepted names (case-insensitive) of generators are:
 .br
 .B BASH
 .br
+.B ARM
+.br
 .B StrucTeX
 .br
 .B LaTeX

nbproject/project.properties

@@ -21,8 +21,12 @@ build.test.results.dir=${build.dir}/test/results
 #debug.transport=dt_socket
 debug.classpath=\
     ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
 debug.test.classpath=\
     ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
 # This directory is removed when the project is cleaned:
 dist.dir=dist
 dist.jar=${dist.dir}/Structorizer.jar
@@ -57,16 +61,22 @@ javac.classpath=\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
+javac.external.vm=false
+javac.modulepath=
+javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
+javac.source=11
+javac.target=11
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
 javadoc.additionalparam=
 javadoc.author=false
 javadoc.encoding=${source.encoding}
+javadoc.html5=false
 javadoc.noindex=false
 javadoc.nonavbar=false
 javadoc.notree=false
@@ -76,6 +86,8 @@ javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
 jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
+jlink.launcher=false
+jlink.launcher.name=Structorizer
 main.class=Structorizer
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
@@ -88,8 +100,12 @@ run.classpath=\
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
 # or test-sys-prop.name=value to set system properties for unit tests):
 run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
 source.encoding=UTF-8
 src.dir=src

src/Structorizer.java

@@ -120,11 +120,6 @@
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 
-//import com.formdev.flatlaf.FlatDarculaLaf;
-//import com.formdev.flatlaf.FlatDarkLaf;
-//import com.formdev.flatlaf.FlatIntelliJLaf;
-//import com.formdev.flatlaf.FlatLightLaf;
-
 //import lu.fisch.structorizer.application.ApplicationFactory;
 import lu.fisch.structorizer.archivar.Archivar;
 import lu.fisch.structorizer.archivar.Archivar.ArchiveIndex;
@@ -362,13 +357,6 @@ else if (parser != null)
 		System.setProperty("sun.java2d.noddraw", "true");
 		// END KGU#521 2018-06-12
 
-		// START KGU#966 2021-03-10: Issue #966 Additional L&F (experimental)
-//		FlatLightLaf.installLafInfo();
-//		FlatDarkLaf.installLafInfo();
-//		FlatDarculaLaf.installLafInfo();
-//		FlatIntelliJLaf.installLafInfo();
-		// END KGU#966 2021-03-10
-
 		// try to load the system Look & Feel
 		try
 		{

src/lu/fisch/structorizer/elements/Call.java

@@ -332,7 +332,7 @@ public String getSignatureString()
 	 * <li> the referred method declaration (in case this obect represents a method reference),</li>
 	 * <li> the called routine if the text complies to the call syntax described in the user guide,</li>
 	 * <li> {@code null} otherwise.</li>
-	 * <ul>
+	 * </ul>
 	 * @return Function object or {@code null}.
 	 * @see #isFunctionCall(boolean)
 	 * @see #isProcedureCall(boolean)

src/lu/fisch/structorizer/elements/Element.java

@@ -259,6 +259,9 @@
  */
 public abstract class Element {
 
+	// START AS 2021-03-25: Enh. #967 (ARM code variant) - KGU 2021-04-15 disabled
+	//public static boolean ARM_GNU = false;
+	// END AS 2021-03-25
 	/** This enumeration type distinguishes drawing contexts for selection display */
 	// START KGU#906 2021-01-06: Enh. #905 need another context to suppress triangles
 	//public enum DrawingContext {DC_STRUCTORIZER, DC_ARRANGER};
@@ -302,7 +305,7 @@ public String toString()
 	public static final long E_HELP_FILE_SIZE = 11700000;
 	public static final String E_DOWNLOAD_PAGE = "https://www.fisch.lu/Php/download.php";
 	// END KGU#791 2020-01-20
-	public static final String E_VERSION = "3.32-02";
+	public static final String E_VERSION = "3.32-03";
 	public static final String E_THANKS =
 	"Developed and maintained by\n"+
 	" - Robert Fisch <[email protected]>\n"+
@@ -321,6 +324,7 @@ public String toString()
 	" - BASIC: Jacek Dzieniewicz\n" +
 	" - Python: Daniel Spittank <[email protected]>\n"+
 	" - Javascript: Kay Gürtzig <[email protected]>\n"+
+	" - ARM code: Alessandro Simonetta <[email protected]>\n"+
 	" - PapDesigner: Kay Gürtzig <[email protected]>\n"+
 	"Import grammars and parsers written and maintained by\n"+
 	" - ANSI-C: Kay Gürtzig <[email protected]>\n"+