From c36d9aa9f5e4f20778c5c920b11859547a6e87e2 Mon Sep 17 00:00:00 2001
From: Joerg Pietschmann <pietsch@apache.org>
Date: Sun, 29 Jun 2003 21:11:39 +0000
Subject: [PATCH] Made source more friendly for Eclipse (and IDEs in general)
 by using conditionally different files instead of source copy with filtering.
 Add either src/java-1.3 or src/java1.4 to your build path, depending on your
 JDK. Ant build should automatically choose the correct file - if the right
 files are comitted in the current mess, that is.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196539 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                     | 35 +++++-----
 .../apache/fop/svg/GraphicsConfiguration.java | 62 +++++++++++++++++
 .../apache/fop/svg/GraphicsConfiguration.java | 67 +++++++++++++++++++
 ...on.javat => PDFGraphicsConfiguration.java} |  9 +--
 4 files changed, 147 insertions(+), 26 deletions(-)
 create mode 100644 src/java-1.3/org/apache/fop/svg/GraphicsConfiguration.java
 create mode 100644 src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java
 rename src/java/org/apache/fop/svg/{PDFGraphicsConfiguration.javat => PDFGraphicsConfiguration.java} (95%)

diff --git a/build.xml b/build.xml
index 785497ec3..4d9aaabe2 100644
--- a/build.xml
+++ b/build.xml
@@ -120,6 +120,11 @@ list of possible build targets.
     <include name="**/*.java"/>
     <exclude name="**/*${ignore_this}"/>
   </patternset>
+  
+  <patternset id="graphics-configuration-source">
+    <include name="org/apache/fop/svg/GraphicsConfiguration.java"/>
+  </patternset>
+  
 
   <!-- =================================================================== -->
   <!-- Initialization target                                               -->
@@ -216,14 +221,10 @@ list of possible build targets.
     <property name="ZapfDingbats.xml" value="${build.codegen}/ZapfDingbats.xml"/>
     <property name="Symbol.xml" value="${build.codegen}/Symbol.xml"/>
 
-    <property name="trax" value="TraxTransform.java"/>
-    <property name="xsltransform" value="XSLTransform.java"/>
-
     <property name="tools.pkg" value="org/apache/fop/tools"/>
 
     <property name="main.class" value="org.apache.fop.apps.Fop"/>
 
-    <filter filtersfile="${build.codegen}/filter" />
   </target>
 
   <target name="init-avail">
@@ -260,17 +261,21 @@ list of possible build targets.
       </not>
     </condition>
     <echo message="${jce.message}"/>
-    <available property="jdk14.present" classname="java.lang.CharSequence"/>
+    <available property="jdk14.present" classname="java.awt.image.VolatileImage"/>
   </target>
 
   <target name="init-filters-jdk13" depends="init-avail" unless="jdk14.present">
-    <echo message="JDK 1.3 or earlier present."/>
-    <copy file="src/codegen/jdk13.filter" toFile="build/src/codegen/filter"/>
+    <echo message="Use GraphicsConfiguration adapter for JDK 1.3 or earlier."/>
+    <path id="graphics-configuration-adapter">
+      <pathelement location="src/java-1.3"/>
+    </path>
   </target>
 
   <target name="init-filters-jdk14" depends="init-avail" if="jdk14.present">
-    <echo message="JDK 1.4 present."/>
-    <copy file="src/codegen/jdk14.filter" toFile="build/src/codegen/filter"/>
+    <echo message="Use GraphicsConfiguration adapter for JDK 1.4."/>
+    <path id="graphics-configuration-adapter">
+      <pathelement location="src/java-1.4"/>
+    </path>
   </target>
 
   <!-- =================================================================== -->
@@ -301,7 +306,7 @@ list of possible build targets.
     <echo message="Resetting codegen directory"/>
 
     <!-- copy codegen directory -->
-    <copy todir="${build.codegen}" filtering="on">
+    <copy todir="${build.codegen}">
       <fileset dir="${src.codegen}"/>
     </copy>
 
@@ -397,14 +402,6 @@ list of possible build targets.
     <style in="${ZapfDingbats.xml}" style="${fontfile.xsl}"
         out="${build.gensrc}/${replacestring}/fonts/base14/ZapfDingbats.java"/>
 
-    <!-- prepare JDK dependant files -->
-    <copy todir="${build.gensrc}" filtering="on">
-      <mapper type="glob" from="*.javat" to="*.java"/>
-      <fileset dir="${src.java}">
-        <include name="**/*.javat"/>
-      </fileset>
-    </copy>
-
   </target>
 
   <!-- =================================================================== -->
@@ -432,6 +429,8 @@ list of possible build targets.
       <patternset refid="exclude-jimi"/>
       <classpath refid="libs-build-classpath"/>
       <patternset refid="base-sources"/>
+      <src refid="graphics-configuration-adapter"/>
+      <patternset refid="graphics-configuration-source"/>
     </javac>
   </target>
 
diff --git a/src/java-1.3/org/apache/fop/svg/GraphicsConfiguration.java b/src/java-1.3/org/apache/fop/svg/GraphicsConfiguration.java
new file mode 100644
index 000000000..ab0694f7d
--- /dev/null
+++ b/src/java-1.3/org/apache/fop/svg/GraphicsConfiguration.java
@@ -0,0 +1,62 @@
+/*
+ * $Id$
+ * ============================================================================
+ *                    The Apache Software License, Version 1.1
+ * ============================================================================
+ * 
+ * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modifica-
+ * tion, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * 3. The end-user documentation included with the redistribution, if any, must
+ *    include the following acknowledgment: "This product includes software
+ *    developed by the Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself, if
+ *    and wherever such third-party acknowledgments normally appear.
+ * 
+ * 4. The names "FOP" and "Apache Software Foundation" must not be used to
+ *    endorse or promote products derived from this software without prior
+ *    written permission. For written permission, please contact
+ *    apache@apache.org.
+ * 
+ * 5. Products derived from this software may not be called "Apache", nor may
+ *    "Apache" appear in their name, without prior written permission of the
+ *    Apache Software Foundation.
+ * 
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+ * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ============================================================================
+ * 
+ * This software consists of voluntary contributions made by many individuals
+ * on behalf of the Apache Software Foundation and was originally created by
+ * James Tauber <jtauber@jtauber.com>. For more information on the Apache
+ * Software Foundation, please see <http://www.apache.org/>.
+ */ 
+
+package org.apache.fop.svg;
+/**
+ * Adapter to allow subclassing java.awt.GraphicsConfiguration without
+ * compilation errors.
+ * The version for JDK 1.3 is just empty. 
+ * 
+ */
+abstract public class GraphicsConfiguration extends java.awt.GraphicsConfiguration {
+
+
+}
diff --git a/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java b/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java
new file mode 100644
index 000000000..12c8183ec
--- /dev/null
+++ b/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java
@@ -0,0 +1,67 @@
+/*
+ * $Id$
+ * ============================================================================
+ *                    The Apache Software License, Version 1.1
+ * ============================================================================
+ * 
+ * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modifica-
+ * tion, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * 3. The end-user documentation included with the redistribution, if any, must
+ *    include the following acknowledgment: "This product includes software
+ *    developed by the Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself, if
+ *    and wherever such third-party acknowledgments normally appear.
+ * 
+ * 4. The names "FOP" and "Apache Software Foundation" must not be used to
+ *    endorse or promote products derived from this software without prior
+ *    written permission. For written permission, please contact
+ *    apache@apache.org.
+ * 
+ * 5. Products derived from this software may not be called "Apache", nor may
+ *    "Apache" appear in their name, without prior written permission of the
+ *    Apache Software Foundation.
+ * 
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+ * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ============================================================================
+ * 
+ * This software consists of voluntary contributions made by many individuals
+ * on behalf of the Apache Software Foundation and was originally created by
+ * James Tauber <jtauber@jtauber.com>. For more information on the Apache
+ * Software Foundation, please see <http://www.apache.org/>.
+ */ 
+
+package org.apache.fop.svg;
+/**
+ * Adapter to allow subclassing java.awt.GraphicsConfiguration without
+ * compilation errors.
+ * The version for JDK 1.4 needs to add an override for the abstract
+ * createCompatibleVolatileImage() method. It can't be overidden
+ * for JDK 1.3 because there is no VolatileImage there. 
+ * 
+ */
+abstract public class GraphicsConfiguration extends java.awt.GraphicsConfiguration {
+
+    public java.awt.image.VolatileImage createCompatibleVolatileImage(int width, int height) {
+        return null;
+    }
+
+}
diff --git a/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.javat b/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java
similarity index 95%
rename from src/java/org/apache/fop/svg/PDFGraphicsConfiguration.javat
rename to src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java
index 8b24b18c3..ba8540d4e 100644
--- a/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.javat
+++ b/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * $Id: PDFGraphicsConfiguration.javat,v 1.2 2003/03/07 09:51:25 jeremias Exp $
+ * $Id$
  * ============================================================================
  *                    The Apache Software License, Version 1.1
  * ============================================================================
@@ -50,7 +50,6 @@
  */ 
 package org.apache.fop.svg;
 
-import java.awt.GraphicsConfiguration;
 import java.awt.Rectangle;
 import java.awt.GraphicsDevice;
 import java.awt.Transparency;
@@ -168,11 +167,5 @@ class PDFGraphicsConfiguration extends GraphicsConfiguration {
         return new PDFGraphicsDevice(this);
     }
 
-    // needed for compiling under jdk1.4
-    @jdk14codestart@
-    public java.awt.image.VolatileImage createCompatibleVolatileImage(int width, int height) {
-        return null;
-    }
-    @jdk14codeend@
 }
 
-- 
2.39.5