You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2010/07/29 14:25:28 UTC
svn commit: r980422 [1/3] - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html...
Author: lofwyr
Date: Thu Jul 29 12:25:26 2010
New Revision: 980422
URL: http://svn.apache.org/viewvc?rev=980422&view=rev
Log:
code style: renaming constants class HtmlConstants to HtmlElements, because it contains only element tag names.
Added:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java (contents, props changed)
- copied, changed from r980410, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlConstants.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlConstants.java
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlConstants.java
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseXmlWriterImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/HiddenRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java Thu Jul 29 12:25:26 2010
@@ -18,11 +18,11 @@ package org.apache.myfaces.tobago.intern
*/
import org.apache.myfaces.tobago.internal.util.Deprecation;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -38,16 +38,16 @@ public abstract class TobagoResponseWrit
private static final Logger LOG = LoggerFactory.getLogger(TobagoResponseWriterBase.class);
protected static final Set<String> EMPTY_TAG = new HashSet<String>(Arrays.asList(
- HtmlConstants.BR,
- HtmlConstants.AREA,
- HtmlConstants.LINK,
- HtmlConstants.IMG,
- HtmlConstants.PARAM,
- HtmlConstants.HR,
- HtmlConstants.INPUT,
- HtmlConstants.COL,
- HtmlConstants.BASE,
- HtmlConstants.META));
+ HtmlElements.BR,
+ HtmlElements.AREA,
+ HtmlElements.LINK,
+ HtmlElements.IMG,
+ HtmlElements.PARAM,
+ HtmlElements.HR,
+ HtmlElements.INPUT,
+ HtmlElements.COL,
+ HtmlElements.BASE,
+ HtmlElements.META));
private UIComponent component;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterImpl.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterImpl.java Thu Jul 29 12:25:26 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.tobago.intern
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.internal.util.HtmlWriterUtils;
import org.apache.myfaces.tobago.renderkit.css.Style;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import javax.faces.component.UIComponent;
import javax.faces.context.ResponseWriter;
@@ -90,11 +90,11 @@ public class TobagoResponseWriterImpl ex
public void startDocument() throws IOException {
getWriter().write(HTML_DOCTYPE);
getWriter().write('\n');
- startElement(HtmlConstants.HTML, null);
+ startElement(HtmlElements.HTML, null);
}
@Override
public void endDocument() throws IOException {
- endElement(HtmlConstants.HTML);
+ endElement(HtmlElements.HTML);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseXmlWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseXmlWriterImpl.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseXmlWriterImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseXmlWriterImpl.java Thu Jul 29 12:25:26 2010
@@ -17,7 +17,7 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.XmlUtils;
import javax.faces.context.ResponseWriter;
@@ -68,13 +68,13 @@ public final class TobagoResponseXmlWrit
public void startDocument() throws IOException {
getWriter().write(XHTML_DOCTYPE);
getWriter().write('\n');
- startElement(HtmlConstants.HTML, null);
+ startElement(HtmlElements.HTML, null);
writeAttribute("xmlns", "http://www.w3.org/1999/xhtml", false);
}
@Override
public void endDocument() throws IOException {
- endElement(HtmlConstants.HTML);
+ endElement(HtmlElements.HTML);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java Thu Jul 29 12:25:26 2010
@@ -17,9 +17,9 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import javax.faces.render.ResponseStateManager;
@@ -65,12 +65,12 @@ public class TobagoResponseStateManager
if (treeStruct != null) {
if (treeStruct instanceof String) {
- responseWriter.startElement(HtmlConstants.INPUT, null);
+ responseWriter.startElement(HtmlElements.INPUT, null);
responseWriter.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
responseWriter.writeAttribute(HtmlAttributes.NAME, TREE_PARAM, null);
responseWriter.writeAttribute(HtmlAttributes.ID, TREE_PARAM, null);
responseWriter.writeAttribute(HtmlAttributes.VALUE, treeStruct, null);
- responseWriter.endElement(HtmlConstants.INPUT);
+ responseWriter.endElement(HtmlElements.INPUT);
}
} else {
if (LOG.isDebugEnabled()) {
@@ -78,7 +78,7 @@ public class TobagoResponseStateManager
}
}
- responseWriter.startElement(HtmlConstants.INPUT, null);
+ responseWriter.startElement(HtmlElements.INPUT, null);
responseWriter.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
responseWriter.writeAttribute(HtmlAttributes.NAME, STATE_PARAM, null);
responseWriter.writeAttribute(HtmlAttributes.ID, STATE_PARAM, null);
@@ -92,14 +92,14 @@ public class TobagoResponseStateManager
LOG.debug("No component states to be saved in client response!");
}
}
- responseWriter.endElement(HtmlConstants.INPUT);
+ responseWriter.endElement(HtmlElements.INPUT);
- responseWriter.startElement(HtmlConstants.INPUT, null);
+ responseWriter.startElement(HtmlElements.INPUT, null);
responseWriter.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
responseWriter.writeAttribute(HtmlAttributes.NAME, VIEWID_PARAM, null);
responseWriter.writeAttribute(HtmlAttributes.ID, VIEWID_PARAM, null);
responseWriter.writeAttribute(HtmlAttributes.VALUE, facescontext.getViewRoot().getViewId(), null);
- responseWriter.endElement(HtmlConstants.INPUT);
+ responseWriter.endElement(HtmlElements.INPUT);
}
}
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java (from r980410, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlConstants.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlConstants.java&r1=980410&r2=980422&rev=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlConstants.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java Thu Jul 29 12:25:26 2010
@@ -17,7 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-public final class HtmlConstants {
+public final class HtmlElements {
+
public static final String A = "a";
public static final String AREA = "area";
public static final String B = "b";
@@ -58,7 +59,7 @@ public final class HtmlConstants {
public static final String U = "u";
public static final String UL = "ul";
- private HtmlConstants() {
+ private HtmlElements() {
}
}
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java Thu Jul 29 12:25:26 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.tobago.webapp
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
import javax.faces.component.UIComponent;
@@ -179,11 +179,11 @@ public abstract class TobagoResponseWrit
public void endJavascript() throws IOException {
write("\n// -->\n");
- endElement(HtmlConstants.SCRIPT);
+ endElement(HtmlElements.SCRIPT);
}
public void startJavascript() throws IOException {
- startElement(HtmlConstants.SCRIPT, null);
+ startElement(HtmlElements.SCRIPT, null);
writeAttribute(HtmlAttributes.TYPE, "text/javascript", false);
write("\n<!--\n");
}
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java Thu Jul 29 12:25:26 2010
@@ -20,6 +20,7 @@ package org.apache.myfaces.tobago.webapp
import org.apache.myfaces.tobago.internal.webapp.TobagoResponseWriterImpl;
import org.apache.myfaces.tobago.internal.webapp.TobagoResponseXmlWriterImpl;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -50,37 +51,37 @@ public class TobagoResponseWriterUnitTes
@Test
public void testEmptyTag() throws IOException {
- writer.startElement("input", null);
- writer.endElement("input");
+ writer.startElement(HtmlElements.INPUT, null);
+ writer.endElement(HtmlElements.INPUT);
Assert.assertEquals("empty tag", "<input\n>", stringWriter.toString());
}
@Test
public void testNormalTag() throws IOException {
- writer.startElement("select", null);
- writer.endElement("select");
+ writer.startElement(HtmlElements.SELECT, null);
+ writer.endElement(HtmlElements.SELECT);
Assert.assertEquals("normal tag", "<select\n></select>", stringWriter.toString());
}
@Test
public void testAttribute() throws IOException {
- writer.startElement("select", null);
+ writer.startElement(HtmlElements.SELECT, null);
writer.writeAttribute(HtmlAttributes.VALUE, "0", null);
- writer.endElement("select");
+ writer.endElement(HtmlElements.SELECT);
Assert.assertEquals("attr tag", "<select value=\"0\"\n></select>", stringWriter.toString());
}
@Test
public void testAttributeQuoting() throws IOException {
- writer.startElement("select", null);
+ writer.startElement(HtmlElements.SELECT, null);
writer.writeAttribute(HtmlAttributes.VALUE, "-<->-ü-â¬-", null);
- writer.endElement("select");
+ writer.endElement(HtmlElements.SELECT);
Assert.assertEquals("attr tag", "<select value=\"-<->-ü-â¬-\"\n></select>", stringWriter.toString());
}
@Test
public void testTextQuoting() throws IOException {
- writer.startElement("textarea", null);
+ writer.startElement(HtmlElements.TEXTAREA, null);
writer.writeText("-<->-ü-â¬-", null);
writer.endElement("textarea");
Assert.assertEquals("attr tag", "<textarea\n>-<->-ü-â¬-</textarea>", stringWriter.toString());
@@ -94,14 +95,14 @@ public class TobagoResponseWriterUnitTes
@Test
public void testManyChars() throws IOException {
- writer.startElement("select", null);
+ writer.startElement(HtmlElements.SELECT, null);
StringBuffer buffer = new StringBuffer();
for (char c = 0x20; c < 0x1ff; c++) {
buffer.append(c);
}
writer.writeAttribute(HtmlAttributes.VALUE, buffer, null);
writer.writeText(buffer, null);
- writer.endElement("select");
+ writer.endElement(HtmlElements.SELECT);
String result = buffer.toString(); // all the same but this 4 items
result = result.replace("&", "&");
@@ -115,10 +116,10 @@ public class TobagoResponseWriterUnitTes
@Test
public void testNonUtf8() throws IOException {
TobagoResponseWriter writer1 = new TobagoResponseWriterImpl(stringWriter, "", "ISO-8859-1");
- writer1.startElement("input", null);
+ writer1.startElement(HtmlElements.INPUT, null);
writer1.writeAttribute(HtmlAttributes.VALUE, "Gutschein über 100 â¬.", null);
writer1.writeAttribute(HtmlAttributes.READONLY, true);
- writer1.endElement("input");
+ writer1.endElement(HtmlElements.INPUT);
writer1.close();
Assert.assertEquals("<input value=\"Gutschein über 100 €.\" readonly=\"readonly\"\n>",
stringWriter.toString());
Added: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlConstants.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlConstants.java?rev=980422&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlConstants.java (added)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlConstants.java Thu Jul 29 12:25:26 2010
@@ -0,0 +1,69 @@
+package org.apache.myfaces.tobago.renderkit.html;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @deprecated please use {@link HtmlElements}
+ */
+@Deprecated
+public final class HtmlConstants {
+
+ public static final String A = "a";
+ public static final String AREA = "area";
+ public static final String B = "b";
+ public static final String BASE = "base";
+ public static final String BODY = "body";
+ public static final String BR = "br";
+ public static final String BUTTON = "button";
+ public static final String COL = "col";
+ public static final String COLGROUP = "colgroup";
+ public static final String DIV = "div";
+ public static final String FIELDSET = "fieldset";
+ public static final String FORM = "form";
+ public static final String HEAD = "head";
+ public static final String HR = "hr";
+ public static final String HTML = "html";
+ public static final String IFRAME = "iframe";
+ public static final String IMG = "img";
+ public static final String INPUT = "input";
+ public static final String LABEL = "label";
+ public static final String LEGEND = "legend";
+ public static final String LI = "li";
+ public static final String LINK = "link";
+ public static final String META = "meta";
+ public static final String OL = "ol";
+ public static final String OPTGROUP = "optgroup";
+ public static final String OPTION = "option";
+ public static final String PARAM = "param";
+ public static final String SCRIPT = "script";
+ public static final String SELECT = "select";
+ public static final String SPAN = "span";
+ public static final String STYLE = "style";
+ public static final String TABLE = "table";
+ public static final String TD = "td";
+ public static final String TEXTAREA = "textarea";
+ public static final String TH = "th";
+ public static final String TITLE = "title";
+ public static final String TR = "tr";
+ public static final String U = "u";
+ public static final String UL = "ul";
+
+ private HtmlConstants() {
+
+ }
+}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java Thu Jul 29 12:25:26 2010
@@ -30,7 +30,7 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -147,9 +147,9 @@ public final class HtmlRendererUtil {
writer.writeText(text);
} else {
writer.writeText(text.substring(0, pos));
- writer.startElement(HtmlConstants.U, null);
+ writer.startElement(HtmlElements.U, null);
writer.writeText(Character.toString(text.charAt(pos)));
- writer.endElement(HtmlConstants.U);
+ writer.endElement(HtmlElements.U);
writer.writeText(text.substring(pos + 1));
}
}
@@ -419,7 +419,7 @@ public final class HtmlRendererUtil {
*/
@Deprecated
public static void startJavascript(ResponseWriter writer) throws IOException {
- writer.startElement(HtmlConstants.SCRIPT, null);
+ writer.startElement(HtmlElements.SCRIPT, null);
writer.writeAttribute(HtmlAttributes.TYPE, "text/javascript", null);
writer.write("\n<!--\n");
}
@@ -430,7 +430,7 @@ public final class HtmlRendererUtil {
@Deprecated
public static void endJavascript(ResponseWriter writer) throws IOException {
writer.write("\n// -->\n");
- writer.endElement(HtmlConstants.SCRIPT);
+ writer.endElement(HtmlElements.SCRIPT);
}
/**
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java Thu Jul 29 12:25:26 2010
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Position;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -81,40 +81,40 @@ public class NumberSliderRenderer extend
inputWidth = (width * (100 - sliderWidthPerc)) / 100;
}
- writer.startElement(HtmlConstants.TABLE, slider);
+ writer.startElement(HtmlElements.TABLE, slider);
writer.writeIdAttribute(id);
writer.writeClassAttribute(Classes.create(slider));
writer.writeStyleAttribute(style);
//writer.writeAttribute(HtmlAttributes.BORDER,"1",false);
- writer.startElement(HtmlConstants.TR, null);
- writer.startElement(HtmlConstants.TD, null);
+ writer.startElement(HtmlElements.TR, null);
+ writer.startElement(HtmlElements.TD, null);
writer.writeClassAttribute(Classes.create(slider, "min"));
Style widthStyle = new Style();
widthStyle.setWidth(Measure.valueOf(sliderWidth / 2));
writer.writeStyleAttribute(widthStyle);
- writer.startElement(HtmlConstants.SPAN, null);
+ writer.startElement(HtmlElements.SPAN, null);
writer.writeClassAttribute(Classes.create(slider, "min"));
writer.write(Integer.toString(min));
- writer.endElement(HtmlConstants.SPAN);
+ writer.endElement(HtmlElements.SPAN);
- writer.endElement(HtmlConstants.TD);
- writer.startElement(HtmlConstants.TD, null);
+ writer.endElement(HtmlElements.TD);
+ writer.startElement(HtmlElements.TD, null);
writer.writeClassAttribute(Classes.create(slider, "max"));
writer.writeStyleAttribute(widthStyle);
- writer.startElement(HtmlConstants.SPAN, null);
+ writer.startElement(HtmlElements.SPAN, null);
writer.writeClassAttribute(Classes.create(slider, "max"));
writer.write(Integer.toString(max));
- writer.endElement(HtmlConstants.SPAN);
- writer.endElement(HtmlConstants.TD);
+ writer.endElement(HtmlElements.SPAN);
+ writer.endElement(HtmlElements.TD);
// the input field starts here
- writer.startElement(HtmlConstants.TD, null);
+ writer.startElement(HtmlElements.TD, null);
writer.writeAttribute(HtmlAttributes.ROWSPAN, "2", false);
writer.writeClassAttribute(Classes.create(slider, "td"));
- writer.startElement(HtmlConstants.INPUT, null);
+ writer.startElement(HtmlElements.INPUT, null);
writer.writeClassAttribute(Classes.create(slider, "input"));
widthStyle.setWidth(Measure.valueOf(inputWidth));
writer.writeStyleAttribute(widthStyle);
@@ -127,21 +127,21 @@ public class NumberSliderRenderer extend
writer.writeAttribute(HtmlAttributes.READONLY, readonly);
writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
//writer.writeAttribute(HtmlAttributes.STYLE, null, STYLE);
- writer.endElement(HtmlConstants.INPUT);
- writer.endElement(HtmlConstants.TD);
+ writer.endElement(HtmlElements.INPUT);
+ writer.endElement(HtmlElements.TD);
- writer.endElement(HtmlConstants.TR);
- writer.startElement(HtmlConstants.TR, null);
- writer.startElement(HtmlConstants.TD, null);
+ writer.endElement(HtmlElements.TR);
+ writer.startElement(HtmlElements.TR, null);
+ writer.startElement(HtmlElements.TD, null);
writer.writeAttribute(HtmlAttributes.COLSPAN, 2);
//track
- writer.startElement(HtmlConstants.DIV, null);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(slider, "slider"));
writer.writeIdAttribute(getIdForSliderTrack(facesContext, slider));
// handle
- writer.startElement(HtmlConstants.DIV, null);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeIdAttribute(getIdForSliderHandle(facesContext, slider));
Style handleStyle = new Style();
handleStyle.setPosition(Position.RELATIVE);
@@ -149,14 +149,14 @@ public class NumberSliderRenderer extend
handleStyle.setWidth(Measure.valueOf(12));
handleStyle.setHeight(Measure.valueOf(6));
writer.writeStyleAttribute(handleStyle); // todo: why not do that via the class?
- writer.startElement(HtmlConstants.IMG, null);
+ writer.startElement(HtmlElements.IMG, null);
writer.writeAttribute(HtmlAttributes.SRC, getAbsoluteImagePath(facesContext, "image/sliderTriangle.gif"), true);
- writer.endElement(HtmlConstants.IMG);
- writer.endElement(HtmlConstants.DIV);
- writer.endElement(HtmlConstants.DIV);
- writer.endElement(HtmlConstants.TD);
- writer.endElement(HtmlConstants.TR);
- writer.endElement(HtmlConstants.TABLE);
+ writer.endElement(HtmlElements.IMG);
+ writer.endElement(HtmlElements.DIV);
+ writer.endElement(HtmlElements.DIV);
+ writer.endElement(HtmlElements.TD);
+ writer.endElement(HtmlElements.TR);
+ writer.endElement(HtmlElements.TABLE);
writeSliderJavaScript(facesContext, slider, writer);
//HtmlRendererUtils.renderFocusId(facesContext, slider);
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java Thu Jul 29 12:25:26 2010
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -45,11 +45,11 @@ public class SelectBooleanCheckboxRender
boolean value = ComponentUtils.getBooleanAttribute(component, Attributes.VALUE);
- writer.startElement(HtmlConstants.SELECT, component);
+ writer.startElement(HtmlElements.SELECT, component);
writer.writeNameAttribute(component.getClientId(facesContext));
writer.writeIdAttribute(component.getClientId(facesContext));
writer.writeAttribute(HtmlAttributes.MULTIPLE, true);
- writer.startElement(HtmlConstants.OPTION, null);
+ writer.startElement(HtmlElements.OPTION, null);
writer.writeAttribute(HtmlAttributes.VALUE, value ? "on" : "off", false);
UIComponent label = component.getFacet(Facets.LABEL);
@@ -57,7 +57,7 @@ public class SelectBooleanCheckboxRender
RenderUtils.encode(facesContext, label);
}
- writer.endElement(HtmlConstants.OPTION);
- writer.endElement(HtmlConstants.SELECT);
+ writer.endElement(HtmlElements.OPTION);
+ writer.endElement(HtmlElements.SELECT);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java Thu Jul 29 12:25:26 2010
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.layout.
import org.apache.myfaces.tobago.renderkit.BoxRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.VariableResolverUtils;
@@ -54,12 +54,12 @@ public class BoxRenderer extends BoxRend
style.setPaddingBottom(Measure.ZERO);
}
- writer.startElement(HtmlConstants.FIELDSET, box);
+ writer.startElement(HtmlElements.FIELDSET, box);
writer.writeClassAttribute(Classes.create(box));
writer.writeStyleAttribute(style);
if (label != null || labelString != null) {
- writer.startElement(HtmlConstants.LEGEND, box);
+ writer.startElement(HtmlElements.LEGEND, box);
writer.writeClassAttribute(Classes.create(box, "legend"));
if (label != null) {
@@ -67,25 +67,25 @@ public class BoxRenderer extends BoxRend
} else {
writer.writeText(labelString);
}
- writer.endElement(HtmlConstants.LEGEND);
+ writer.endElement(HtmlElements.LEGEND);
}
Style contentStyle = new Style(facesContext, box);
if (toolbar != null) {
- writer.startElement(HtmlConstants.DIV, null);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(box, "toolbarOuter"));
- writer.startElement(HtmlConstants.DIV, null);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(box, "toolbarInner"));
toolbar.setRendererType(RendererTypes.BOX_TOOL_BAR);
RenderUtils.encode(facesContext, toolbar);
- writer.endElement(HtmlConstants.DIV);
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
+ writer.endElement(HtmlElements.DIV);
if (VariableResolverUtils.resolveClientProperties(facesContext).getUserAgent().isMsie()) {
// XXX check for what is this, and delete or comment it
contentStyle.setTop(Measure.valueOf(-10));
}
}
- writer.startElement(HtmlConstants.DIV, box);
+ writer.startElement(HtmlElements.DIV, box);
writer.writeClassAttribute(Classes.create(box, "content")); // needed to be scrollable inside of the box
writer.writeStyleAttribute(contentStyle);
final Measure offsetLeft = getOffsetLeft(facesContext, box);
@@ -102,8 +102,8 @@ public class BoxRenderer extends BoxRend
@Override
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
- writer.endElement(HtmlConstants.DIV);
- writer.endElement(HtmlConstants.FIELDSET);
+ writer.endElement(HtmlElements.DIV);
+ writer.endElement(HtmlElements.FIELDSET);
}
@Override
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java Thu Jul 29 12:25:26 2010
@@ -32,7 +32,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.CommandRendererHelper;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
@@ -60,7 +60,7 @@ public class ButtonRenderer extends Comm
LabelWithAccessKey label = new LabelWithAccessKey(button);
- writer.startElement(HtmlConstants.BUTTON, button);
+ writer.startElement(HtmlElements.BUTTON, button);
writer.writeAttribute(HtmlAttributes.TYPE, createButtonType(button), false);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
@@ -89,10 +89,10 @@ public class ButtonRenderer extends Comm
} else {
image = getImageWithPath(facesContext, imageName, helper.isDisabled());
}
- writer.startElement(HtmlConstants.IMG, null);
+ writer.startElement(HtmlElements.IMG, null);
writer.writeAttribute(HtmlAttributes.SRC, image, true);
HtmlRendererUtils.renderImageTip(component, writer);
- writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlElements.IMG);
}
if (label.getText() != null) {
@@ -102,7 +102,7 @@ public class ButtonRenderer extends Comm
HtmlRendererUtils.writeLabelWithAccessKey(writer, label);
}
- writer.endElement(HtmlConstants.BUTTON);
+ writer.endElement(HtmlElements.BUTTON);
if (label.getAccessKey() != null) {
if (LOG.isInfoEnabled()
&& !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java Thu Jul 29 12:25:26 2010
@@ -29,7 +29,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
@@ -91,7 +91,7 @@ public class CalendarRenderer extends La
// rendering
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlConstants.TABLE, component);
+ writer.startElement(HtmlElements.TABLE, component);
writer.writeIdAttribute(id);
HtmlRendererUtils.renderDojoDndItem(component, writer, true);
writer.writeClassAttribute(Classes.create(output));
@@ -101,74 +101,74 @@ public class CalendarRenderer extends La
writer.writeAttribute(HtmlAttributes.CELLPADDING, 3);
writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
- writer.startElement(HtmlConstants.TR, null);
+ writer.startElement(HtmlElements.TR, null);
writer.writeClassAttribute(Classes.create(output, "headerRow"));
- writer.startElement(HtmlConstants.TH, null);
+ writer.startElement(HtmlElements.TH, null);
writer.writeAttribute(HtmlAttributes.COLSPAN, 7);
- writer.startElement(HtmlConstants.TABLE, null);
+ writer.startElement(HtmlElements.TABLE, null);
writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
writer.writeClassAttribute(Classes.create(output, "header"));
- writer.startElement(HtmlConstants.TR, null);
+ writer.startElement(HtmlElements.TR, null);
- writer.startElement(HtmlConstants.TD, null);
+ writer.startElement(HtmlElements.TD, null);
writer.writeAttribute(HtmlAttributes.ALIGN, "left", false);
- writer.startElement(HtmlConstants.IMG, null);
+ writer.startElement(HtmlElements.IMG, null);
writer.writeClassAttribute(Classes.create(output, "header"));
writer.writeAttribute(HtmlAttributes.ALT, "", false);
writer.writeAttribute(HtmlAttributes.SRC,
ResourceManagerUtils.getImageWithPath(facesContext, "image/calendarFastPrev.gif"), false);
writer.writeAttribute(HtmlAttributes.ONCLICK, "addMonth('" + id + "', -12)", false);
- writer.endElement(HtmlConstants.IMG);
- writer.endElement(HtmlConstants.TD);
+ writer.endElement(HtmlElements.IMG);
+ writer.endElement(HtmlElements.TD);
- writer.startElement(HtmlConstants.TD, null);
+ writer.startElement(HtmlElements.TD, null);
writer.writeAttribute(HtmlAttributes.ALIGN, "left", false);
- writer.startElement(HtmlConstants.IMG, null);
+ writer.startElement(HtmlElements.IMG, null);
writer.writeClassAttribute(Classes.create(output, "header"));
writer.writeAttribute(HtmlAttributes.ALT, "", false);
writer.writeAttribute(HtmlAttributes.SRC,
ResourceManagerUtils.getImageWithPath(facesContext, "image/calendarPrev.gif"), false);
writer.writeAttribute(HtmlAttributes.ONCLICK, "addMonth('" + id + "', -1)", false);
- writer.endElement(HtmlConstants.IMG);
- writer.endElement(HtmlConstants.TD);
+ writer.endElement(HtmlElements.IMG);
+ writer.endElement(HtmlElements.TD);
- writer.startElement(HtmlConstants.TH, null);
+ writer.startElement(HtmlElements.TH, null);
writer.writeClassAttribute(Classes.create(output, "headerCenter"));
writer.writeAttribute(HtmlAttributes.ALIGN, "center", false);
writer.writeIdAttribute(id + ":title");
writer.writeText(dateFormat.format(calendar.getTime()));
- writer.endElement(HtmlConstants.TH);
+ writer.endElement(HtmlElements.TH);
- writer.startElement(HtmlConstants.TD, null);
+ writer.startElement(HtmlElements.TD, null);
writer.writeAttribute(HtmlAttributes.ALIGN, "right", false);
- writer.startElement(HtmlConstants.IMG, null);
+ writer.startElement(HtmlElements.IMG, null);
writer.writeClassAttribute(Classes.create(output, "header"));
writer.writeAttribute(HtmlAttributes.ALT, "", false);
writer.writeAttribute(HtmlAttributes.SRC,
ResourceManagerUtils.getImageWithPath(facesContext, "image/calendarNext.gif"), false);
writer.writeAttribute(HtmlAttributes.ONCLICK, "addMonth('" + id + "', 1)", false);
- writer.endElement(HtmlConstants.IMG);
- writer.endElement(HtmlConstants.TD);
+ writer.endElement(HtmlElements.IMG);
+ writer.endElement(HtmlElements.TD);
- writer.startElement(HtmlConstants.TD, null);
+ writer.startElement(HtmlElements.TD, null);
writer.writeAttribute(HtmlAttributes.ALIGN, "right", false);
- writer.startElement(HtmlConstants.IMG, null);
+ writer.startElement(HtmlElements.IMG, null);
writer.writeClassAttribute(Classes.create(output, "header"));
writer.writeAttribute(HtmlAttributes.ALT, "", false);
writer.writeAttribute(HtmlAttributes.SRC,
ResourceManagerUtils.getImageWithPath(facesContext, "image/calendarFastNext.gif"), false);
writer.writeAttribute(HtmlAttributes.ONCLICK, "addMonth('" + id + "', 12)", false);
- writer.endElement(HtmlConstants.IMG);
- writer.endElement(HtmlConstants.TD);
+ writer.endElement(HtmlElements.IMG);
+ writer.endElement(HtmlElements.TD);
- writer.endElement(HtmlConstants.TR);
- writer.endElement(HtmlConstants.TABLE);
+ writer.endElement(HtmlElements.TR);
+ writer.endElement(HtmlElements.TABLE);
- writer.endElement(HtmlConstants.TH);
- writer.endElement(HtmlConstants.TR);
+ writer.endElement(HtmlElements.TH);
+ writer.endElement(HtmlElements.TR);
- writer.startElement(HtmlConstants.TR, null);
+ writer.startElement(HtmlElements.TR, null);
dateFormat = new SimpleDateFormat("E", locale);
for (int dayIt = 0; dayIt < 7; ++dayIt) {
@@ -176,18 +176,18 @@ public class CalendarRenderer extends La
String dayName = dateFormat.format(date.getCalendar().getTime());
dayName = StringUtils.substring(dayName, 0, 2);
- writer.startElement(HtmlConstants.TH, null);
+ writer.startElement(HtmlElements.TH, null);
writer.writeClassAttribute(Classes.create(output, "headerInner"));
writer.writeText(dayName);
- writer.endElement(HtmlConstants.TH);
+ writer.endElement(HtmlElements.TH);
}
- writer.endElement(HtmlConstants.TR);
+ writer.endElement(HtmlElements.TR);
// int weekCount = model.getWeekCount();
for (int week = 0; week < 6; ++week) {
// String style = (week < weekCount) ? "" : "style=\"display: none\"";
- writer.startElement(HtmlConstants.TR, null);
+ writer.startElement(HtmlElements.TR, null);
writer.writeIdAttribute(id + ":" + week);
// writer.writeAttribute(HtmlAttributes.STYLE, style, null);
@@ -197,7 +197,7 @@ public class CalendarRenderer extends La
String dayDescription = String.valueOf(date.getDay());
String onclick = "selectDay('" + id + "', " + week + " , " + dayIt + ");";
- writer.startElement(HtmlConstants.TD, null);
+ writer.startElement(HtmlElements.TD, null);
writer.writeAttribute(HtmlAttributes.ONCLICK, onclick, true);
writer.writeIdAttribute(id + ":" + week + ":" + dayIt);
writer.writeClassAttribute(
@@ -205,15 +205,15 @@ public class CalendarRenderer extends La
writer.writeText(dayDescription);
- writer.endElement(HtmlConstants.TD);
+ writer.endElement(HtmlElements.TD);
// } else {
// % ><td id="< %= id + ":" + week + ":" + day % >">x</td>< %
// }
}
- writer.endElement(HtmlConstants.TR);
+ writer.endElement(HtmlElements.TR);
}
- writer.endElement(HtmlConstants.TABLE);
+ writer.endElement(HtmlElements.TABLE);
writeInputHidden(writer, "/" + id + "/year", id + ":year", Integer.toString(calendar.get(Calendar.YEAR)));
@@ -243,14 +243,14 @@ public class CalendarRenderer extends La
private void writeInputHidden(TobagoResponseWriter writer, String name,
String id, String value) throws IOException {
- writer.startElement(HtmlConstants.INPUT, null);
+ writer.startElement(HtmlElements.INPUT, null);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
if (name != null) {
writer.writeNameAttribute(name);
}
writer.writeIdAttribute(id);
writer.writeAttribute(HtmlAttributes.VALUE, value, true);
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
}
private String getMonthNames(Locale locale) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java Thu Jul 29 12:25:26 2010
@@ -17,12 +17,12 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
import org.apache.myfaces.tobago.internal.util.DateFormatUtils;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -67,11 +67,11 @@ public class DateRenderer extends InRend
if (pattern != null) {
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
String id = component.getClientId(facesContext);
- writer.startElement(HtmlConstants.INPUT, component);
+ writer.startElement(HtmlElements.INPUT, component);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeIdAttribute(id + ":converterPattern");
writer.writeAttribute(HtmlAttributes.VALUE, pattern, false);
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
} else {
LOG.warn("Can't find the pattern for the converter! DatePicker may not work correctly.");
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java Thu Jul 29 12:25:26 2010
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -114,7 +114,7 @@ public class FileRenderer extends InputR
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlConstants.INPUT, input);
+ writer.startElement(HtmlElements.INPUT, input);
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.FILE, false);
writer.writeClassAttribute(Classes.create(input));
Style style = new Style(facesContext, input);
@@ -127,7 +127,7 @@ public class FileRenderer extends InputR
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
HtmlRendererUtils.renderTip(input, writer);
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java Thu Jul 29 12:25:26 2010
@@ -39,7 +39,7 @@ public class GridLayoutRenderer extends
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
// TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
// UIGridLayout gridLayout = (UIGridLayout) component;
-// writer.startElement(HtmlConstants.DIV, gridLayout);
+// writer.startElement(HtmlElements.DIV, gridLayout);
// writer.writeClassAttribute();
}
@@ -54,7 +54,7 @@ public class GridLayoutRenderer extends
FacesContext facesContext,
UIComponent component) throws IOException {
// TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
-// writer.endElement(HtmlConstants.DIV);
+// writer.endElement(HtmlElements.DIV);
}
public Measure getColumnSpacing(FacesContext facesContext, Configurable component) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/HiddenRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/HiddenRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/HiddenRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/HiddenRenderer.java Thu Jul 29 12:25:26 2010
@@ -24,7 +24,7 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.renderkit.InputRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -43,12 +43,12 @@ public class HiddenRenderer extends Inpu
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlConstants.INPUT, component);
+ writer.startElement(HtmlElements.INPUT, component);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
writer.writeAttribute(HtmlAttributes.VALUE, value != null ? value : "", true);
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java Thu Jul 29 12:25:26 2010
@@ -30,7 +30,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
@@ -83,7 +83,7 @@ public class ImageRenderer extends Layou
alt = "";
}
- writer.startElement(HtmlConstants.IMG, image);
+ writer.startElement(HtmlElements.IMG, image);
final String clientId = image.getClientId(facesContext);
writer.writeIdAttribute(clientId);
if (src != null) {
@@ -96,7 +96,7 @@ public class ImageRenderer extends Layou
writer.writeStyleAttribute(style);
HtmlRendererUtils.renderDojoDndItem(image, writer, true);
writer.writeClassAttribute(Classes.create(image));
- writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlElements.IMG);
}
private String createSrc(String src, String ext) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java Thu Jul 29 12:25:26 2010
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -108,7 +108,7 @@ public class InRenderer extends InputRen
}
String id = input.getClientId(facesContext);
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlConstants.INPUT, input);
+ writer.startElement(HtmlElements.INPUT, input);
writer.writeAttribute(HtmlAttributes.TYPE, type, false);
writer.writeNameAttribute(id);
writer.writeIdAttribute(id);
@@ -146,7 +146,7 @@ public class InRenderer extends InputRen
// writer.writeAttribute(HtmlAttributes.ONCHANGE, onchange, null);
}
} */
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
HtmlRendererUtils.checkForCommandFacet(input, facesContext, writer);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java Thu Jul 29 12:25:26 2010
@@ -27,7 +27,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -72,7 +72,7 @@ public class LabelRenderer extends Layou
String forValue = ComponentUtils.findClientIdFor(component, facesContext);
String clientId = component.getClientId(facesContext);
- writer.startElement(HtmlConstants.LABEL, component);
+ writer.startElement(HtmlElements.LABEL, component);
HtmlRendererUtils.renderDojoDndItem(component, writer, true);
final Classes classes = Classes.create(component);
writer.writeClassAttribute(classes);
@@ -98,6 +98,6 @@ public class LabelRenderer extends Layou
}
HtmlRendererUtils.addClickAcceleratorKey(facesContext, clientId, label.getAccessKey());
}
- writer.endElement(HtmlConstants.LABEL);
+ writer.endElement(HtmlElements.LABEL);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java Thu Jul 29 12:25:26 2010
@@ -33,7 +33,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.CommandRendererHelper;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -61,9 +61,9 @@ public class LinkRenderer extends Comman
LabelWithAccessKey label = new LabelWithAccessKey(link);
if (helper.isDisabled()) {
- writer.startElement(HtmlConstants.SPAN, link);
+ writer.startElement(HtmlElements.SPAN, link);
} else {
- writer.startElement(HtmlConstants.A, link);
+ writer.startElement(HtmlElements.A, link);
writer.writeAttribute(HtmlAttributes.HREF, href, true);
if (helper.getOnclick() != null) {
writer.writeAttribute(HtmlAttributes.ONCLICK, helper.getOnclick(), true);
@@ -99,12 +99,12 @@ public class LinkRenderer extends Comman
} else {
image = getImageWithPath(facesContext, image, helper.isDisabled());
}
- writer.startElement(HtmlConstants.IMG, link);
+ writer.startElement(HtmlElements.IMG, link);
writer.writeAttribute(HtmlAttributes.SRC, image, true);
writer.writeAttribute(HtmlAttributes.BORDER, 0); // TODO: is border=0 setting via style possible?
HtmlRendererUtils.renderImageTip(link, writer);
HtmlRendererUtils.renderTip(link, writer);
- writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlElements.IMG);
}
// label
@@ -134,9 +134,9 @@ public class LinkRenderer extends Comman
ResponseWriter writer = facesContext.getResponseWriter();
if (ComponentUtils.getBooleanAttribute(component, Attributes.DISABLED)) {
- writer.endElement(HtmlConstants.SPAN);
+ writer.endElement(HtmlElements.SPAN);
} else {
- writer.endElement(HtmlConstants.A);
+ writer.endElement(HtmlElements.A);
}
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java Thu Jul 29 12:25:26 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.component.UIMenuBar;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -40,13 +40,13 @@ public class MenuBarRenderer extends Lay
UIMenuBar menuBar = (UIMenuBar) component;
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlConstants.OL, menuBar);
+ writer.startElement(HtmlElements.OL, menuBar);
writer.writeClassAttribute(Classes.create(menuBar));
}
@Override
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.endElement(HtmlConstants.OL);
+ writer.endElement(HtmlElements.OL);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java Thu Jul 29 12:25:26 2010
@@ -30,7 +30,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.CommandRendererHelper;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.JQueryUtils;
@@ -113,21 +113,21 @@ public class MenuCommandRenderer extends
}
private void encodeHidden(TobagoResponseWriter writer, String hiddenId, Object value) throws IOException {
- writer.startElement(HtmlConstants.INPUT, null);
+ writer.startElement(HtmlElements.INPUT, null);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeIdAttribute(hiddenId);
writer.writeNameAttribute(hiddenId);
if (value != null) {
writer.writeAttribute(HtmlAttributes.VALUE, value.toString(), true);
}
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
}
private void encodeItem(
FacesContext facesContext, TobagoResponseWriter writer, UIComponent component, LabelWithAccessKey label,
String onclick, boolean disabled, boolean firstLevel, String image) throws IOException {
- writer.startElement(HtmlConstants.LI, null);
+ writer.startElement(HtmlElements.LI, null);
writer.writeClassAttribute(Classes.createWorkaround("menu", firstLevel ? Markup.TOP : null));
writer.writeAttribute(HtmlAttributes.ONCLICK, onclick, true);
@@ -139,7 +139,7 @@ public class MenuCommandRenderer extends
writer.writeStyleAttribute(style);
}
- writer.startElement(HtmlConstants.A, null);
+ writer.startElement(HtmlElements.A, null);
writer.writeAttribute(HtmlAttributes.HREF, "#", false);
// writer.writeIdAttribute(clientId);
@@ -155,8 +155,8 @@ public class MenuCommandRenderer extends
}
HtmlRendererUtils.writeLabelWithAccessKey(writer, label);
}
- writer.endElement(HtmlConstants.A);
- writer.endElement(HtmlConstants.LI);
+ writer.endElement(HtmlElements.A);
+ writer.endElement(HtmlElements.LI);
}
private void addAcceleratorKey(FacesContext facesContext, UIComponent component, Character accessKey) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java Thu Jul 29 12:25:26 2010
@@ -27,7 +27,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -56,14 +56,14 @@ public class MenuRenderer extends Layout
boolean isParentMenu = menu.getChildCount() > 0; // todo: may be not correct
String clientId = menu.getClientId(facesContext);
- writer.startElement(HtmlConstants.LI, menu);
+ writer.startElement(HtmlElements.LI, menu);
writer.writeClassAttribute(Classes.create(menu, firstLevel ? Markup.TOP : null));
if (menu.getImage() != null) {
Style style = new Style();
style.setBackgroundImage("url(" + menu.getImage() + ")");
writer.writeStyleAttribute(style);
}
- writer.startElement(HtmlConstants.A, menu);
+ writer.startElement(HtmlElements.A, menu);
writer.writeAttribute(HtmlAttributes.HREF, "#", false);
writer.writeIdAttribute(clientId);
@@ -80,14 +80,14 @@ public class MenuRenderer extends Layout
}
HtmlRendererUtils.writeLabelWithAccessKey(writer, label);
}
- writer.endElement(HtmlConstants.A);
+ writer.endElement(HtmlElements.A);
if (isParentMenu) {
if (firstLevel) {
ResponseWriterDivider divider = ResponseWriterDivider.getInstance(facesContext, MenuBarRenderer.DIVIDER);
divider.activateBranch(facesContext);
writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
}
- writer.startElement(HtmlConstants.OL, menu);
+ writer.startElement(HtmlElements.OL, menu);
writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "menu");
}
}
@@ -101,14 +101,14 @@ public class MenuRenderer extends Layout
boolean isParentMenu = menu.getChildCount() > 0; // todo: may be not correct
if (isParentMenu) {
- writer.endElement(HtmlConstants.OL);
+ writer.endElement(HtmlElements.OL);
if (firstLevel) {
ResponseWriterDivider divider = ResponseWriterDivider.getInstance(facesContext, MenuBarRenderer.DIVIDER);
divider.passivateBranch(facesContext);
writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
}
}
- writer.endElement(HtmlConstants.LI);
+ writer.endElement(HtmlElements.LI);
}
private void addAcceleratorKey(FacesContext facesContext, UIComponent component, Character accessKey) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java Thu Jul 29 12:25:26 2010
@@ -19,7 +19,7 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -32,10 +32,10 @@ public class MenuSeparatorRenderer exten
@Override
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlConstants.LI, component);
+ writer.startElement(HtmlElements.LI, component);
writer.writeClassAttribute(Classes.create(component));
- writer.startElement(HtmlConstants.HR, component);
- writer.endElement(HtmlConstants.HR);
- writer.endElement(HtmlConstants.LI);
+ writer.startElement(HtmlElements.HR, component);
+ writer.endElement(HtmlElements.HR);
+ writer.endElement(HtmlElements.LI);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java Thu Jul 29 12:25:26 2010
@@ -39,7 +39,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -76,7 +76,7 @@ public class MessagesRenderer extends La
LOG.debug("facesContext is " + facesContext.getClass().getName());
}
if (facesContext.getMessages().hasNext()) { // in ie empty span gets a height
- writer.startElement(HtmlConstants.SPAN, messages);
+ writer.startElement(HtmlElements.SPAN, messages);
writer.writeClassAttribute(Classes.create(messages));
writer.writeStyleAttribute(new Style(facesContext, messages));
@@ -107,7 +107,7 @@ public class MessagesRenderer extends La
ComponentUtils.findPage(facesContext, messages).setFocusId(focusId);
}
*/
- writer.endElement(HtmlConstants.SPAN);
+ writer.endElement(HtmlElements.SPAN);
}
}
@@ -196,7 +196,7 @@ public class MessagesRenderer extends La
String summary = message.getSummary();
String detail = message.getDetail();
- writer.startElement(HtmlConstants.LABEL, null);
+ writer.startElement(HtmlElements.LABEL, null);
if (clientId != null) {
writer.writeAttribute(HtmlAttributes.FOR, clientId, false);
}
@@ -218,9 +218,9 @@ public class MessagesRenderer extends La
if (writeEmptyText) {
writer.writeText("");
}
- writer.endElement(HtmlConstants.LABEL);
- writer.startElement(HtmlConstants.BR, null);
- writer.endElement(HtmlConstants.BR);
+ writer.endElement(HtmlElements.LABEL);
+ writer.startElement(HtmlElements.BR, null);
+ writer.endElement(HtmlElements.BR);
}
@Override
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java Thu Jul 29 12:25:26 2010
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -37,7 +37,7 @@ public class ObjectRenderer extends Layo
UIObject object = (UIObject) component;
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlConstants.IFRAME, object);
+ writer.startElement(HtmlElements.IFRAME, object);
writer.writeIdAttribute(object.getClientId(facesContext));
writer.writeNameAttribute(object.getClientId(facesContext));
Object src = object.getSrc();
@@ -53,15 +53,15 @@ public class ObjectRenderer extends Layo
String noframes = ResourceManagerUtils.getPropertyNotNull(
facesContext, "tobago", "browser.noframe.message.prefix");
writer.writeText(noframes + " ");
- writer.startElement(HtmlConstants.A, object);
+ writer.startElement(HtmlElements.A, object);
if (src != null) {
writer.writeAttributeFromComponent(HtmlAttributes.HREF, Attributes.SRC);
writer.writeTextFromComponent(Attributes.SRC);
}
- writer.endElement(HtmlConstants.A);
+ writer.endElement(HtmlElements.A);
noframes = ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "browser.noframe.message.postfix");
writer.writeText(" " + noframes);
- writer.endElement(HtmlConstants.IFRAME);
+ writer.endElement(HtmlElements.IFRAME);
}
}