[OFBiz] SVN: r4465 - trunk/components/content/src/org/ofbiz/content/widget/html

[byersa at svn.ofbiz.org]

Author: byersa
Date: 2005-02-09 13:15:07 -0600 (Wed, 09 Feb 2005)
New Revision: 4465

Modified:
   trunk/components/content/src/org/ofbiz/content/widget/html/HtmlScreenRenderer.java
Log:
Modified renderLabel to not wrap label text in a span tag if
no "id" and no "style" attributes are given.


Modified: trunk/components/content/src/org/ofbiz/content/widget/html/HtmlScreenRenderer.java
===================================================================
--- trunk/components/content/src/org/ofbiz/content/widget/html/HtmlScreenRenderer.java	2005-02-09 19:04:26 UTC (rev 4464)
+++ trunk/components/content/src/org/ofbiz/content/widget/html/HtmlScreenRenderer.java	2005-02-09 19:15:07 UTC (rev 4465)
@@ -93,28 +93,31 @@
 
     public void renderLabel(Writer writer, Map context, ModelScreenWidget.Label label) throws IOException {
         // open tag
-        if (Debug.verboseOn()) Debug.logVerbose("renderLabel, depth:" + context.get("depth"), module);
-        writer.write("<span");
+        String style = label.getStyle(context);
         String id = label.getId(context);
-        if (UtilValidate.isNotEmpty(id)) {
-            writer.write(" id=\"");
-            writer.write(id);
-            writer.write("\"");
+        if (UtilValidate.isNotEmpty(style) || UtilValidate.isNotEmpty(id) ) {
+            writer.write("<span");
+            if (UtilValidate.isNotEmpty(id)) {
+                writer.write(" id=\"");
+                writer.write(id);
+                writer.write("\"");
+            }
+            if (UtilValidate.isNotEmpty(style)) {
+                writer.write(" class=\"");
+                writer.write(style);
+                writer.write("\"");
+            }
+            writer.write(">");
+            
+            // the text
+            writer.write(label.getText(context));
+            
+            // close tag
+            writer.write("</span>");
+        } else {
+            writer.write(label.getText(context));
         }
-        String style = label.getStyle(context);
-        if (UtilValidate.isNotEmpty(style)) {
-            writer.write(" class=\"");
-            writer.write(style);
-            writer.write("\"");
-        }
-        writer.write(">");
         
-        // the text
-        writer.write(label.getText(context));
-        
-        // close tag
-        writer.write("</span>");
-        
         appendWhitespace(writer);
     }