cvs commit: xml-fop/src/java/org/apache/fop/datatypes ColorType.java CompoundDatatype.java FODimension.java KeepValue.java Length.java LengthBase.java Numeric.java PercentBase.java ToBeImplemented.java

2004-02-27 Thread jeremias 
jeremias2004/02/27 09:42:28

  Modified:src/java/org/apache/fop/datatypes ColorType.java
CompoundDatatype.java FODimension.java
KeepValue.java Length.java LengthBase.java
Numeric.java PercentBase.java ToBeImplemented.java
  Log:
  Applied Apache License Version 2.0 by following the instructions at 
http://www.apache.org/dev/apply-license.html.
  
  Revision  ChangesPath
  1.6   +16 -48xml-fop/src/java/org/apache/fop/datatypes/ColorType.java
  
  Index: ColorType.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/ColorType.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ColorType.java2 Feb 2004 15:01:39 -   1.5
  +++ ColorType.java27 Feb 2004 17:42:28 -  1.6
  @@ -1,53 +1,21 @@
   /*
  - * $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/.
  + * Copyright 1999-2004 The Apache Software Foundation.
  + * 
  + * Licensed under the Apache License, Version 2.0 (the License);
  + * you may not use this file except in compliance with the License.
  + * You may obtain a copy of the License at
  + * 
  + *  http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed under the License is distributed on an AS IS BASIS,
  + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
*/
  +
  +/* $Id$ */
  +
   package org.apache.fop.datatypes;
   
   import java.awt.Color;
  
  
  
  1.5   +16 -48xml-fop/src/java/org/apache/fop/datatypes/CompoundDatatype.java
  
  Index: CompoundDatatype.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/CompoundDatatype.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CompoundDatatype.java 2 Feb

cvs commit: xml-fop/src/java/org/apache/fop/datatypes ColorType.java

2004-01-04 Thread pbwest 
pbwest  2004/01/04 18:15:03

  Modified:src/java/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
ColorType.java
  Log:
  Removed spurious exception in throws clause.
  Javadocs cleanup.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.2   +5 -7  xml-fop/src/java/org/apache/fop/datatypes/ColorType.java
  
  Index: ColorType.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/ColorType.java,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- ColorType.java5 Jul 2003 19:08:19 -   1.2.2.1
  +++ ColorType.java5 Jan 2004 02:15:03 -   1.2.2.2
  @@ -301,9 +301,7 @@
* @return a ttfloat[4]/tt containing the RGB information for
* that color.
*/
  -public static float[] getStandardColor(String name)
  -throws PropertyException
  -{
  +public static float[] getStandardColor(String name) {
   return (float[])standardColors.get(name);
   }
   
  @@ -327,8 +325,8 @@
   /**
* A ttHashMap/tt containing four-element arrays of ttfloat/tt
* with the normalized RGB values of standard colours, indexed by the
  - * name of the color.
  - * @return a ttfloat[4]/tt array representing the normalized color.
  + * name of the color.  Individual values are ttfloat[4]/tt arrays
  + * representing the normalized color.
*/
   private static final HashMap standardColors;
   static {
  @@ -372,8 +370,8 @@
* with the normalized RGB values of system colours, indexed by the
* system name of the color.  This array is referred to when system color
* references are encountered.  If the color is in the HashMap,
  - * a reference to the array is returned.
  - * @return a ttfloat[4]/tt array representing the normalized color.
  + * a reference to the array is returned.  Individual values are
  + * ttfloat[4]/tt arrays representing the normalized color.
*/
   private static final HashMap systemColors;
   static {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/java/org/apache/fop/datatypes ColorType.java

2003-09-16 Thread vmote 
vmote   2003/09/16 07:14:05

  Modified:src/java/org/apache/fop/datatypes ColorType.java
  Log:
  correct computation of integer conversion, as per patch submitted by Peter Herweg -- 
see http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23080
  
  Revision  ChangesPath
  1.4   +1 -1  xml-fop/src/java/org/apache/fop/datatypes/ColorType.java
  
  Index: ColorType.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/ColorType.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ColorType.java1 Sep 2003 01:28:51 -   1.3
  +++ ColorType.java16 Sep 2003 14:14:04 -  1.4
  @@ -254,7 +254,7 @@
   if (floatValue  0) {
   floatValue = 0;
   }
  -return (int) floatValue * 255;
  +return (int) (floatValue * 255);
   }
   
   /**
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]