Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java?rev=431841&r1=431840&r2=431841&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java Tue Aug 15 23:18:17 2006 @@ -31,11 +31,11 @@ import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils; +import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer; import org.apache.myfaces.trinidadinternal.share.url.URLEncoder; import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UIConstants; -import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafConstants; import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafRenderer; import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase; @@ -422,7 +422,7 @@ */ protected String getFieldTextClass() { - return XhtmlLafConstants.AF_FIELD_TEXT_STYLE_CLASS; + return XhtmlConstants.AF_FIELD_TEXT_STYLE_CLASS; } /** @@ -450,7 +450,7 @@ */ private String getLabelClassName() { - return XhtmlLafConstants.AF_LABEL_TEXT_STYLE_CLASS; + return XhtmlConstants.AF_LABEL_TEXT_STYLE_CLASS; } /**
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java?rev=431841&r1=431840&r2=431841&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java Tue Aug 15 23:18:17 2006 @@ -41,6 +41,7 @@ import org.apache.myfaces.trinidad.logging.TrinidadLogger; import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent; +import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants; import org.apache.myfaces.trinidadinternal.share.io.DefaultNameResolver; import org.apache.myfaces.trinidadinternal.share.io.NameResolver; import org.apache.myfaces.trinidadinternal.share.io.CachingNameResolver; @@ -63,8 +64,6 @@ import org.apache.myfaces.trinidadinternal.style.xml.parse.StyleSheetDocument; import org.apache.myfaces.trinidadinternal.style.xml.parse.StyleSheetNode; -import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafConstants; - /** * The FileSystemStyleCache is a StyleProvider implementation which * caches generated CSS style sheets on the file system. @@ -1533,24 +1532,24 @@ "af|chooseDate::content A"); _STYLE_KEY_MAP.put( - XhtmlLafConstants.AF_SHOWMANYACCORDION_TITLE_LINK_STYLE_CLASS, + XhtmlConstants.AF_SHOWMANYACCORDION_TITLE_LINK_STYLE_CLASS, "A.af|showManyAccordion::title-link"); _STYLE_KEY_MAP.put( - XhtmlLafConstants.AF_SHOWMANYACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS, + XhtmlConstants.AF_SHOWMANYACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS, "A.af|showManyAccordion::title-disabled-link"); _STYLE_KEY_MAP.put( - XhtmlLafConstants.AF_SHOWONEACCORDION_TITLE_LINK_STYLE_CLASS, + XhtmlConstants.AF_SHOWONEACCORDION_TITLE_LINK_STYLE_CLASS, "A.af|showOneAccordion::title-link"); _STYLE_KEY_MAP.put( - XhtmlLafConstants.AF_SHOWONEACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS, + XhtmlConstants.AF_SHOWONEACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS, "A.af|showOneAccordion::title-disabled-link"); _STYLE_KEY_MAP.put( - XhtmlLafConstants.AF_PANELACCORDION_TITLE_LINK_STYLE_CLASS, + XhtmlConstants.AF_PANELACCORDION_TITLE_LINK_STYLE_CLASS, "A.af|panelAccordion::title-link"); _STYLE_KEY_MAP.put( - XhtmlLafConstants.AF_PANELACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS, + XhtmlConstants.AF_PANELACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS, "A.af|panelAccordion::title-disabled-link"); _STYLE_KEY_MAP.put("af|panelTabbed::tab-link",
