svn commit: r570819 - /wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java

[iv...@apache.org]

Author: ivaynberg
Date: Wed Aug 29 07:21:52 2007
New Revision: 570819

URL: http://svn.apache.org/viewvc?rev=570819&view=rev
Log:
small cleanup

Modified:
    wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java

Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java?rev=570819&r1=570818&r2=570819&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java Wed Aug 29 07:21:52 2007
@@ -22,11 +22,12 @@
 
 import org.apache.wicket.Component;
 import org.apache.wicket.ResourceReference;
-import org.apache.wicket.behavior.HeaderContributor;
 import org.apache.wicket.extensions.markup.html.form.palette.component.Choices;
 import org.apache.wicket.extensions.markup.html.form.palette.component.Recorder;
 import org.apache.wicket.extensions.markup.html.form.palette.component.Selection;
 import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.IHeaderContributor;
+import org.apache.wicket.markup.html.IHeaderResponse;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.FormComponent;
@@ -63,7 +64,7 @@
  * @author Igor Vaynberg ( ivaynberg )
  * 
  */
-public class Palette extends Panel
+public class Palette extends Panel implements IHeaderContributor
 {
 	private static final String SELECTED_HEADER_ID = "selectedHeader";
 
@@ -83,6 +84,9 @@
 	/** number of rows to show in the select boxes */
 	private int rows;
 
+	/** if reordering of selected items is allowed in */
+	private final boolean allowOrder;
+
 	/**
 	 * recorder component used to track user's selection. it is updated by
 	 * javascript on changes.
@@ -130,7 +134,8 @@
 	 * @param choicesModel
 	 *            Model representing collection of all available choices
 	 * @param choiceRenderer
-	 *            Render used to render choices. This must use unique IDs for the objects, not the index.
+	 *            Render used to render choices. This must use unique IDs for
+	 *            the objects, not the index.
 	 * @param rows
 	 *            Number of choices to be visible on the screen with out
 	 *            scrolling
@@ -151,7 +156,8 @@
 	 * @param choicesModel
 	 *            Model representing collection of all available choices
 	 * @param choiceRenderer
-	 *            Render used to render choices. This must use unique IDs for the objects, not the index.
+	 *            Render used to render choices. This must use unique IDs for
+	 *            the objects, not the index.
 	 * @param rows
 	 *            Number of choices to be visible on the screen with out
 	 *            scrolling
@@ -166,6 +172,26 @@
 		this.choicesModel = choicesModel;
 		this.choiceRenderer = choiceRenderer;
 		this.rows = rows;
+		this.allowOrder = allowOrder;
+	}
+
+	protected void onBeforeRender()
+	{
+		if (!hasBeenRendered())
+		{
+			initFactories();
+		}
+		super.onBeforeRender();
+	}
+
+
+	/**
+	 * One-time init method for components that are created via overridable
+	 * factories. This method is here because we do not want to call overridable
+	 * methods form palette's constructor.
+	 */
+	private void initFactories()
+	{
 		recorderComponent = newRecorderComponent();
 		add(recorderComponent);
 
@@ -183,13 +209,6 @@
 
 		add(newAvailableHeader(AVAILABLE_HEADER_ID));
 		add(newSelectedHeader(SELECTED_HEADER_ID));
-
-		add(HeaderContributor.forJavaScript(JAVASCRIPT));
-		ResourceReference css = getCSS();
-		if (css != null)
-		{
-			add(HeaderContributor.forCss(css));
-		}
 	}
 
 	/**
@@ -383,7 +402,7 @@
 	}
 
 	/**
-	 * @see wicket.extensions.markup.html.form.palette.component#getAdditionalAttributes()
+	 * @see org.apache.wicket.extensions.markup.html.form.palette.component#getAdditionalAttributes()
 	 */
 	protected Map getAdditionalAttributesForSelection(Object choice)
 	{
@@ -409,7 +428,7 @@
 	}
 
 	/**
-	 * @see wicket.extensions.markup.html.form.palette.component#getAdditionalAttributes()
+	 * @see org.apache.wicket.extensions.markup.html.form.palette.component#getAdditionalAttributes()
 	 */
 	protected Map getAdditionalAttributesForChoices(Object choice)
 	{
@@ -593,6 +612,21 @@
 			{
 				tag.getAttributes().put("disabled", "disabled");
 			}
+		}
+	}
+
+	/**
+	 * Renders header contributions
+	 * 
+	 * @param response
+	 */
+	public void renderHead(IHeaderResponse response)
+	{
+		response.renderJavascriptReference(JAVASCRIPT);
+		ResourceReference css = getCSS();
+		if (css != null)
+		{
+			response.renderCSSReference(css);
 		}
 	}
 }