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 13:49:28 UTC
svn commit: r928377 - in
/click/trunk/click/extras/src/org/apache/click/extras/control:
AutoCompleteTextField.java Menu.java
Author: sabob
Date: Sun Mar 28 11:49:28 2010
New Revision: 928377
URL: http://svn.apache.org/viewvc?rev=928377&view=rev
Log:
added override annotations
Modified:
click/trunk/click/extras/src/org/apache/click/extras/control/AutoCompleteTextField.java
click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java
Modified: click/trunk/click/extras/src/org/apache/click/extras/control/AutoCompleteTextField.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/org/apache/click/extras/control/AutoCompleteTextField.java?rev=928377&r1=928376&r2=928377&view=diff
==============================================================================
--- click/trunk/click/extras/src/org/apache/click/extras/control/AutoCompleteTextField.java (original)
+++ click/trunk/click/extras/src/org/apache/click/extras/control/AutoCompleteTextField.java Sun Mar 28 11:49:28 2010
@@ -83,11 +83,11 @@ import org.apache.click.util.HtmlStringB
*/
public abstract class AutoCompleteTextField extends TextField {
- // -------------------------------------------------------------- Constants
+ // Constants --------------------------------------------------------------
private static final long serialVersionUID = 1L;
- // ----------------------------------------------------- Instance Variables
+ // Instance Variables -----------------------------------------------------
/**
* The JavaScript 'script.aculo.us' Autocompleter initialization options,
@@ -95,7 +95,7 @@ public abstract class AutoCompleteTextFi
*/
protected String autoCompleteOptions = "{minChars:1}";
- // ----------------------------------------------------------- Constructors
+ // Constructors -----------------------------------------------------------
/**
* Construct the AutoCompleteTextField with the given name. The default text field size
@@ -163,7 +163,7 @@ public abstract class AutoCompleteTextFi
public AutoCompleteTextField() {
}
- // ------------------------------------------------------- Abstract Methods
+ // Abstract Methods -------------------------------------------------------
/**
* Return the list of suggested values for the given search criteria.
@@ -173,7 +173,7 @@ public abstract class AutoCompleteTextFi
*/
abstract public List getAutoCompleteList(String criteria);
- // --------------------------------------------------------- Public Methods
+ // Public Methods ---------------------------------------------------------
/**
* Return the JavaScript 'script.aculo.us' Autocompleter initialization
@@ -228,6 +228,7 @@ public abstract class AutoCompleteTextFi
* @throws IllegalArgumentException if the given parent instance is
* referencing <tt>this</tt> object: <tt>if (parent == this)</tt>
*/
+ @Override
public void setParent(Object parent) {
if (parent == null) {
// If the field parent control is set to null (indicating the field
@@ -259,6 +260,7 @@ public abstract class AutoCompleteTextFi
* @throws IllegalStateException if the field's name has not been set
* @throws IllegalStateException if the field is not attached to the Page
*/
+ @Override
public List getHeadElements() {
// Check that the field name and parent Page has been set
String fieldName = getName();
@@ -325,6 +327,7 @@ public abstract class AutoCompleteTextFi
*
* @param buffer the specified buffer to render the control's output to
*/
+ @Override
public void render(HtmlStringBuffer buffer) {
super.render(buffer);
@@ -335,7 +338,7 @@ public abstract class AutoCompleteTextFi
buffer.elementEnd("div");
}
- // --------------------------------------------------------- Event Handlers
+ // Event Handlers ---------------------------------------------------------
/**
* Register the field with the parent page to intercept POST autocompletion
@@ -343,6 +346,7 @@ public abstract class AutoCompleteTextFi
*
* @see org.apache.click.Control#onInit()
*/
+ @Override
public void onInit() {
super.onInit();
@@ -380,6 +384,7 @@ public abstract class AutoCompleteTextFi
*
* @return false if an auto complete request, otherwise returns true
*/
+ @Override
public boolean onProcess() {
Context context = getContext();
if (context.isPost()) {
@@ -399,7 +404,7 @@ public abstract class AutoCompleteTextFi
return true;
}
- // ------------------------------------------------------ Protected Methods
+ // Protected Methods ------------------------------------------------------
/**
* Render the suggested auto completion list to the servlet response.
Modified: click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java?rev=928377&r1=928376&r2=928377&view=diff
==============================================================================
--- click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java (original)
+++ click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java Sun Mar 28 11:49:28 2010
@@ -913,7 +913,7 @@ public class Menu extends AbstractContro
// is contained in the headElement.
String menuId = getId();
JsScript script = new JsScript();
- script.setId(menuId + "_setup");
+ script.setId(menuId + "_js_setup");
if (!headElements.contains(script)) {
// Script must be executed as soon as browser dom is ready
script.setExecuteOnDomReady(true);