diff --git a/autotests/folding/highlight.java.fold b/autotests/folding/highlight.java.fold
new file mode 100644
--- /dev/null
+++ b/autotests/folding/highlight.java.fold
@@ -0,0 +1,39 @@
+/* highlighting test case for Java */
+
+// single line comment with ### TODO FIXME
+
+/* multiline comment with ### TODO FIXME */
+
+/** Javadoc comment with ### TODO FIXME
+ * @param foo bla bla ATTENTION
+ * @return abc cde
+ * @see javadoc.xml
+*/
+
+package org.kde.itinerary;
+
+import org.qtproject.qt5.android.bindings.QtActivity;
+import java.io.*;
+import java.util.*;
+
+public class Activity extends QtActivity
+{
+ private static final String TAG = "org.kde.itinerary";
+
+ public void launchViewIntentFromUri(String uri)
+ {
+ Uri mapIntentUri = Uri.parse(uri);
+ Intent mapIntent = new Intent(Intent.ACTION_VIEW, mapIntentUri);
+ startActivity(mapIntent);
+ }
+
+ @Override
+ protected String stuff()
+ {
+ while (true) {
+ }
+ int num = 1;
+ num = 0x2;
+ double f = .4e+49;
+ }
+}
diff --git a/autotests/html/highlight.java.html b/autotests/html/highlight.java.html
new file mode 100644
--- /dev/null
+++ b/autotests/html/highlight.java.html
@@ -0,0 +1,46 @@
+
+
+
+highlight.java
+
+
+/* highlighting test case for Java */
+
+// single line comment with ### TODO FIXME
+
+/* multiline comment with ### TODO FIXME */
+
+/** Javadoc comment with ### TODO FIXME
+ * @param foo bla bla ATTENTION
+ * @return abc cde
+ * @see javadoc.xml
+*/
+
+package org.kde.itinerary;
+
+import org.qtproject.qt5.android.bindings.QtActivity;
+import java.io.*;
+import java.util.*;
+
+public class Activity extends QtActivity
+{
+ private static final String TAG = "org.kde.itinerary";
+
+ public void launchViewIntentFromUri(String uri)
+ {
+ Uri mapIntentUri = Uri.parse(uri);
+ Intent mapIntent = new Intent(Intent.ACTION_VIEW, mapIntentUri);
+ startActivity(mapIntent);
+ }
+
+ @Override
+ protected String stuff()
+ {
+ while (true) {
+ }
+ int num = 1;
+ num = 0x2;
+ double f = .4e+49;
+ }
+}
+
diff --git a/autotests/input/highlight.java b/autotests/input/highlight.java
new file mode 100644
--- /dev/null
+++ b/autotests/input/highlight.java
@@ -0,0 +1,39 @@
+/* highlighting test case for Java */
+
+// single line comment with ### TODO FIXME
+
+/* multiline comment with ### TODO FIXME */
+
+/** Javadoc comment with ### TODO FIXME
+ * @param foo bla bla ATTENTION
+ * @return abc cde
+ * @see javadoc.xml
+*/
+
+package org.kde.itinerary;
+
+import org.qtproject.qt5.android.bindings.QtActivity;
+import java.io.*;
+import java.util.*;
+
+public class Activity extends QtActivity
+{
+ private static final String TAG = "org.kde.itinerary";
+
+ public void launchViewIntentFromUri(String uri)
+ {
+ Uri mapIntentUri = Uri.parse(uri);
+ Intent mapIntent = new Intent(Intent.ACTION_VIEW, mapIntentUri);
+ startActivity(mapIntent);
+ }
+
+ @Override
+ protected String stuff()
+ {
+ while (true) {
+ }
+ int num = 1;
+ num = 0x2;
+ double f = .4e+49;
+ }
+}
diff --git a/autotests/reference/highlight.java.ref b/autotests/reference/highlight.java.ref
new file mode 100644
--- /dev/null
+++ b/autotests/reference/highlight.java.ref
@@ -0,0 +1,39 @@
+/* highlighting test case for Java */
+
+// single line comment with ### TODO FIXME
+
+/* multiline comment with ### TODO FIXME */
+
+/** Javadoc comment with ### TODO FIXME
+ * @param foo bla bla ATTENTION
+ * @return abc cde
+ * @see javadoc.xml
+*/
+
+package org.kde.itinerary;
+
+import org.qtproject.qt5.android.bindings.QtActivity;
+import java.io.*;
+import java.util.*;
+
+public class Activity extends QtActivity
+{
+ private static final String TAG = "org.kde.itinerary";
+
+ public void launchViewIntentFromUri(String uri)
+ {
+ Uri mapIntentUri = Uri.parse(uri);
+ Intent mapIntent = new Intent(Intent.ACTION_VIEW, mapIntentUri);
+ startActivity(mapIntent);
+ }
+
+ @Override
+ protected String stuff()
+ {
+ while (true) {
+ }
+ int num = 1;
+ num = 0x2;
+ double f = .4e+49;
+ }
+}
diff --git a/data/syntax/java.xml b/data/syntax/java.xml
--- a/data/syntax/java.xml
+++ b/data/syntax/java.xml
@@ -1,6 +1,6 @@
-
+
- ACTIVE
@@ -3822,9 +3822,12 @@
-
+
+
+
+
diff --git a/data/syntax/javadoc.xml b/data/syntax/javadoc.xml
--- a/data/syntax/javadoc.xml
+++ b/data/syntax/javadoc.xml
@@ -1,6 +1,6 @@
-
+
@@ -29,6 +29,7 @@
+
@@ -71,12 +72,14 @@
+
+
@@ -94,12 +97,12 @@
-
-
-
-
-
-
+
+
+
+
+
+