[richfaces-svn-commits] JBoss Rich Faces SVN: r2411 - trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2007-08-22 14:59:06 -0400 (Wed, 22 Aug 2007)
New Revision: 2411

Modified:
   trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java
Log:
http://jira.jboss.com/jira/browse/RF-665 sample for TabStripeImage 

Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java	2007-08-22 18:54:21 UTC (rev 2410)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java	2007-08-22 18:59:06 UTC (rev 2411)
@@ -63,9 +63,13 @@
         String color = (String) skin.getParameter(context, colorParameterName);
         if (color == null || color.length() == 0) {
             Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context);
-        	return new Integer(HtmlColor.decode(
-        			(String) defaultSkin.getParameter(context, colorParameterName)).getRGB());
+        	color = (String) defaultSkin.getParameter(context, colorParameterName);
         }
+        
+        if (color == null) {
+        	return null;
+        }
+        
         byte[] ret = new byte[3];
         Zipper.zip(ret,HtmlColor.decode(color).getRGB(),0);
         return ret;
@@ -79,6 +83,13 @@
         return new Dimension(width, height);
     }
 
+    protected Object deserializeData(byte[] objectArray) {
+    	if (objectArray == null) {
+    		return null;
+    	}
+    	return new Integer(Zipper.unzip(objectArray, 0));
+    }
+    
     protected void paint(ResourceContext context, Graphics2D graphics2D) {
         super.paint(context, graphics2D);
 
@@ -89,12 +100,13 @@
         graphics2D.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING,
                 RenderingHints.VALUE_COLOR_RENDER_QUALITY);
 
-        Integer tabData = new Integer(Zipper.unzip((byte[])restoreData(context),0));
+        Integer tabData = (Integer) restoreData(context);
+        if (tabData != null) {
+            Dimension dimension = getDimensions(context);
+            Rectangle2D region = new Rectangle2D.Double(0, 1, dimension.getWidth(), dimension.getHeight() - 1);
 
-        Dimension dimension = getDimensions(context);
-        Rectangle2D region = new Rectangle2D.Double(0, 1, dimension.getWidth(), dimension.getHeight() - 1);
-
-        graphics2D.setColor(new Color(tabData.intValue()));
-        graphics2D.fill(region);
+            graphics2D.setColor(new Color(tabData.intValue()));
+            graphics2D.fill(region);
+        }
     }
 }