jedit-cvs

[ jEdit-commits ] SF.net SVN: jedit:[25667] plugins/JSON/trunk/ant_json_test.xml

[<dal...@us...>]

Revision: 25667
          http://sourceforge.net/p/jedit/svn/25667
Author:   daleanson
Date:     2023-09-07 19:53:17 +0000 (Thu, 07 Sep 2023)
Log Message:
-----------
Additional test files.

Modified Paths:
--------------
    plugins/JSON/trunk/ant_json_test.xml

Modified: plugins/JSON/trunk/ant_json_test.xml
===================================================================
--- plugins/JSON/trunk/ant_json_test.xml	2023-09-07 19:52:45 UTC (rev 25666)
+++ plugins/JSON/trunk/ant_json_test.xml	2023-09-07 19:53:17 UTC (rev 25667)
@@ -28,7 +28,7 @@
         </path>
     </target>
 
-    <target name="test" depends="test1, test2, test3, test4, test5, test6"></target>
+    <target name="test" depends="test1, test2, test3, test4, test5, test6, test7, test8, test9, test10"></target>
 
     <target name="test1" depends="setClasspath">
         <delete file="${basedir}/test/json/after/test1.json" quiet="true"/>
@@ -111,4 +111,60 @@
         <fail unless:true="${test6}">test6 failed</fail>
     </target>
 
+    <target name="test7" depends="setClasspath">
+        <delete file="${basedir}/test/json/after/test7.json" quiet="true"/>
+        <java classname="json.parser.JSONBeautyListener" fork="true" output="${basedir}/test/json/after/test7.json">
+            <classpath refid="classpathref"/>
+            <arg file="${basedir}/test/json/before/test7.json"/>
+        </java>
+        
+        <condition property="test7">
+            <filesmatch file1="${basedir}/test/json/after/test7.json" file2="${basedir}/test/json/expected/test7.json"/>
+        </condition>
+        <echo if:true="${test7}">test7 passed</echo>
+        <fail unless:true="${test7}">test7 failed</fail>
+    </target>
+
+    <target name="test8" depends="setClasspath">
+        <delete file="${basedir}/test/json/after/test8.json" quiet="true"/>
+        <java classname="json.parser.JSONBeautyListener" fork="true" output="${basedir}/test/json/after/test8.json">
+            <classpath refid="classpathref"/>
+            <arg file="${basedir}/test/json/before/test8.json"/>
+        </java>
+        
+        <condition property="test8">
+            <filesmatch file1="${basedir}/test/json/after/test8.json" file2="${basedir}/test/json/expected/test8.json"/>
+        </condition>
+        <echo if:true="${test8}">test8 passed</echo>
+        <fail unless:true="${test8}">test8 failed</fail>
+    </target>
+
+    <target name="test9" depends="setClasspath">
+        <delete file="${basedir}/test/json/after/test9.json" quiet="true"/>
+        <java classname="json.parser.JSONBeautyListener" fork="true" output="${basedir}/test/json/after/test9.json">
+            <classpath refid="classpathref"/>
+            <arg file="${basedir}/test/json/before/test9.json"/>
+        </java>
+        
+        <condition property="test9">
+            <filesmatch file1="${basedir}/test/json/after/test9.json" file2="${basedir}/test/json/expected/test9.json"/>
+        </condition>
+        <echo if:true="${test9}">test9 passed</echo>
+        <fail unless:true="${test9}">test9 failed</fail>
+    </target>
+
+    <target name="test10" depends="setClasspath">
+        <delete file="${basedir}/test/json/after/test10.json" quiet="true"/>
+        <java classname="json.parser.JSONBeautyListener" fork="true" output="${basedir}/test/json/after/test10.json">
+            <classpath refid="classpathref"/>
+            <arg file="${basedir}/test/json/before/test10.json"/>
+        </java>
+        
+        <condition property="test10">
+            <filesmatch file1="${basedir}/test/json/after/test10.json" file2="${basedir}/test/json/expected/test10.json"/>
+        </condition>
+        <echo if:true="${test10}">test10 passed</echo>
+        <fail unless:true="${test10}">test10 failed</fail>
+    </target>
+
 </project>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25666] plugins/JSON/trunk/test/json

[<dal...@us...>]

Revision: 25666
          http://sourceforge.net/p/jedit/svn/25666
Author:   daleanson
Date:     2023-09-07 19:52:45 +0000 (Thu, 07 Sep 2023)
Log Message:
-----------
Additional test files.

Added Paths:
-----------
    plugins/JSON/trunk/test/json/before/test10.json
    plugins/JSON/trunk/test/json/before/test7.json
    plugins/JSON/trunk/test/json/before/test8.json
    plugins/JSON/trunk/test/json/before/test9.json
    plugins/JSON/trunk/test/json/expected/test10.json
    plugins/JSON/trunk/test/json/expected/test7.json
    plugins/JSON/trunk/test/json/expected/test8.json
    plugins/JSON/trunk/test/json/expected/test9.json

Removed Paths:
-------------
    plugins/JSON/trunk/test/json/after/#test6.json#

Deleted: plugins/JSON/trunk/test/json/after/#test6.json#
===================================================================
--- plugins/JSON/trunk/test/json/after/#test6.json#	2023-09-07 19:38:14 UTC (rev 25665)
+++ plugins/JSON/trunk/test/json/after/#test6.json#	2023-09-07 19:52:45 UTC (rev 25666)
@@ -1,24 +0,0 @@
-[
-    {
-        "name": "Molecule Man",
-        "age": 29,
-        "secretIdentity": "Dan Jukes",
-        "powers": 
-        [
-            "Radiation resistance",
-            "Turning tiny",
-            "Radiation blast"
-        ]
-    },
-    {
-        "name": "Madame Uppercut",
-        "age": 39,
-        "secretIdentity": "Jane Wilson",
-        "powers": 
-        [
-            "Million tonne punch",
-            "Damage resistance",
-            "Superhuman reflexes"
-        ]
-    }
-]
\ No newline at end of file

Added: plugins/JSON/trunk/test/json/before/test10.json
===================================================================
--- plugins/JSON/trunk/test/json/before/test10.json	                        (rev 0)
+++ plugins/JSON/trunk/test/json/before/test10.json	2023-09-07 19:52:45 UTC (rev 25666)
@@ -0,0 +1,88 @@
+{"web-app": {
+  "servlet": [   
+    {
+      "servlet-name": "cofaxCDS",
+      "servlet-class": "org.cofax.cds.CDSServlet",
+      "init-param": {
+        "configGlossary:installationAt": "Philadelphia, PA",
+        "configGlossary:adminEmail": "ks...@po...",
+        "configGlossary:poweredBy": "Cofax",
+        "configGlossary:poweredByIcon": "/images/cofax.gif",
+        "configGlossary:staticPath": "/content/static",
+        "templateProcessorClass": "org.cofax.WysiwygTemplate",
+        "templateLoaderClass": "org.cofax.FilesTemplateLoader",
+        "templatePath": "templates",
+        "templateOverridePath": "",
+        "defaultListTemplate": "listTemplate.htm",
+        "defaultFileTemplate": "articleTemplate.htm",
+        "useJSP": false,
+        "jspListTemplate": "listTemplate.jsp",
+        "jspFileTemplate": "articleTemplate.jsp",
+        "cachePackageTagsTrack": 200,
+        "cachePackageTagsStore": 200,
+        "cachePackageTagsRefresh": 60,
+        "cacheTemplatesTrack": 100,
+        "cacheTemplatesStore": 50,
+        "cacheTemplatesRefresh": 15,
+        "cachePagesTrack": 200,
+        "cachePagesStore": 100,
+        "cachePagesRefresh": 10,
+        "cachePagesDirtyRead": 10,
+        "searchEngineListTemplate": "forSearchEnginesList.htm",
+        "searchEngineFileTemplate": "forSearchEngines.htm",
+        "searchEngineRobotsDb": "WEB-INF/robots.db",
+        "useDataStore": true,
+        "dataStoreClass": "org.cofax.SqlDataStore",
+        "redirectionClass": "org.cofax.SqlRedirection",
+        "dataStoreName": "cofax",
+        "dataStoreDriver": "com.microsoft.jdbc.sqlserver.SQLServerDriver",
+        "dataStoreUrl": "jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon",
+        "dataStoreUser": "sa",
+        "dataStorePassword": "dataStoreTestQuery",
+        "dataStoreTestQuery": "SET NOCOUNT ON;select test='test';",
+        "dataStoreLogFile": "/usr/local/tomcat/logs/datastore.log",
+        "dataStoreInitConns": 10,
+        "dataStoreMaxConns": 100,
+        "dataStoreConnUsageLimit": 100,
+        "dataStoreLogLevel": "debug",
+        "maxUrlLength": 500}},
+    {
+      "servlet-name": "cofaxEmail",
+      "servlet-class": "org.cofax.cds.EmailServlet",
+      "init-param": {
+      "mailHost": "mail1",
+      "mailHostOverride": "mail2"}},
+    {
+      "servlet-name": "cofaxAdmin",
+      "servlet-class": "org.cofax.cds.AdminServlet"},
+ 
+    {
+      "servlet-name": "fileServlet",
+      "servlet-class": "org.cofax.cds.FileServlet"},
+    {
+      "servlet-name": "cofaxTools",
+      "servlet-class": "org.cofax.cms.CofaxToolsServlet",
+      "init-param": {
+        "templatePath": "toolstemplates/",
+        "log": 1,
+        "logLocation": "/usr/local/tomcat/logs/CofaxTools.log",
+        "logMaxSize": "",
+        "dataLog": 1,
+        "dataLogLocation": "/usr/local/tomcat/logs/dataLog.log",
+        "dataLogMaxSize": "",
+        "removePageCache": "/content/admin/remove?cache=pages&id=",
+        "removeTemplateCache": "/content/admin/remove?cache=templates&id=",
+        "fileTransferFolder": "/usr/local/tomcat/webapps/content/fileTransferFolder",
+        "lookInContext": 1,
+        "adminGroupID": 4,
+        "betaServer": true}}],
+  "servlet-mapping": {
+    "cofaxCDS": "/",
+    "cofaxEmail": "/cofaxutil/aemail/*",
+    "cofaxAdmin": "/admin/*",
+    "fileServlet": "/static/*",
+    "cofaxTools": "/tools/*"},
+ 
+  "taglib": {
+    "taglib-uri": "cofax.tld",
+    "taglib-location": "/WEB-INF/tlds/cofax.tld"}}}

Added: plugins/JSON/trunk/test/json/before/test7.json
===================================================================
--- plugins/JSON/trunk/test/json/before/test7.json	                        (rev 0)
+++ plugins/JSON/trunk/test/json/before/test7.json	2023-09-07 19:52:45 UTC (rev 25666)
@@ -0,0 +1,22 @@
+{
+    "glossary": {
+        "title": "example glossary",
+		"GlossDiv": {
+            "title": "S",
+			"GlossList": {
+                "GlossEntry": {
+                    "ID": "SGML",
+					"SortAs": "SGML",
+					"GlossTerm": "Standard Generalized Markup Language",
+					"Acronym": "SGML",
+					"Abbrev": "ISO 8879:1986",
+					"GlossDef": {
+                        "para": "A meta-markup language, used to create markup languages such as DocBook.",
+						"GlossSeeAlso": ["GML", "XML"]
+                    },
+					"GlossSee": "markup"
+                }
+            }
+        }
+    }
+}

Added: plugins/JSON/trunk/test/json/before/test8.json
===================================================================
--- plugins/JSON/trunk/test/json/before/test8.json	                        (rev 0)
+++ plugins/JSON/trunk/test/json/before/test8.json	2023-09-07 19:52:45 UTC (rev 25666)
@@ -0,0 +1,11 @@
+{"menu": {
+  "id": "file",
+  "value": "File",
+  "popup": {
+    "menuitem": [
+      {"value": "New", "onclick": "CreateNewDoc()"},
+      {"value": "Open", "onclick": "OpenDoc()"},
+      {"value": "Close", "onclick": "CloseDoc()"}
+    ]
+  }
+}}
\ No newline at end of file

Added: plugins/JSON/trunk/test/json/before/test9.json
===================================================================
--- plugins/JSON/trunk/test/json/before/test9.json	                        (rev 0)
+++ plugins/JSON/trunk/test/json/before/test9.json	2023-09-07 19:52:45 UTC (rev 25666)
@@ -0,0 +1,26 @@
+{"widget": {
+    "debug": "on",
+    "window": {
+        "title": "Sample Konfabulator Widget",
+        "name": "main_window",
+        "width": 500,
+        "height": 500
+    },
+    "image": { 
+        "src": "Images/Sun.png",
+        "name": "sun1",
+        "hOffset": 250,
+        "vOffset": 250,
+        "alignment": "center"
+    },
+    "text": {
+        "data": "Click Here",
+        "size": 36,
+        "style": "bold",
+        "name": "text1",
+        "hOffset": 250,
+        "vOffset": 100,
+        "alignment": "center",
+        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
+    }
+}}    

Added: plugins/JSON/trunk/test/json/expected/test10.json
===================================================================
--- plugins/JSON/trunk/test/json/expected/test10.json	                        (rev 0)
+++ plugins/JSON/trunk/test/json/expected/test10.json	2023-09-07 19:52:45 UTC (rev 25666)
@@ -0,0 +1,107 @@
+{
+    "web-app": 
+    {
+        "servlet": 
+        [
+            {
+                "servlet-name": "cofaxCDS",
+                "servlet-class": "org.cofax.cds.CDSServlet",
+                "init-param": 
+                {
+                    "configGlossary:installationAt": "Philadelphia, PA",
+                    "configGlossary:adminEmail": "ks...@po...",
+                    "configGlossary:poweredBy": "Cofax",
+                    "configGlossary:poweredByIcon": "/images/cofax.gif",
+                    "configGlossary:staticPath": "/content/static",
+                    "templateProcessorClass": "org.cofax.WysiwygTemplate",
+                    "templateLoaderClass": "org.cofax.FilesTemplateLoader",
+                    "templatePath": "templates",
+                    "templateOverridePath": "",
+                    "defaultListTemplate": "listTemplate.htm",
+                    "defaultFileTemplate": "articleTemplate.htm",
+                    "useJSP": false,
+                    "jspListTemplate": "listTemplate.jsp",
+                    "jspFileTemplate": "articleTemplate.jsp",
+                    "cachePackageTagsTrack": 200,
+                    "cachePackageTagsStore": 200,
+                    "cachePackageTagsRefresh": 60,
+                    "cacheTemplatesTrack": 100,
+                    "cacheTemplatesStore": 50,
+                    "cacheTemplatesRefresh": 15,
+                    "cachePagesTrack": 200,
+                    "cachePagesStore": 100,
+                    "cachePagesRefresh": 10,
+                    "cachePagesDirtyRead": 10,
+                    "searchEngineListTemplate": "forSearchEnginesList.htm",
+                    "searchEngineFileTemplate": "forSearchEngines.htm",
+                    "searchEngineRobotsDb": "WEB-INF/robots.db",
+                    "useDataStore": true,
+                    "dataStoreClass": "org.cofax.SqlDataStore",
+                    "redirectionClass": "org.cofax.SqlRedirection",
+                    "dataStoreName": "cofax",
+                    "dataStoreDriver": "com.microsoft.jdbc.sqlserver.SQLServerDriver",
+                    "dataStoreUrl": "jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon",
+                    "dataStoreUser": "sa",
+                    "dataStorePassword": "dataStoreTestQuery",
+                    "dataStoreTestQuery": "SET NOCOUNT ON;select test='test';",
+                    "dataStoreLogFile": "/usr/local/tomcat/logs/datastore.log",
+                    "dataStoreInitConns": 10,
+                    "dataStoreMaxConns": 100,
+                    "dataStoreConnUsageLimit": 100,
+                    "dataStoreLogLevel": "debug",
+                    "maxUrlLength": 500
+                }
+            },
+            {
+                "servlet-name": "cofaxEmail",
+                "servlet-class": "org.cofax.cds.EmailServlet",
+                "init-param": 
+                {
+                    "mailHost": "mail1",
+                    "mailHostOverride": "mail2"
+                }
+            },
+            {
+                "servlet-name": "cofaxAdmin",
+                "servlet-class": "org.cofax.cds.AdminServlet"
+            },
+            {
+                "servlet-name": "fileServlet",
+                "servlet-class": "org.cofax.cds.FileServlet"
+            },
+            {
+                "servlet-name": "cofaxTools",
+                "servlet-class": "org.cofax.cms.CofaxToolsServlet",
+                "init-param": 
+                {
+                    "templatePath": "toolstemplates/",
+                    "log": 1,
+                    "logLocation": "/usr/local/tomcat/logs/CofaxTools.log",
+                    "logMaxSize": "",
+                    "dataLog": 1,
+                    "dataLogLocation": "/usr/local/tomcat/logs/dataLog.log",
+                    "dataLogMaxSize": "",
+                    "removePageCache": "/content/admin/remove?cache=pages&id=",
+                    "removeTemplateCache": "/content/admin/remove?cache=templates&id=",
+                    "fileTransferFolder": "/usr/local/tomcat/webapps/content/fileTransferFolder",
+                    "lookInContext": 1,
+                    "adminGroupID": 4,
+                    "betaServer": true
+                }
+            }
+        ],
+        "servlet-mapping": 
+        {
+            "cofaxCDS": "/",
+            "cofaxEmail": "/cofaxutil/aemail/*",
+            "cofaxAdmin": "/admin/*",
+            "fileServlet": "/static/*",
+            "cofaxTools": "/tools/*"
+        },
+        "taglib": 
+        {
+            "taglib-uri": "cofax.tld",
+            "taglib-location": "/WEB-INF/tlds/cofax.tld"
+        }
+    }
+}

Added: plugins/JSON/trunk/test/json/expected/test7.json
===================================================================
--- plugins/JSON/trunk/test/json/expected/test7.json	                        (rev 0)
+++ plugins/JSON/trunk/test/json/expected/test7.json	2023-09-07 19:52:45 UTC (rev 25666)
@@ -0,0 +1,31 @@
+{
+    "glossary": 
+    {
+        "title": "example glossary",
+        "GlossDiv": 
+        {
+            "title": "S",
+            "GlossList": 
+            {
+                "GlossEntry": 
+                {
+                    "ID": "SGML",
+                    "SortAs": "SGML",
+                    "GlossTerm": "Standard Generalized Markup Language",
+                    "Acronym": "SGML",
+                    "Abbrev": "ISO 8879:1986",
+                    "GlossDef": 
+                    {
+                        "para": "A meta-markup language, used to create markup languages such as DocBook.",
+                        "GlossSeeAlso": 
+                        [
+                            "GML",
+                            "XML"
+                        ]
+                    },
+                    "GlossSee": "markup"
+                }
+            }
+        }
+    }
+}

Added: plugins/JSON/trunk/test/json/expected/test8.json
===================================================================
--- plugins/JSON/trunk/test/json/expected/test8.json	                        (rev 0)
+++ plugins/JSON/trunk/test/json/expected/test8.json	2023-09-07 19:52:45 UTC (rev 25666)
@@ -0,0 +1,25 @@
+{
+    "menu": 
+    {
+        "id": "file",
+        "value": "File",
+        "popup": 
+        {
+            "menuitem": 
+            [
+                {
+                    "value": "New",
+                    "onclick": "CreateNewDoc()"
+                },
+                {
+                    "value": "Open",
+                    "onclick": "OpenDoc()"
+                },
+                {
+                    "value": "Close",
+                    "onclick": "CloseDoc()"
+                }
+            ]
+        }
+    }
+}

Added: plugins/JSON/trunk/test/json/expected/test9.json
===================================================================
--- plugins/JSON/trunk/test/json/expected/test9.json	                        (rev 0)
+++ plugins/JSON/trunk/test/json/expected/test9.json	2023-09-07 19:52:45 UTC (rev 25666)
@@ -0,0 +1,32 @@
+{
+    "widget": 
+    {
+        "debug": "on",
+        "window": 
+        {
+            "title": "Sample Konfabulator Widget",
+            "name": "main_window",
+            "width": 500,
+            "height": 500
+        },
+        "image": 
+        {
+            "src": "Images/Sun.png",
+            "name": "sun1",
+            "hOffset": 250,
+            "vOffset": 250,
+            "alignment": "center"
+        },
+        "text": 
+        {
+            "data": "Click Here",
+            "size": 36,
+            "style": "bold",
+            "name": "text1",
+            "hOffset": 250,
+            "vOffset": 100,
+            "alignment": "center",
+            "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
+        }
+    }
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25665] plugins/JSON/trunk

[<dal...@us...>]

Revision: 25665
          http://sourceforge.net/p/jedit/svn/25665
Author:   daleanson
Date:     2023-09-07 19:38:14 +0000 (Thu, 07 Sep 2023)
Log Message:
-----------
Added option pane for beautifier.

Modified Paths:
--------------
    plugins/JSON/trunk/JSON.props
    plugins/JSON/trunk/build.xml

Added Paths:
-----------
    plugins/JSON/trunk/src/json/options/
    plugins/JSON/trunk/src/json/options/JSONOptionPane.java

Modified: plugins/JSON/trunk/JSON.props
===================================================================
--- plugins/JSON/trunk/JSON.props	2023-09-07 17:57:09 UTC (rev 25664)
+++ plugins/JSON/trunk/JSON.props	2023-09-07 19:38:14 UTC (rev 25665)
@@ -15,6 +15,7 @@
 plugin.json.JSONPlugin.depend.3=plugin eclipseicons.EclipseIconsPlugin 1.0
 plugin.json.JSONPlugin.depend.4=plugin sidekick.SideKickPlugin 1.7
 plugin.json.JSONPlugin.depend.5=plugin beauty.BeautyPlugin 1.1
+plugin.json.JSONPlugin.depend.6=plugin CommonControlsPlugin 1.7.4
 
 # set mode antlr4 for this sidekick
 sidekick.parser.json.label=JSON
@@ -26,3 +27,9 @@
 
 # mode handler
 mode.json.beauty.beautifier=JSON
+
+# option pane settings
+plugin.json.JSONPlugin.option-pane=jsonplugin
+options.jsonplugin.title=JSON
+options.jsonplugin.label=JSON
+options.jsonplugin.code=new json.options.JSONOptionPane();

Modified: plugins/JSON/trunk/build.xml
===================================================================
--- plugins/JSON/trunk/build.xml	2023-09-07 17:57:09 UTC (rev 25664)
+++ plugins/JSON/trunk/build.xml	2023-09-07 19:38:14 UTC (rev 25665)
@@ -37,6 +37,7 @@
 		<pathelement location="${install.dir}/antlr-4.10.1-complete.jar"/>
 		<pathelement location="${install.dir}/EclipseIcons.jar"/>
 		<pathelement location="${install.dir}/Beauty.jar"/>
+        <pathelement location="${jedit.plugins.dir}/kappalayout.jar"/>
 	</path>
    
 

Added: plugins/JSON/trunk/src/json/options/JSONOptionPane.java
===================================================================
--- plugins/JSON/trunk/src/json/options/JSONOptionPane.java	                        (rev 0)
+++ plugins/JSON/trunk/src/json/options/JSONOptionPane.java	2023-09-07 19:38:14 UTC (rev 25665)
@@ -0,0 +1,90 @@
+
+package json.options;
+
+import json.parser.JSONBeautyListener;
+
+import ise.java.awt.*;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.io.*;
+import java.util.*;
+
+import javax.swing.*;
+import javax.swing.event.*;
+import javax.swing.table.*;
+
+import org.gjt.sp.jedit.*;
+import org.gjt.sp.jedit.msg.*;
+
+
+/**
+* An option pane to configure settings for the built-in JSON beautifier.
+*/
+public class JSONOptionPane extends AbstractOptionPane {
+
+    private JLabel beautifierLabel;
+    private JRadioButton attachedBrackets;
+    private JRadioButton brokenBrackets;
+    private int bracketStyle;
+
+    public JSONOptionPane() {
+        super( "jsonplugin" );
+        bracketStyle = jEdit.getIntegerProperty( "json.bracketStyle", JSONBeautyListener.ATTACHED );
+    }
+
+    // called when this class is first accessed
+    public void _init() {
+        installComponents();
+    }
+
+    // create the user interface components and do the layout
+    private void installComponents() {
+        setLayout( new KappaLayout() );
+        setBorder( BorderFactory.createEmptyBorder( 6, 6, 6, 6 ) );
+
+        // create the components
+        beautifierLabel = new JLabel("<html><strong>JSON Beautifier");
+        
+        // Note that the Beauty plugin is a dependency, so it's okay to use
+        // these properties from that plugin
+        attachedBrackets = new JRadioButton( "<html>" + jEdit.getProperty( "beauty.msg.Use_attached_brackets,_e.g.", "Use attached brackets, e.g." ) + "<br> object: {" );
+        brokenBrackets = new JRadioButton( "<html>" + jEdit.getProperty( "beauty.msg.Use_broken_brackets,_e.g.", "Use broken brackets, e.g." ) + "<br>object:<br>{" );
+
+        ButtonGroup bg = new ButtonGroup();
+        bg.add( attachedBrackets );
+        bg.add( brokenBrackets );
+
+        switch ( bracketStyle ) {
+            case JSONBeautyListener.ATTACHED:
+                attachedBrackets.setSelected( true );
+                brokenBrackets.setSelected( false );
+                break;
+            case JSONBeautyListener.BROKEN:
+                attachedBrackets.setSelected( false );
+                brokenBrackets.setSelected( true );
+                break;
+        }
+
+        ActionListener al = new ActionListener(){
+
+            public void actionPerformed( ActionEvent ae ) {
+                if ( attachedBrackets.equals( ae.getSource() ) ) {
+                    bracketStyle = JSONBeautyListener.ATTACHED;
+                }
+                else if ( brokenBrackets.equals( ae.getSource() ) ) {
+                    bracketStyle = JSONBeautyListener.BROKEN;
+                }
+            }
+        };
+        attachedBrackets.addActionListener( al );
+        brokenBrackets.addActionListener( al );
+        add( "0, 1, 1, 1, W, w, 3", beautifierLabel);
+        add( "0, 2, 1, 1, W, w, 3", attachedBrackets );
+        add( "0, 3, 1, 1, W, w, 3", brokenBrackets );
+    }
+
+    public void _save() {
+        jEdit.setIntegerProperty( "json.bracketStyle", bracketStyle );
+    }
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25664] plugins/JSON/tags/4.10/

[<dal...@us...>]

Revision: 25664
          http://sourceforge.net/p/jedit/svn/25664
Author:   daleanson
Date:     2023-09-07 17:57:09 +0000 (Thu, 07 Sep 2023)
Log Message:
-----------
Oops, a little hasty with the tagging, forgot to move the option pane from Beauty to here.

Removed Paths:
-------------
    plugins/JSON/tags/4.10/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25663] plugins/JSON/tags/4.10/

[<dal...@us...>]

Revision: 25663
          http://sourceforge.net/p/jedit/svn/25663
Author:   daleanson
Date:     2023-09-07 17:53:52 +0000 (Thu, 07 Sep 2023)
Log Message:
-----------
Tagging for release. This is the initial release for this plugin, but it is a combination of the JSON sidekick from the XML plugin and the JSON beautifier from the Beauty plugin.

Added Paths:
-----------
    plugins/JSON/tags/4.10/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25661] plugins/JSON/trunk/

[<dal...@us...>]

Revision: 25661
          http://sourceforge.net/p/jedit/svn/25661
Author:   daleanson
Date:     2023-09-07 17:46:49 +0000 (Thu, 07 Sep 2023)
Log Message:
-----------
no comment

Added Paths:
-----------
    plugins/JSON/trunk/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25660] plugins/JSON/tags/

[<dal...@us...>]

Revision: 25660
          http://sourceforge.net/p/jedit/svn/25660
Author:   daleanson
Date:     2023-09-07 17:46:35 +0000 (Thu, 07 Sep 2023)
Log Message:
-----------
no comment

Added Paths:
-----------
    plugins/JSON/tags/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25659] plugins/JSON/branches/

[<dal...@us...>]

Revision: 25659
          http://sourceforge.net/p/jedit/svn/25659
Author:   daleanson
Date:     2023-09-07 17:46:16 +0000 (Thu, 07 Sep 2023)
Log Message:
-----------
no comment

Added Paths:
-----------
    plugins/JSON/branches/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25658] plugins/JSON/

[<dal...@us...>]

Revision: 25658
          http://sourceforge.net/p/jedit/svn/25658
Author:   daleanson
Date:     2023-09-07 17:45:48 +0000 (Thu, 07 Sep 2023)
Log Message:
-----------
Consolidating some JSON tools.

Added Paths:
-----------
    plugins/JSON/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25657] jEdit/trunk

[<vam...@us...>]

Revision: 25657
          http://sourceforge.net/p/jedit/svn/25657
Author:   vampire0
Date:     2023-09-04 02:55:14 +0000 (Mon, 04 Sep 2023)
Log Message:
-----------
Properly support useMD5forDirtyCalculation for untitled buffers

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/org/gjt/sp/jedit/Buffer.java

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2023-09-04 02:20:21 UTC (rev 25656)
+++ jEdit/trunk/doc/CHANGES.txt	2023-09-04 02:55:14 UTC (rev 25657)
@@ -4,11 +4,13 @@
 
 {{{ Version 5.7pre1
 
-Thanks to Björn Kautler, Matthieu Casanova and Dale Anson for contributing to this release.
+Thanks to Björn Kautler, Matthieu Casanova and Dale Anson for contributing to
+this release.
 
 {{{ Bug Fixes
 
-- Fix the installation of plugins trying to use invalid file names (Björn Kautler)
+- Fix the installation of plugins trying to use invalid file names
+  (Björn Kautler)
 
 - VFSManager.canReadFile() was returning true only for directories (#4102 - Matthieu Casanova)
 
@@ -76,6 +78,9 @@
 }}}
 {{{ Editing
 
+- Never mark buffers dirty if contents are unchanged is now also properly
+  supported for untitled buffers (Björn Kautler)
+
 - New edit mode for Dockerfile (Matthieu Casanova)
 
 - New edit mode for QDoc (Dale Anson)

Modified: jEdit/trunk/org/gjt/sp/jedit/Buffer.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/Buffer.java	2023-09-04 02:20:21 UTC (rev 25656)
+++ jEdit/trunk/org/gjt/sp/jedit/Buffer.java	2023-09-04 02:55:14 UTC (rev 25657)
@@ -145,6 +145,8 @@
 	 * @since jEdit 4.0pre4
 	 */
 	public static final String GZIPPED = "gzipped";
+
+	private static final byte[] DUMMY_HASH = new byte[0];
 	//}}}
 
 	//{{{ Input/output methods
@@ -972,8 +974,7 @@
 		boolean old_d = isDirty();
 		if (d && getLength() == initialLength)
 		{
-			// for untitled, do not check if the content existed before
-			if (jEdit.getBooleanProperty("useMD5forDirtyCalculation") && !isUntitled())
+			if (jEdit.getBooleanProperty("useMD5forDirtyCalculation"))
 				d = !Arrays.equals(calculateHash(), md5hash);
 		}
 		super.setDirty(d);
@@ -2203,9 +2204,8 @@
 	/** @return an MD5 hash of the contents of the buffer */
 	private byte[] calculateHash()
 	{
-		final byte[] dummy = new byte[1];
 		if (!jEdit.getBooleanProperty("useMD5forDirtyCalculation"))
-			return dummy;
+			return DUMMY_HASH;
 		return StandardUtilities.md5(getSegment(0, getLength()));
 	}
 
@@ -2214,8 +2214,16 @@
 	 */
 	private void updateHash()
 	{
-		initialLength = getLength();
-		md5hash = calculateHash();
+		if (isUntitled())
+		{
+			initialLength = 0;
+			md5hash = StandardUtilities.md5("");
+		}
+		else
+		{
+			initialLength = getLength();
+			md5hash = calculateHash();
+		}
 	}
 
 	//{{{ finishLoading() method

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25656] jEdit/trunk/org/gjt/sp/jedit/io/VFS.java

[<vam...@us...>]

Revision: 25656
          http://sourceforge.net/p/jedit/svn/25656
Author:   vampire0
Date:     2023-09-04 02:20:21 +0000 (Mon, 04 Sep 2023)
Log Message:
-----------
Do not discard buffers of unloadable remote files on startup

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/io/VFS.java

Modified: jEdit/trunk/org/gjt/sp/jedit/io/VFS.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/VFS.java	2023-09-03 01:54:09 UTC (rev 25655)
+++ jEdit/trunk/org/gjt/sp/jedit/io/VFS.java	2023-09-04 02:20:21 UTC (rev 25656)
@@ -493,21 +493,17 @@
 		try
 		{
 			VFSFile vfsFile = _getFile(session, path, view);
-			if (vfsFile == null)
+			if ((vfsFile != null) && (vfsFile.getLength() > Integer.MAX_VALUE))
 			{
-				VFSManager.error(view,path,"ioerror.read-error", new String[] {"Unable to open file"});
+				VFSManager.error(view, path, "ioerror.file-too-big", null);
 				return false;
 			}
-			if (vfsFile.getLength() > Integer.MAX_VALUE)
-			{
-				VFSManager.error(view,path,"ioerror.file-too-big", null);
-				return false;
-			}
 		}
 		catch (IOException e)
 		{
-			VFSManager.error(view,path,"ioerror.read-error", new String[] {e.toString()});
-			return false;
+			// just log the exception here as it was only for the file size check
+			// maybe the actual loading succeeds
+			Log.log(Log.DEBUG, VFS.class, "Error during file size verification", e);
 		}
 
 		if((getCapabilities() & WRITE_CAP) == 0)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25655] jEdit/trunk

[<vam...@us...>]

Revision: 25655
          http://sourceforge.net/p/jedit/svn/25655
Author:   vampire0
Date:     2023-09-03 01:54:09 +0000 (Sun, 03 Sep 2023)
Log Message:
-----------
Make building possible when using Java 15+

Modified Paths:
--------------
    jEdit/trunk/build.xml
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/ivysettings.xml

Modified: jEdit/trunk/build.xml
===================================================================
--- jEdit/trunk/build.xml	2023-09-02 18:08:43 UTC (rev 25654)
+++ jEdit/trunk/build.xml	2023-09-03 01:54:09 UTC (rev 25655)
@@ -110,37 +110,6 @@
 	<target name="init-ivy"
 		depends="init,download-ivy"
 		unless="ivy.done">
-		<script language="javascript">
-			<![CDATA[
-				try {
-					var dbf = javax.xml.parsers.DocumentBuilderFactory.newInstance()
-					dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
-					var document = dbf.newDocumentBuilder().parse('http://plugins.jedit.org/export/mirror_list.php')
-					var xpath = javax.xml.xpath.XPathFactory.newInstance().newXPath()
-					var mirrors = xpath.evaluate('/MIRRORS/MIRROR/@ID', document, javax.xml.xpath.XPathConstants.NODESET)
-					var artifactPatterns = ''
-					for (i = 0; i < mirrors.getLength(); i++) {
-						artifactPatterns += '<artifact pattern="jar:http://'
-								    + mirrors.item(i).getTextContent()
-								    + '.dl.sourceforge.net/project/jedit-plugins/[artifact]/[revision]/[artifact]-[revision]-bin.zip!/[artifact].jar" />\n'
-					}
-					project.setUserProperty('jedit.plugins.artifact.patterns', artifactPatterns)
-				} catch(e) {
-					self.log('Error while retrieving mirror list, if plugins are not in Ivy cache, they will not be resolvable: ' + e, e, project.MSG_WARN)
-				}
-			]]>
-		</script>
-
-		<copy todir="${build.dir}"
-		      encoding="UTF-8"
-		      overwrite="true">
-			<fileset file="ivysettings.xml"/>
-			<filterset>
-				<filter token="jedit.plugins.artifact.patterns"
-					value="${jedit.plugins.artifact.patterns}"/>
-			</filterset>
-		</copy>
-
 		<property name="ivy.retrieve.pattern"
 			  value="${lib.dir}/[conf]/[artifact](-[classifier]).[ext]"/>
 		<taskdef resource="org/apache/ivy/ant/antlib.xml"
@@ -147,7 +116,6 @@
 			 classpath="${ivy.jar.file}"
 			 loaderref="ivy.loader"
 			 uri="antlib:org.apache.ivy.ant"/>
-		<ivy:settings file="${build.dir}/ivysettings.xml"/>
 	</target>
 
 	<target name="retrieve"

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2023-09-02 18:08:43 UTC (rev 25654)
+++ jEdit/trunk/doc/CHANGES.txt	2023-09-03 01:54:09 UTC (rev 25655)
@@ -19,6 +19,8 @@
 
 - Status bar design updated with the ability to add widgets to the left and the right of the bar (Matthieu Casanova)
 
+- Make building possible when using Java 15+ (Björn Kautler)
+
 }}}
 {{{ API Changes
 

Modified: jEdit/trunk/ivysettings.xml
===================================================================
--- jEdit/trunk/ivysettings.xml	2023-09-02 18:08:43 UTC (rev 25654)
+++ jEdit/trunk/ivysettings.xml	2023-09-03 01:54:09 UTC (rev 25655)
@@ -26,7 +26,7 @@
 	<resolvers>
 		<ibiblio name="public" root="https://repo1.maven.org/maven2/" m2compatible="true"/>
 		<url name="jedit-plugins">
-			@jedit.plugins.artifact.patterns@
+			<artifact pattern="jar:https://sourceforge.net/projects/jedit-plugins/files/[artifact]/[revision]/[artifact]-[revision]-bin.zip/download!/[artifact].jar" />
 		</url>
 	</resolvers>
 	<modules>
@@ -33,7 +33,7 @@
 		<module organisation="org.jedit.plugins" resolver="jedit-plugins" />
 	</modules>
 
-	
+
 	<include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
 	<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
 	<include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25654] jEdit/trunk

[<vam...@us...>]

Revision: 25654
          http://sourceforge.net/p/jedit/svn/25654
Author:   vampire0
Date:     2023-09-02 18:08:43 +0000 (Sat, 02 Sep 2023)
Log Message:
-----------
Fix the installation of plugins trying to use invalid file names

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/org/gjt/sp/jedit/io/UrlVFS.java

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2023-08-31 02:59:16 UTC (rev 25653)
+++ jEdit/trunk/doc/CHANGES.txt	2023-09-02 18:08:43 UTC (rev 25654)
@@ -4,10 +4,12 @@
 
 {{{ Version 5.7pre1
 
-Thanks to Björn "Vampire" Kautler, Matthieu Casanova for contributing to this release.
+Thanks to Björn Kautler, Matthieu Casanova and Dale Anson for contributing to this release.
 
 {{{ Bug Fixes
 
+- Fix the installation of plugins trying to use invalid file names (Björn Kautler)
+
 - VFSManager.canReadFile() was returning true only for directories (#4102 - Matthieu Casanova)
 
 - Allow user to choose filename when printing to pdf (partial fix for #4115 - Dale Anson)

Modified: jEdit/trunk/org/gjt/sp/jedit/io/UrlVFS.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/UrlVFS.java	2023-08-31 02:59:16 UTC (rev 25653)
+++ jEdit/trunk/org/gjt/sp/jedit/io/UrlVFS.java	2023-09-02 18:08:43 UTC (rev 25654)
@@ -88,6 +88,18 @@
 		}
 	} //}}}
 
+	//{{{ getFileName() method
+	@Override
+	public String getFileName(String path)
+	{
+		String result = super.getFileName(path);
+		int index = result.indexOf('?');
+		if (index == -1)
+			return result;
+		else
+			return result.substring(0, index);
+	} //}}}
+
 	//{{{ getFilePath() method
 	@Override
 	public String getFilePath(String vfsPath)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25652] plugins/JsonSideKick/trunk/

[<dal...@us...>]

Revision: 25652
          http://sourceforge.net/p/jedit/svn/25652
Author:   daleanson
Date:     2023-08-31 02:54:45 +0000 (Thu, 31 Aug 2023)
Log Message:
-----------
no comment

Added Paths:
-----------
    plugins/JsonSideKick/trunk/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25651] plugins/JsonSideKick/tags/

[<dal...@us...>]

Revision: 25651
          http://sourceforge.net/p/jedit/svn/25651
Author:   daleanson
Date:     2023-08-31 02:54:23 +0000 (Thu, 31 Aug 2023)
Log Message:
-----------
no comment

Added Paths:
-----------
    plugins/JsonSideKick/tags/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25650] plugins/JsonSideKick/branches/

[<dal...@us...>]

Revision: 25650
          http://sourceforge.net/p/jedit/svn/25650
Author:   daleanson
Date:     2023-08-31 02:54:03 +0000 (Thu, 31 Aug 2023)
Log Message:
-----------
no comment

Added Paths:
-----------
    plugins/JsonSideKick/branches/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25649] plugins/JsonSideKick/

[<dal...@us...>]

Revision: 25649
          http://sourceforge.net/p/jedit/svn/25649
Author:   daleanson
Date:     2023-08-31 02:53:15 +0000 (Thu, 31 Aug 2023)
Log Message:
-----------
Create repository for JsonSideKick

Added Paths:
-----------
    plugins/JsonSideKick/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25648] plugins/Beauty/tags/beauty-1.1/

[<dal...@us...>]

Revision: 25648
          http://sourceforge.net/p/jedit/svn/25648
Author:   daleanson
Date:     2023-08-29 19:56:51 +0000 (Tue, 29 Aug 2023)
Log Message:
-----------
Tag for release

Added Paths:
-----------
    plugins/Beauty/tags/beauty-1.1/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25647] plugins/Beauty/tags/beauty-1.1/

[<dal...@us...>]

Revision: 25647
          http://sourceforge.net/p/jedit/svn/25647
Author:   daleanson
Date:     2023-08-29 19:55:45 +0000 (Tue, 29 Aug 2023)
Log Message:
-----------
Delete for replace.

Removed Paths:
-------------
    plugins/Beauty/tags/beauty-1.1/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25646] jEdit/trunk/modes/qdoc.xml

[<ez...@us...>]

Revision: 25646
          http://sourceforge.net/p/jedit/svn/25646
Author:   ezust
Date:     2023-08-22 14:51:08 +0000 (Tue, 22 Aug 2023)
Log Message:
-----------
Update comments.

Modified Paths:
--------------
    jEdit/trunk/modes/qdoc.xml

Modified: jEdit/trunk/modes/qdoc.xml
===================================================================
--- jEdit/trunk/modes/qdoc.xml	2023-08-22 14:42:56 UTC (rev 25645)
+++ jEdit/trunk/modes/qdoc.xml	2023-08-22 14:51:08 UTC (rev 25646)
@@ -3,8 +3,8 @@
 
 
 <!--
-    This mode file describes the ANTLR 4 syntax definition language as
-    described in the book "The Definitive ANTLR 4 Reference" by Terrence Parr.
+    This mode file for QDoc, which is a documentation file format used by
+    The Qt Group, www.qt.io
 -->
 <MODE>
     <PROPS>
@@ -17,10 +17,10 @@
         <SPAN TYPE="FUNCTION" NO_LINE_BREAK="TRUE">
           <BEGIN>{</BEGIN>
           <END>}</END>
-        </SPAN>        
+        </SPAN>
         <KEYWORDS>
-            
-                        
+
+
             <!-- topic commands -->
             <KEYWORD1>\class</KEYWORD1>
             <KEYWORD1>\enum</KEYWORD1>
@@ -47,12 +47,12 @@
             <KEYWORD1>\typealias</KEYWORD1>
             <KEYWORD1>\typedef</KEYWORD1>
             <KEYWORD1>\variable</KEYWORD1>
-            
-            
-                        
-                        
-                        
-            <!-- context commands  -->           
+
+
+
+
+
+            <!-- context commands  -->
             <KEYWORD2>\abstract</KEYWORD2>
             <KEYWORD2>\default</KEYWORD2>
             <KEYWORD2>\deprecated</KEYWORD2>
@@ -80,9 +80,9 @@
             <KEYWORD2>\threadsafe</KEYWORD2>
             <KEYWORD2>\title</KEYWORD2>
             <KEYWORD2>\wrapper</KEYWORD2>
-                        
-            
-            
+
+
+
             <!-- markup commands -->
             <KEYWORD3>\a</KEYWORD3>
             <KEYWORD3>\annotatedlist</KEYWORD3>
@@ -151,9 +151,9 @@
             <KEYWORD3>\unicode</KEYWORD3>
             <KEYWORD3>\warning</KEYWORD3>
             <KEYWORD3>\\</KEYWORD3>
-            
+
             <INVALID>\qmlclass</INVALID>
         </KEYWORDS>
     </RULES>
-    
+
 </MODE>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25645] jEdit/trunk

[<ez...@us...>]

Revision: 25645
          http://sourceforge.net/p/jedit/svn/25645
Author:   ezust
Date:     2023-08-22 14:42:56 +0000 (Tue, 22 Aug 2023)
Log Message:
-----------
New edit mode: qdoc.

And removal trailing whitespace too.

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/modes/catalog

Added Paths:
-----------
    jEdit/trunk/modes/qdoc.xml

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2023-08-21 00:44:19 UTC (rev 25644)
+++ jEdit/trunk/doc/CHANGES.txt	2023-08-22 14:42:56 UTC (rev 25645)
@@ -74,11 +74,13 @@
 
 - New edit mode for Dockerfile (Matthieu Casanova)
 
+- New edit mode for QDoc (Dale Anson)
+
 - Status bar encoding widget allow to choose between updating the encoding or reloading
   with a new encoding (Matthieu Casanova)
-  
-- Updated java mode for new keywords introduced up to Java 17. (Dale Anson)  
 
+- Updated java mode for new keywords introduced up to Java 17. (Dale Anson)
+
 }}}
 
 }}}

Modified: jEdit/trunk/modes/catalog
===================================================================
--- jEdit/trunk/modes/catalog	2023-08-21 00:44:19 UTC (rev 25644)
+++ jEdit/trunk/modes/catalog	2023-08-22 14:42:56 UTC (rev 25645)
@@ -241,7 +241,7 @@
 <!-- Used by Andre Kaplan's Hex plugin -->
 <MODE NAME="hex"		FILE="hex.xml" />
 
-<MODE NAME="hl7v2" FILE="hl7v2.xml" 
+<MODE NAME="hl7v2" FILE="hl7v2.xml"
         FILE_NAME_GLOB="*.{hl7,hl7v2,hl7-2}" FIRST_LINE_GLOB="MSH*"/>
 
 <MODE NAME="hlsl"		FILE="hlsl.xml"
@@ -448,7 +448,7 @@
 
 <MODE NAME="plaintex"		FILE="plaintex.xml" />
 
-<MODE NAME="plantuml" FILE="plantuml.xml" 
+<MODE NAME="plantuml" FILE="plantuml.xml"
         FILE_NAME_GLOB="*.{plant,plantuml,pu,puml}"/>
 
 <MODE NAME="PostgreSQL" FILE="pg-sql.xml"
@@ -514,6 +514,10 @@
         FILE_NAME_GLOB="*.{py,pyw,sc,jy}"
         FIRST_LINE_GLOB="#!*/*python*" />
 
+<MODE NAME="qdoc"   FILE="qdoc.xml"
+        FILE_NAME_GLOB="*.{qdoc}"
+        FIRST_LINE_GLOB="/*!" />
+
 <MODE NAME="rebol"		FILE="rebol.xml"
         FILE_NAME_GLOB="*.r" />
 

Added: jEdit/trunk/modes/qdoc.xml
===================================================================
--- jEdit/trunk/modes/qdoc.xml	                        (rev 0)
+++ jEdit/trunk/modes/qdoc.xml	2023-08-22 14:42:56 UTC (rev 25645)
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE MODE SYSTEM "xmode.dtd"><!--  -->
+
+
+<!--
+    This mode file describes the ANTLR 4 syntax definition language as
+    described in the book "The Definitive ANTLR 4 Reference" by Terrence Parr.
+-->
+<MODE>
+    <PROPS>
+        <PROPERTY NAME="wordBreakChars" VALUE="" />
+    </PROPS>
+    <RULES IGNORE_CASE="FALSE"
+		HIGHLIGHT_DIGITS="TRUE"
+		DIGIT_RE="(0[lL]?|[1-9]\d{0,9}(\d{0,9}[lL])?|0[xX]\p{XDigit}{1,8}(\p{XDigit}{0,8}[lL])?|0[0-7]{1,11}([0-7]{0,11}[lL])?|([0-9]+\.[0-9]*|\.[0-9]+)([eE][+-]?[0-9]+)?[fFdD]?|[0-9]+([eE][+-]?[0-9]+[fFdD]?|([eE][+-]?[0-9]+)?[fFdD]))">
+
+        <SPAN TYPE="FUNCTION" NO_LINE_BREAK="TRUE">
+          <BEGIN>{</BEGIN>
+          <END>}</END>
+        </SPAN>        
+        <KEYWORDS>
+            
+                        
+            <!-- topic commands -->
+            <KEYWORD1>\class</KEYWORD1>
+            <KEYWORD1>\enum</KEYWORD1>
+            <KEYWORD1>\example</KEYWORD1>
+            <KEYWORD1>\externalpage</KEYWORD1>
+            <KEYWORD1>\fn (function)</KEYWORD1>
+            <KEYWORD1>\group</KEYWORD1>
+            <KEYWORD1>\headerfile</KEYWORD1>
+            <KEYWORD1>\macro</KEYWORD1>
+            <KEYWORD1>\module</KEYWORD1>
+            <KEYWORD1>\namespace</KEYWORD1>
+            <KEYWORD1>\page</KEYWORD1>
+            <KEYWORD1>\property</KEYWORD1>
+            <KEYWORD1>\qmlattachedproperty</KEYWORD1>
+            <KEYWORD1>\qmlattachedsignal</KEYWORD1>
+            <KEYWORD1>\qmlvaluetype</KEYWORD1>
+            <KEYWORD1>\qmlmethod</KEYWORD1>
+            <KEYWORD1>\qmltype</KEYWORD1>
+            <KEYWORD1>\qmlproperty</KEYWORD1>
+            <KEYWORD1>\qmlsignal</KEYWORD1>
+            <KEYWORD1>\qmlmodule</KEYWORD1>
+            <KEYWORD1>\inqmlmodule</KEYWORD1>
+            <KEYWORD1>\instantiates</KEYWORD1>
+            <KEYWORD1>\typealias</KEYWORD1>
+            <KEYWORD1>\typedef</KEYWORD1>
+            <KEYWORD1>\variable</KEYWORD1>
+            
+            
+                        
+                        
+                        
+            <!-- context commands  -->           
+            <KEYWORD2>\abstract</KEYWORD2>
+            <KEYWORD2>\default</KEYWORD2>
+            <KEYWORD2>\deprecated</KEYWORD2>
+            <KEYWORD2>\ingroup</KEYWORD2>
+            <KEYWORD2>\inheaderfile</KEYWORD2>
+            <KEYWORD2>\inherits</KEYWORD2>
+            <KEYWORD2>\inmodule</KEYWORD2>
+            <KEYWORD2>\internal</KEYWORD2>
+            <KEYWORD2>\nextpage</KEYWORD2>
+            <KEYWORD2>\nonreentrant</KEYWORD2>
+            <KEYWORD2>\overload</KEYWORD2>
+            <KEYWORD2>\preliminary</KEYWORD2>
+            <KEYWORD2>\previouspage</KEYWORD2>
+            <KEYWORD2>\qmlabstract</KEYWORD2>
+            <KEYWORD2>\qmldefault</KEYWORD2>
+            <KEYWORD2>\qtcmakepackage</KEYWORD2>
+            <KEYWORD2>\readonly</KEYWORD2>
+            <KEYWORD2>\reentrant</KEYWORD2>
+            <KEYWORD2>\reimp</KEYWORD2>
+            <KEYWORD2>\relates</KEYWORD2>
+            <KEYWORD2>\required</KEYWORD2>
+            <KEYWORD2>\since</KEYWORD2>
+            <KEYWORD2>\startpage</KEYWORD2>
+            <KEYWORD2>\subtitle</KEYWORD2>
+            <KEYWORD2>\threadsafe</KEYWORD2>
+            <KEYWORD2>\title</KEYWORD2>
+            <KEYWORD2>\wrapper</KEYWORD2>
+                        
+            
+            
+            <!-- markup commands -->
+            <KEYWORD3>\a</KEYWORD3>
+            <KEYWORD3>\annotatedlist</KEYWORD3>
+            <KEYWORD3>\b</KEYWORD3>
+            <KEYWORD3>\badcode</KEYWORD3>
+            <INVALID>\bold</INVALID>
+            <KEYWORD3>\brief</KEYWORD3>
+            <KEYWORD3>\c</KEYWORD3>
+            <KEYWORD3>\caption</KEYWORD3>
+            <KEYWORD3>\code</KEYWORD3>
+            <KEYWORD3>\endcode</KEYWORD3>
+            <KEYWORD3>\codeline</KEYWORD3>
+            <KEYWORD3>\div</KEYWORD3>
+            <KEYWORD3>\dots</KEYWORD3>
+            <KEYWORD3>\e</KEYWORD3>
+            <KEYWORD3>\else</KEYWORD3>
+            <KEYWORD3>\endif</KEYWORD3>
+            <KEYWORD3>\footnote</KEYWORD3>
+            <KEYWORD3>\generatelist</KEYWORD3>
+            <KEYWORD3>\header</KEYWORD3>
+            <INVALID>\i</INVALID>
+            <KEYWORD3>\if</KEYWORD3>
+            <KEYWORD3>\image</KEYWORD3>
+            <KEYWORD3>\include</KEYWORD3>
+            <KEYWORD3>\input</KEYWORD3>
+            <KEYWORD3>\inlineimage</KEYWORD3>
+            <KEYWORD3>\keyword</KEYWORD3>
+            <KEYWORD3>\l</KEYWORD3>
+            <KEYWORD3>\legalese</KEYWORD3>
+            <KEYWORD3>\li</KEYWORD3>
+            <KEYWORD3>\list</KEYWORD3>
+            <KEYWORD3>\endlist</KEYWORD3>
+            <KEYWORD3>\meta</KEYWORD3>
+            <KEYWORD3>\noautolist</KEYWORD3>
+            <INVALID>\o</INVALID>
+            <KEYWORD3>\note</KEYWORD3>
+            <KEYWORD3>\omit</KEYWORD3>
+            <KEYWORD3>\printline</KEYWORD3>
+            <KEYWORD3>\printto</KEYWORD3>
+            <KEYWORD3>\printuntil</KEYWORD3>
+            <KEYWORD3>\qml</KEYWORD3>
+            <KEYWORD3>\quotation</KEYWORD3>
+            <KEYWORD3>\quotefile</KEYWORD3>
+            <KEYWORD3>\quotefromfile</KEYWORD3>
+            <KEYWORD3>\raw</KEYWORD3>
+            <KEYWORD3>\row</KEYWORD3>
+            <KEYWORD3>\sa</KEYWORD3>
+            <KEYWORD3>\section1</KEYWORD3>
+            <KEYWORD3>\section2</KEYWORD3>
+            <KEYWORD3>\section3</KEYWORD3>
+            <KEYWORD3>\section4</KEYWORD3>
+            <KEYWORD3>\skipline</KEYWORD3>
+            <KEYWORD3>\skipto</KEYWORD3>
+            <KEYWORD3>\skipuntil</KEYWORD3>
+            <KEYWORD3>\snippet</KEYWORD3>
+            <KEYWORD3>\span</KEYWORD3>
+            <KEYWORD3>\sub</KEYWORD3>
+            <KEYWORD3>\sup</KEYWORD3>
+            <KEYWORD3>\table</KEYWORD3>
+            <KEYWORD3>\endtable</KEYWORD3>
+            <KEYWORD3>\tableofcontents</KEYWORD3>
+            <KEYWORD3>\target</KEYWORD3>
+            <KEYWORD3>\tt</KEYWORD3>
+            <KEYWORD3>\uicontrol</KEYWORD3>
+            <KEYWORD3>\underline</KEYWORD3>
+            <KEYWORD3>\unicode</KEYWORD3>
+            <KEYWORD3>\warning</KEYWORD3>
+            <KEYWORD3>\\</KEYWORD3>
+            
+            <INVALID>\qmlclass</INVALID>
+        </KEYWORDS>
+    </RULES>
+    
+</MODE>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25644] plugins/Beauty/tags/beauty-1.1/

[<dal...@us...>]

Revision: 25644
          http://sourceforge.net/p/jedit/svn/25644
Author:   daleanson
Date:     2023-08-21 00:44:19 +0000 (Mon, 21 Aug 2023)
Log Message:
-----------
Tag for release, replaced previous tag to update the build files to make it easier to release the plugin.

Added Paths:
-----------
    plugins/Beauty/tags/beauty-1.1/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25643] plugins/Beauty/tags/beauty-1.1/

[<dal...@us...>]

Revision: 25643
          http://sourceforge.net/p/jedit/svn/25643
Author:   daleanson
Date:     2023-08-21 00:43:11 +0000 (Mon, 21 Aug 2023)
Log Message:
-----------
Delete for replace.

Removed Paths:
-------------
    plugins/Beauty/tags/beauty-1.1/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25642] plugins/Beauty/trunk

[<dal...@us...>]

Revision: 25642
          http://sourceforge.net/p/jedit/svn/25642
Author:   daleanson
Date:     2023-08-21 00:42:44 +0000 (Mon, 21 Aug 2023)
Log Message:
-----------
Updated build files to make it easier to release the plugin.

Modified Paths:
--------------
    plugins/Beauty/trunk/ant_java_test.xml
    plugins/Beauty/trunk/ant_json_test.xml
    plugins/Beauty/trunk/build.xml
    plugins/Beauty/trunk/src/docs/index.html

Added Paths:
-----------
    plugins/Beauty/trunk/beauty_build.xml

Modified: plugins/Beauty/trunk/ant_java_test.xml
===================================================================
--- plugins/Beauty/trunk/ant_java_test.xml	2023-08-21 00:21:04 UTC (rev 25641)
+++ plugins/Beauty/trunk/ant_java_test.xml	2023-08-21 00:42:44 UTC (rev 25642)
@@ -1,9 +1,9 @@
 <project name="java_test" default="test" basedir="." xmlns:if="ant:if" xmlns:unless="ant:unless">
 
     <echo>
-================================================================================
-    Java Tests
-================================================================================    
+==============================
+=====     Java Tests     =====     
+==============================
     </echo>
     
    <!-- ========================================================================

Modified: plugins/Beauty/trunk/ant_json_test.xml
===================================================================
--- plugins/Beauty/trunk/ant_json_test.xml	2023-08-21 00:21:04 UTC (rev 25641)
+++ plugins/Beauty/trunk/ant_json_test.xml	2023-08-21 00:42:44 UTC (rev 25642)
@@ -1,9 +1,9 @@
 <project name="json_test" default="test" basedir="." xmlns:if="ant:if" xmlns:unless="ant:unless">
 
     <echo>
-================================================================================    
-    JSON Tests
-================================================================================    
+==============================
+=====     JSON Tests     =====
+==============================    
     </echo>
     
    <!-- ========================================================================

Added: plugins/Beauty/trunk/beauty_build.xml
===================================================================
--- plugins/Beauty/trunk/beauty_build.xml	                        (rev 0)
+++ plugins/Beauty/trunk/beauty_build.xml	2023-08-21 00:42:44 UTC (rev 25642)
@@ -0,0 +1,297 @@
+<project name="Beauty" default="dist" basedir="." xmlns:if="ant:if" xmlns:unless="ant:unless">
+    <!-- read build.props to override properties set below -->
+    <property file="../build.properties"/>
+    <property file="build.properties"/>
+
+
+    <!-- default location of jedit.jar -->
+    <property name="jedit.install.dir" value="../.."/>
+
+
+    <!-- jar name -->
+    <property name="jar.name" value="${ant.project.name}.jar"/>
+
+    <!-- version number -->
+    <property name="build.num" value="0.2.0"/>
+
+    <!-- where to put the finished plugin -->
+    <property name="install.dir" value=".." />
+
+    <!-- source code directory, this is where the .java files live -->
+    <property name="src.dir" location="src" />
+
+    <!-- parser source code directory, this is where the .jj file lives -->
+    <property name="parser.src.dir" location="${src.dir}/beauty/parsers"/>
+
+    <!-- temporary directory for post-compile processing -->
+    <property name="temp" location="temp"/>
+
+    <!-- configuration directory, this is where the configuration files for the
+      plugin are placed for additional processing prior to getting jarred. -->
+    <property name="config.dir" location="${temp}/config" />
+
+    <!-- documentation directory, this is where the plugin documentation
+      files live. Files in this directory will be distributed with the plugin -->
+    <property name="doc.dir" location="${temp}/docs" />
+
+    <!-- the directory for the compiled classes. Files in this directory will be
+      included in the finished jar file. -->
+    <property name="classes.dir" location="${temp}/classes" />
+
+    <property name="target.version" value="11"/>
+
+
+    <condition property="can.reload.plugins">
+        <and>
+            <available classname="org.gjt.sp.jedit.jEdit"/>
+            <available classname="ReloadPluginTask"/>
+        </and>
+    </condition>
+
+   <!-- ========================================================================
+      Target: set classpath
+   ========================================================================= -->
+    <target name="setClasspath">
+        <path id="classpathref">
+         <!-- required locations/jars -->
+            <pathelement location="${classes.dir}" />
+            <pathelement path="${java.class.path}"/>
+
+         <!-- required for jEdit plugin -->
+            <pathelement location="${jedit.install.dir}/jedit.jar" />
+
+         <!-- dependencies -->
+         <pathelement location="${jedit.plugins.dir}/kappalayout.jar"/>
+		 <pathelement location="${jedit.plugins.dir}/antlr-4.10.1-complete.jar"/>
+        </path>
+    </target>
+
+   <!-- ========================================================================
+      Target: compile
+   ========================================================================= -->
+    <target name="compile"
+            description="Compile"
+            depends="init,setClasspath">
+            
+        <!-- this is to use google's ErrorProne compiler plugin, which turns out 
+        to be less useful than PMD.
+        <path id="processorpath.ref">
+          <pathelement location="${user.home}/apps/apache-ant-1.10.12/lib/error_prone_core-2.16-with-dependencies.jar"/>
+          <pathelement location="${user.home}/apps/apache-ant-1.10.12/lib/dataflow-errorprone-3.15.0.jar"/>
+        </path>
+        
+        <javac deprecation="on"
+                debug="on"
+                nowarn="on"
+                fork="yes"
+                destdir="${classes.dir}"
+                srcdir="${src.dir}"
+                includeantruntime="no"
+                target="${target.version}"
+                source="${target.version}">
+           <classpath refid="classpathref" />
+          <compilerarg value="-XDcompilePolicy=simple"/>
+          <compilerarg value="-processorpath"/>
+          <compilerarg pathref="processorpath.ref"/>
+          <compilerarg value="-Xplugin:ErrorProne -Xep:DeadException:ERROR" />
+          should be dashJdashdashadd but of course dashdash isn't allowed in comments, because WTF, that would make sense
+          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
+          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" />
+          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED" />
+          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED" />
+          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" />
+          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED" />
+          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" />
+          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" />
+          <compilerarg value="-J- -add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" />
+          <compilerarg value="-J- -add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED" />
+        </javac>            
+        -->
+        
+        <javac deprecation="on"
+                debug="on"
+                nowarn="on"
+                fork="yes"
+                destdir="${classes.dir}"
+                srcdir="${src.dir}"
+                includeantruntime="no"
+                target="${target.version}"
+                source="${target.version}">
+            <classpath refid="classpathref" />
+        </javac>
+    </target>
+
+   <!-- ========================================================================
+      Target: javacc clean and create
+   ========================================================================= -->
+    <target name="javacc_clean">
+        <delete>
+            <fileset dir="${parser.src.dir}/java">
+                <include name="*.java"/>
+                <exclude name="Token.java"/>
+                <exclude name="ModifierSet.java"/>
+            </fileset>
+            <fileset dir="${parser.src.dir}/javacc">
+                <include name="*.java"/>
+                <exclude name="Token.java"/>
+                <exclude name="ModifierSet.java"/>
+            </fileset>
+        </delete>
+    </target>
+
+    <target name="javacc" description="Runs javacc">
+        <condition property="javacchome.set">
+            <isset property="javacchome"/>
+        </condition>
+        <fail unless="javacchome.set" message="Property 'javacchome' needs to be set."/>
+        <javacc javacchome="${javacchome}" target="./src/beauty/parsers/java/Java1.5.jj"/>
+        <javacc javacchome="${javacchome}" target="./src/beauty/parsers/javacc/JavaCC.jj"/>
+        <javacc javacchome="${javacchome}" target="./src/beauty/parsers/html/HtmlParser.jj"/>
+        <javacc javacchome="${javacchome}" target="./src/beauty/parsers/css/CSS3Parser.jj"/>
+        <javacc javacchome="${javacchome}" target="./src/beauty/parsers/bsh/bsh.jj"/>
+        <javacc javacchome="${javacchome}" target="./src/beauty/parsers/jsp/jsp.jj"/>
+    </target>
+
+
+   <!-- ========================================================================
+      Target: dist
+      creates jar file suitable for dropping into jEdit, and puts it up one
+      directory level
+   ========================================================================= -->
+    <target name="dist"
+            description="Compiles, jars, puts the jar in the jEdit jars directory."
+            depends="clean,init,compile,prep_files,test">
+
+
+        <!-- make the plugin jar file -->
+        <tstamp/>
+        <jar jarfile="${install.dir}/${ant.project.name}.jar">
+            <manifest>
+                <attribute name="AppName" value="${ant.project.name}" />
+                <attribute name="AppVersion" value="${build.num}" />
+                <attribute name="Author" value="Dale Anson" />
+                <attribute name="Created-By" value="${user.name}" />
+                <attribute name="Created-On" value="${TODAY}"/>
+            </manifest>
+
+            <!-- include everything in the build directory -->
+            <fileset dir="${classes.dir}">
+                <include name="**/*" />
+            </fileset>
+
+            <!-- include everything in the config directory-->
+            <fileset dir="${config.dir}">
+                <include name="**/*" />
+            </fileset>
+
+            <!-- include everything in the doc directory -->
+            <fileset dir="${doc.dir}">
+                <include name="**/*" />
+            </fileset>
+
+            <!-- include custom beautifier properties files -->
+            <fileset dir="${src.dir}">
+                <include name="beauty/beautifiers/custom/*.properties"/>
+            </fileset>
+        </jar>
+
+        <antcall target="reload"/>
+
+    </target>
+
+    <target name="reload" if="can.reload.plugins">
+        <echo>Reloading ${install.dir}/${ant.project.name}.jar</echo>
+        <taskdef name="reloadPlugin" classname="ReloadPluginTask"/>
+        <reloadPlugin jarfile="${install.dir}/${jar.name}"/>
+    </target>
+
+   <!-- ========================================================================
+      Target: prep_files
+      prepares certain files for distribution by doing string replacement.
+      Assumes that the configuration files and documentation files are ready.
+   ========================================================================= -->
+    <target name="prep_files">
+        <echo>preparing files</echo>
+        <!-- clean out the config and doc deployment directories -->
+        <delete>
+            <fileset dir="${config.dir}" includes="**/*"/>
+            <fileset dir="${doc.dir}" includes="**/*"/>
+        </delete>
+        
+        <!-- copy the config  files to deployment directory
+        CHANGED: apparently, having a 'src/config' directory to hold the configuration
+        files is too confusing, so now they are dumped in basedir, along with
+        any other crud that may or may not be part of the deployment package.
+        Now need to explicitly name the proper files, so we don't pick up the
+        crud.
+        -->
+        <copy todir="${config.dir}">
+            <fileset dir="${basedir}">
+                <include name="Beauty.props"/>
+                <include name="actions.xml"/>
+                <include name="lang_*.properties"/>
+                <include name="services.xml"/>
+            </fileset>
+        </copy>
+
+        <!-- copy the docs -->
+        <copy todir="${doc.dir}/docs" overwrite="yes">
+            <fileset dir="${src.dir}/docs">
+                <include name="**/*"/>
+            </fileset>
+        </copy>
+
+    </target>
+
+   <!-- ========================================================================
+      Target: clean
+      deletes all files from the temp directory
+   ========================================================================= -->
+    <target name="clean" description="Delete all files from the classes directory.">
+        <!-- delete old directories that may still be hanging around.  These
+        caused some confusion. -->
+        <delete dir="config"/>
+        <delete dir="docs"/>
+        <delete dir="${temp}/config"/>
+        <delete dir="${temp}/docs"/>
+        <delete dir="${temp}/classes/beauty"/>
+        <delete dir="${temp}/classes/outerbeauty"/>
+        <delete dir="${temp}/classes/docs"/>
+    </target>
+
+   <!-- ========================================================================
+      Target: init
+      this target creates the directories needed for this project and
+      only needs to be done once.
+   ========================================================================= -->
+    <target name="init"
+            description="Create directory structure.">
+        <fail unless="jedit.install.dir" message="Please set jedit.install.dir property."/>
+        <mkdir dir="${src.dir}" />
+        <mkdir dir="${classes.dir}" />
+        <mkdir dir="${doc.dir}" />
+        <mkdir dir="${config.dir}" />
+    </target>
+
+
+
+    <!-- this is for local testing of individual files, note hard-coded path to test file -->
+    <target name="run"
+            description="Run the application."
+            depends="setClasspath">
+        <java classname="beauty.parsers.java.java.JavaParserBeautyListener" fork="true">
+            <classpath refid="classpathref"/>
+            <arg file="/home/danson/src/jedit/plugins/Beauty/test/test_files/BasicClass2.java"/>
+            <!--
+            <arg file="/home/danson/src/jedit/plugins/Beauty/test/test_files/java/before/AllInOne7.java"/>
+            -->
+        </java>
+    </target>
+
+    <target name="all" depends="javacc,dist"/>
+    
+    <target name="test">
+        <ant antfile="ant_java_test.xml" />
+        <ant antfile="ant_json_test.xml" />
+    </target>
+</project>

Modified: plugins/Beauty/trunk/build.xml
===================================================================
--- plugins/Beauty/trunk/build.xml	2023-08-21 00:21:04 UTC (rev 25641)
+++ plugins/Beauty/trunk/build.xml	2023-08-21 00:42:44 UTC (rev 25642)
@@ -1,315 +1,78 @@
-<project name="Beauty" default="dist" basedir="." xmlns:if="ant:if" xmlns:unless="ant:unless">
-    <!-- read build.props to override properties set below -->
-    <property file="../build.properties"/>
-    <property file="build.properties"/>
-
-
-    <!-- default location of jedit.jar -->
-    <property name="jedit.install.dir" value="../.."/>
-
-
-    <!-- jar name -->
-    <property name="jar.name" value="${ant.project.name}.jar"/>
-
-    <!-- version number -->
-    <property name="build.num" value="0.2.0"/>
-
-    <!-- where to put the finished plugin -->
-    <property name="install.dir" value=".." />
-
-    <!-- source code directory, this is where the .java files live -->
-    <property name="src.dir" location="src" />
-
-    <!-- parser source code directory, this is where the .jj file lives -->
-    <property name="parser.src.dir" location="${src.dir}/beauty/parsers"/>
-
-    <!-- temporary directory for post-compile processing -->
-    <property name="temp" location="temp"/>
-
-    <!-- configuration directory, this is where the configuration files for the
-      plugin are placed for additional processing prior to getting jarred. -->
-    <property name="config.dir" location="${temp}/config" />
-
-    <!-- documentation directory, this is where the plugin documentation
-      files live. Files in this directory will be distributed with the plugin -->
-    <property name="doc.dir" location="${temp}/docs" />
-
-    <!-- the directory for the compiled classes. Files in this directory will be
-      included in the finished jar file. -->
-    <property name="classes.dir" location="${temp}/classes" />
-
-    <property name="target.version" value="11"/>
-
-
-    <condition property="can.reload.plugins">
-        <and>
-            <available classname="org.gjt.sp.jedit.jEdit"/>
-            <available classname="ReloadPluginTask"/>
-        </and>
-    </condition>
-
-   <!-- ========================================================================
-      Target: set classpath
-   ========================================================================= -->
-    <target name="setClasspath">
-        <path id="classpathref">
-         <!-- required locations/jars -->
-            <pathelement location="${classes.dir}" />
-            <pathelement path="${java.class.path}"/>
-
-         <!-- required for jEdit plugin -->
-            <pathelement location="${jedit.install.dir}/jedit.jar" />
-
-         <!-- dependencies -->
+<?xml version="1.0" ?>
+<project name="Beauty" default="dist" basedir=".">
+   <property file="build.properties" />
+   <property file="../build.properties" />
+   <property name="compiler.source" value="11" />
+   <property name="compiler.target" value="11" />
+   <property name="src.dir" value="src" />
+   
+   <!-- Documentation process
+      none: if you supply your own html file as this template does.
+      xsltproc: if you plan on using docbook
+   -->
+   <property name="docs-proc.target" value="none" />
+   
+   <!-- jEdit installation properties. -->
+   <property name="build.support" value=".." />
+   <property name="install.dir" value=".." />
+   <property name="jedit.install.dir" value=".." />
+   <property name="jedit.plugins.dir" value="${install.dir}" />
+   <import file="${build.support}/plugin-build.xml" />
+   
+	<path id="project.class.path">
+		<pathelement location="${jedit.install.dir}/jedit.jar" />
          <pathelement location="${jedit.plugins.dir}/kappalayout.jar"/>
-		 <pathelement location="${jedit.plugins.dir}/antlr-4.10.1-complete.jar"/>
-        </path>
-    </target>
+		<pathelement location="${install.dir}/antlr-4.10.1-complete.jar"/>
+	</path>
+   
 
-   <!-- ========================================================================
-      Target: compile
-   ========================================================================= -->
-    <target name="compile"
-            description="Compile"
-            depends="init,setClasspath">
-            
-        <!-- this is to use google's ErrorProne compiler plugin, which turns out 
-        to be less useful than PMD.
-        <path id="processorpath.ref">
-          <pathelement location="${user.home}/apps/apache-ant-1.10.12/lib/error_prone_core-2.16-with-dependencies.jar"/>
-          <pathelement location="${user.home}/apps/apache-ant-1.10.12/lib/dataflow-errorprone-3.15.0.jar"/>
-        </path>
-        
-        <javac deprecation="on"
-                debug="on"
-                nowarn="on"
-                fork="yes"
-                destdir="${classes.dir}"
-                srcdir="${src.dir}"
-                includeantruntime="no"
-                target="${target.version}"
-                source="${target.version}">
-           <classpath refid="classpathref" />
-          <compilerarg value="-XDcompilePolicy=simple"/>
-          <compilerarg value="-processorpath"/>
-          <compilerarg pathref="processorpath.ref"/>
-          <compilerarg value="-Xplugin:ErrorProne -Xep:DeadException:ERROR" />
-          should be dashJdashdashadd but of course dashdash isn't allowed in comments, because WTF, that would make sense
-          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
-          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" />
-          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED" />
-          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED" />
-          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" />
-          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED" />
-          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" />
-          <compilerarg value="-J- -add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" />
-          <compilerarg value="-J- -add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" />
-          <compilerarg value="-J- -add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED" />
-        </javac>            
-        -->
-        
-        <javac deprecation="on"
-                debug="on"
-                nowarn="on"
-                fork="yes"
-                destdir="${classes.dir}"
-                srcdir="${src.dir}"
-                includeantruntime="no"
-                target="${target.version}"
-                source="${target.version}">
-            <classpath refid="classpathref" />
-        </javac>
-        <copy todir="${classes.dir}/docs" overwrite="no">
+	<target name="build.prepare">
+    <echo>
+****************************    
+****************************    
+*****                  *****
+*****   First pass...  *****
+*****                  *****
+****************************    
+****************************    
+    </echo>
+        <ant antfile="beauty_build.xml" target="dist"/>	
+		<mkdir dir="${build.dir}" />
+        <copy todir="${build.docs}/docs" overwrite="yes">
             <fileset dir="${src.dir}/docs">
                 <include name="**/*"/>
             </fileset>
         </copy>
-    </target>
-
-   <!-- ========================================================================
-      Target: javacc clean and create
-   ========================================================================= -->
-    <target name="javacc_clean">
-        <delete>
-            <fileset dir="${parser.src.dir}/java">
-                <include name="*.java"/>
-                <exclude name="Token.java"/>
-                <exclude name="ModifierSet.java"/>
-            </fileset>
-            <fileset dir="${parser.src.dir}/javacc">
-                <include name="*.java"/>
-                <exclude name="Token.java"/>
-                <exclude name="ModifierSet.java"/>
-            </fileset>
-        </delete>
-    </target>
-
-    <target name="javacc" description="Runs javacc">
-        <condition property="javacchome.set">
-            <isset property="javacchome"/>
-        </condition>
-        <fail unless="javacchome.set" message="Property 'javacchome' needs to be set."/>
-        <javacc javacchome="${javacchome}" target="./src/beauty/parsers/java/Java1.5.jj"/>
-        <javacc javacchome="${javacchome}" target="./src/beauty/parsers/javacc/JavaCC.jj"/>
-        <javacc javacchome="${javacchome}" target="./src/beauty/parsers/html/HtmlParser.jj"/>
-        <javacc javacchome="${javacchome}" target="./src/beauty/parsers/css/CSS3Parser.jj"/>
-        <javacc javacchome="${javacchome}" target="./src/beauty/parsers/bsh/bsh.jj"/>
-        <javacc javacchome="${javacchome}" target="./src/beauty/parsers/jsp/jsp.jj"/>
-    </target>
-
-
-   <!-- ========================================================================
-      Target: dist
-      creates jar file suitable for dropping into jEdit, and puts it up one
-      directory level
-   ========================================================================= -->
-    <target name="dist"
-            description="Compiles, jars, puts the jar in the jEdit jars directory."
-            depends="clean,init,compile,prep_files,test">
-
-
-        <!-- make the plugin jar file -->
-        <tstamp/>
-        <jar jarfile="${install.dir}/${ant.project.name}.jar">
-            <manifest>
-                <attribute name="AppName" value="${ant.project.name}" />
-                <attribute name="AppVersion" value="${build.num}" />
-                <attribute name="Author" value="Dale Anson" />
-                <attribute name="Created-By" value="${user.name}" />
-                <attribute name="Created-On" value="${TODAY}"/>
-            </manifest>
-
-            <!-- include everything in the build directory -->
-            <fileset dir="${classes.dir}">
-                <include name="**/*" />
-            </fileset>
-
-            <!-- include everything in the config directory-->
-            <fileset dir="${config.dir}">
-                <include name="**/*" />
-            </fileset>
-
-            <!-- include everything in the doc directory -->
-            <fileset dir="${doc.dir}">
-                <include name="**/*" />
-            </fileset>
-
-            <!-- include custom beautifier properties files -->
-            <fileset dir="${src.dir}">
-                <include name="beauty/beautifiers/custom/*.properties"/>
-            </fileset>
-        </jar>
-
-        <antcall target="reload"/>
-
-    </target>
-
-    <target name="reload" if="can.reload.plugins">
-        <echo>Reloading ${install.dir}/${ant.project.name}.jar</echo>
-        <taskdef name="reloadPlugin" classname="ReloadPluginTask"/>
-        <reloadPlugin jarfile="${install.dir}/${jar.name}"/>
-    </target>
-
-   <!-- ========================================================================
-      Target: prep_files
-      prepares certain files for distribution by doing string replacement.
-      Assumes that the configuration files and documentation files are ready.
-   ========================================================================= -->
-    <target name="prep_files">
-        <echo>preparing files</echo>
-        <!-- clean out the config and doc deployment directories -->
-        <delete>
-            <fileset dir="${config.dir}" includes="**/*"/>
-            <fileset dir="${doc.dir}" includes="**/*"/>
-        </delete>
-
-        <!-- copy the config  files to deployment directory
-        CHANGED: apparently, having a 'src/config' directory to hold the configuration
-        files is too confusing, so now they are dumped in basedir, along with
-        any other crud that may or may not be part of the deployment package.
-        Now need to explicitly name the proper files, so we don't pick up the
-        crud.
-        -->
-        <copy todir="${config.dir}">
+        <copy todir="${build.extras}">
             <fileset dir="${basedir}">
-                <include name="beauty.props"/>
+                <include name="Beauty.props"/>
                 <include name="actions.xml"/>
                 <include name="lang_*.properties"/>
                 <include name="services.xml"/>
             </fileset>
         </copy>
-
-        <!-- copy the docs -->
-        <copy todir="${doc.dir}/docs" overwrite="yes">
-            <fileset dir="${src.dir}/docs">
-                <include name="**/*"/>
-            </fileset>
-        </copy>
-
-        <!-- insert the build number into the documentation and configuration
-        files -->
-        <!-- CHANGED: don't do this, the python build system for jEdit gets
-        confused if the build number isn't present BEFORE the build, so need
-        to change it by hand everytime there is a new release.
-        <replace dir="${config.dir}" token="@@build.num@@"
-            value="${build.num}" />
-        -->
-        <replace dir="${doc.dir}" token="@@build.num@@"
-                value="${build.num}" />
-        <tstamp/>
-        <replace dir="${doc.dir}" token="@@tstamp@@"
-                value="${TODAY}" />
-    </target>
-
-   <!-- ========================================================================
-      Target: clean
-      deletes all files from the temp directory
-   ========================================================================= -->
-    <target name="clean" description="Delete all files from the classes directory.">
-        <!-- delete old directories that may still be hanging around.  These
-        caused some confusion. -->
-        <delete dir="config"/>
-        <delete dir="docs"/>
-        <delete dir="${temp}/config"/>
-        <delete dir="${temp}/docs"/>
-        <delete dir="${temp}/classes/beauty"/>
-        <delete dir="${temp}/classes/outerbeauty"/>
-        <delete dir="${temp}/classes/docs"/>
-    </target>
-
-   <!-- ========================================================================
-      Target: init
-      this target creates the directories needed for this project and
-      only needs to be done once.
-   ========================================================================= -->
-    <target name="init"
-            description="Create directory structure.">
-        <fail unless="jedit.install.dir" message="Please set jedit.install.dir property."/>
-        <mkdir dir="${src.dir}" />
-        <mkdir dir="${classes.dir}" />
-        <mkdir dir="${doc.dir}" />
-        <mkdir dir="${config.dir}" />
-    </target>
-
-
-
-    <!-- this is for local testing of individual files, note hard-coded path to test file -->
-    <target name="run"
-            description="Run the application."
-            depends="setClasspath">
-        <java classname="beauty.parsers.java.java.JavaParserBeautyListener" fork="true">
-            <classpath refid="classpathref"/>
-            <arg file="/home/danson/src/jedit/plugins/Beauty/test/test_files/BasicClass2.java"/>
-            <!--
-            <arg file="/home/danson/src/jedit/plugins/Beauty/test/test_files/java/before/AllInOne7.java"/>
-            -->
-        </java>
-    </target>
-
-    <target name="all" depends="javacc,dist"/>
-    
-    <target name="test">
-        <ant antfile="ant_java_test.xml" />
-        <ant antfile="ant_json_test.xml" />
-    </target>
+    <echo>
+********************************    
+********************************    
+*****                      *****
+*****    Second pass...    *****
+*****                      *****
+********************************    
+********************************    
+    </echo>
+	</target>
+	
+	<target name="build.post">
+        <ant antfile="beauty_build.xml" target="test"/>
+    <echo>
+************************************    
+************************************    
+*****                          *****
+*****    No further passes.    *****
+*****                          *****
+************************************    
+************************************    
+    </echo>
+	</target>
+   
 </project>

Modified: plugins/Beauty/trunk/src/docs/index.html
===================================================================
--- plugins/Beauty/trunk/src/docs/index.html	2023-08-21 00:21:04 UTC (rev 25641)
+++ plugins/Beauty/trunk/src/docs/index.html	2023-08-21 00:42:44 UTC (rev 25642)
@@ -13,7 +13,7 @@
                </strong>                                              
             </td>
             <td valign="TOP" align="RIGHT">
-               <font size="-1"><p><strong>Version 1.1 (@@tstamp@@)</strong> <p>Dale Anson</font>
+               <font size="-1"><p><strong>Version 1.1, August 2023</strong> <p>Dale Anson</font>
             </td>
          </tr>
       </table>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25641] plugins/Beauty/trunk

[<dal...@us...>]

Revision: 25641
          http://sourceforge.net/p/jedit/svn/25641
Author:   daleanson
Date:     2023-08-21 00:21:04 +0000 (Mon, 21 Aug 2023)
Log Message:
-----------
Moving "beauty.props" to "Beauty.props" because case makes a difference.

Added Paths:
-----------
    plugins/Beauty/trunk/Beauty.props

Removed Paths:
-------------
    plugins/Beauty/trunk/beauty.props

Copied: plugins/Beauty/trunk/Beauty.props (from rev 25638, plugins/Beauty/trunk/beauty.props)
===================================================================
--- plugins/Beauty/trunk/Beauty.props	                        (rev 0)
+++ plugins/Beauty/trunk/Beauty.props	2023-08-21 00:21:04 UTC (rev 25641)
@@ -0,0 +1,185 @@
+#
+# Plugin properties
+#
+
+plugin.beauty.BeautyPlugin.activate=defer
+plugin.beauty.BeautyPlugin.name=Beauty
+plugin.beauty.BeautyPlugin.author=Dale Anson
+plugin.beauty.BeautyPlugin.version=1.1
+plugin.beauty.BeautyPlugin.docs=docs/index.html
+plugin.beauty.BeautyPlugin.depend.0=jdk 11
+plugin.beauty.BeautyPlugin.depend.1=jedit 05.06.00.00
+plugin.beauty.BeautyPlugin.depend.2=plugin CommonControlsPlugin 1.7.5
+plugin.beauty.BeautyPlugin.depend.3=plugin antlr.AntlrPlugin 4.10
+plugin.beauty.BeautyPlugin.usePluginHome=true
+
+plugin.beauty.BeautyPlugin.description=The Beauty plugin is a general framework for code beautifiers and provides several built-in beautifiers.
+
+beautyplugin.label=Beauty
+
+#
+# Menu/Action properties
+#
+
+make_it_pretty.label=Beautify Buffer
+beauty.toggleSplitAttributes.label=Split/Unsplit Attributes
+
+#
+# Option pane properties
+#
+plugin.beauty.BeautyPlugin.option-group=beauty.general beauty.beautifiers beauty.custom beauty.css beauty.jsp beauty.java beauty.json
+
+options.beauty.general.title=General
+options.beauty.general.label=General
+options.beauty.general.code=new beauty.options.GeneralOptionPane();
+
+options.beauty.beautifiers.title=Modes
+options.beauty.beautifiers.label=Modes
+options.beauty.beautifiers.code=new beauty.options.BeautifierOptionPane();
+options.beauty.beautifiers.mode=Mode
+options.beauty.beautifiers.beautifier=Beautifier
+
+options.beauty.custom.title=Custom Beautifier
+options.beauty.custom.label=Custom Beautifier
+options.beauty.custom.code=new beauty.options.CustomBeautifierOptionPane();
+
+options.beauty.css.title=CSS Beautifier
+options.beauty.css.label=CSS Beautifier
+options.beauty.css.code=new beauty.options.CSSOptionPane();
+
+options.beauty.jsp.title=JSP Beautifier
+options.beauty.jsp.label=JSP Beautifier
+options.beauty.jsp.code=new beauty.options.JspOptionPane();
+
+options.beauty.java.title=Java Beautifier
+options.beauty.java.label=Java Beautifier
+options.beauty.java.code=new beauty.options.JavaOptionPane();
+
+options.beauty.json.title=JSON Beautifier
+options.beauty.json.label=JSON Beautifier
+options.beauty.json.code=new beauty.options.JsonOptionPane();
+
+# mode handlers
+mode.html.beauty.beautifier=html
+mode.asp.beauty.beautifier=html
+mode.coldfusion.beauty.beautifier=html
+mode.jhtml.beauty.beautifier=html
+mode.php.beauty.beautifier=html
+mode.sgml.beauty.beautifier=html
+mode.xml.beauty.beautifier=html
+mode.jsp.beauty.beautifier=jsp
+mode.java.beauty.beautifier=java
+mode.java.beauty.beautifier=java8
+mode.javacc.beauty.beautifier=javacc
+mode.csv.beauty.beautifier=csv
+mode.json.beauty.beautifier=json
+
+# Menus
+plugin.beauty.BeautyPlugin.menu=make_it_pretty
+
+# Comma separated list of custom beautifier properties files
+plugin.beauty.beautifiers.custom=ada.properties,javascript.properties
+
+#
+# Error messages
+#
+
+beauty.confirm.mode.title=Beauty
+beauty.confirm.mode.message=\
+    The current buffer is not in a supported mode.\n\
+    \n\
+    The results may be unpredictable.\n\
+    \n\
+    Are you sure you want to beautify the current buffer?
+
+beauty.error.empty.title=Beauty Error
+beauty.error.empty.message=\
+    Beauty returned an empty result for the current buffer.\n\
+    I better leave the buffer untouched.
+
+beauty.error.other.title=Beauty Error
+beauty.error.other.message=\
+    Beauty was unable to reformat the current buffer, because an\n\
+    unhandled exception occurred:\n\
+    {0}\n\
+    \n\
+    See the activity log for any details.
+
+beauty.error.isReadOnly.title=Beauty Error
+beauty.error.isReadOnly.message=\
+    Cannot format the current buffer, because it is read-only.
+
+# random strings
+beauty.msg.<html><b>Assign_beautifiers_to_modes=<html><b>Assign beautifiers to modes
+beauty.msg.Use_jEdit_indenter_for_undefined_modes=Use jEdit indenter for undefined modes
+beauty.msg.<html><b>Create_a_custom_beautifier_for_a_mode=<html><b>Create a custom beautifier for a mode
+beauty.msg.Use_jEdit_indenter_for_this_mode=Use jEdit indenter for this mode
+beauty.msg.before=before
+beauty.msg.after=after
+beauty.msg.Label_on_separate_line=Label on separate line
+beauty.msg.Collapse_multiple_blank_lines=Collapse multiple blank lines
+beauty.msg.Collapse_linear_whitespace=Collapse linear whitepace
+beauty.msg.Mode>_=Mode: 
+beauty.msg.Pad_functions=Pad functions
+beauty.msg.Pad_operators=Pad operators
+beauty.msg.Pad_digits=Pad digits
+beauty.msg.Pad_keywords1=Pad keywords1
+beauty.msg.Pad_keywords2=Pad keywords2
+beauty.msg.Pad_keywords2=Pad keywords2
+beauty.msg.Pad_keywords4=Pad keywords4
+beauty.msg.Pad_before_these_characters>=Pad before these characters:
+beauty.msg.Pad_after_these_characters>=Pad after these characters:
+beauty.msg.Don't_pad_before_these_characters>=Don't pad before these characters:
+beauty.msg.Don't_pad_after_these_characters>=Don't pad after these characters:
+beauty.msg.Insert_line_separator_before_these_strings_(separate_with_comma)>=Insert line separator before these strings (separate with comma):
+beauty.msg.Insert_line_separator_after_these_strings_(separate_with_comma)>=Insert line separator after these strings (separate with comma):
+beauty.msg.Line_up_closing_bracket=Line up closing bracket
+beauty.msg.Double_bracket_indent=Double bracket indent
+beauty.msg.Indent_open_brackets>=Indent open brackets:
+beauty.msg.Indent_close_brackets>=Indent close brackets:
+beauty.msg.Unaligned_open_brackets>=Unaligned open brackets:
+beauty.msg.Unaligned_close_brackets>=Unaligned close brackets:
+beauty.msg.Indent_next_line>=Indent next line:
+beauty.msg.Unindent_this_line>=Unindent this line:
+beauty.msg.Electric_keys>=Electric keys:
+beauty.msg.Padding=Padding
+beauty.msg.Indenting=Indenting
+beauty.msg.CSS_Options=CSS Options
+beauty.msg.Pad_combinators_(+,_>,_~)=Pad combinators (+, >, ~)
+beauty.msg.Pad_selectors=Pad selectors
+beauty.msg.Pad_attributes=Pad attributes
+beauty.msg.Pad_operators_(/_and_,)=Pad operators (/ and ,)
+beauty.msg.Pad_important_(!)=Pad important (!)
+beauty.msg.Pad_terms=Pad terms
+beauty.msg.Pad_function_parameters=Pad function parameters
+beauty.msg.General_Options=General Options
+beauty.msg.Show_error_dialogs=Show error dialogs
+beauty.msg.Java_Options=Java Options
+beauty.msg.Use_broken_brackets,_e.g.=Use broken brackets, e.g.
+beauty.msg.Use_attached_brackets,_e.g.=Use attached brackets, e.g.
+beauty.msg.Use_broken_brackets,_e.g.=Use broken brackets, e.g.
+beauty.msg.Break=Break
+beauty.msg.Pad_parenthesis,_e.g._=Pad parenthesis, e.g. 
+beauty.msg.Pad_operators,_e.g._=Pad operators, e.g.
+beauty.msg.JSP_Options=JSP Options
+beauty.msg.Pad_tag_slash_end_(/>)=Pad tag slash end (/>)
+beauty.msg.Pad_tag_end_(>)=Pad tag end (>)
+beauty.msg.Wrap_attributes=Wrap attributes
+beauty.msg.Collapse_blank_lines=Collapse blank lines
+beauty.java8.Blank_Lines_Before_Package=Blank Lines Before Package
+beauty.java8.Blank_Lines_After_Package=Blank Lines After Package
+beauty.java8.Blank_Lines_After_Imports=Blank Lines After Imports
+beauty.java8.Sort_Imports=Sort Imports
+beauty.java8.Group_Imports=Group Imports
+beauty.java8.Blank_Lines_Between_Import_Groups=Blank Lines Between Import Groups
+beauty.java8.Blank_Lines_After_Class_Declaration=Blank Lines After Class Declaration
+beauty.java8.Blank_Lines_Before_Methods=Blank Lines Before Methods
+beauty.java8.Sort_Modifiers=Sort Modifiers
+beauty.java8.Collapse_Multiple_Blank_Lines_To=Collapse Multiple Blank Lines To
+beauty.java8.Blank_Lines_After_Class_Body=Blank Lines After Class Body
+beauty.java8.Blank_Lines_After_Methods=Blank Lines After Methods
+beauty.java8.Wait_--_beautifying_buffer...=Wait -- beautifying buffer...
+beauty.java8.Please_wait,_beautifying_buffer...=Please wait, beautifying buffer...
+beauty.java8.Encountered_possible_syntax_error,_reparsing...=Encountered possible syntax error, reparsing...
+beauty.java8.Brackets_and_Padding=Brackets and Padding
+beauty.java8.Blank_Lines=Blank Lines

Deleted: plugins/Beauty/trunk/beauty.props
===================================================================
--- plugins/Beauty/trunk/beauty.props	2023-08-09 16:35:56 UTC (rev 25640)
+++ plugins/Beauty/trunk/beauty.props	2023-08-21 00:21:04 UTC (rev 25641)
@@ -1,185 +0,0 @@
-#
-# Plugin properties
-#
-
-plugin.beauty.BeautyPlugin.activate=defer
-plugin.beauty.BeautyPlugin.name=Beauty
-plugin.beauty.BeautyPlugin.author=Dale Anson
-plugin.beauty.BeautyPlugin.version=1.1
-plugin.beauty.BeautyPlugin.docs=docs/index.html
-plugin.beauty.BeautyPlugin.depend.0=jdk 11
-plugin.beauty.BeautyPlugin.depend.1=jedit 05.06.00.00
-plugin.beauty.BeautyPlugin.depend.2=plugin CommonControlsPlugin 1.7.5
-plugin.beauty.BeautyPlugin.depend.3=plugin antlr.AntlrPlugin 4.10
-plugin.beauty.BeautyPlugin.usePluginHome=true
-
-plugin.beauty.BeautyPlugin.description=The Beauty plugin is a general framework for code beautifiers and provides several built-in beautifiers.
-
-beautyplugin.label=Beauty
-
-#
-# Menu/Action properties
-#
-
-make_it_pretty.label=Beautify Buffer
-beauty.toggleSplitAttributes.label=Split/Unsplit Attributes
-
-#
-# Option pane properties
-#
-plugin.beauty.BeautyPlugin.option-group=beauty.general beauty.beautifiers beauty.custom beauty.css beauty.jsp beauty.java beauty.json
-
-options.beauty.general.title=General
-options.beauty.general.label=General
-options.beauty.general.code=new beauty.options.GeneralOptionPane();
-
-options.beauty.beautifiers.title=Modes
-options.beauty.beautifiers.label=Modes
-options.beauty.beautifiers.code=new beauty.options.BeautifierOptionPane();
-options.beauty.beautifiers.mode=Mode
-options.beauty.beautifiers.beautifier=Beautifier
-
-options.beauty.custom.title=Custom Beautifier
-options.beauty.custom.label=Custom Beautifier
-options.beauty.custom.code=new beauty.options.CustomBeautifierOptionPane();
-
-options.beauty.css.title=CSS Beautifier
-options.beauty.css.label=CSS Beautifier
-options.beauty.css.code=new beauty.options.CSSOptionPane();
-
-options.beauty.jsp.title=JSP Beautifier
-options.beauty.jsp.label=JSP Beautifier
-options.beauty.jsp.code=new beauty.options.JspOptionPane();
-
-options.beauty.java.title=Java Beautifier
-options.beauty.java.label=Java Beautifier
-options.beauty.java.code=new beauty.options.JavaOptionPane();
-
-options.beauty.json.title=JSON Beautifier
-options.beauty.json.label=JSON Beautifier
-options.beauty.json.code=new beauty.options.JsonOptionPane();
-
-# mode handlers
-mode.html.beauty.beautifier=html
-mode.asp.beauty.beautifier=html
-mode.coldfusion.beauty.beautifier=html
-mode.jhtml.beauty.beautifier=html
-mode.php.beauty.beautifier=html
-mode.sgml.beauty.beautifier=html
-mode.xml.beauty.beautifier=html
-mode.jsp.beauty.beautifier=jsp
-mode.java.beauty.beautifier=java
-mode.java.beauty.beautifier=java8
-mode.javacc.beauty.beautifier=javacc
-mode.csv.beauty.beautifier=csv
-mode.json.beauty.beautifier=json
-
-# Menus
-plugin.beauty.BeautyPlugin.menu=make_it_pretty
-
-# Comma separated list of custom beautifier properties files
-plugin.beauty.beautifiers.custom=ada.properties,javascript.properties
-
-#
-# Error messages
-#
-
-beauty.confirm.mode.title=Beauty
-beauty.confirm.mode.message=\
-    The current buffer is not in a supported mode.\n\
-    \n\
-    The results may be unpredictable.\n\
-    \n\
-    Are you sure you want to beautify the current buffer?
-
-beauty.error.empty.title=Beauty Error
-beauty.error.empty.message=\
-    Beauty returned an empty result for the current buffer.\n\
-    I better leave the buffer untouched.
-
-beauty.error.other.title=Beauty Error
-beauty.error.other.message=\
-    Beauty was unable to reformat the current buffer, because an\n\
-    unhandled exception occurred:\n\
-    {0}\n\
-    \n\
-    See the activity log for any details.
-
-beauty.error.isReadOnly.title=Beauty Error
-beauty.error.isReadOnly.message=\
-    Cannot format the current buffer, because it is read-only.
-
-# random strings
-beauty.msg.<html><b>Assign_beautifiers_to_modes=<html><b>Assign beautifiers to modes
-beauty.msg.Use_jEdit_indenter_for_undefined_modes=Use jEdit indenter for undefined modes
-beauty.msg.<html><b>Create_a_custom_beautifier_for_a_mode=<html><b>Create a custom beautifier for a mode
-beauty.msg.Use_jEdit_indenter_for_this_mode=Use jEdit indenter for this mode
-beauty.msg.before=before
-beauty.msg.after=after
-beauty.msg.Label_on_separate_line=Label on separate line
-beauty.msg.Collapse_multiple_blank_lines=Collapse multiple blank lines
-beauty.msg.Collapse_linear_whitespace=Collapse linear whitepace
-beauty.msg.Mode>_=Mode: 
-beauty.msg.Pad_functions=Pad functions
-beauty.msg.Pad_operators=Pad operators
-beauty.msg.Pad_digits=Pad digits
-beauty.msg.Pad_keywords1=Pad keywords1
-beauty.msg.Pad_keywords2=Pad keywords2
-beauty.msg.Pad_keywords2=Pad keywords2
-beauty.msg.Pad_keywords4=Pad keywords4
-beauty.msg.Pad_before_these_characters>=Pad before these characters:
-beauty.msg.Pad_after_these_characters>=Pad after these characters:
-beauty.msg.Don't_pad_before_these_characters>=Don't pad before these characters:
-beauty.msg.Don't_pad_after_these_characters>=Don't pad after these characters:
-beauty.msg.Insert_line_separator_before_these_strings_(separate_with_comma)>=Insert line separator before these strings (separate with comma):
-beauty.msg.Insert_line_separator_after_these_strings_(separate_with_comma)>=Insert line separator after these strings (separate with comma):
-beauty.msg.Line_up_closing_bracket=Line up closing bracket
-beauty.msg.Double_bracket_indent=Double bracket indent
-beauty.msg.Indent_open_brackets>=Indent open brackets:
-beauty.msg.Indent_close_brackets>=Indent close brackets:
-beauty.msg.Unaligned_open_brackets>=Unaligned open brackets:
-beauty.msg.Unaligned_close_brackets>=Unaligned close brackets:
-beauty.msg.Indent_next_line>=Indent next line:
-beauty.msg.Unindent_this_line>=Unindent this line:
-beauty.msg.Electric_keys>=Electric keys:
-beauty.msg.Padding=Padding
-beauty.msg.Indenting=Indenting
-beauty.msg.CSS_Options=CSS Options
-beauty.msg.Pad_combinators_(+,_>,_~)=Pad combinators (+, >, ~)
-beauty.msg.Pad_selectors=Pad selectors
-beauty.msg.Pad_attributes=Pad attributes
-beauty.msg.Pad_operators_(/_and_,)=Pad operators (/ and ,)
-beauty.msg.Pad_important_(!)=Pad important (!)
-beauty.msg.Pad_terms=Pad terms
-beauty.msg.Pad_function_parameters=Pad function parameters
-beauty.msg.General_Options=General Options
-beauty.msg.Show_error_dialogs=Show error dialogs
-beauty.msg.Java_Options=Java Options
-beauty.msg.Use_broken_brackets,_e.g.=Use broken brackets, e.g.
-beauty.msg.Use_attached_brackets,_e.g.=Use attached brackets, e.g.
-beauty.msg.Use_broken_brackets,_e.g.=Use broken brackets, e.g.
-beauty.msg.Break=Break
-beauty.msg.Pad_parenthesis,_e.g._=Pad parenthesis, e.g. 
-beauty.msg.Pad_operators,_e.g._=Pad operators, e.g.
-beauty.msg.JSP_Options=JSP Options
-beauty.msg.Pad_tag_slash_end_(/>)=Pad tag slash end (/>)
-beauty.msg.Pad_tag_end_(>)=Pad tag end (>)
-beauty.msg.Wrap_attributes=Wrap attributes
-beauty.msg.Collapse_blank_lines=Collapse blank lines
-beauty.java8.Blank_Lines_Before_Package=Blank Lines Before Package
-beauty.java8.Blank_Lines_After_Package=Blank Lines After Package
-beauty.java8.Blank_Lines_After_Imports=Blank Lines After Imports
-beauty.java8.Sort_Imports=Sort Imports
-beauty.java8.Group_Imports=Group Imports
-beauty.java8.Blank_Lines_Between_Import_Groups=Blank Lines Between Import Groups
-beauty.java8.Blank_Lines_After_Class_Declaration=Blank Lines After Class Declaration
-beauty.java8.Blank_Lines_Before_Methods=Blank Lines Before Methods
-beauty.java8.Sort_Modifiers=Sort Modifiers
-beauty.java8.Collapse_Multiple_Blank_Lines_To=Collapse Multiple Blank Lines To
-beauty.java8.Blank_Lines_After_Class_Body=Blank Lines After Class Body
-beauty.java8.Blank_Lines_After_Methods=Blank Lines After Methods
-beauty.java8.Wait_--_beautifying_buffer...=Wait -- beautifying buffer...
-beauty.java8.Please_wait,_beautifying_buffer...=Please wait, beautifying buffer...
-beauty.java8.Encountered_possible_syntax_error,_reparsing...=Encountered possible syntax error, reparsing...
-beauty.java8.Brackets_and_Padding=Brackets and Padding
-beauty.java8.Blank_Lines=Blank Lines

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.