Author: ivaynberg
Date: Wed Nov 5 00:10:28 2008
New Revision: 711526
URL: http://svn.apache.org/viewvc?rev=711526&view=rev
Log:
WICKET-1890
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java?rev=711526&r1=711525&r2=711526&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
Wed Nov 5 00:10:28 2008
@@ -50,8 +50,8 @@
* <p>
* <strong>Ajaxifying the palette</strong>: The palette itself cannot be
ajaxified because it is a
* panel and therefore does not receive any javascript events. Instead ajax
behaviors can be
- * attached to the recorder component which supports the javascript
<code>onchange</code> event.
- * The behavior should be attached by overriding [EMAIL PROTECTED]
#newRecorderComponent()}
+ * attached to the recorder component which supports the javascript
<code>onchange</code> event. The
+ * behavior should be attached by overriding [EMAIL PROTECTED]
#newRecorderComponent()}
*
* Example:
*
@@ -183,7 +183,7 @@
@Override
protected void onBeforeRender()
{
- if (!hasBeenRendered())
+ if (get("recorder") == null)
{
initFactories();
}
@@ -405,7 +405,7 @@
private static final long serialVersionUID = 1L;
@Override
- protected Map<String,String>
getAdditionalAttributes(Object choice)
+ protected Map<String, String>
getAdditionalAttributes(Object choice)
{
return
Palette.this.getAdditionalAttributesForSelection(choice);
}
@@ -415,7 +415,7 @@
/**
* @see
org.apache.wicket.extensions.markup.html.form.palette.component.Selection#getAdditionalAttributes(Object)
*/
- protected Map<String,String> getAdditionalAttributesForSelection(Object
choice)
+ protected Map<String, String>
getAdditionalAttributesForSelection(Object choice)
{
return null;
}
@@ -432,7 +432,7 @@
private static final long serialVersionUID = 1L;
@Override
- protected Map<String,String>
getAdditionalAttributes(Object choice)
+ protected Map<String, String>
getAdditionalAttributes(Object choice)
{
return
Palette.this.getAdditionalAttributesForChoices(choice);
}
@@ -442,7 +442,7 @@
/**
* @see
org.apache.wicket.extensions.markup.html.form.palette.component.Selection#getAdditionalAttributes(Object)
*/
- protected Map<String,String> getAdditionalAttributesForChoices(Object
choice)
+ protected Map<String, String> getAdditionalAttributesForChoices(Object
choice)
{
return null;
}