[Fudaa-svn-commit] SF.net SVN: fudaa:[6013] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque

[<bma...@us...>]

Revision: 6013
          http://fudaa.svn.sourceforge.net/fudaa/?rev=6013&view=rev
Author:   bmarchan
Date:     2010-10-28 11:11:14 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
Ajout de la possibilit?\195?\169 d'utiliser un modele ImageRaster sans image associ?\195?\169e.

Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueImageRaster.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiqueImageRaster.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueImageRaster.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueImageRaster.java	2010-10-28 11:09:57 UTC (rev 6012)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueImageRaster.java	2010-10-28 11:11:14 UTC (rev 6013)
@@ -157,7 +157,7 @@
    */
   public void paintIcon(final Component _c, final Graphics _g, final int _x, final int _y) {
     // boolean attenue = isAttenue();
-    if (getModelImage() == null) {
+    if (getModelImage() == null || getModelImage().getImage()==null) {
       return;
     }
     final int w = getIconWidth() - 1;

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiqueImageRaster.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiqueImageRaster.java	2010-10-28 11:09:57 UTC (rev 6012)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiqueImageRaster.java	2010-10-28 11:11:14 UTC (rev 6013)
@@ -143,6 +143,11 @@
   File path_;
   AffineTransform raster_;
 
+  public ZModeleStatiqueImageRaster() {
+    super(false);
+    pts_ = createZone();
+  }
+
   public ZModeleStatiqueImageRaster(final CtuluImageContainer _img) {
     super(false);
     pts_ = createZone();
@@ -291,7 +296,8 @@
 
   public final void clear() {
     pts_.removeAll(null);
-    initTransform();
+    if (image_!=null)
+      initTransform();
     // raster_ = null;
 
   }
@@ -441,7 +447,9 @@
   }
 
   public BufferedImage getImage() {
-    return image_.getSnapshot();
+    if (image_!=null)
+      return image_.getSnapshot();
+    return null;
   }
 
   public Object getObject(final int _ind) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.