--- old/functional/ControlsTests/build.xml	2017-02-10 15:01:32.201122862 +0300
+++ new/functional/ControlsTests/build.xml	2017-02-10 15:01:32.153122316 +0300
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--  
+<!--
 /*
  * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -21,24 +21,24 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 -->
 <project name="ControlsTests" default="default" basedir="."
          xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:fx="javafx:com.sun.javafx.tools.ant">
     <description>Builds, tests, and runs the project ControlsTests.</description>
 
-    <import file="../../tools/SharedTestUtilsOpen/image-utils.xml"/>  
+    <import file="../../tools/SharedTestUtilsOpen/image-utils.xml"/>
     <import file="../../tools/FxTestRunner/javatest_fx.xml"/>
     <import file="../../tools/FxTestRunner/run_javatest_macro.xml"/>
     <import file="../../tools/FxTestRunner/plugin_support.xml"/>
 
     <condition property="external.output" value="${external.output}" else="${basedir}/..">
-    	<isset property="external.output"/>
+        <isset property="external.output"/>
     </condition>
 
-    <property name="image.properties" location="${basedir}/image.properties"/> 
+    <property name="image.properties" location="${basedir}/image.properties"/>
     <property name="test.sources" value="test"/>
 
     <target name="-pre-init" unless="no.need.to.find.java.fx">
@@ -48,7 +48,7 @@
         </ant>
     </target>
 
-    <import file="nbproject/build-impl.xml"/>    
+    <import file="nbproject/build-impl.xml"/>
 
     <target name="test-dir" depends="init, compile-test,-pre-test-run" if="have.tests">
         <fail unless="test.subdir">Must set test.subdir with short name of root dir of tests; eg ListView</fail>
@@ -58,8 +58,8 @@
     <!-- javatest support -->
     <target name="javatest" depends="compile, compile-test, run-manual"/>
     <target name="run-manual" depends="init,dojavatest"/>
-	<target name="run-automated" depends="-post-jar, javatest-automated"/>
-	<target name="run-automated-nobuild" depends="init, dist-plugin, javatest-automated"/>
+    <target name="run-automated" depends="-post-jar, javatest-automated"/>
+    <target name="run-automated-nobuild" depends="init, dist-plugin, javatest-automated"/>
     <target name="-post-jar" depends="compile-test, dist-plugin"/>
 
     <!--    Prepare jars for manual testing -->
@@ -68,15 +68,15 @@
     <target name="manual-jars" depends="init">
         <echo message="FX-ANT=${file.reference.ant-javafx.jar}" />
 
-        <condition property="file.reference.ant-javafx.jar" value="${javafx.home}/../lib/ant-javafx.jar" else="${javafx.rt}/../lib/ant-javafx.jar">
-    	    <isset property="javafx.home"/>
+        <condition property="file.reference.ant-javafx.jar" value="${javafx.home}/lib/ant-javafx.jar" else="${javafx.rt}/lib/ant-javafx.jar">
+            <isset property="javafx.home"/>
         </condition>
         <echo message="debug: file.reference.ant-javafx.jar = ${file.reference.ant-javafx.jar}"/>
 
         <taskdef resource="com/sun/javafx/tools/ant/antlib.xml"
                  uri="javafx:com.sun.javafx.tools.ant"
                  classpath="${file.reference.ant-javafx.jar}"/>
-                
+
         <fx:jar destfile="${content.dir}/source.jar">
             <application mainClass="javafx.draganddrop.DragDropWithControls" name="DragAndClipboard"  />
             <fileset dir="${build.classes.dir}">
@@ -89,18 +89,18 @@
                 <attribute name="Implementation-Version" value="1.0"/>
             </manifest>
             <fx:resources>
-		<fx:fileset dir="${content.dir}" includes="SharedTestUtilsOpen.jar"/>
-		<fx:fileset dir="${content.dir}" includes="JemmyAWTInput.jar"/>
+                <fx:fileset dir="${content.dir}" includes="SharedTestUtilsOpen.jar"/>
+                <fx:fileset dir="${content.dir}" includes="JemmyAWTInput.jar"/>
                 <fx:fileset dir="${content.dir}" includes="JemmyCore.jar"/>
                 <fx:fileset dir="${content.dir}" includes="JemmyFX.jar"/>
             </fx:resources>
         </fx:jar>
-        <copy file="../../tools/SharedTestUtilsOpen/dist/SharedTestUtilsOpen.jar" tofile="${content.dir}/SharedTestUtilsOpen.jar"/>		
-	<copy file="../../tools/Jemmy/jemmy_core/JemmyAWTInput.jar"               tofile="${content.dir}/JemmyAWTInput.jar"/>
+        <copy file="../../tools/SharedTestUtilsOpen/dist/SharedTestUtilsOpen.jar" tofile="${content.dir}/SharedTestUtilsOpen.jar"/>
+    <copy file="../../tools/Jemmy/jemmy_core/JemmyAWTInput.jar"               tofile="${content.dir}/JemmyAWTInput.jar"/>
         <copy file="../../tools/Jemmy/jemmy_core/JemmyCore.jar"                   tofile="${content.dir}/JemmyCore.jar"/>
         <copy file="../../tools/Jemmy/JemmyFX/dist/JemmyFX.jar"                   tofile="${content.dir}/JemmyFX.jar"/>
     </target>
-	
+
     <target name="check-template" unless="template">
         <fail message="template variable must be set to merge"/>
     </target>