xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r954487 - in /xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics: image/loader/impl/ java2d/ java2d/color/
Date Mon, 14 Jun 2010 14:40:27 GMT
Author: jeremias
Date: Mon Jun 14 14:40:26 2010
New Revision: 954487

URL: http://svn.apache.org/viewvc?rev=954487&view=rev
Log:
Moved all Java2D- and Color-related classes to org.apache.xmlgraphics.java2d.color in order
to avoid clutter in the parent package.
Deprecated CMYKColorSpace which was already in the previous release.

Added:
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/CMYKColorSpace.java
      - copied, changed from r954373, xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/CMYKColorSpace.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorConverter.java
      - copied, changed from r954373, xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorConverter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorExt.java
      - copied, changed from r954373, xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorExt.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorUtil.java
      - copied, changed from r954373, xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorUtil.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/DefaultColorConverter.java
      - copied, changed from r954373, xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/DefaultColorConverter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/GrayScaleColorConverter.java
      - copied, changed from r954373, xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GrayScaleColorConverter.java
Removed:
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorConverter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorExt.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorUtil.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/DefaultColorConverter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GrayScaleColorConverter.java
Modified:
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/CMYKColorSpace.java

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java?rev=954487&r1=954486&r2=954487&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java
(original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java
Mon Jun 14 14:40:26 2010
@@ -39,7 +39,7 @@ import org.apache.xmlgraphics.image.load
 import org.apache.xmlgraphics.image.loader.ImageInfo;
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;
 import org.apache.xmlgraphics.image.loader.util.ImageUtil;
-import org.apache.xmlgraphics.java2d.CMYKColorSpace;
+import org.apache.xmlgraphics.java2d.color.CMYKColorSpace;
 import org.apache.xmlgraphics.util.MimeConstants;
 
 /**

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/CMYKColorSpace.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/CMYKColorSpace.java?rev=954487&r1=954486&r2=954487&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/CMYKColorSpace.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/CMYKColorSpace.java Mon
Jun 14 14:40:26 2010
@@ -23,6 +23,7 @@ import java.awt.color.ColorSpace;
 
 /**
  * This class represents an uncalibrated CMYK color space.
+ * @deprecated This class has been moved to the "color" subpackage.
  */
 public class CMYKColorSpace extends ColorSpace {
 

Copied: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/CMYKColorSpace.java
(from r954373, xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/CMYKColorSpace.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/CMYKColorSpace.java?p2=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/CMYKColorSpace.java&p1=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/CMYKColorSpace.java&r1=954373&r2=954487&rev=954487&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/CMYKColorSpace.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/CMYKColorSpace.java
Mon Jun 14 14:40:26 2010
@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.xmlgraphics.java2d;
+package org.apache.xmlgraphics.java2d.color;
 
 import java.awt.color.ColorSpace;
 
@@ -31,10 +31,12 @@ public class CMYKColorSpace extends Colo
     private static CMYKColorSpace instance;
 
     /**
+     * Constructs an uncalibrated CMYK ColorSpace object with {@link ColorSpace#TYPE_CMYK}
and
+     * 4 components.
      * @see java.awt.color.ColorSpace#ColorSpace(int, int)
      */
-    protected CMYKColorSpace(int type, int numcomponents) {
-        super(type, numcomponents);
+    protected CMYKColorSpace() {
+        super(TYPE_CMYK, 4);
     }
 
     /**
@@ -43,7 +45,7 @@ public class CMYKColorSpace extends Colo
      */
     public static CMYKColorSpace getInstance() {
         if (instance == null) {
-            instance = new CMYKColorSpace(TYPE_CMYK, 4);
+            instance = new CMYKColorSpace();
         }
         return instance;
     }

Copied: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorConverter.java
(from r954373, xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorConverter.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorConverter.java?p2=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorConverter.java&p1=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorConverter.java&r1=954373&r2=954487&rev=954487&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorConverter.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorConverter.java
Mon Jun 14 14:40:26 2010
@@ -17,7 +17,7 @@
 
 /* $Id:$ */
 
-package org.apache.xmlgraphics.java2d;
+package org.apache.xmlgraphics.java2d.color;
 
 import java.awt.Color;
 

Copied: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorExt.java
(from r954373, xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorExt.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorExt.java?p2=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorExt.java&p1=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorExt.java&r1=954373&r2=954487&rev=954487&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorExt.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorExt.java Mon
Jun 14 14:40:26 2010
@@ -17,7 +17,7 @@
 
 /* $Id: ColorExt.java 884117 2009-11-25 14:42:48Z jeremias $ */
 
-package org.apache.xmlgraphics.java2d;
+package org.apache.xmlgraphics.java2d.color;
 
 import java.awt.Color;
 import java.awt.color.ColorSpace;

Copied: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorUtil.java
(from r954373, xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorUtil.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorUtil.java?p2=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorUtil.java&p1=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorUtil.java&r1=954373&r2=954487&rev=954487&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ColorUtil.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorUtil.java
Mon Jun 14 14:40:26 2010
@@ -17,10 +17,11 @@
 
 /* $Id: ColorUtil.java 815938 2009-09-16 19:38:13Z jeremias $ */
 
-package org.apache.xmlgraphics.java2d;
+package org.apache.xmlgraphics.java2d.color;
 
 import java.awt.Color;
 
+
 /**
  * Generic Color helper class.
  * <p>

Copied: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/DefaultColorConverter.java
(from r954373, xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/DefaultColorConverter.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/DefaultColorConverter.java?p2=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/DefaultColorConverter.java&p1=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/DefaultColorConverter.java&r1=954373&r2=954487&rev=954487&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/DefaultColorConverter.java
(original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/DefaultColorConverter.java
Mon Jun 14 14:40:26 2010
@@ -17,11 +17,11 @@
 
 /* $Id:$ */
 
-package org.apache.xmlgraphics.java2d;
+package org.apache.xmlgraphics.java2d.color;
 
 import java.awt.Color;
 
-import org.apache.xmlgraphics.java2d.ColorConverter;
+import org.apache.xmlgraphics.java2d.color.ColorConverter;
 
 /**
  * A default implementation that does not apply any conversion

Copied: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/GrayScaleColorConverter.java
(from r954373, xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GrayScaleColorConverter.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/GrayScaleColorConverter.java?p2=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/GrayScaleColorConverter.java&p1=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GrayScaleColorConverter.java&r1=954373&r2=954487&rev=954487&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GrayScaleColorConverter.java
(original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/GrayScaleColorConverter.java
Mon Jun 14 14:40:26 2010
@@ -17,11 +17,11 @@
 
 /* $Id:$ */
 
-package org.apache.xmlgraphics.java2d;
+package org.apache.xmlgraphics.java2d.color;
 
 import java.awt.Color;
 
-import org.apache.xmlgraphics.java2d.ColorConverter;
+import org.apache.xmlgraphics.java2d.color.ColorConverter;
 
 /**
  * Converts to grayscale using the standard RED=30%, GREEN=59% and BLUE=11%



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org


Mime
View raw message