svn commit: r161911 - in incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding: cellrepeater/CellRepeater.java repeater/Repeater.java

[ekoneil]

Author: ekoneil
Date: Tue Apr 19 08:59:23 2005
New Revision: 161911

URL: http://svn.apache.org/viewcvs?view=rev&rev=161911
Log:
Removing a couple of unused methods from the previous consolidation of the 
DataSourceTag base class.

BB: self
BVT: NetUI pass


Modified:
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java?view=diff&r1=161910&r2=161911
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java
 Tue Apr 19 08:59:23 2005
@@ -381,8 +381,7 @@
             Iterator iterator = null;
             iterator = IteratorFactory.createIterator(source);
             if(iterator == null) {
-                if(LOGGER.isInfoEnabled())
-                    LOGGER.info("CellRepeater: The data structure from which 
to create an iterator is null.");
+                LOGGER.info("CellRepeater: The data structure from which to 
create an iterator is null.");
                 iterator = IteratorFactory.EMPTY_ITERATOR;
             }
 
@@ -496,8 +495,7 @@
                 haveNext = ensureItem(_currentRow * _columns + _currentColumn, 
_dataList);
 
             if(!haveNext) {
-                if(LOGGER.isDebugEnabled())
-                    LOGGER.debug("missing next at location (" + _currentRow + 
", " + _currentColumn + ")");
+                LOGGER.debug("missing next at location (" + _currentRow + ", " 
+ _currentColumn + ")");
 
                 // render empty cell
                 addContent(renderCellTag(computeStyleIndex(_currentRow, 
_currentColumn)));
@@ -643,21 +641,17 @@
         else if(_rows == DEFAULT_DIMENSION_VALUE) {
             int remainder = dataSize % _columns;
             _rows = (dataSize / _columns) + (remainder > 0 ? 1 : 0);
-
-            if(LOGGER.isDebugEnabled())
-                LOGGER.debug("guessed row size: " + _rows);
+            LOGGER.debug("guessed row size: " + _rows);
         }
         else if(_columns == DEFAULT_DIMENSION_VALUE) {
             int remainder = dataSize % _rows;
             _columns = (dataSize / _rows) + (remainder > 0 ? 1 : 0);
-
-            if(LOGGER.isDebugEnabled())
-                LOGGER.debug("guessed column size: " + _columns);
+            LOGGER.debug("guessed column size: " + _columns);
         }
     }
 
     private void validateAttributes(int rows, int columns)
-            throws JspException {
+        throws JspException {
         if(rows <= 0) {
             String msg = Bundle.getString("Tags_CellRepeater_invalidRowValue", 
new Object[]{getTagName(), new Integer(rows)});
             registerTagError(msg, null);
@@ -793,10 +787,5 @@
         // have a valid expression
         Object o = expr.evaluateExpression(dataSource, "dataSource", 
pageContext);
         return o;
-    }
-
-    private String doNaming()
-            throws JspException {
-        return applyNamingChain(getDataSource());
     }
 }

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java?view=diff&r1=161910&r2=161911
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java
 Tue Apr 19 08:59:23 2005
@@ -757,9 +757,4 @@
         Object o = expr.evaluateExpression(dataSource, "dataSource", 
pageContext);
         return o;
     }
-
-    private String doNaming()
-            throws JspException {
-        return applyNamingChain(getDataSource());
-    }
 }