Fixes #1136, fixes #1137

fesch · Mar 12, 2024 · 185a4dd · 185a4dd
1 parent 4322ba4
commit 185a4dd
Show file tree

Hide file tree

Showing 9 changed files with 263 additions and 31 deletions.
diff --git a/src/lu/fisch/structorizer/gui/changelog.txt b/src/lu/fisch/structorizer/gui/changelog.txt
@@ -23,7 +23,7 @@ Known issues (also see https://github.com/fesch/Structorizer.Desktop/issues):
 - ARM export is still experimental and relies on a specific and very restricted
   syntax for the element contents in order to produce meaningful results.
 
-Current development version 3.32-18 (2024-03-11)
+Current development version 3.32-18 (2024-03-12)
 - 01: Bugfix #987: Duplicate subroutine comment export by Pascal generator <2>
 - 01: Bugfix #988: Syntax error in Structorizer.bat and Arranger.bat fixed <2>
 - 01: Bugfix #989: Expressions in EXIT elements (e.g. return) were forgotten
@@ -203,6 +203,9 @@ Current development version 3.32-18 (2024-03-11)
 - 17: Bugfix #1132 Java import defect on backslashes in string literals <2>
 - 18: Bugfix #1135 Two Java import bugs - unicode escape sequences in string
       literals and identifiers 'str', 'binary', 'hex' caused failure. <2>
+- 18: Bugfix #1136 Three Java import problems due to angular brackets of type
+      arguments (nested parameterized types, casting, "<?>" parameters). <2>
+- 18: Bugfix #1137 Workaround for Java import errors due to ".this" <2>
 
 Version 3.32 (2021-09-19) requiring Java 11 or newer
 - 01: Bugfix #851/2: SPECIAL-NAMES sections caused COBOL parser abort <2>

diff --git a/src/lu/fisch/structorizer/gui/parsers.xml b/src/lu/fisch/structorizer/gui/parsers.xml
@@ -24,10 +24,12 @@
 	<plugin title="Java-SE8" 			class="lu.fisch.structorizer.parsers.JavaParser" icon="">
 		<option name="convert_syntax" type="Boolean" title="Convert declarations etc. to Pascal/Structorizer style" help="This setting slightly raises the chance of executability and re-export in Structorizer" default="true" />
 		<option name="dissect_anon_inner_class" type="Boolean" title="Dissect anonymous inner classes into diagrams" help="Otherwise on-the-fly-defined subclasses will be passed as very long source code expressions to the instantiation element." default="true" />
+		<option name="separate_angular_brackets" type="Boolean" title="Separate >> of type parameters to > >" help="Heuristic preprocessing to avoid nested type parameter closing be mistaken for shift operator '>>'. If it overdoes, do it manually." default="true" />
 	</plugin>
 	<plugin title="Processing" 			class="lu.fisch.structorizer.parsers.ProcessingParser" icon="">
 		<option name="convert_syntax" type="Boolean" title="Convert declarations etc. to Pascal/Structorizer style" help="This setting slightly raises the chance of executability and re-export in Structorizer" default="true" />
 		<option name="dissect_anon_inner_class" type="Boolean" title="Dissect anonymous inner classes into diagrams" help="Otherwise on-the-fly-defined subclasses will be passed as very long source code expressions to the instantiation element." default="true" />
+		<option name="separate_angular_brackets" type="Boolean" title="Separate >> of type parameters to > >" help="Heuristic preprocessing to avoid nested type parameter closing be mistaken for shift operator '>>'. If it overdoes, do it manually." default="true" />
 	</plugin>
 
 </plugins>
diff --git a/src/lu/fisch/structorizer/locales/de.txt b/src/lu/fisch/structorizer/locales/de.txt
@@ -143,7 +143,8 @@
  *      Kay Gürtzig         2023-10-13  Issues #980,#1096: New messages for declaration syntax check (error31_*)
  *      Kay Gürtzig         2023-11-13  Enh. #1115: New messages for C99 import option definesToConstants
  *      Kay Gürtzig         2024-03-04  Mnemonic changed on Find&Replace, PluginOptionDialog message added
- *      Kay Gürtzig         2024-03-09  Issue #1117: Messages for new PuginOptionDialog option dissect_anon_inner_class
+ *      Kay Gürtzig         2024-03-09  Issue #1131: Messages for new PluginOptionDialog option dissect_anon_inner_class
+ *      Kay Gürtzig         2024-03-12  Bugfix #1136: New PluginOptionDialog import option separate_angular_brackets
  *
  ******************************************************************************************************
  *
@@ -1210,6 +1211,8 @@ PluginOptionDialog.optionComponents.convert_syntax.text=Deklarationen/Ausdrücke
 PluginOptionDialog.optionComponents.convert_syntax.tooltip=Diese Einstellung vergrößert die Chancen der Ausführbarkeit oder des Re-Exports in Structorizer
 PluginOptionDialog.optionComponents.dissect_anon_inner_class.text=Anonyme innere Klassen in Diagramme zerlegen
 PluginOptionDialog.optionComponents.dissect_anon_inner_class.tooltip=Anderenfalls würde die en passant definierte innere Klasse einfach als sehr langer Quellcode-Ausdruck in das instanziierende Element durchgereicht.
+PluginOptionDialog.optionComponents.separate_angular_brackets.text=Trenne >> bei Typparametern zu > >
+PluginOptionDialog.optionComponents.separate_angular_brackets.tooltip=Heuristische Vermeidung, dass '>>' bei verschachtelten Typparametern als Shift-Operator fehlinterprtiert wird. (Bei Übergriffigkeit deaktivieren und von Hand ändern!)
 PluginOptionDialog.optionComponents.debugLines.text[getPluginKey():COBOLParser]=Debug-Zeilen als aktiven Code importieren
 PluginOptionDialog.optionComponents.debugLines.tooltip[getPluginKey():COBOLParser]=Falls aktiviert, werden Debug-Zeilen ggf. als gültiger Code importiert, anderenfalls in Kommentarzeilen "DEBUG ..." umgewandelt.
 PluginOptionDialog.optionComponents.decimalComma.text[getPluginKey():COBOLParser]=Dezimalkomma (statt Dezimalpunkt) im Quelltext

diff --git a/src/lu/fisch/structorizer/locales/en.txt b/src/lu/fisch/structorizer/locales/en.txt
@@ -136,7 +136,8 @@
  *      Kay Gürtzig     2023-08-01      Enh. #1082: Function name now included in messages Menu.error13_*
  *      Kay Gürtzig     2023-10-06      Issue #311: Menu reorganisation (menuDiagram split)
  *      Kay Gürtzig     2023-10-16      Issue #980/#1096: New messages for declaration syntax check (error31_*)
- *      Kay Gürtzig     2024-03-09      Issue #1117: Messages for new PuginOptionDialog option dissect_anon_inner_class
+ *      Kay Gürtzig     2024-03-09      Issue #1131: Messages for new PluginOptionDialog entry dissect_anon_inner_class
+ *      Kay Gürtzig     2024-03-12      Bugfix #1136: New PluginOptionDialog import option separate_angular_brackets
  *
  ******************************************************************************************************
  *
@@ -1205,6 +1206,8 @@ PluginOptionDialog.optionComponents.convert_syntax.text=
 PluginOptionDialog.optionComponents.convert_syntax.tooltip=
 PluginOptionDialog.optionComponents.dissect_anon_inner_class.text=
 PluginOptionDialog.optionComponents.dissect_anon_inner_class.tooltip=
+PluginOptionDialog.optionComponents.separate_angular_brackets.text=
+PluginOptionDialog.optionComponents.separate_angular_brackets.tooltip=
 PluginOptionDialog.optionComponents.debugLines.text[getPluginKey():COBOLParser]=
 PluginOptionDialog.optionComponents.debugLines.tooltip[getPluginKey():COBOLParser]=
 PluginOptionDialog.optionComponents.decimalComma.text[getPluginKey():COBOLParser]=

diff --git a/src/lu/fisch/structorizer/locales/es.txt b/src/lu/fisch/structorizer/locales/es.txt
@@ -143,7 +143,8 @@
  *      Kay Gürtzig     2023-11-13  Enh. #1115: New messages for C99 import option definesToConstants
  *      Kay Gürtzig     2024-01-26  Issue #311/bugfix #1126: Menu reorganisation (menuDiagram split)
  *      Kay Gürtzig     2024-03-04  Mnemonics for Find&Replace dialog specified.
- *      Kay Gürtzig     2024-03-09  Issue #1117: Messages for new PuginOptionDialog option dissect_anon_inner_class
+ *      Kay Gürtzig     2024-03-09  Issue #1131: Messages for new PluginOptionDialog option dissect_anon_inner_class
+ *      Kay Gürtzig     2024-03-12  Bugfix #1136: New PluginOptionDialog import option separate_angular_brackets
  * 
  ******************************************************************************************************
  *
@@ -1212,6 +1213,8 @@ PluginOptionDialog.optionComponents.convert_syntax.text=Convertir declaraciones/
 PluginOptionDialog.optionComponents.convert_syntax.tooltip=Esta opción aumenta la probabilidad de poder ejecutar o re-exportar el resultado en Structorizer
 PluginOptionDialog.optionComponents.dissect_anon_inner_class.text=Desglosar clases anónimas interiores a diagramas
 PluginOptionDialog.optionComponents.dissect_anon_inner_class.tooltip=De otro modo, una clase anónima definida en pasada simplemente sería puesto como una larga expresión de código fuente al elemento que contiene su instanciación.
+PluginOptionDialog.optionComponents.separate_angular_brackets.text=Separar >> detrás parametros de tipos hacia > >
+PluginOptionDialog.optionComponents.separate_angular_brackets.tooltip=Tentativa heuristica de evitar, que '>>' por parametros de tipos anidados sean ecivocados con operadores >>. (En caso de exageración ¡desactivelo y hagalo manualmente!)
 PluginOptionDialog.optionComponents.debugLines.text[getPluginKey():COBOLParser]=Importar líneas debug como código válido
 PluginOptionDialog.optionComponents.debugLines.tooltip[getPluginKey():COBOLParser]=Si es activada, líneas debug serán importadas como código válido, de otro modo serían convertidas en comentarios "DEBUG ...".
 PluginOptionDialog.optionComponents.decimalComma.text[getPluginKey():COBOLParser]=Coma decimal (en lugar de punto decimal) en el código