Formatted XML files using defined rules (#11956)

Change-Id: Iecd621321fdde29d2d89d910ba46e9dadee58995

4 files changed, 132 insertions, 125 deletions

diff --git a/client/build.xml b/client/build.xml
index a2262eed7d..a027d00f60 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -1,43 +1,46 @@
 <?xml version="1.0"?>
 
-<project name="vaadin-client" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
-	<description>
-		Compiles build helpers used when building other modules.
-	</description>
-	<include file="../common.xml" as="common" />
-	<include file="../build.xml" as="vaadin" />
-	<include file="../gwt-files.xml" as="gwtfiles" />
+<project name="vaadin-client" basedir="." default="publish-local"
+    xmlns:ivy="antlib:org.apache.ivy.ant">
+    <description>
+        Compiles build helpers used when building other modules.
+    </description>
+    <include file="../common.xml" as="common" />
+    <include file="../build.xml" as="vaadin" />
+    <include file="../gwt-files.xml" as="gwtfiles" />
 
-	<!-- global properties -->
-	<property name="module.name" value="vaadin-client" />
-	<property name="module.symbolic" value="com.vaadin.client" />
-	<property name="result.dir" value="result" />
+    <!-- global properties -->
+    <property name="module.name" value="vaadin-client" />
+    <property name="module.symbolic" value="com.vaadin.client" />
+    <property name="result.dir" value="result" />
 
-	<path id="classpath.compile.custom">
-		<!-- Could possibly compile GWT files also here to verify that
-		a) the same dependencies are used and
-		b) all dependencies have been declared
-		-->
-		<fileset file="${gwt.user.jar}" />
-	</path>
-	<path id="classpath.test.custom" />
+    <path id="classpath.compile.custom">
+        <!-- Could possibly compile GWT files also here to verify that a) 
+            the same dependencies are used and b) all dependencies have been declared -->
+        <fileset file="${gwt.user.jar}" />
+    </path>
+    <path id="classpath.test.custom" />
 
-	<target name="jar">
-		<property name="jar.file" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
-		<antcall target="common.jar">
-			<reference refid="client.gwt.includes" torefid="extra.jar.includes" />
-		</antcall>
-		<jar destfile="${jar.file}" update="true">
-			<manifest>
-				<attribute name="Vaadin-Package-Version" value="1" />
-				<attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" />
-			</manifest>
-		</jar>
-		<!-- Hack to add validation dependency with source classifier -->
-		<property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
-		<copy file="${pom.xml}" tofile="${temp.pom}">
-			<filterchain>
-				<replacestring from="  &lt;/dependencies&gt;" to="    &lt;dependency&gt;
+    <target name="jar">
+        <property name="jar.file"
+            location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
+        <antcall target="common.jar">
+            <reference refid="client.gwt.includes" torefid="extra.jar.includes" />
+        </antcall>
+        <jar destfile="${jar.file}" update="true">
+            <manifest>
+                <attribute name="Vaadin-Package-Version"
+                    value="1" />
+                <attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" />
+            </manifest>
+        </jar>
+        <!-- Hack to add validation dependency with source classifier -->
+        <property name="pom.xml"
+            location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
+        <copy file="${pom.xml}" tofile="${temp.pom}">
+            <filterchain>
+                <replacestring from="  &lt;/dependencies&gt;"
+                    to="    &lt;dependency&gt;
                &lt;groupId&gt;javax.validation&lt;/groupId&gt;
                &lt;artifactId&gt;validation-api&lt;/artifactId&gt;
                &lt;version&gt;1.0.0.GA&lt;/version&gt;
@@ -45,32 +48,32 @@
                &lt;classifier&gt;sources&lt;/classifier&gt;
              &lt;/dependency&gt;
   &lt;/dependencies&gt;" />
-			</filterchain>
-		</copy>
-		<move file="${temp.pom}" tofile="${pom.xml}" />
-	</target>
+            </filterchain>
+        </copy>
+        <move file="${temp.pom}" tofile="${pom.xml}" />
+    </target>
 
-	<target name="publish-local" depends="jar">
-		<antcall target="common.sources.jar">
-			<reference torefid="extra.jar.includes" refid="client.gwt.includes" />
-		</antcall>
-		<antcall target="common.javadoc.jar" />
+    <target name="publish-local" depends="jar">
+        <antcall target="common.sources.jar">
+            <reference torefid="extra.jar.includes" refid="client.gwt.includes" />
+        </antcall>
+        <antcall target="common.javadoc.jar" />
 
-		<antcall target="common.publish-local" />
-	</target>
+        <antcall target="common.publish-local" />
+    </target>
 
-	<target name="clean">
-		<antcall target="common.clean" />
-	</target>
+    <target name="clean">
+        <antcall target="common.clean" />
+    </target>
 
-	<target name="checkstyle">
-		<antcall target="common.checkstyle">
-			<param name="cs.src" location="src" />
-		</antcall>
-	</target>
+    <target name="checkstyle">
+        <antcall target="common.checkstyle">
+            <param name="cs.src" location="src" />
+        </antcall>
+    </target>
 
-	<target name="test" depends="checkstyle">
-		<antcall target="common.test.run" />
-	</target>
+    <target name="test" depends="checkstyle">
+        <antcall target="common.test.run" />
+    </target>
 
 </project>
\ No newline at end of file
diff --git a/client/src/com/vaadin/DefaultWidgetSet.gwt.xml b/client/src/com/vaadin/DefaultWidgetSet.gwt.xml
index 26ab7478e0..3aba1f6fee 100755
--- a/client/src/com/vaadin/DefaultWidgetSet.gwt.xml
+++ b/client/src/com/vaadin/DefaultWidgetSet.gwt.xml
@@ -1,13 +1,13 @@
 <module>
-	<!-- This GWT module defines the Vaadin DefaultWidgetSet. This is the module 
-		you want to extend when creating an extended widget set, or when creating 
-		a specialized widget set with a subset of the components. -->
+    <!-- This GWT module defines the Vaadin DefaultWidgetSet. This is the 
+        module you want to extend when creating an extended widget set, or when creating 
+        a specialized widget set with a subset of the components. -->
 
-	<!-- Hint for WidgetSetBuilder not to automatically update the file -->
-	<!-- WS Compiler: manually edited -->
+    <!-- Hint for WidgetSetBuilder not to automatically update the file -->
+    <!-- WS Compiler: manually edited -->
 
-	<inherits name="com.vaadin.Vaadin" />
+    <inherits name="com.vaadin.Vaadin" />
 
-	<entry-point class="com.vaadin.client.ApplicationConfiguration" />
+    <entry-point class="com.vaadin.client.ApplicationConfiguration" />
 
 </module>
diff --git a/client/src/com/vaadin/Vaadin.gwt.xml b/client/src/com/vaadin/Vaadin.gwt.xml
index a4eb88d9b4..31eb703e3c 100644
--- a/client/src/com/vaadin/Vaadin.gwt.xml
+++ b/client/src/com/vaadin/Vaadin.gwt.xml
@@ -12,13 +12,14 @@
     <inherits name="com.google.gwt.http.HTTP" />
 
     <inherits name="com.google.gwt.json.JSON" />
-    
+
     <inherits name="com.google.gwt.logging.Logging" />
-    <!-- Firebug handler is deprecated but for some reason still enabled by default -->
+    <!-- Firebug handler is deprecated but for some reason still enabled 
+        by default -->
     <set-property name="gwt.logging.firebugHandler" value="DISABLED" />
     <!-- Disable popup logging as we have our own popup logger -->
     <set-property name="gwt.logging.popupHandler" value="DISABLED" />
-    
+
     <inherits name="com.vaadin.VaadinBrowserSpecificOverrides" />
 
     <source path="client" />
@@ -40,19 +41,21 @@
         <when-type-assignable
             class="com.vaadin.client.metadata.ConnectorBundleLoader" />
     </generate-with>
-    
-    <replace-with class="com.vaadin.client.communication.AtmospherePushConnection">
+
+    <replace-with
+        class="com.vaadin.client.communication.AtmospherePushConnection">
         <when-type-is class="com.vaadin.client.communication.PushConnection" />
-    </replace-with>    
-    
-    <!-- Set vaadin.profiler to true to include profiling support in the module -->
+    </replace-with>
+
+    <!-- Set vaadin.profiler to true to include profiling support in the 
+        module -->
     <define-property name="vaadin.profiler" values="true,false" />
-    <set-property name="vaadin.profiler" value="false" />    
-    
+    <set-property name="vaadin.profiler" value="false" />
+
     <replace-with class="com.vaadin.client.Profiler.EnabledProfiler">
         <when-type-is class="com.vaadin.client.Profiler" />
         <when-property-is name="vaadin.profiler" value="true" />
-    </replace-with>    
+    </replace-with>
 
     <!-- Use the new cross site linker to get a nocache.js without document.write -->
     <add-linker name="xsiframe" />
diff --git a/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml b/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml
index ba6c171a7d..45ede928f5 100644
--- a/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml
+++ b/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml
@@ -1,54 +1,55 @@
 <module>
-	<!-- This GWT module defines the browser specific overrides used by Vaadin -->
-
-	<!-- Hint for WidgetSetBuilder not to automatically update the file -->
-	<!-- WS Compiler: manually edited -->
-
-	<!-- Fall through to this rule for everything but IE -->
-	<replace-with
-		class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy">
-		<when-type-is
-			class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy" />
-	</replace-with>
-
-	<replace-with
-		class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategyIE">
-		<when-type-is
-			class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy" />
-		<any>
-			<when-property-is name="user.agent" value="ie8" />
-		</any>
-	</replace-with>
-
-	<!-- Fall through to this rule for everything but IE -->
-	<replace-with class="com.vaadin.client.ui.VDragAndDropWrapper">
-		<when-type-is class="com.vaadin.client.ui.VDragAndDropWrapper" />
-	</replace-with>
-
-	<replace-with class="com.vaadin.client.ui.VDragAndDropWrapperIE">
-		<when-type-is class="com.vaadin.client.ui.VDragAndDropWrapper" />
-		<any>
-			<when-property-is name="user.agent" value="ie8" />
-		</any>
-	</replace-with>
-
-	<!-- Fall through to this rule for everything but IE -->
-	<replace-with class="com.vaadin.client.LayoutManager">
-		<when-type-is class="com.vaadin.client.LayoutManager" />
-	</replace-with>
-
-	<replace-with class="com.vaadin.client.LayoutManagerIE8">
-		<when-type-is class="com.vaadin.client.LayoutManager" />
-		<any>
-			<when-property-is name="user.agent" value="ie8" />
-		</any>
-	</replace-with>
-	
-	<replace-with class="com.vaadin.client.ui.VPopupImpl">
-    	<when-type-is class="com.google.gwt.user.client.ui.impl.PopupImplMozilla" />
-    	<when-property-is name="user.agent" value="gecko1_8"/>
-    </replace-with>
-    
+    <!-- This GWT module defines the browser specific overrides used by Vaadin -->
+
+    <!-- Hint for WidgetSetBuilder not to automatically update the file -->
+    <!-- WS Compiler: manually edited -->
+
+    <!-- Fall through to this rule for everything but IE -->
+    <replace-with
+        class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy">
+        <when-type-is
+            class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy" />
+    </replace-with>
+
+    <replace-with
+        class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategyIE">
+        <when-type-is
+            class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy" />
+        <any>
+            <when-property-is name="user.agent" value="ie8" />
+        </any>
+    </replace-with>
+
+    <!-- Fall through to this rule for everything but IE -->
+    <replace-with class="com.vaadin.client.ui.VDragAndDropWrapper">
+        <when-type-is class="com.vaadin.client.ui.VDragAndDropWrapper" />
+    </replace-with>
+
+    <replace-with class="com.vaadin.client.ui.VDragAndDropWrapperIE">
+        <when-type-is class="com.vaadin.client.ui.VDragAndDropWrapper" />
+        <any>
+            <when-property-is name="user.agent" value="ie8" />
+        </any>
+    </replace-with>
+
+    <!-- Fall through to this rule for everything but IE -->
+    <replace-with class="com.vaadin.client.LayoutManager">
+        <when-type-is class="com.vaadin.client.LayoutManager" />
+    </replace-with>
+
+    <replace-with class="com.vaadin.client.LayoutManagerIE8">
+        <when-type-is class="com.vaadin.client.LayoutManager" />
+        <any>
+            <when-property-is name="user.agent" value="ie8" />
+        </any>
+    </replace-with>
+
+    <replace-with class="com.vaadin.client.ui.VPopupImpl">
+        <when-type-is
+            class="com.google.gwt.user.client.ui.impl.PopupImplMozilla" />
+        <when-property-is name="user.agent" value="gecko1_8" />
+    </replace-with>
+
     <replace-with class="com.vaadin.client.ui.VPopupImpl">
         <when-type-is class="com.google.gwt.user.client.ui.impl.PopupImpl" />
     </replace-with>