Skip to content

Commit

Permalink
Whitespace clean-up repository-wide
Browse files Browse the repository at this point in the history
  - Remove trailing whitespace
  - Use tabs/spaces consistently (4-space indents)
  • Loading branch information
pbrant authored and asolntsev committed Sep 6, 2023
1 parent ed2c952 commit edd5751
Show file tree
Hide file tree
Showing 320 changed files with 5,322 additions and 5,322 deletions.
6 changes: 3 additions & 3 deletions archive/buildn.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<zip basedir="${basedir}" zipfile="../flyingsaucer.zip"/>
</target>


<!-- =================================================
Documentation
================================================= -->
Expand Down Expand Up @@ -183,7 +183,7 @@
</copy>
</target>


<!-- =======================================
General
======================================= -->
Expand Down Expand Up @@ -269,7 +269,7 @@

<!-- ========== this is the CVS log. Don't delete! ========== -->

<!--
<!--
$Id$
$Log$
Expand Down
2 changes: 1 addition & 1 deletion archive/etc/build/clean.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<project name="build.clean">
<target name="clean-for-core-debug" depends="clean,resources.core"/>

<!-- cleans all javadoc/api files -->
<target name="clean.javadoc" description="Clean project javadoc files" depends="properties">
<delete dir="${dest.javadoc.full.dir}"/>
Expand Down
2 changes: 1 addition & 1 deletion archive/etc/build/compile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<antcall target="compile.browser" />
<antcall target="compile.about" />
</target>

<!-- Compiles the Help/About Box demo along with the main codebase -->
<target name="compile.about" depends="compile">
<javac-full srcdir="${src.about.java.dir}"/>
Expand Down
4 changes: 2 additions & 2 deletions archive/etc/build/convert.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<target name="convert.www" description="Convert WWW Xilize files to XHTML">
<xilize args="-do ${www.dir}" />
</target>

<target name="convert.guide" depends="check.app.version, jar.core" description="Convert User's Guide Xilize files to XHTML and PDF">
<property name="ugxil" value="${guide}/users-guide-${app.version}.xil" />
<fail message="Can't find User's Guide file named ${ugxil}.">
<condition>
<condition>
<not>
<available file="${ugxil}" />
</not>
Expand Down
4 changes: 2 additions & 2 deletions archive/etc/build/demo-apps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<!-- hack: for os x and swt, need vm parameter startOnFirstThread. not sure how to make this conditional
within Ant; if you figure out a way, please merge these SWT targets into one browser-swt -->
<target name="browser-swt" depends="browser-swt-not-osx,browser-swt-osx" />

<target name="browser-swt-not-osx" depends="jar.browser" unless="isMac">
<echo message="Please make sure you have the swt.jar corresponding to your platform in the lib directory."/>
<java classname="org.xhtmlrenderer.demo.browser.swt.BrowserStartup"
Expand All @@ -43,7 +43,7 @@
<sysproperty key="java.protocol.handler.pkgs" value="org.xhtmlrenderer.protocols"/>
</java>
</target>

<target name="browser-swt-osx" depends="jar.browser" if="isMac">
<echo message="Please make sure you have the swt.jar corresponding to your platform in the lib directory."/>
<java classname="org.xhtmlrenderer.demo.browser.swt.BrowserStartup"
Expand Down
2 changes: 1 addition & 1 deletion archive/etc/build/dist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
/>
</target>

<!--
<!--
Builds a ZIP file of all source for distribution, with 3rd party libraries
and XHTML samples included
-->
Expand Down
2 changes: 1 addition & 1 deletion archive/etc/build/docs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!--
DONT USE THIS FROM COMMAND LINE; use docs
builds JavaDoc for all code. Meant to be used with antcall; set parameters
for properties antcall.dest.javadoc.dir and antcall.javadoc.file
for properties antcall.dest.javadoc.dir and antcall.javadoc.file
-->
<target name="_javadoc"
description="internal use; use 'docs' instead. builds javadoc for all XR packages"
Expand Down
2 changes: 1 addition & 1 deletion archive/etc/build/jars.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</fileset>
</jar>
</target>

<!-- Compiles SVG sample and main codebase, and builds jar for browser -->
<target name="jar.svg" depends="compile.svg, jar.core" description="build SVG jar">
<jar jarfile="${dest.dir}/svg.jar" compress="true"
Expand Down
10 changes: 5 additions & 5 deletions archive/etc/build/netbeans.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<nbprofiledirect>
<classpath refid="libraries-and-dest.all"/>
</nbprofiledirect>
<java fork="true" classname="org.xhtmlrenderer.swing.HTMLTest"
<java fork="true" classname="org.xhtmlrenderer.swing.HTMLTest"
jvm="${profiler.info.jvm}">
<jvmarg value="${profiler.info.jvmargs.agent}"/>
<jvmarg line="${profiler.info.jvmargs}"/>
Expand All @@ -18,16 +18,16 @@
<classpath refid="libraries-and-dest.all"/>
</java>
</target>

<!--
Optional - If source roots are properly declared in project, should
work without setting source path.
<sourcepath refid="debug.sourcepath"/>
work without setting source path.
<sourcepath refid="debug.sourcepath"/>
-->
<target name="debug" depends="compile" if="netbeans.home" description="Debug Project">
<nbjpdastart name="flying-saucer-simple" addressproperty="jpda.address" transport="dt_socket">
<classpath refid="run.classpath"/>

</nbjpdastart>
<java fork="true" classname="org.xhtmlrenderer.swing.HTMLTest">
<jvmarg value="-Xdebug"/>
Expand Down
2 changes: 1 addition & 1 deletion archive/etc/build/preset-defs.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- :mode=xml:folding=none: -->
<project name="build.preset-defs">
<import file="properties.xml" />
<!--
<!--
definition of a javac task with all compiler parameters read from
properties. can be used for most uses of javac in this file.
-->
Expand Down
2 changes: 1 addition & 1 deletion archive/etc/build/properties.xml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
<fileset dir="${libraries.dir}/swt">
<selector if="isMac64">
<filename name="swt-3.6-osx-64.jar"/>
</selector>
</selector>
</fileset>
</path>

Expand Down
36 changes: 18 additions & 18 deletions archive/etc/build/tests.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!-- =================================================
Tests
================================================= -->

<!-- Compiles, then runs HTML test -->
<target name="test" depends="compile" description="Test">
<java
Expand All @@ -21,10 +21,10 @@
<classpath refid="libraries.all"/>
</java>
</target>

<!-- Runs a speed test after a compile -->
<target name="test.speed" depends="test.css-speed"></target>

<!-- Runs a speed test after a compile -->
<target name="test.css-speed" depends="compile" description="Test timing on loading Hamlet.xhtml multiple times.">
<java classname="org.xhtmlrenderer.test.HamletSpeedTest"
Expand Down Expand Up @@ -56,7 +56,7 @@
<classpath refid="libraries.all"/>
</java>
</target>

<!-- target just shows how a single test can be run -->
<target name="test.junit.simple" depends="compile.junit">
<junit printsummary="withOutAndErr"
Expand All @@ -65,7 +65,7 @@
haltonerror="on"
showoutput="on"
haltonfailure="on">

<classpath>
<pathelement path="${basedir}" />
<pathelement path="${dest.dir}" />
Expand All @@ -74,14 +74,14 @@
<include name="*.jar"/>
</fileset>
</classpath>

<formatter type="plain" usefile="false" />

<!-- run a single test -->
<test name="tests.public_apis.SimpleJUnitTest" />
</junit>
</target>

<!-- target just shows how a single test can be run -->
<target name="test.junit.ident" depends="compile.junit" description="test idents">
<junit printsummary="withOutAndErr"
Expand All @@ -90,7 +90,7 @@
haltonerror="on"
showoutput="on"
haltonfailure="on">

<classpath>
<pathelement path="${basedir}" />
<pathelement path="${dest.dir}" />
Expand All @@ -99,25 +99,25 @@
<include name="*.jar"/>
</fileset>
</classpath>

<formatter type="plain" usefile="false" />

<!-- run a single test -->
<test name="tests.public_apis.css.properties.resolve.IdentResolutionTest" />
</junit>
</target>
</target>

<target name="test.junit.public-apis" depends="compile.junit" description="Runs all JUnit unit tests.">
<junit printsummary="withOutAndErr"
timeout="60000"
filtertrace="on"
haltonerror="on"
showoutput="on"
haltonfailure="on">

<!-- <sysproperty key="show-config" value="${show-config}" /> -->
<!-- <sysproperty key="show-config" value="ALL" /> -->

<classpath>
<pathelement path="${basedir}" />
<pathelement path="${dest.dir}" />
Expand All @@ -126,9 +126,9 @@
<include name="*.jar"/>
</fileset>
</classpath>

<formatter type="plain" usefile="false" />

<!-- run all class files with Test in the name in the java dest directory -->
<batchtest fork="no">
<fileset dir="${dest.java.dir}">
Expand Down Expand Up @@ -239,7 +239,7 @@
<echo message="${dest.java.dir}" />
<java classname="org.xhtmlrenderer.test.ReferenceComparison"
fork="${java-exec.fork.tests}"

maxmemory="256m">
<classpath>
<path refid="libraries.all"/>
Expand Down
2 changes: 1 addition & 1 deletion flying-saucer-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<instructions>
<Bundle-SymbolicName>org.xhtmlrenderer.flying.saucer.core</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
<!-- Dependency resolution seems not to work properly with default
<!-- Dependency resolution seems not to work properly with default
behavior of importing the exported packages. -->
<Import-Package>!org.xhtmlrenderer.*</Import-Package>
<Export-Package>org.xhtmlrenderer.*</Export-Package>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@


/*
/*
* {{{ header & license
* {{{ header & license
* Copyright (c) 2004, 2005 Joshua Marinacci
* Copyright (c) 2004, 2005 Joshua Marinacci
*
*
* This program is free software; you can redistribute it and/or
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
* of the License, or (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
* GNU Lesser General Public License for more details.
*
*
* You should have received a copy of the GNU Lesser General Public License
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* }}}
* }}}
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class AWTFontResolver implements FontResolver {
public AWTFontResolver() {
init();
}

private void init() {
GraphicsEnvironment gfx = GraphicsEnvironment.getLocalGraphicsEnvironment();
String[] available_fonts = gfx.getAvailableFontFamilyNames();
Expand All @@ -72,7 +72,7 @@ private void init() {
available_fonts_hash.put("SansSerif", new Font("SansSerif", Font.PLAIN, 1));
available_fonts_hash.put("Monospaced", new Font("Monospaced", Font.PLAIN, 1));
}

public void flushCache() {
init();
}
Expand Down
Loading

0 comments on commit edd5751

Please sign in to comment.