beehive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ekon...@apache.org
Subject svn commit: rev 43690 - in incubator/beehive/trunk/netui/src: bootstrap/org/apache/beehive/netui/tools/ant bootstrap/org/apache/beehive/netui/tools/tldx tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid tags-html/org/apache/beehive/netui/tags/html
Date Fri, 10 Sep 2004 21:26:17 GMT
Author: ekoneil
Date: Fri Sep 10 14:26:16 2004
New Revision: 43690

Modified:
   incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/ant/BuildModules.java
   incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxConfigTagsHandler.java
   incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxSubTask.java
   incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
   incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
   incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
   incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java
   incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
   incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
   incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
   incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java
   incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
Log:
Fixup the parenting requirements specified in the TLDX for the data grid tags.

Remove references in the config tags handler to the old netui-datagrid tag library.

CR: Daryl
BB: self
BVT: NetUI pass 



Modified: incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/ant/BuildModules.java
==============================================================================
--- incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/ant/BuildModules.java
(original)
+++ incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/ant/BuildModules.java
Fri Sep 10 14:26:16 2004
@@ -23,8 +23,6 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.Ant;
 
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
 import org.apache.tools.ant.Task;
 
 /**

Modified: incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxConfigTagsHandler.java
==============================================================================
--- incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxConfigTagsHandler.java
(original)
+++ incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxConfigTagsHandler.java
Fri Sep 10 14:26:16 2004
@@ -23,18 +23,10 @@
 import java.util.Properties;
 
 // internal imports
-import org.apache.commons.logging.Log;
 
 // external imports
-import xdoclet.DocletSupport;
 import xdoclet.XDocletException;
-import xdoclet.XDocletTagSupport;
 import xdoclet.tagshandler.ConfigTagsHandler;
-import xdoclet.tagshandler.TypeTagsHandler;
-import xdoclet.util.LogUtil;
-import xdoclet.util.TypeConversionUtil;
-
-import xjavadoc.*;
 
 /**
  *
@@ -46,7 +38,6 @@
     private static final String HTML_URI = "http://beehive.apache.org/netui/tags-html-1.0";
     private static final String TEMPLATE_URI = "http://beehive.apache.org/netui/tags-template-1.0";
     private static final String DATABINDING_URI = "http://beehive.apache.org/netui/tags-databinding-1.0";
-    private static final String DATAGRID_URI = "http://beehive.apache.org/netui/tags-datagrid-1.0";
 
     // map short names to a list of taglib links
     private static final Map links = new HashMap();
@@ -56,7 +47,6 @@
         links.put(TEMPLATE_URI, new String[] {"netui", "data"});
         links.put(HTML_URI, new String[] {"data", "temp", "datagrid"});
         links.put(DATABINDING_URI, new String[] {"netui", "temp"});
-        links.put(DATAGRID_URI, new String[] {"netui", "temp", "data"});
     }
 
     public String generateLinks(Properties properties)
@@ -89,9 +79,7 @@
             uri = DATABINDING_URI;
         else if(shortName.equals("temp"))
             uri = TEMPLATE_URI;
-        else if(shortName.equals("datagrid"))
-            uri = DATAGRID_URI;
-
+ 
         StringBuffer buf = new StringBuffer(64);
         buf.append("    <link>\n");
         buf.append("        <prefix>" + shortName + "</prefix>\n");

Modified: incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxSubTask.java
==============================================================================
--- incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxSubTask.java
(original)
+++ incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxSubTask.java
Fri Sep 10 14:26:16 2004
@@ -19,7 +19,6 @@
 
 import xdoclet.TemplateSubTask;
 import xdoclet.XDocletException;
-import xdoclet.util.Translator;
 
 /**
  * Generate the DatabaseControl class for a given JavaBean class, and an optional messages
properties bundle to go with it.

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
Fri Sep 10 14:26:16 2004
@@ -36,7 +36,6 @@
  * @netui.tldx:tag whitespace="indent" 
  *                 netuiexpressioninfo=""
  *                 renderer="workshop.netui.jspdesigner.tldx.AnchorColumnRenderer"
- *                 requiredchild="parameter formatDate formatNumber formatString attrobite"
  */
 public class AnchorColumn
     extends AbstractHtmlColumn

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
Fri Sep 10 14:26:16 2004
@@ -28,7 +28,6 @@
  * @netui:tag name="imageColumn" description="Renders a column of images in a NetUI data
grid" body-content="scriptless"
  * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.ImageColumnRenderer"
  *                 whitespace="indent" netuiexpressioninfo=""
- *                 requiredchild="attribute"
  */
 public class ImageColumn
     extends AbstractHtmlColumn

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
Fri Sep 10 14:26:16 2004
@@ -29,7 +29,6 @@
  * @netui.tldx:tag whitespace="indent"
  *                 renderer="workshop.netui.jspdesigner.tldx.LiteralColumnRenderer"
  *                 netuiexpressioninfo=""
- *                 requiredchild="formatDate formatNumber formatString attribute"
  */
 public class LiteralColumn
     extends AbstractHtmlColumn

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java
(original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java
Fri Sep 10 14:26:16 2004
@@ -49,6 +49,7 @@
  * @netui:tag name="attribute" body-content="empty" description="Add an attribute to the
parent tag which be rendered."
  * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.AttributeRenderer"
  * bodycontentpref="empty" whitespace="indent"
+ * requiredparent="data:anchorColumn data:imageColumn data:literalColumn"
  */
 public class Attribute extends AbstractSimpleTag
 {

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
(original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
Fri Sep 10 14:26:16 2004
@@ -186,7 +186,7 @@
  *    &lt;/netui:label></pre>
  * 
  * @netui:tag name="formatDate" body-content="empty" description="A formatter used to format
dates."
- * @netui.tldx:tag requiredparent="label select textArea textBox data:anchorColumn data:basicColumn
data:expressionColumn"
+ * @netui.tldx:tag requiredparent="label select textArea textBox data:anchorColumn data:literalColumn"
  * requiredchild="#nothing"
  * renderer="workshop.netui.jspdesigner.tldx.FormatDateRenderer"
  * bodycontentpref="empty"

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
(original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
Fri Sep 10 14:26:16 2004
@@ -106,7 +106,7 @@
  *    &lt;/netui:label></pre>
  *
  * @netui:tag name="formatNumber" body-content="empty" description="A formatter used to format
numbers."
- * @netui.tldx:tag requiredparent="label select textArea textBox data:anchorColumn data:basicColumn
data:expressionColumn"
+ * @netui.tldx:tag requiredparent="label select textArea textBox data:anchorColumn data:literalColumn"
  * requiredchild="#nothing"
  * renderer="workshop.netui.jspdesigner.tldx.FormatNumberRenderer"
  * bodycontentpref="empty"

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
(original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
Fri Sep 10 14:26:16 2004
@@ -95,7 +95,7 @@
  *    &lt;/netui:label> </pre>
  * 
  * @netui:tag name="formatString" body-content="empty" description="A formatter used to format
strings."
- * @netui.tldx:tag requiredparent="label select textArea textBox data:anchorColumn data:basicColumn
data:expressionColumn"
+ * @netui.tldx:tag requiredparent="label select textArea textBox data:anchorColumn data:literalColumn"
  * requiredchild="#nothing"
  * renderer="workshop.netui.jspdesigner.tldx.FormatStringRenderer"
  * bodycontentpref="empty"

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java
(original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java
Fri Sep 10 14:26:16 2004
@@ -53,7 +53,7 @@
  * <pre>      http://www.google.com/search?q=Socrates</pre>
  * 
  * @netui:tag name="parameter" description="Writes a URL parameter to a URL on its parent
tag."
- * @netui.tldx:tag requiredparent="anchor button form image imageAnchor datagrid:anchorColumn
data:anchorColumn"
+ * @netui.tldx:tag requiredparent="anchor button form image imageAnchor data:anchorColumn"
  * requiredchild="#nothing"
  * renderer="workshop.netui.jspdesigner.tldx.ParameterRenderer"
  * bodycontentpref="empty"

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
(original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
Fri Sep 10 14:26:16 2004
@@ -36,10 +36,10 @@
  * <p>Writes a group of name/value pairs to the URL or the parent tag.
  * 
  * <p>The &lt;netui:parameterMap> can be nested inside of the 
- * {@link com.bea.wlw.netui.tags.html.Anchor},
- * {@link com.bea.wlw.netui.tags.html.Button},
- * {@link com.bea.wlw.netui.tags.html.Form}, and
- * {@link com.bea.wlw.netui.tags.html.Image} tags.
+ * {@link org.apache.beehive.netui.tags.html.Anchor},
+ * {@link org.apache.beehive.netui.tags.html.Button},
+ * {@link org.apache.beehive.netui.tags.html.Form}, and
+ * {@link org.apache.beehive.netui.tags.html.Image} tags.
  * 
  * <p>You can dynamically determine the value of the &lt;netui:parameterMap>
tag by pointing
  * the <code>map</code> attribute at a {@link java.util.HashMap java.util.HashMap}
object.
@@ -65,7 +65,7 @@
  * 
  * <pre>      http://www.google.com/search?lr=lang_el&q=Socrates&as_qdr=m3</pre>
  * 
- * @netui:tag name="parameterMap" description="Provides a read-only XScript expression that
points to a map of parameters. Each entry in the map provides a URL parameter that will be
added to the parent tag's URL."
+ * @netui:tag name="parameterMap" description="Uses a JSP 2.0 expression that points to a
map of parameters. Each entry in the map provides a URL parameter that will be added to the
parent tag's URL."
  * @netui.tldx:tag requiredparent="anchor button form image imageAnchor data:anchorColumn"
  * requiredchild="#nothing"
  * renderer="workshop.netui.jspdesigner.tldx.ParameterMapRenderer"

Mime
View raw message