The following commit has been merged in the patch/ScientificFormat.java branch:
commit 13461480cc76c3b35f3052f97fc49f15190687b9
Merge: a305e8a93900b00e8277e06e2695b1175af6f9af 
87975a17a0cae2bceae76ca9d1d68ba6799db207
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date:   Mon Dec 5 23:42:19 2011 +0100

    Merge commit 'refs/top-bases/patch/ScientificFormat.java' into 
patch/ScientificFormat.java

diff --combined geogebra/util/ScientificFormat.java
index d903341,839e673..d983c7f
--- a/geogebra/util/ScientificFormat.java
+++ b/geogebra/util/ScientificFormat.java
@@@ -7,7 -7,6 +7,6 @@@ import java.text.Format
  import java.text.ParsePosition;
  import java.util.Locale;
  
- import org.freehep.util.DoubleWithError;
  
  
  /**
@@@ -21,7 -20,7 +20,7 @@@
   *
   * @author Paul Spence
   * @author Mark Donszelmann
-  * @version $Id: ScientificFormat.java,v 1.2.2.1 2009-01-02 17:44:07 
hohenwarter Exp $
+  * @version $Id: ScientificFormat.java,v 1.4 2009-06-22 02:18:22 hohenwarter 
Exp $
   */
  
  public class ScientificFormat extends Format
@@@ -70,17 -69,17 +69,17 @@@
           toAppendTo.append(format(dwe.getValue()));
           if (dwe.hasAsymmetricError())
           {
 -            toAppendTo.append(DoubleWithError.plus);
 +            toAppendTo.append('+');
              int errorSigDigit = 
resolveErrorSigDigit(dwe.getValue(),dwe.getPlusError());
              toAppendTo.append(format(dwe.getPlusError(),errorSigDigit));
              
 -            toAppendTo.append(DoubleWithError.minus);
 +            toAppendTo.append('-');
              errorSigDigit = 
resolveErrorSigDigit(dwe.getValue(),dwe.getMinError());
              toAppendTo.append(format(dwe.getMinError(),errorSigDigit));
           }
           else
           {
 -            toAppendTo.append(DoubleWithError.plusorminus);
 +            toAppendTo.append('\u00b1');
              int errorSigDigit = 
resolveErrorSigDigit(dwe.getValue(),dwe.getError());
              toAppendTo.append(format(dwe.getError(),errorSigDigit));
           }
@@@ -238,4 -237,4 +237,4 @@@
  //      return format(dx, resolveErrorSigDigit(d, dx));
  //   }
  
 -}
 +}

-- 
GeoGebra: Dynamic mathematics software for education

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to