You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@locus.apache.org on 2000/07/11 03:14:27 UTC

cvs commit: xml-fop/src/org/apache/fop/pdf PDFNumber.java

keiron      00/07/10 18:14:27

  Modified:    src/org/apache/fop/pdf PDFNumber.java
  Log:
  handles negative numbers, same otherwise
  
  Revision  Changes    Path
  1.2       +33 -17    xml-fop/src/org/apache/fop/pdf/PDFNumber.java
  
  Index: PDFNumber.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/pdf/PDFNumber.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PDFNumber.java	2000/05/15 13:00:19	1.1
  +++ PDFNumber.java	2000/07/11 01:14:26	1.2
  @@ -1,4 +1,4 @@
  -/*-- $Id: PDFNumber.java,v 1.1 2000/05/15 13:00:19 gears Exp $ -- 
  +/*-- $Id: PDFNumber.java,v 1.2 2000/07/11 01:14:26 keiron Exp $ -- 
   
    ============================================================================
   				   The Apache Software License, Version 1.1
  @@ -64,6 +64,10 @@
   	public String doubleOut(Double doubleDown)
   	{
   		StringBuffer p = new StringBuffer();
  +		if(doubleDown.doubleValue() < 0) {
  +			doubleDown = new Double(-doubleDown.doubleValue());
  +			p.append("-");
  +		}
   		double trouble = doubleDown.doubleValue() % 1;
   		if(trouble > 0.950)
   		{
  @@ -77,15 +81,19 @@
   		{
   			String doubleString = new String(doubleDown+"");
   			int decimal = doubleString.indexOf(".");
  -			p.append(doubleString.substring(0, decimal));
  +			if(decimal != -1) {
  +				p.append(doubleString.substring(0, decimal));
   
  -			if ((doubleString.length() - decimal) > 6)
  -			{
  -				p.append(doubleString.substring(decimal,decimal+6));
  -			}
  -			else
  -			{
  -				p.append(doubleString.substring(decimal));
  +				if ((doubleString.length() - decimal) > 6)
  +				{
  +					p.append(doubleString.substring(decimal,decimal+6));
  +				}
  +				else
  +				{
  +					p.append(doubleString.substring(decimal));
  +				}
  +			} else {
  +				p.append(doubleString);
   			}
   		}
   		return(p.toString());
  @@ -95,6 +103,10 @@
   	{
   		
   		StringBuffer p = new StringBuffer();
  +		if(doubleDown < 0) {
  +			doubleDown = -doubleDown;
  +			p.append("-");
  +		}
   		double trouble = doubleDown % 1;
   		
   		if(trouble > 0.950)
  @@ -109,15 +121,19 @@
   		{
   			String doubleString = new String(doubleDown+"");
   			int decimal = doubleString.indexOf(".");
  -			p.append(doubleString.substring(0, decimal));
  +			if(decimal != -1) {
  +				p.append(doubleString.substring(0, decimal));
   
  -			if ((doubleString.length() - decimal) > 6)
  -			{
  -				p.append(doubleString.substring(decimal,decimal+6));
  -			}
  -			else
  -			{
  -				p.append(doubleString.substring(decimal));
  +				if ((doubleString.length() - decimal) > 6)
  +				{
  +					p.append(doubleString.substring(decimal,decimal+6));
  +				}
  +				else
  +				{
  +					p.append(doubleString.substring(decimal));
  +				}
  +			} else {
  +				p.append(doubleString);
   			}
   		}
   		return(p.toString());