cvs commit: xml-fop/src/org/apache/fop/fo/declarations FoColorProfile.java FoDeclarations.java
pbwest 2003/03/30 18:38:23 Modified:src/org/apache/fop/fo/declarations Tag: FOP_0-20-0_Alt-Design FoColorProfile.java FoDeclarations.java Log: Tidied copyright notice Revision ChangesPath No revision No revision 1.1.2.5 +48 -48 xml-fop/src/org/apache/fop/fo/declarations/Attic/FoColorProfile.java Index: FoColorProfile.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/declarations/Attic/FoColorProfile.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- FoColorProfile.java 19 Mar 2003 14:02:59 - 1.1.2.4 +++ FoColorProfile.java 31 Mar 2003 02:38:23 - 1.1.2.5 @@ -1,52 +1,52 @@ /* * $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 - * [EMAIL PROTECTED] - * - * 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 [EMAIL PROTECTED]. For more information on the Apache - * Software Foundation, please see http://www.apache.org/. + * + * 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
cvs commit: xml-fop/src/org/apache/fop/fo/declarations FoColorProfile.java FoDeclarations.java
pbwest 2003/03/19 06:02:59 Modified:src/org/apache/fop/fo/declarations Tag: FOP_0-20-0_Alt-Design FoColorProfile.java FoDeclarations.java Log: Full LICENSE text. Revision ChangesPath No revision No revision 1.1.2.4 +50 -5 xml-fop/src/org/apache/fop/fo/declarations/Attic/FoColorProfile.java Index: FoColorProfile.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/declarations/Attic/FoColorProfile.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoColorProfile.java 3 Dec 2002 07:31:25 - 1.1.2.3 +++ FoColorProfile.java 19 Mar 2003 14:02:59 - 1.1.2.4 @@ -1,8 +1,53 @@ /* * $Id$ - * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. - * For details on use and redistribution please refer to the - * LICENSE file included with these sources. + * + * + *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 + * [EMAIL PROTECTED] + * + * 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 [EMAIL PROTECTED]. For more information on the Apache + * Software Foundation, please see http://www.apache.org/. + * * * @author a href=mailto:[EMAIL PROTECTED]Peter B. West/a */ 1.1.2.5 +51 -6 xml-fop/src/org/apache/fop/fo/declarations/Attic/FoDeclarations.java Index: FoDeclarations.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/declarations/Attic/FoDeclarations.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- FoDeclarations.java 3 Dec 2002 07:31:25 - 1.1.2.4 +++ FoDeclarations.java 19 Mar 2003 14:02:59 - 1.1.2.5 @@ -18,9 +18,54 @@ /* * $Id$ - * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. - * For details on use and redistribution please refer to the - * LICENSE file included with these sources. + * + * + *The Apache
cvs commit: xml-fop/src/org/apache/fop/fo/declarations FoColorProfile.java FoDeclarations.java
pbwest 2002/12/02 23:31:26
Modified:src/org/apache/fop/fo/declarations Tag:
FOP_0-20-0_Alt-Design FoColorProfile.java
FoDeclarations.java
Log:
sparsePropsMap changed from HashMap to int[].
Revision ChangesPath
No revision
No revision
1.1.2.3 +6 -6
xml-fop/src/org/apache/fop/fo/declarations/Attic/FoColorProfile.java
Index: FoColorProfile.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/declarations/Attic/FoColorProfile.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoColorProfile.java 22 Nov 2002 02:17:22 - 1.1.2.2
+++ FoColorProfile.java 3 Dec 2002 07:31:25 - 1.1.2.3
@@ -38,7 +38,7 @@
position in the isparsePropsSet/i array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
-private static final HashMap sparsePropsMap;
+private static final int[] sparsePropsMap;
/** An ttint/tt array of of the applicable property indices, in
property index order. */
@@ -59,7 +59,7 @@
// sparsePropsSet is a HashMap containing the indicies of the
// sparsePropsSet array, indexed by the FO index of the FO slot
// in sparsePropsSet.
-sparsePropsMap = new HashMap();
+sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -67,8 +67,8 @@
next = 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
-sparsePropsMap.put
-(Ints.consts.get(next), Ints.consts.get(propx++));
+sparsePropsMap
+[next] = propx++;
}
}
1.1.2.4 +8 -5
xml-fop/src/org/apache/fop/fo/declarations/Attic/FoDeclarations.java
Index: FoDeclarations.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/declarations/Attic/FoDeclarations.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoDeclarations.java 1 Dec 2002 14:42:04 - 1.1.2.3
+++ FoDeclarations.java 3 Dec 2002 07:31:25 - 1.1.2.4
@@ -1,10 +1,12 @@
package org.apache.fop.fo.declarations;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.NoSuchElementException;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
@@ -39,7 +41,7 @@
position in the isparsePropsSet/i array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
-private static final HashMap sparsePropsMap;
+private static final int[] sparsePropsMap;
/** An ttint/tt array of of the applicable property indices, in
property index order. */
@@ -53,7 +55,8 @@
// applicableProps is a HashMap containing the indicies of the
// sparsePropsSet array, indexed by the FO index of the FO slot
// in sparsePropsSet.
-sparsePropsMap = new HashMap(0);
+sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+Arrays.fill(sparsePropsMap, -1);
numProps = 0;
sparseIndices = new int[] {};
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/declarations FoColorProfile.java FoDeclarations.java
pbwest 2002/11/21 18:17:22
Modified:src/org/apache/fop/fo/declarations Tag:
FOP_0-20-0_Alt-Design FoColorProfile.java
FoDeclarations.java
Log:
REmoved numProps arg to super constructor.
DECLARATIONS_SET now in FONode.
Revision ChangesPath
No revision
No revision
1.1.2.2 +3 -5
xml-fop/src/org/apache/fop/fo/declarations/Attic/FoColorProfile.java
Index: FoColorProfile.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/declarations/Attic/FoColorProfile.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoColorProfile.java 5 Nov 2002 14:11:52 - 1.1.2.1
+++ FoColorProfile.java 22 Nov 2002 02:17:22 - 1.1.2.2
@@ -11,7 +11,6 @@
// FOP
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FONode;
@@ -83,8 +82,7 @@
throws TreeException, FOPException
{
super(foTree, FObjectNames.COLOR_PROFILE, parent, event,
- FOPropertySets.DECLARATIONS_SET, sparsePropsMap, sparseIndices,
- numProps);
+ FONode.DECLARATIONS_SET, sparsePropsMap, sparseIndices);
makeSparsePropsSet();
}
1.1.2.2 +4 -6
xml-fop/src/org/apache/fop/fo/declarations/Attic/FoDeclarations.java
Index: FoDeclarations.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/declarations/Attic/FoDeclarations.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoDeclarations.java 5 Nov 2002 14:11:52 - 1.1.2.1
+++ FoDeclarations.java 22 Nov 2002 02:17:22 - 1.1.2.2
@@ -5,7 +5,6 @@
import java.util.NoSuchElementException;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
@@ -70,8 +69,7 @@
throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.DECLARATIONS, parent, event,
- FOPropertySets.DECLARATIONS_SET, sparsePropsMap, sparseIndices,
- numProps);
+ FONode.DECLARATIONS_SET, sparsePropsMap, sparseIndices);
try {
FoXMLEvent ev =
xmlevents.expectStartElement
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
