# HG changeset patch
# User kcr
# Date 1421102531 28800
# Node ID a826950ca98cc706bc1c4219ba65c3ad7f4af30e
# Parent  e22470b76121f8844d988277df1d0906fbbec8a1
[mq]: part2-rm-designTime

diff --git a/build.gradle b/build.gradle
--- a/build.gradle
+++ b/build.gradle
@@ -1202,7 +1202,7 @@
     // entire SDK, a different javadoc command is used (see the javadoc task on the top level)
     javadoc {
         enabled = IS_BUILD_JAVADOC
-        exclude("com/**/*", "javafx/scene/ParentDesignInfo*", "Compile*", "javafx/builder/**/*", "javafx/scene/accessibility/**/*");
+        exclude("com/**/*", "Compile*", "javafx/builder/**/*", "javafx/scene/accessibility/**/*");
         executable = JAVADOC;
         options.windowTitle("JavaFX Project ${project.name} ${RELEASE_NAME}")
         if (BUILD_CLOSED) {
@@ -2728,7 +2728,7 @@
     classpath += files(projectsToDocument.collect { project ->
         project.sourceSets.main.output
     });
-    exclude("com/**/*", "javafx/scene/ParentDesignInfo*", "Compile*", "javafx/builder/**/*", "javafx/scene/accessibility/**/*");
+    exclude("com/**/*", "Compile*", "javafx/builder/**/*", "javafx/scene/accessibility/**/*");
     options.windowTitle("${javadocTitle}")
     options.header("${javadocHeader}")
     options.bottom("${javadocBottom}")
diff --git a/modules/controls/src/main/dt/javafx/scene/control/ControlDesignInfo.java b/modules/controls/src/main/dt/javafx/scene/control/ControlDesignInfo.java
deleted file mode 100644

diff --git a/modules/controls/src/main/dt/javafx/scene/control/SplitPaneDesignInfo.java b/modules/controls/src/main/dt/javafx/scene/control/SplitPaneDesignInfo.java
deleted file mode 100644

diff --git a/modules/controls/src/main/dt/javafx/scene/control/resources.properties b/modules/controls/src/main/dt/javafx/scene/control/resources.properties
deleted file mode 100644

diff --git a/netbeans/controls/nbproject/build-impl.xml b/netbeans/controls/nbproject/build-impl.xml
--- a/netbeans/controls/nbproject/build-impl.xml
+++ b/netbeans/controls/nbproject/build-impl.xml
@@ -164,7 +164,6 @@
         <condition property="have.sources">
             <or>
                 <available file="${src.dir}"/>
-                <available file="${java.dir}"/>
                 <available file="${src.resources.dir}"/>
             </or>
         </condition>
@@ -253,7 +252,6 @@
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
         <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="java.dir">Must set java.dir</fail>
         <fail unless="src.resources.dir">Must set src.resources.dir</fail>
         <fail unless="test.src.dir">Must set test.src.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
@@ -276,7 +274,7 @@
     </target>
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}:${java.dir}:${src.resources.dir}" name="srcdir"/>
+            <attribute default="${src.dir}:${src.resources.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -317,7 +315,7 @@
     </target>
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}:${java.dir}:${src.resources.dir}" name="srcdir"/>
+            <attribute default="${src.dir}:${src.resources.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -350,7 +348,7 @@
     </target>
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}:${java.dir}:${src.resources.dir}" name="srcdir"/>
+            <attribute default="${src.dir}:${src.resources.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -977,13 +975,12 @@
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.dir}:${java.dir}:${src.resources.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.dir}:${src.resources.dir}:${build.generated.subdirs}"/>
     </target>
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.classes.dir}">
             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${java.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.resources.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
@@ -1005,7 +1002,7 @@
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}:${java.dir}:${src.resources.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}:${src.resources.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -1277,9 +1274,6 @@
             <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${java.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
             <fileset dir="${src.resources.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -1293,9 +1287,6 @@
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
-            <fileset dir="${java.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
             <fileset dir="${src.resources.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
diff --git a/netbeans/controls/nbproject/genfiles.properties b/netbeans/controls/nbproject/genfiles.properties
--- a/netbeans/controls/nbproject/genfiles.properties
+++ b/netbeans/controls/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=c3f48d47
+build.xml.data.CRC32=f6f7f6b6
 build.xml.script.CRC32=03d88dda
-build.xml.stylesheet.CRC32=8064a381@1.68.1.46
+build.xml.stylesheet.CRC32=8064a381@1.74.2.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=c3f48d47
-nbproject/build-impl.xml.script.CRC32=ff0ad9e9
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
+nbproject/build-impl.xml.data.CRC32=f6f7f6b6
+nbproject/build-impl.xml.script.CRC32=bab810c1
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
diff --git a/netbeans/controls/nbproject/project.properties b/netbeans/controls/nbproject/project.properties
--- a/netbeans/controls/nbproject/project.properties
+++ b/netbeans/controls/nbproject/project.properties
@@ -27,13 +27,11 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.main-dt=../../modules/controls/src/main/dt
 file.reference.main-java=../../modules/controls/src/main/java
 file.reference.main-resources=../../modules/controls/src/main/resources
 file.reference.test-java=../../modules/controls/src/test/java
 includes=**
 jar.compress=false
-java.dir=${file.reference.main-java}
 javac.classpath=\
     ${reference.base.jar}:\
     ${reference.buildSrc.jar}:\
@@ -85,6 +83,6 @@
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
 source.encoding=UTF-8
-src.dir=${file.reference.main-dt}
+src.dir=${file.reference.main-java}
 src.resources.dir=${file.reference.main-resources}
 test.src.dir=${file.reference.test-java}
diff --git a/netbeans/controls/nbproject/project.xml b/netbeans/controls/nbproject/project.xml
--- a/netbeans/controls/nbproject/project.xml
+++ b/netbeans/controls/nbproject/project.xml
@@ -7,7 +7,6 @@
             <explicit-platform explicit-source-supported="true"/>
             <source-roots>
                 <root id="src.dir"/>
-                <root id="java.dir"/>
                 <root id="src.resources.dir"/>
             </source-roots>
             <test-roots>