click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r932338 - in /click/trunk/click/extras/src/org/apache/click/extras/control: AbstractContainerField.java FormTable.java
Date Fri, 09 Apr 2010 10:22:32 GMT
Author: sabob
Date: Fri Apr  9 10:22:32 2010
New Revision: 932338

URL: http://svn.apache.org/viewvc?rev=932338&view=rev
Log:
removed getHtmlImports. CLK-647

Modified:
    click/trunk/click/extras/src/org/apache/click/extras/control/AbstractContainerField.java
    click/trunk/click/extras/src/org/apache/click/extras/control/FormTable.java

Modified: click/trunk/click/extras/src/org/apache/click/extras/control/AbstractContainerField.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/org/apache/click/extras/control/AbstractContainerField.java?rev=932338&r1=932337&r2=932338&view=diff
==============================================================================
--- click/trunk/click/extras/src/org/apache/click/extras/control/AbstractContainerField.java
(original)
+++ click/trunk/click/extras/src/org/apache/click/extras/control/AbstractContainerField.java
Fri Apr  9 10:22:32 2010
@@ -205,31 +205,6 @@ public abstract class AbstractContainerF
     }
 
     /**
-     * Return the HTML head import statements for contained controls.
-     *
-     * @see org.apache.click.Control#getHtmlImports()
-     *
-     * @return the HTML includes statements for the contained control stylesheet
-     * and JavaScript files
-     */
-    @Override
-    @SuppressWarnings("deprecation")
-    public String getHtmlImports() {
-        if (hasControls()) {
-            HtmlStringBuffer buffer = new HtmlStringBuffer(0);
-
-            for (Control control : getControls()) {
-                String htmlImports = control.getHtmlImports();
-                if (htmlImports != null) {
-                    buffer.append(htmlImports);
-                }
-            }
-            return buffer.toString();
-        }
-        return null;
-    }
-
-    /**
      * This method does nothing by default.
      * <p/>
      * Subclasses can override this method to binds the submitted request

Modified: click/trunk/click/extras/src/org/apache/click/extras/control/FormTable.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/org/apache/click/extras/control/FormTable.java?rev=932338&r1=932337&r2=932338&view=diff
==============================================================================
--- click/trunk/click/extras/src/org/apache/click/extras/control/FormTable.java (original)
+++ click/trunk/click/extras/src/org/apache/click/extras/control/FormTable.java Fri Apr  9
10:22:32 2010
@@ -307,54 +307,6 @@ public class FormTable extends Table {
     }
 
     /**
-     * Return the HTML head element import string. This method will also include
-     * the imports of the form and the contained fields.
-     *
-     * @deprecated use the new {@link #getHeadElements()} instead
-     *
-     * @see org.apache.click.Control#getHtmlImports()
-     *
-     * @return the HTML head element import string
-     */
-    @Override
-    public String getHtmlImports() {
-        HtmlStringBuffer buffer = new HtmlStringBuffer(255);
-
-        String htmlImports = super.getHtmlImports();
-        if (htmlImports != null) {
-            buffer.append(htmlImports);
-        }
-
-        htmlImports = getControlLink().getHtmlImports();
-        if (htmlImports != null) {
-            buffer.append(htmlImports);
-        }
-
-        int firstRow = getFirstRow();
-        int lastRow = getLastRow();
-
-        for (int i = 0; i < getColumnList().size(); i++) {
-            Column column = (Column) getColumnList().get(i);
-            if (column instanceof FieldColumn) {
-                Field field = ((FieldColumn) column).getField();
-
-                if (field != null) {
-                    for (int j = firstRow; j < lastRow; j++) {
-                        field.setName(column.getName() + "_" + j);
-
-                        htmlImports = field.getHtmlImports();
-                        if (htmlImports != null) {
-                            buffer.append(htmlImports);
-                        }
-                    }
-                }
-            }
-        }
-
-        return buffer.toString();
-    }
-
-    /**
      * Return the HEAD elements for the Control. This method will include the
      * HEAD elements of the contained fields.
      *



Mime
View raw message