JavaScript updates and some more cosmetics.

@@ -13,7 +13,7 @@
         <superclass>org.richfaces.component.UINotify</superclass>
         <superclass>org.richfaces.component.UINotify</superclass>
         <description>
         <description>
             <![CDATA[
             <![CDATA[
-			]]>
+                    ]]>
         </description>
         </description>
         <renderer generate="false" override="true">
         <renderer generate="false" override="true">
             <name>org.richfaces.NotifyRenderer</name>
             <name>org.richfaces.NotifyRenderer</name>
@@ -31,7 +31,7 @@
                 <superclassname>org.ajax4jsf.tests.AbstractJspTestCase</superclassname>
                 <superclassname>org.ajax4jsf.tests.AbstractJspTestCase</superclassname>
             </test>
             </test>
             -->
             -->
-			
+
         </tag>
         </tag>
         &ui_component_attributes;
         &ui_component_attributes;
         &ajax_output_attributes;
         &ajax_output_attributes;
@@ -50,8 +50,8 @@
             </description>
             </description>
             <defaultvalue>""</defaultvalue>
             <defaultvalue>""</defaultvalue>
         </property>
         </property>
-        
-        
+
+
         <property>
         <property>
             <name>styleClass</name>
             <name>styleClass</name>
             <classname>java.lang.String</classname>
             <classname>java.lang.String</classname>

@@ -13,7 +13,7 @@
         <superclass>org.richfaces.component.UINotifyMessages</superclass>
         <superclass>org.richfaces.component.UINotifyMessages</superclass>
         <description>
         <description>
             <![CDATA[
             <![CDATA[
-			]]>
+                    ]]>
         </description>
         </description>
         <renderer generate="false" override="true">
         <renderer generate="false" override="true">
             <name>org.richfaces.NotifyMessagesRenderer</name>
             <name>org.richfaces.NotifyMessagesRenderer</name>
@@ -31,7 +31,7 @@
                 <superclassname>org.ajax4jsf.tests.AbstractJspTestCase</superclassname>
                 <superclassname>org.ajax4jsf.tests.AbstractJspTestCase</superclassname>
             </test>
             </test>
             -->
             -->
-			
+
         </tag>
         </tag>
         &ui_component_attributes;
         &ui_component_attributes;
         &ajax_output_attributes;
         &ajax_output_attributes;

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN"  "http://labs.jboss.com/jbossrichfaces/component-config.dtd" >
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN"
+        "http://labs.jboss.com/jbossrichfaces/component-config.dtd" >
 <components>
 <components>
     <component>
     <component>
         <name>org.richfaces.NotifyStack</name>
         <name>org.richfaces.NotifyStack</name>
@@ -8,7 +9,7 @@
         <superclass>org.richfaces.component.UINotifyStack</superclass>
         <superclass>org.richfaces.component.UINotifyStack</superclass>
         <description>
         <description>
             <![CDATA[
             <![CDATA[
-			]]>
+                    ]]>
         </description>
         </description>
         <renderer generate="false" override="false">
         <renderer generate="false" override="false">
             <name>org.richfaces.NotifyStackRenderer</name>
             <name>org.richfaces.NotifyStackRenderer</name>
@@ -26,7 +27,7 @@
                 <superclassname>org.ajax4jsf.tests.AbstractJspTestCase</superclassname>
                 <superclassname>org.ajax4jsf.tests.AbstractJspTestCase</superclassname>
             </test>
             </test>
             -->
             -->
-			
+
         </tag>
         </tag>
         &ui_component_attributes;
         &ui_component_attributes;
         <property>
         <property>

+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright , Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
 package org.richfaces.component;
 package org.richfaces.component;
 
 
+import org.richfaces.cdk.annotations.Attribute;
+
 public interface NotifyAttributes {
 public interface NotifyAttributes {
 
 
-    public abstract boolean isSticky();
+    @Attribute
+    boolean isSticky();
 
 
-    public abstract void setSticky(boolean sticky);
+    void setSticky(boolean sticky);
 
 
-    public abstract Integer getStayTime();
+    @Attribute
+    Integer getStayTime();
 
 
-    public abstract void setStayTime(Integer time);
+    void setStayTime(Integer time);
 
 
-    public abstract Integer getDelay();
+    @Attribute
+    Integer getDelay();
 
 
-    public abstract void setDelay(Integer delay);
+    void setDelay(Integer delay);
 
 
-    public abstract String getStyleClass();
+    @Attribute
+    String getStyleClass();
 
 
-    public abstract void setStyleClass(String styleClass);
+    void setStyleClass(String styleClass);
 
 
-    public abstract String getAppearAnimation();
+    @Attribute
+    String getAppearAnimation();
 
 
-    public abstract void setAppearAnimation(String appearAnimation);
+    void setAppearAnimation(String appearAnimation);
 
 
-    public abstract String getHideAnimation();
+    @Attribute
+    String getHideAnimation();
 
 
-    public abstract void setHideAnimation(String hideAnimation);
+    void setHideAnimation(String hideAnimation);
 
 
-    public abstract Integer getAnimationSpeed();
+    @Attribute
+    Integer getAnimationSpeed();
 
 
-    public abstract void setAnimationSpeed(Integer animationSpeed);
+    void setAnimationSpeed(Integer animationSpeed);
 
 
-    public abstract boolean isShowHistory();
+    @Attribute
+    boolean isShowHistory();
 
 
-    public abstract void setShowHistory(boolean showHistory);
+    void setShowHistory(boolean showHistory);
 
 
-    public abstract boolean isNonblocking();
+    @Attribute
+    boolean isNonblocking();
 
 
-    public abstract void setNonblocking(boolean nonblocking);
+    void setNonblocking(boolean nonblocking);
 
 
-    public abstract boolean isShowShadow();
+    @Attribute
+    boolean isShowShadow();
 
 
-    public abstract void setShowShadow(boolean showShadow);
+    void setShowShadow(boolean showShadow);
 
 
-    public abstract boolean isShowCloseButton();
+    @Attribute(defaultValue = "true")
+    boolean isShowCloseButton();
 
 
-    public abstract void setShowCloseButton(boolean showCloseButton);
+    void setShowCloseButton(boolean showCloseButton);
 
 
-    public abstract Double getNonblockingOpacity();
+    @Attribute
+    Double getNonblockingOpacity();
 
 
-    public abstract void setNonblockingOpacity(Double nonblockingOpacity);
+    void setNonblockingOpacity(Double nonblockingOpacity);
 
 
-    public abstract String getStack();
+    @Attribute
+    String getStack();
 
 
-    public abstract void setStack(String stack);
+    void setStack(String stack);
 }
 }

@@ -7,6 +7,8 @@ public abstract class UINotify extends UIComponentBase implements NotifyAttribut
     public static final String COMPONENT_TYPE = "org.richfaces.Notify";
     public static final String COMPONENT_TYPE = "org.richfaces.Notify";
     public static final String COMPONENT_FAMILY = "org.richfaces.Notify";
     public static final String COMPONENT_FAMILY = "org.richfaces.Notify";
 
 
+    public static final double DEFAULT_NONBLOCKING_OPACITY = .2;
+
     public abstract String getTitle();
     public abstract String getTitle();
 
 
     public abstract void setTitle(String title);
     public abstract void setTitle(String title);

 package org.richfaces.component;
 package org.richfaces.component;
 
 
-import javax.faces.component.UIMessages;
 import org.ajax4jsf.component.AjaxOutput;
 import org.ajax4jsf.component.AjaxOutput;
 
 
+import javax.faces.component.UIMessages;
+
 public abstract class UINotifyMessages extends UIMessages implements AjaxOutput, NotifyAttributes {
 public abstract class UINotifyMessages extends UIMessages implements AjaxOutput, NotifyAttributes {
 
 
     public static final String COMPONENT_TYPE = "org.richfaces.NotifyMessages";
     public static final String COMPONENT_TYPE = "org.richfaces.NotifyMessages";

+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright , Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
 package org.richfaces.renderkit.html;
 package org.richfaces.renderkit.html;
 
 
+import org.ajax4jsf.renderkit.RendererUtils;
+import org.ajax4jsf.renderkit.RendererUtils.HTML;
+import org.richfaces.component.UINotify;
+import org.richfaces.component.UINotifyMessages;
+
+import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Iterator;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.ResponseWriter;
-import org.ajax4jsf.renderkit.RendererUtils.HTML;
-import org.richfaces.component.UINotify;
-import org.richfaces.component.UINotifyMessages;
 
 
 public class NotifyMessagesRenderer extends NotifyRenderer {
 public class NotifyMessagesRenderer extends NotifyRenderer {
 
 
@@ -17,7 +41,7 @@ public class NotifyMessagesRenderer extends NotifyRenderer {
         UINotifyMessages messagesComponent = (UINotifyMessages) component;
         UINotifyMessages messagesComponent = (UINotifyMessages) component;
         ResponseWriter writer = context.getResponseWriter();
         ResponseWriter writer = context.getResponseWriter();
         writer.startElement(HTML.DIV_ELEM, null);
         writer.startElement(HTML.DIV_ELEM, null);
-        writer.writeAttribute(HTML.id_ATTRIBUTE, getUtils().clientId(context, component), "type");
+        writer.writeAttribute(HTML.id_ATTRIBUTE, RendererUtils.getInstance().clientId(context, component), "type");
         Integer delay = messagesComponent.getDelay();
         Integer delay = messagesComponent.getDelay();
         if (delay == null) {
         if (delay == null) {
             delay = 0;
             delay = 0;
@@ -27,10 +51,12 @@ public class NotifyMessagesRenderer extends NotifyRenderer {
             interval = 0;
             interval = 0;
         }
         }
 
 
-        Iterator<FacesMessage> messages = messagesComponent.isGlobalOnly() ? context.getMessages(null) : context.getMessages();
+        Iterator<FacesMessage> messages = messagesComponent.isGlobalOnly()
+            ? context.getMessages(null) : context.getMessages();
         while (messages.hasNext()) {
         while (messages.hasNext()) {
             FacesMessage msg = messages.next();
             FacesMessage msg = messages.next();
-            UINotify notify = (UINotify) context.getApplication().createComponent(UINotify.COMPONENT_TYPE);
+            UINotify notify = (UINotify) context.getApplication()
+                .createComponent(UINotify.COMPONENT_TYPE);
             notify.setAnimationSpeed(messagesComponent.getAnimationSpeed());
             notify.setAnimationSpeed(messagesComponent.getAnimationSpeed());
             notify.setAppearAnimation(messagesComponent.getAppearAnimation());
             notify.setAppearAnimation(messagesComponent.getAppearAnimation());
             notify.setDelay(delay);
             notify.setDelay(delay);
@@ -50,7 +76,7 @@ public class NotifyMessagesRenderer extends NotifyRenderer {
                 notify.setText(msg.getDetail());
                 notify.setText(msg.getDetail());
             }
             }
             String styleClass = messagesComponent.getStyleClass();
             String styleClass = messagesComponent.getStyleClass();
-            if(styleClass == null) {
+            if (styleClass == null) {
                 styleClass = "";
                 styleClass = "";
             }
             }
             if (FacesMessage.SEVERITY_INFO.equals(msg.getSeverity())) {
             if (FacesMessage.SEVERITY_INFO.equals(msg.getSeverity())) {

+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright , Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
 package org.richfaces.renderkit.html;
 package org.richfaces.renderkit.html;
 
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-import java.util.*;
 import org.ajax4jsf.javascript.JSFunction;
 import org.ajax4jsf.javascript.JSFunction;
 import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
 import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
 import org.ajax4jsf.renderkit.RendererUtils.HTML;
 import org.ajax4jsf.renderkit.RendererUtils.HTML;
@@ -12,24 +29,37 @@ import org.ajax4jsf.resource.InternetResource;
 import org.richfaces.component.UINotify;
 import org.richfaces.component.UINotify;
 import org.richfaces.component.UINotifyStack;
 import org.richfaces.component.UINotifyStack;
 
 
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 public class NotifyRenderer extends HeaderResourcesRendererBase {
 public class NotifyRenderer extends HeaderResourcesRendererBase {
 
 
-    private static final Map<String, Object> defaults = new HashMap<String, Object>();
+    private static final Map<String, Object> DEFAULTS;
 
 
-    {
-        defaults.put("pnotify_addclass", "");
-        defaults.put("pnotify_nonblock", false);
-        defaults.put("pnotify_nonblock_opacity", .2);
-        defaults.put("pnotify_history", true);
-        defaults.put("pnotify_animate_speed", "slow");
-        defaults.put("pnotify_opacity", 1);
-        defaults.put("pnotify_shadow", false);
-        defaults.put("pnotify_closer", true);
-        defaults.put("pnotify_hide", true);
-        defaults.put("pnotify_delay", 8000);
+    static {
+        Map<String, Object> defaults = new HashMap<String, Object>();
+        defaults.put("styleClass", "");
+        defaults.put("nonblocking", false);
+        defaults.put("nonblockingOpacity", UINotify.DEFAULT_NONBLOCKING_OPACITY);
+        defaults.put("showHistory", true);
+        defaults.put("animationSpeed", "slow");
+        defaults.put("opacity", 1);
+        defaults.put("showShadow", false);
+        defaults.put("showCloseButton", true);
+        defaults.put("appearAnimation", "fade");
+        defaults.put("hideAnimation", "fade");
+        defaults.put("sticky", false);
+        defaults.put("stayTime", 8000);
         defaults.put("delay", 0);
         defaults.put("delay", 0);
-
+        DEFAULTS = Collections.unmodifiableMap(defaults);
     }
     }
+
     private final InternetResource[] scripts = {
     private final InternetResource[] scripts = {
         getResource("/org/richfaces/renderkit/html/scripts/jquery-1.4.2.js"),
         getResource("/org/richfaces/renderkit/html/scripts/jquery-1.4.2.js"),
         getResource("/org/richfaces/renderkit/html/scripts/jquery.pnotify.js"),
         getResource("/org/richfaces/renderkit/html/scripts/jquery.pnotify.js"),
@@ -60,29 +90,29 @@ public class NotifyRenderer extends HeaderResourcesRendererBase {
          * Include only attributes that are actually set.
          * Include only attributes that are actually set.
          */
          */
         Map<String, Object> options = new HashMap<String, Object>();
         Map<String, Object> options = new HashMap<String, Object>();
-        addOptionIfSetAndNotDefault("pnotify_title", notify.getTitle(), options);
-        addOptionIfSetAndNotDefault("pnotify_text", notify.getText(), options);
-        addOptionIfSetAndNotDefault("pnotify_hide", !notify.isSticky(), options);
-        addOptionIfSetAndNotDefault("pnotify_delay", notify.getStayTime(), options);
+        addOptionIfSetAndNotDefault("title", notify.getTitle(), options);
+        addOptionIfSetAndNotDefault("text", notify.getText(), options);
+        addOptionIfSetAndNotDefault("sticky", notify.isSticky(), options);
+        addOptionIfSetAndNotDefault("stayTime", notify.getStayTime(), options);
         Map<String, Object> animationOptions = new HashMap<String, Object>();
         Map<String, Object> animationOptions = new HashMap<String, Object>();
-        addOptionIfSetAndNotDefault("effect_in", notify.getAppearAnimation(), animationOptions);
-        addOptionIfSetAndNotDefault("effect_out", notify.getHideAnimation(), animationOptions);
-        addOptionIfSetAndNotDefault("pnotify_animation", animationOptions, options);
-        addOptionIfSetAndNotDefault("pnotify_animate_speed", notify.getAnimationSpeed(), options);
-        addOptionIfSetAndNotDefault("pnotify_nonblock", notify.isNonblocking(), options);
-        addOptionIfSetAndNotDefault("pnotify_nonblock_opacity", notify.getNonblockingOpacity(), options);
-        addOptionIfSetAndNotDefault("pnotify_history", notify.isShowHistory(), options);
-        addOptionIfSetAndNotDefault("pnotify_shadow", notify.isShowShadow(), options);
-        addOptionIfSetAndNotDefault("pnotify_closer", notify.isShowCloseButton(), options);
+        addOptionIfSetAndNotDefault("appearAnimation", notify.getAppearAnimation(), animationOptions);
+        addOptionIfSetAndNotDefault("hideAnimation", notify.getHideAnimation(), animationOptions);
+        addOptionIfSetAndNotDefault("animation", animationOptions, options);
+        addOptionIfSetAndNotDefault("animationSpeed", notify.getAnimationSpeed(), options);
+        addOptionIfSetAndNotDefault("nonblocking", notify.isNonblocking(), options);
+        addOptionIfSetAndNotDefault("nonblockingOpacity", notify.getNonblockingOpacity(), options);
+        addOptionIfSetAndNotDefault("showHistory", notify.isShowHistory(), options);
+        addOptionIfSetAndNotDefault("showShadow", notify.isShowShadow(), options);
+        addOptionIfSetAndNotDefault("showCloseButton", notify.isShowCloseButton(), options);
         UINotifyStack stack = getStackComponent(context, notify);
         UINotifyStack stack = getStackComponent(context, notify);
         if (stack != null) {
         if (stack != null) {
-            addOptionIfSetAndNotDefault("pnotify_stack", getUtils().clientId(context, stack), options);
+            addOptionIfSetAndNotDefault("stack", getUtils().clientId(context, stack), options);
         }
         }
         String styleClass = notify.getStyleClass();
         String styleClass = notify.getStyleClass();
         if (styleClass == null) {
         if (styleClass == null) {
             styleClass = "";
             styleClass = "";
         }
         }
-        addOptionIfSetAndNotDefault("pnotify_addclass", getStackStyleClass(context, notify) + " " + styleClass, options);
+        addOptionIfSetAndNotDefault("styleClass", getStackStyleClass(context, notify) + " " + styleClass, options);
         addOptionIfSetAndNotDefault("delay", notify.getDelay(), options);
         addOptionIfSetAndNotDefault("delay", notify.getDelay(), options);
         return options;
         return options;
     }
     }
@@ -93,7 +123,10 @@ public class NotifyRenderer extends HeaderResourcesRendererBase {
     }
     }
 
 
     protected void addOptionIfSetAndNotDefault(String optionName, Object value, Map<String, Object> options) {
     protected void addOptionIfSetAndNotDefault(String optionName, Object value, Map<String, Object> options) {
-        if (value != null && value != "" && !value.equals(defaults.get(optionName))) {
+        if (value != null && !"".equals(value)
+            && !value.equals(DEFAULTS.get(optionName))
+            && !(value instanceof Collection && ((Collection) value).size() == 0)
+            && !(value instanceof Map && ((Map) value).size() == 0)) {
             options.put(optionName, value);
             options.put(optionName, value);
         }
         }
     }
     }

+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright , Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
 package org.richfaces.renderkit.html;
 package org.richfaces.renderkit.html;
 
 
+import org.ajax4jsf.javascript.JSFunction;
+import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
+import org.ajax4jsf.renderkit.RendererUtils;
+import org.ajax4jsf.resource.InternetResource;
+import org.richfaces.component.UINotifyStack;
 
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.FacesContext;
@@ -7,11 +34,6 @@ import javax.faces.context.ResponseWriter;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
-import org.ajax4jsf.javascript.JSFunction;
-import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
-import org.ajax4jsf.renderkit.RendererUtils.HTML;
-import org.ajax4jsf.resource.InternetResource;
-import org.richfaces.component.UINotifyStack;
 
 
 public class NotifyStackRenderer extends HeaderResourcesRendererBase {
 public class NotifyStackRenderer extends HeaderResourcesRendererBase {
 
 
@@ -25,12 +47,15 @@ public class NotifyStackRenderer extends HeaderResourcesRendererBase {
             return;
             return;
         }
         }
         ResponseWriter writer = context.getResponseWriter();
         ResponseWriter writer = context.getResponseWriter();
-        writer.startElement(HTML.SCRIPT_ELEM, null);
-        writer.writeText(new JSFunction("RichFaces.NotifyStack.register", getUtils().clientId(context, component), getOptions(context, (UINotifyStack) component)), null);
-        writer.endElement(HTML.SCRIPT_ELEM);
+        writer.startElement(RendererUtils.HTML.SCRIPT_ELEM, null);
+        writer.writeText(new JSFunction("RichFaces.NotifyStack.register",
+            RendererUtils.getInstance().clientId(context, component),
+            getOptions((UINotifyStack) component)
+        ), null);
+        writer.endElement(RendererUtils.HTML.SCRIPT_ELEM);
     }
     }
 
 
-    protected Map<String, Object> getOptions(FacesContext context, UINotifyStack stack) throws IOException {
+    protected Map<String, Object> getOptions(UINotifyStack stack) throws IOException {
         /**
         /**
          * Include only attributes that are actually set.
          * Include only attributes that are actually set.
          */
          */
@@ -42,7 +67,7 @@ public class NotifyStackRenderer extends HeaderResourcesRendererBase {
     }
     }
 
 
     protected void addOptionIfSet(String optionName, Object value, Map<String, Object> options) {
     protected void addOptionIfSet(String optionName, Object value, Map<String, Object> options) {
-        if (value != null && value != "") {
+        if (value != null && !"".equals(value)) {
             options.put(optionName, value);
             options.put(optionName, value);
         }
         }
     }
     }

+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright , Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
 window.RichFaces = window.RichFaces || {};
 window.RichFaces = window.RichFaces || {};
-RichFaces.NotifyStack = (function(){
+RichFaces.NotifyStack = (function() {
     var stacks = {};
     var stacks = {};
     return {
     return {
-        register: function(id,stack) {
+        register: function(id, stack) {
             var existingStack = stacks[id];
             var existingStack = stacks[id];
-            if(existingStack != null)  {
-                stack = jQuery.extend(existingStack,stack);
+            if (existingStack != null) {
+                stack = jQuery.extend(existingStack, stack);
                 delete stack.addpos1;
                 delete stack.addpos1;
                 delete stack.addpos2;
                 delete stack.addpos2;
                 delete stack.animation;
                 delete stack.animation;
@@ -14,13 +36,14 @@ RichFaces.NotifyStack = (function(){
                 delete stack.nextpos1;
                 delete stack.nextpos1;
                 delete stack.nextpos2;
                 delete stack.nextpos2;
             }
             }
+            stack.id = id;
             stacks[id] = stack;
             stacks[id] = stack;
         },
         },
         getStack: function(id) {
         getStack: function(id) {
             var stack = stacks[id];
             var stack = stacks[id];
-            if(stack == null) {
-                stack = {};
-                stacks[id] = stack;
+            if (stack == null) {
+                stack = jQuery.extend({}, jQuery.pnotify.defaults.pnotify_stack);
+                this.register(id, stack);
             }
             }
             return stack;
             return stack;
         }
         }
@@ -28,16 +51,124 @@ RichFaces.NotifyStack = (function(){
 })();
 })();
 
 
 RichFaces.Notify = function(options) {
 RichFaces.Notify = function(options) {
-    if(options!=null && typeof options.pnotify_stack == "string") {
-        options.pnotify_stack = RichFaces.NotifyStack.getStack(options.pnotify_stack);
+    /**
+     * Copies attributes from one objects to other object, but
+     * can change the name of target attributes.
+     */
+    function extend(target, source, translation) {
+        for (var attr in source) {
+            var targetAttr = translation[attr] != null ? translation[attr] : attr;
+            target[targetAttr] = source[attr];
+            if (attr != 'stack' && target[targetAttr] instanceof Object) {
+                target[targetAttr] = extend({}, target[targetAttr], translation);
+            }
+        }
+        return target;
+    }
+
+    options = jQuery.extend({stack:'default'}, options);
+    if (options != null && typeof options.stack == "string") {
+        options.stack = RichFaces.NotifyStack.getStack(options.stack);
+    }
+    var delegateOptions = extend({}, options, {
+        'title':'pnotify_title' ,
+        'text': 'pnotify_text',
+        'styleClass': 'pnotify_addclass',
+        'nonblocking': 'pnotify_nonblock',
+        'nonblockingOpacity': 'pnotify_nonblock_opacity',
+        'showHistory': 'pnotify_history',
+        'animation': 'pnotify_animation',
+        'appearAnimation': 'effect_in',
+        'hideAnimation': 'effect_out',
+        'animationSpeed': 'pnotify_animate_speed',
+        'opacity': 'pnotify_opacity',
+        'showShadow': 'pnotify_shadow',
+        'showCloseButton': 'pnotify_closer',
+        'sticky': 'pnotify_hide',
+        'stayTime': 'pnotify_delay',
+        'stack': 'pnotify_stack'
+    });
+    if (options.sticky !== null) {
+        delegateOptions.pnotify_hide = !options.sticky;
     }
     }
     jQuery(document).ready(function() {
     jQuery(document).ready(function() {
-        if(options.delay) {
-            setTimeout(function(){
-                jQuery.pnotify(options);
-            },options.delay);
+        if (options.delay) {
+            setTimeout(function() {
+                jQuery.pnotify(delegateOptions);
+            }, options.delay);
         } else {
         } else {
-            jQuery.pnotify(options);
+            jQuery.pnotify(delegateOptions);
+        }
+    });
+};
+
+//TODO remove this fix when it gets in to jquery.js
+(function() {
+    var safariCompatMode;
+    var getCompatMode = function() {
+        var compatMode = document.compatMode;
+        if (!compatMode && jQuery.browser.safari) {
+            if (!safariCompatMode) {
+                //detect compatMode as described in http://code.google.com/p/doctype/wiki/ArticleCompatMode
+                var width = jQuery(document.createElement("div")).attr('style', 'position:absolute;width:0;height:0;width:1')
+                        .css('width');
+                safariCompatMode = compatMode = (width == '1px' ? 'BackCompat' : 'CSS1Compat');
+            } else {
+                compatMode = safariCompatMode;
+            }
         }
         }
+
+        return compatMode;
+    };
+
+
+    // Create innerHeight, innerWidth, outerHeight and outerWidth methods
+    jQuery.each([ "Height", "Width" ], function(i, name) {
+
+        var tl = i ? "Left" : "Top",  // top or left
+                br = i ? "Right" : "Bottom", // bottom or right
+                lower = name.toLowerCase();
+
+        // innerHeight and innerWidth
+        jQuery.fn["inner" + name] = function() {
+            return this[0] ?
+                    jQuery.css(this[0], lower, false, "padding") :
+                    null;
+        };
+
+        // outerHeight and outerWidth
+        jQuery.fn["outer" + name] = function(margin) {
+            return this[0] ?
+                    jQuery.css(this[0], lower, false, margin ? "margin" : "border") :
+                    null;
+        };
+
+        var type = name.toLowerCase();
+
+        jQuery.fn[ type ] = function(size) {
+            // Get window width or height
+            return this[0] == window ?
+                // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+                    getCompatMode() == "CSS1Compat" && document.documentElement[ "client" + name ] ||
+                            document.body[ "client" + name ] :
+
+                // Get document width or height
+                    this[0] == document ?
+                        // Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+                            Math.max(
+                                    document.documentElement["client" + name],
+                                    document.body["scroll" + name], document.documentElement["scroll" + name],
+                                    document.body["offset" + name], document.documentElement["offset" + name]
+                                    ) :
+
+                        // Get or set width or height on the element
+                            size === undefined ?
+                                // Get width or height on the element
+                                    (this.length ? jQuery.css(this[0], type) : null) :
+
+                                // Set the width or height on the element (default to pixels if value is unitless)
+                                    this.css(type, typeof size === "string" ? size : size + "px");
+        };
+
     });
     });
-}
+}());

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<f:root 
-    xmlns:f="http://jsf.exadel.com/template"
-    xmlns:vcp=" http://jsf.exadel.com/vcp"
-    xmlns:ui=" http://jsf.exadel.com/ui"
-    xmlns:x=" http://jsf.exadel.com/vcp"
-    xmlns:u="http://jsf.exadel.com/util"
-    xmlns:h="http://jsf.exadel.com/header"
-    component="org.richfaces.component.UINotify"
-    baseclass="org.ajax4jsf.renderkit.HeaderResourcesRendererBase"
-    class="org.richfaces.renderkit.html.NotifyRenderer">
+<f:root
+        xmlns:f="http://jsf.exadel.com/template"
+        xmlns:vcp=" http://jsf.exadel.com/vcp"
+        xmlns:ui=" http://jsf.exadel.com/ui"
+        xmlns:x=" http://jsf.exadel.com/vcp"
+        xmlns:u="http://jsf.exadel.com/util"
+        xmlns:h="http://jsf.exadel.com/header"
+        component="org.richfaces.component.UINotify"
+        baseclass="org.ajax4jsf.renderkit.HeaderResourcesRendererBase"
+        class="org.richfaces.renderkit.html.NotifyRenderer">
     <jsp:directive.page import="javax.faces.application.FacesMessage"/>
     <jsp:directive.page import="javax.faces.application.FacesMessage"/>
 
 
     <h:scripts>/org/richfaces/renderkit/html/scripts/jquery-1.4.2.js,
     <h:scripts>/org/richfaces/renderkit/html/scripts/jquery-1.4.2.js,
-    /org/richfaces/renderkit/html/scripts/jquery.pnotify.js</h:scripts>
+        /org/richfaces/renderkit/html/scripts/jquery.pnotify.js</h:scripts>
     <h:styles>/org/richfaces/renderkit/html/css/jquery.pnotify.xcss</h:styles>
     <h:styles>/org/richfaces/renderkit/html/css/jquery.pnotify.xcss</h:styles>
     <f:clientid var="clientId"/>
     <f:clientid var="clientId"/>
+
     <div id="#{clientId}">
     <div id="#{clientId}">
         <jsp:scriptlet>
         <jsp:scriptlet>
 <![CDATA[
 <![CDATA[
-        variables.setVariable("details",component.getDetails());
-        variables.setVariable("summary",component.getSummary());
-        variables.setVariable("showHistory",component.isShowHistory());
-        variables.setVariable("nonblocking",component.isNonblocking());
-        variables.setVariable("shadow",component.isShowShadow());
-        variables.setVariable("closeButton",component.isShowCloseButton());
-        variables.setVariable("nonblockingOpacity",component.getNonblockingOpacity());
-        variables.setVariable("appearAnimation",component.getAppearAnimation());
-        variables.setVariable("hideAnimation",component.getHideAnimation());
-        variables.setVariable("animationSpeed",component.getAnimationSpeed());
-        variables.setVariable("stackDirVertical",component.getStackDirVertical());
-        variables.setVariable("stackDirHorizontal",component.getStackDirHorizontal());
-        variables.setVariable("stackPush",component.getStackPush());
-        variables.setVariable("time",component.getStayTime()!=null ? component.getStayTime() : 0);
-        variables.setVariable("styleClass",component.getStyleClass()==null?"":component.getStyleClass());
+            variables.setVariable("details", component.getDetails());
+            variables.setVariable("summary", component.getSummary());
+            variables.setVariable("showHistory", component.isShowHistory());
+            variables.setVariable("nonblocking", component.isNonblocking());
+            variables.setVariable("shadow", component.isShowShadow());
+            variables.setVariable("closeButton", component.isShowCloseButton());
+            variables.setVariable("nonblockingOpacity", component.getNonblockingOpacity());
+            variables.setVariable("appearAnimation", component.getAppearAnimation());
+            variables.setVariable("hideAnimation", component.getHideAnimation());
+            variables.setVariable("animationSpeed", component.getAnimationSpeed());
+            variables.setVariable("stackDirVertical", component.getStackDirVertical());
+            variables.setVariable("stackDirHorizontal", component.getStackDirHorizontal());
+            variables.setVariable("stackPush", component.getStackPush());
+            variables.setVariable("time", component.getStayTime() != null ? component.getStayTime() : 0);
+            variables.setVariable("styleClass", component.getStyleClass() == null ? "" : component.getStyleClass());
 ]]>
 ]]>
         </jsp:scriptlet>
         </jsp:scriptlet>
         <script type="text/javascript">
         <script type="text/javascript">