[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: indentation fixes for java.awt.color

Kaffe CVS cvs-commits at kaffe.org
Wed Nov 24 16:13:31 PST 2004


PatchSet 5479 
Date: 2004/11/25 00:09:10
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: indentation fixes for java.awt.color

2004-11-24  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/awt/color/ICC_ColorSpace.java,
        libraries/javalib/java/awt/color/ICC_Profile.java,
        libraries/javalib/java/awt/color/ICC_ProfileGray.java,
        libraries/javalib/java/awt/color/ICC_ProfileRGB.java,
        libraries/javalib/java/awt/datatransfer/StringSelection.java,
        libraries/javalib/java/awt/geom/Area.java:
        Resynced with GNU Classpath.

        2004-11-16  Michael Koch  <konqueror at gmx.de>

        * java/awt/color/ICC_ColorSpace.java,
        java/awt/color/ICC_Profile.java,
        java/awt/color/ICC_ProfileGray.java,
        java/awt/color/ICC_ProfileRGB.java:
        Re-indent copyright header to be standardish.
        * java/awt/datatransfer/StringSelection.java:
        Reformatted.
        * java/awt/geom/Area.java
        (EPSILON): Made static.
        (RS_EPSILON): Likewise.
        (PE_EPSILON): Likewide.

Members: 
	ChangeLog:1.3025->1.3026 
	libraries/javalib/java/awt/color/ICC_ColorSpace.java:1.5->1.6 
	libraries/javalib/java/awt/color/ICC_Profile.java:1.7->1.8 
	libraries/javalib/java/awt/color/ICC_ProfileGray.java:1.2->1.3 
	libraries/javalib/java/awt/color/ICC_ProfileRGB.java:1.2->1.3 
	libraries/javalib/java/awt/datatransfer/StringSelection.java:1.8->1.9 
	libraries/javalib/java/awt/geom/Area.java:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3025 kaffe/ChangeLog:1.3026
--- kaffe/ChangeLog:1.3025	Wed Nov 24 23:24:26 2004
+++ kaffe/ChangeLog	Thu Nov 25 00:09:10 2004
@@ -1,5 +1,29 @@
 2004-11-24  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/awt/color/ICC_ColorSpace.java,
+	libraries/javalib/java/awt/color/ICC_Profile.java,
+	libraries/javalib/java/awt/color/ICC_ProfileGray.java,
+	libraries/javalib/java/awt/color/ICC_ProfileRGB.java,
+	libraries/javalib/java/awt/datatransfer/StringSelection.java,
+	libraries/javalib/java/awt/geom/Area.java:
+        Resynced with GNU Classpath.
+
+	2004-11-16  Michael Koch  <konqueror at gmx.de>
+
+        * java/awt/color/ICC_ColorSpace.java,
+        java/awt/color/ICC_Profile.java,
+        java/awt/color/ICC_ProfileGray.java,
+        java/awt/color/ICC_ProfileRGB.java:
+        Re-indent copyright header to be standardish.
+        * java/awt/datatransfer/StringSelection.java:
+        Reformatted.
+        * java/awt/geom/Area.java
+        (EPSILON): Made static.
+        (RS_EPSILON): Likewise.
+        (PE_EPSILON): Likewide.
+
+2004-11-24  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/javax/swing/SwingUtilities.java:
         Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/java/awt/color/ICC_ColorSpace.java
diff -u kaffe/libraries/javalib/java/awt/color/ICC_ColorSpace.java:1.5 kaffe/libraries/javalib/java/awt/color/ICC_ColorSpace.java:1.6
--- kaffe/libraries/javalib/java/awt/color/ICC_ColorSpace.java:1.5	Fri Oct 29 00:00:37 2004
+++ kaffe/libraries/javalib/java/awt/color/ICC_ColorSpace.java	Thu Nov 25 00:09:14 2004
@@ -1,39 +1,40 @@
 /* ICC_ColorSpace.java -- the canonical color space implementation
    Copyright (C) 2000, 2002, 2004 Free Software Foundation
 
-   This file is part of GNU Classpath.
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
-   GNU Classpath is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   GNU Classpath is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Classpath; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.
-
-   Linking this library statically or dynamically with other modules is
-   making a combined work based on this library.  Thus, the terms and
-   conditions of the GNU General Public License cover the whole
-   combination.
-
-   As a special exception, the copyright holders of this library give you
-   permission to link this library with independent modules to produce an
-   executable, regardless of the license terms of these independent
-   modules, and to copy and distribute the resulting executable under
-   terms of your choice, provided that you also meet, for each linked
-   independent module, the terms and conditions of the license of that
-   module.  An independent module is a module which is not derived from
-   or based on this library.  If you modify this library, you may extend
-   this exception to your version of the library, but you are not
-   obligated to do so.  If you do not wish to do so, delete this
-   exception statement from your version. */
 
 package java.awt.color;
 
@@ -46,9 +47,9 @@
 import gnu.java.awt.color.PyccConverter;
 import gnu.java.awt.color.RgbProfileConverter;
 import gnu.java.awt.color.SrgbConverter;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
-
 
 /**
  * ICC_ColorSpace - an implementation of ColorSpace
Index: kaffe/libraries/javalib/java/awt/color/ICC_Profile.java
diff -u kaffe/libraries/javalib/java/awt/color/ICC_Profile.java:1.7 kaffe/libraries/javalib/java/awt/color/ICC_Profile.java:1.8
--- kaffe/libraries/javalib/java/awt/color/ICC_Profile.java:1.7	Fri Oct 29 00:00:37 2004
+++ kaffe/libraries/javalib/java/awt/color/ICC_Profile.java	Thu Nov 25 00:09:14 2004
@@ -1,44 +1,46 @@
 /* ICC_Profile.java -- color space profiling
    Copyright (C) 2000, 2002, 2004 Free Software Foundation
 
-   This file is part of GNU Classpath.
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
-   GNU Classpath is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   GNU Classpath is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Classpath; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.
-
-   Linking this library statically or dynamically with other modules is
-   making a combined work based on this library.  Thus, the terms and
-   conditions of the GNU General Public License cover the whole
-   combination.
-
-   As a special exception, the copyright holders of this library give you
-   permission to link this library with independent modules to produce an
-   executable, regardless of the license terms of these independent
-   modules, and to copy and distribute the resulting executable under
-   terms of your choice, provided that you also meet, for each linked
-   independent module, the terms and conditions of the license of that
-   module.  An independent module is a module which is not derived from
-   or based on this library.  If you modify this library, you may extend
-   this exception to your version of the library, but you are not
-   obligated to do so.  If you do not wish to do so, delete this
-   exception statement from your version. */
 
 package java.awt.color;
 
 import gnu.java.awt.color.ProfileHeader;
 import gnu.java.awt.color.TagEntry;
+
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -53,7 +55,6 @@
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-
 /**
  * ICC Profile - represents an ICC Color profile.
  * The ICC profile format is a standard file format which maps the transform
@@ -239,7 +240,7 @@
   /**
    * @serial
    */
-  private final int iccProfileSerializedDataVersion = 1;
+  private static final int iccProfileSerializedDataVersion = 1;
 
   /**
    * Constants related to generating profiles for
Index: kaffe/libraries/javalib/java/awt/color/ICC_ProfileGray.java
diff -u kaffe/libraries/javalib/java/awt/color/ICC_ProfileGray.java:1.2 kaffe/libraries/javalib/java/awt/color/ICC_ProfileGray.java:1.3
--- kaffe/libraries/javalib/java/awt/color/ICC_ProfileGray.java:1.2	Fri Oct 29 00:00:37 2004
+++ kaffe/libraries/javalib/java/awt/color/ICC_ProfileGray.java	Thu Nov 25 00:09:14 2004
@@ -1,42 +1,42 @@
 /* ICC_ProfileGray.java -- the ICC profile for a Gray colorspace
    Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
-   This file is part of GNU Classpath.
+This file is part of GNU Classpath.
 
-   GNU Classpath is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   GNU Classpath is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Classpath; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.
-
-   Linking this library statically or dynamically with other modules is
-   making a combined work based on this library.  Thus, the terms and
-   conditions of the GNU General Public License cover the whole
-   combination.
-
-   As a special exception, the copyright holders of this library give you
-   permission to link this library with independent modules to produce an
-   executable, regardless of the license terms of these independent
-   modules, and to copy and distribute the resulting executable under
-   terms of your choice, provided that you also meet, for each linked
-   independent module, the terms and conditions of the license of that
-   module.  An independent module is a module which is not derived from
-   or based on this library.  If you modify this library, you may extend
-   this exception to your version of the library, but you are not
-   obligated to do so.  If you do not wish to do so, delete this
-   exception statement from your version. */
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
-package java.awt.color;
 
+package java.awt.color;
 
 /**
  * ICC_ProfileGray - a special case of ICC_Profiles.
Index: kaffe/libraries/javalib/java/awt/color/ICC_ProfileRGB.java
diff -u kaffe/libraries/javalib/java/awt/color/ICC_ProfileRGB.java:1.2 kaffe/libraries/javalib/java/awt/color/ICC_ProfileRGB.java:1.3
--- kaffe/libraries/javalib/java/awt/color/ICC_ProfileRGB.java:1.2	Fri Oct 29 00:00:37 2004
+++ kaffe/libraries/javalib/java/awt/color/ICC_ProfileRGB.java	Thu Nov 25 00:09:14 2004
@@ -1,44 +1,42 @@
 /* ICC_ProfileRGB.java -- the ICC profile for a RGB colorspace
    Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
-   This file is part of GNU Classpath.
+This file is part of GNU Classpath.
 
-   GNU Classpath is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   GNU Classpath is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Classpath; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.
-
-   Linking this library statically or dynamically with other modules is
-   making a combined work based on this library.  Thus, the terms and
-   conditions of the GNU General Public License cover the whole
-   combination.
-
-   As a special exception, the copyright holders of this library give you
-   permission to link this library with independent modules to produce an
-   executable, regardless of the license terms of these independent
-   modules, and to copy and distribute the resulting executable under
-   terms of your choice, provided that you also meet, for each linked
-   independent module, the terms and conditions of the license of that
-   module.  An independent module is a module which is not derived from
-   or based on this library.  If you modify this library, you may extend
-   this exception to your version of the library, but you are not
-   obligated to do so.  If you do not wish to do so, delete this
-   exception statement from your version. */
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
-package java.awt.color;
-
-import java.nio.ByteBuffer;
 
+package java.awt.color;
 
 /**
  * ICC_ProfileRGB - a special case of ICC_Profiles.
Index: kaffe/libraries/javalib/java/awt/datatransfer/StringSelection.java
diff -u kaffe/libraries/javalib/java/awt/datatransfer/StringSelection.java:1.8 kaffe/libraries/javalib/java/awt/datatransfer/StringSelection.java:1.9
--- kaffe/libraries/javalib/java/awt/datatransfer/StringSelection.java:1.8	Mon Oct  4 09:01:33 2004
+++ kaffe/libraries/javalib/java/awt/datatransfer/StringSelection.java	Thu Nov 25 00:09:14 2004
@@ -68,26 +68,15 @@
 // This is the data to transfer
 private String data;
 
-/*************************************************************************/
-
-/*
- * Constructors
- */
-
-/**
-  * Transfer the specfied string as text.
-  */
-public
-StringSelection(String data)
-{
-  this.data = data;
-}
-
-/*************************************************************************/
-
-/*
- * Instance Methods
- */
+  /**
+   * Transfer the specfied string as text.
+   *
+   * @param data the data for the string selection
+   */
+  public StringSelection(String data)
+  {
+    this.data = data;
+  }
 
 /**
   * Returns a list of supported data flavors.
Index: kaffe/libraries/javalib/java/awt/geom/Area.java
diff -u kaffe/libraries/javalib/java/awt/geom/Area.java:1.3 kaffe/libraries/javalib/java/awt/geom/Area.java:1.4
--- kaffe/libraries/javalib/java/awt/geom/Area.java:1.3	Sun Sep 12 15:11:01 2004
+++ kaffe/libraries/javalib/java/awt/geom/Area.java	Thu Nov 25 00:09:15 2004
@@ -75,17 +75,17 @@
   /**
    * General numerical precision
    */
-  private final double EPSILON = 1E-11;
+  private static final double EPSILON = 1E-11;
 
   /**
    * recursive subdivision epsilon - (see getRecursionDepth)
    */
-  private final double RS_EPSILON = 1E-13;
+  private static final double RS_EPSILON = 1E-13;
 
   /**
    * Snap distance - points within this distance are considered equal
    */
-  private final double PE_EPSILON = 1E-11;
+  private static final double PE_EPSILON = 1E-11;
 
   /**
    * Segment vectors containing solid areas and holes




More information about the kaffe mailing list