You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by sa...@apache.org on 2010/03/28 14:56:14 UTC
svn commit: r928393 - in
/click/trunk/click/extras/src/org/apache/click/extras:
cayenne/TabbedCayenneForm.java control/TabbedForm.java
Author: sabob
Date: Sun Mar 28 12:56:14 2010
New Revision: 928393
URL: http://svn.apache.org/viewvc?rev=928393&view=rev
Log:
migrated html imports to head elements
Modified:
click/trunk/click/extras/src/org/apache/click/extras/cayenne/TabbedCayenneForm.java
click/trunk/click/extras/src/org/apache/click/extras/control/TabbedForm.java
Modified: click/trunk/click/extras/src/org/apache/click/extras/cayenne/TabbedCayenneForm.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/org/apache/click/extras/cayenne/TabbedCayenneForm.java?rev=928393&r1=928392&r2=928393&view=diff
==============================================================================
--- click/trunk/click/extras/src/org/apache/click/extras/cayenne/TabbedCayenneForm.java (original)
+++ click/trunk/click/extras/src/org/apache/click/extras/cayenne/TabbedCayenneForm.java Sun Mar 28 12:56:14 2010
@@ -22,9 +22,11 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.click.Context;
import org.apache.click.control.Field;
import org.apache.click.control.FieldSet;
+import org.apache.click.element.CssImport;
import org.apache.click.extras.control.TabbedForm;
import org.apache.click.util.ClickUtils;
import org.apache.click.util.HtmlStringBuffer;
@@ -58,7 +60,7 @@ public class TabbedCayenneForm extends C
private static final long serialVersionUID = 1L;
- // ----------------------------------------------------- Instance Variables
+ // Instance Variables -----------------------------------------------------
/**
* The form HTML background color. The default background color is
@@ -87,7 +89,7 @@ public class TabbedCayenneForm extends C
*/
protected String template = "/org/apache/click/extras/control/TabbedForm.htm";
- // ----------------------------------------------------------- Constructors
+ // Constructors -----------------------------------------------------------
/**
* Create a Tabbed Cayenne Form with the given form name and
@@ -124,7 +126,7 @@ public class TabbedCayenneForm extends C
setButtonStyle("");
}
- // ------------------------------------------------------------ Properities
+ // Properities ------------------------------------------------------------
/**
* Add the given FieldSet tab sheet to the form.
@@ -168,25 +170,30 @@ public class TabbedCayenneForm extends C
}
/**
- * Return the TabbedCayenneForm HTML head imports statements for the
- * following resources:
- * <p/>
+ * Return the TabbedCayenneForm HTML HEAD elements for the following resource:
+ *
* <ul>
* <li><tt>click/extras-control.css</tt></li>
* </ul>
- * <p/>
- * Additionally all the {@link org.apache.click.control.Form#getHtmlImports()
+ *
+ * Additionally all the {@link org.apache.click.control.Form#getHeadElements()
* Form import statements} are also returned.
*
- * @see org.apache.click.Control#getHtmlImports()
+ * @see org.apache.click.Control#getHeadElements()
*
- * @return the HTML head import statements for the control
+ * @return the control list of HEAD elements to be included in the page
*/
- public String getHtmlImports() {
- HtmlStringBuffer buffer = new HtmlStringBuffer(512);
- buffer.append(super.getHtmlImports());
- buffer.append(ClickUtils.createHtmlImport(TabbedForm.HTML_IMPORTS, getContext()));
- return buffer.toString();
+ @Override
+ public List getHeadElements() {
+ if (headElements == null) {
+ headElements = super.getHeadElements();
+
+ Context context = getContext();
+ String versionIndicator = ClickUtils.getResourceVersionIndicator(context);
+
+ headElements.add(new CssImport("/click/extras-control.css", versionIndicator));
+ }
+ return headElements;
}
/**
@@ -278,7 +285,7 @@ public class TabbedCayenneForm extends C
this.template = template;
}
- // --------------------------------------------------------- Public Methods
+ // Public Methods ---------------------------------------------------------
/**
* Process the Form request. In addition to the normal Form
@@ -287,6 +294,7 @@ public class TabbedCayenneForm extends C
*
* @return true to continue Page event processing or false otherwise
*/
+ @Override
public boolean onProcess() {
boolean result = super.onProcess();
@@ -317,6 +325,7 @@ public class TabbedCayenneForm extends C
*
* @param buffer the specified buffer to render the control's output to
*/
+ @Override
public void render(HtmlStringBuffer buffer) {
applyMetaData();
Modified: click/trunk/click/extras/src/org/apache/click/extras/control/TabbedForm.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/org/apache/click/extras/control/TabbedForm.java?rev=928393&r1=928392&r2=928393&view=diff
==============================================================================
--- click/trunk/click/extras/src/org/apache/click/extras/control/TabbedForm.java (original)
+++ click/trunk/click/extras/src/org/apache/click/extras/control/TabbedForm.java Sun Mar 28 12:56:14 2010
@@ -22,10 +22,13 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.click.Context;
import org.apache.click.control.Field;
import org.apache.click.control.FieldSet;
import org.apache.click.control.Form;
+import org.apache.click.element.CssImport;
+import org.apache.click.element.JsImport;
import org.apache.click.util.ClickUtils;
import org.apache.click.util.HtmlStringBuffer;
@@ -131,15 +134,11 @@ import org.apache.click.util.HtmlStringB
*/
public class TabbedForm extends Form {
- // -------------------------------------------------------------- Constants
+ // Constants --------------------------------------------------------------
private static final long serialVersionUID = 1L;
- /** The TabbedForm imports statement. */
- public static final String HTML_IMPORTS = Form.HTML_IMPORTS
- + "<link type=\"text/css\" rel=\"stylesheet\" href=\"{0}/click/extras-control{1}.css\"/>\n";
-
- // ----------------------------------------------------- Instance Variables
+ // Instance Variables -----------------------------------------------------
/**
* The form HTML background color. The default background color is
@@ -168,7 +167,7 @@ public class TabbedForm extends Form {
*/
protected String template = "/org/apache/click/extras/control/TabbedForm.htm";
- // ---------------------------------------------------------- Constructors
+ // Constructors -----------------------------------------------------------
/**
* Create a new tabbed form instance with the given name.
@@ -191,7 +190,7 @@ public class TabbedForm extends Form {
setButtonStyle("");
}
- // ------------------------------------------------------------ Properities
+ // Properities ------------------------------------------------------------
/**
* Add the given FieldSet tab sheet to the form.
@@ -244,25 +243,30 @@ public class TabbedForm extends Form {
}
/**
- * Return the TabbedForm HTML head imports statements for the following
- * resources:
- * <p/>
+ * Return the TabbedForm HTML HEAD elements for the following resource:
+ *
* <ul>
* <li><tt>click/extras-control.css</tt></li>
* </ul>
- * <p/>
- * Additionally all the {@link org.apache.click.control.Form#getHtmlImports()
+ *
+ * Additionally all the {@link org.apache.click.control.Form#getHeadElements()
* Form import statements} are also returned.
*
- * @see org.apache.click.Control#getHtmlImports()
+ * @see org.apache.click.Control#getHeadElements()
*
- * @return the HTML head import statements for the control
+ * @return the control list of HEAD elements to be included in the page
*/
- public String getHtmlImports() {
- HtmlStringBuffer buffer = new HtmlStringBuffer(512);
- buffer.append(super.getHtmlImports());
- buffer.append(ClickUtils.createHtmlImport(HTML_IMPORTS, getContext()));
- return buffer.toString();
+ @Override
+ public List getHeadElements() {
+ if (headElements == null) {
+ headElements = super.getHeadElements();
+
+ Context context = getContext();
+ String versionIndicator = ClickUtils.getResourceVersionIndicator(context);
+
+ headElements.add(new CssImport("/click/extras-control.css", versionIndicator));
+ }
+ return headElements;
}
/**
@@ -345,7 +349,7 @@ public class TabbedForm extends Form {
this.template = template;
}
- // --------------------------------------------------------- Public Methods
+ // Public Methods ---------------------------------------------------------
/**
* Process the Form request. In addition to the normal Form
@@ -354,6 +358,7 @@ public class TabbedForm extends Form {
*
* @return true to continue Page event processing or false otherwise
*/
+ @Override
public boolean onProcess() {
boolean result = super.onProcess();
@@ -376,6 +381,7 @@ public class TabbedForm extends Form {
*
* @param buffer the specified buffer to render the control's output to
*/
+ @Override
public void render(HtmlStringBuffer buffer) {
Map model = new HashMap();
model.put("form", this);
@@ -395,6 +401,7 @@ public class TabbedForm extends Form {
*
* @return the HTML string representation of the form
*/
+ @Override
public String toString() {
return super.toString();
}