Doesn't hurt on 1.2, but haven't tested on 1.1 system. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193724 13f79535-47bb-0310-9956-ffa450edef68pull/32/head
@@ -155,6 +155,14 @@ Sometimes ant gives out this warnings, but the build is finished without any pro | |||
<property name="ignore_this" value="ignore_this.java"/> | |||
<property name="jimi" value="JimiImage.java"/> | |||
<property name="ignore_jdk11" | |||
value="org/apache/fop/render/awt/** | |||
,org/apache/fop/image/analyzer/* | |||
,org/apache/fop/viewer/** | |||
,org/apache/fop/image/* | |||
,**/PrintCommandLine.java | |||
,**/AWTCommandLine.java"/> | |||
<property name="xslt" value="org.apache.xalan.xslt.Process"/> | |||
<property name="src.properties.xsl" value="${src.codegen}/properties.xsl"/> | |||
<property name="properties.xml" value="${build.codegen}/properties.xml"/> | |||
@@ -317,6 +325,19 @@ Sometimes ant gives out this warnings, but the build is finished without any pro | |||
excludes="**/${ignore_this},${jimi}"/> | |||
</target> | |||
<target name="compile-jdk11" depends="codegen, prepare-src"> | |||
<echo message="Compiling the sources for JDK1.1"/> | |||
<!-- create directories --> | |||
<mkdir dir="${build.dest}"/> | |||
<javac srcdir="${build.src}" | |||
destdir="${build.dest}" | |||
debug="${debug}" | |||
deprecation="${deprecation}" | |||
optimize="${optimize}" | |||
excludes="**/${ignore_this},${jimi},${ignore_jdk11}"/> | |||
</target> | |||
<!-- =================================================================== --> | |||
<!-- Creates the class package --> | |||
<!-- =================================================================== --> | |||
@@ -327,6 +348,13 @@ Sometimes ant gives out this warnings, but the build is finished without any pro | |||
includes="org/**"/> | |||
</target> | |||
<target name="package-jdk11" depends="compile-jdk11"> | |||
<echo message="Creating the jar file ${build.dir}/${name}11.jar"/> | |||
<jar jarfile="${build.dir}/${name}-jdk11.jar" | |||
basedir="${build.dest}" | |||
includes="org/**"/> | |||
</target> | |||
<!-- =================================================================== --> | |||
<!-- Prepares the docs --> | |||
<!-- =================================================================== --> |
@@ -1,6 +1,6 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | |||
<fo:root font-family="Times Roman" font-size="12pt" text-align="justify" xmlns:fo="http://www.w3.org/1999/XSL/Format"> | |||
<fo:root font-family="Times Roman" font-size="12pt" text-align="center" xmlns:fo="http://www.w3.org/1999/XSL/Format"> | |||
<fo:layout-master-set> | |||
<fo:simple-page-master master-name="right" |
@@ -92,7 +92,7 @@ public class Compare { | |||
StringTokenizer tokens = new StringTokenizer(filenames,","); | |||
Vector filenameListTmp = new Vector(20); | |||
while (tokens.hasMoreTokens()) { | |||
filenameListTmp.add(tokens.nextToken()); | |||
filenameListTmp.addElement(tokens.nextToken()); | |||
} | |||
filenameList = new String [filenameListTmp.size()] ; | |||
filenameListTmp.copyInto((String[]) filenameList); |
@@ -195,10 +195,10 @@ | |||
<inherited>true</inherited> | |||
<datatype> | |||
<enumeration> | |||
<value const="START">start</value> | |||
<value const="CENTER">center</value> | |||
<value const="END">end</value> | |||
<value const="START">start</value> | |||
<value const="JUSTIFY">justify</value> | |||
<value const="CENTER">center</value> | |||
</enumeration> | |||
</datatype> | |||
<default>start</default> |
@@ -109,12 +109,13 @@ public class PageSequenceMaster extends FObj { | |||
protected void addSubsequenceSpecifier( SubSequenceSpecifier pageMasterReference ) | |||
{ | |||
subSequenceSpecifiers.add( pageMasterReference ); | |||
subSequenceSpecifiers.addElement( pageMasterReference ); | |||
} | |||
protected SubSequenceSpecifier getNextSubsequenceSpecifier() | |||
{ | |||
currentPmr = (SubSequenceSpecifier)subSequenceSpecifiers.remove( 0 ); | |||
currentPmr = (SubSequenceSpecifier)subSequenceSpecifiers.elementAt( 0 ); | |||
subSequenceSpecifiers.removeElementAt(0); | |||
return currentPmr; | |||
} | |||
@@ -129,7 +129,7 @@ public class RepeatablePageMasterAlternatives extends FObj | |||
for (int i = 0; i < conditionalPageMasterRefs.size(); i++) | |||
{ | |||
ConditionalPageMasterReference cpmr = | |||
(ConditionalPageMasterReference)conditionalPageMasterRefs.get(i); | |||
(ConditionalPageMasterReference)conditionalPageMasterRefs.elementAt(i); | |||
// 0-indexed page number | |||
if (cpmr.isValid(currentPageNumber + 1, thisIsFirstPage)) |
@@ -124,7 +124,7 @@ if (i % 75 == 0) buffer.append("\n"); | |||
throw new PDFFilterException("filter not supported"); | |||
} | |||
this.m_filters.add(filter); | |||
this.m_filters.addElement(filter); | |||
} | |||
public String toPDF() { | |||
@@ -135,7 +135,7 @@ if (i % 75 == 0) buffer.append("\n"); | |||
buffer.append("\n"); | |||
buffer.append("/Filter ["); | |||
for (int i = this.m_filters.size(); i > 0; i--) { | |||
PDFFilter filter = (PDFFilter) this.m_filters.get(i - 1); | |||
PDFFilter filter = (PDFFilter) this.m_filters.elementAt(i - 1); | |||
buffer.append(filter.toPDF()); | |||
if (i > 1) buffer.append(" "); | |||
} | |||
@@ -161,7 +161,7 @@ if (i % 75 == 0) buffer.append("\n"); | |||
if (this.m_filters.size() > 0) { | |||
buffer.append("/Filter ["); | |||
for (int i = this.m_filters.size(); i > 0; i--) { | |||
PDFFilter filter = (PDFFilter) this.m_filters.get(i - 1); | |||
PDFFilter filter = (PDFFilter) this.m_filters.elementAt(i - 1); | |||
buffer.append(filter.toPDF()); | |||
if (i > 1) buffer.append(" "); | |||
} |