8301121: rich text area control

build.gradle

@@ -2749,11 +2749,11 @@ project(":controls") {
     addValidateSourceSets(project, sourceSets)
 }
 
-project(":incubator.controls") {
+project(":incubator.richtext") {
     project.ext.buildModule = true
     project.ext.includeSources = true
     project.ext.moduleRuntime = true
-    project.ext.moduleName = "javafx.incubator.controls"
+    project.ext.moduleName = "javafx.incubator.richtext"
     project.ext.incubating = true
 
     sourceSets {
@@ -2775,7 +2775,7 @@ project(":incubator.controls") {
     project.ext.moduleSourcePath = defaultModuleSourcePath
     project.ext.moduleSourcePathShim = defaultModuleSourcePathShim
 
-    commonModuleSetup(project, [ 'base', 'graphics', 'controls', 'incubator.controls' ])
+    commonModuleSetup(project, [ 'base', 'graphics', 'controls', 'incubator.richtext' ])
 
     dependencies {
         testImplementation project(":base").sourceSets.test.output
@@ -4321,7 +4321,7 @@ task javadoc(type: Javadoc, dependsOn: createMSPfile) {
     description = "Generates the JavaDoc for all the public API"
     executable = JAVADOC
     def projectsToDocument = [
-            project(":base"), project(":graphics"), project(":controls"), project(":incubator.controls"), project(":media"),
+            project(":base"), project(":graphics"), project(":controls"), project(":incubator.richtext"), project(":media"),
             project(":swing"), /*project(":swt"),*/ project(":fxml"), project(":web")]
     source(projectsToDocument.collect({
         [it.sourceSets.main.java]

modules/javafx.base/src/main/java/module-info.java

@@ -47,7 +47,7 @@
 
     exports com.sun.javafx to
         javafx.controls,
-        javafx.incubator.controls,
+        javafx.incubator.richtext,
         javafx.graphics,
         javafx.fxml,
         javafx.media,

modules/javafx.graphics/src/main/java/module-info.java

@@ -135,7 +135,7 @@
     exports com.sun.javafx.util to
         javafx.controls,
         javafx.fxml,
-        javafx.incubator.controls,
+        javafx.incubator.richtext,
         javafx.media,
         javafx.swing,
         javafx.web;

modules/javafx.incubator.controls/.project → modules/javafx.incubator.richtext/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>incubator.controls</name>
+	<name>incubator.richtext</name>
 	<comment></comment>
 	<projects>
 	</projects>

modules/javafx.incubator.controls/src/main/java/module-info.java → modules/javafx.incubator.richtext/src/main/java/module-info.java

@@ -32,7 +32,7 @@
  * @moduleGraph
  * @since 999
  */
-module javafx.incubator.controls {
+module javafx.incubator.richtext {
     requires transitive javafx.base;
     requires transitive javafx.graphics;
     requires transitive javafx.controls;

modules/javafx.incubator.controls/src/test/addExports → modules/javafx.incubator.richtext/src/test/addExports

@@ -16,5 +16,5 @@
 --add-exports javafx.controls/com.sun.javafx.scene.control.skin=ALL-UNNAMED
 --add-exports javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED
 #
---add-exports javafx.incubator.controls/com.sun.javafx.incubator.scene.control.dummy=ALL-UNNAMED
---add-exports javafx.incubator.controls/com.sun.javafx.incubator.scene.control.rich=ALL-UNNAMED
+--add-exports javafx.incubator.richtext/com.sun.javafx.incubator.scene.control.dummy=ALL-UNNAMED
+--add-exports javafx.incubator.richtext/com.sun.javafx.incubator.scene.control.rich=ALL-UNNAMED

settings.gradle

@@ -23,12 +23,12 @@
  * questions.
  */
 
-include "base", "graphics", "controls", "incubator.controls", "swing", "swt", "fxml", "web", "media", "systemTests"
+include "base", "graphics", "controls", "incubator.richtext", "swing", "swt", "fxml", "web", "media", "systemTests"
 
 project(":base").projectDir = file("modules/javafx.base")
 project(":graphics").projectDir = file("modules/javafx.graphics")
 project(":controls").projectDir = file("modules/javafx.controls")
-project(":incubator.controls").projectDir = file("modules/javafx.incubator.controls")
+project(":incubator.richtext").projectDir = file("modules/javafx.incubator.richtext")
 project(":swing").projectDir = file("modules/javafx.swing")
 project(":swt").projectDir = file("modules/javafx.swt")
 project(":fxml").projectDir = file("modules/javafx.fxml")

tests/manual/RichTextAreaDemo/.classpath

@@ -52,7 +52,7 @@
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/incubator.controls">
+	<classpathentry combineaccessrules="false" kind="src" path="/incubator.richtext">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

tests/manual/RichTextAreaDemo/src/module-info.java

@@ -40,5 +40,5 @@
     requires javafx.base;
     requires javafx.controls;
     requires javafx.graphics;
-    requires javafx.incubator.controls;
+    requires javafx.incubator.richtext;
 }