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 2015/02/11 22:01:51 UTC
svn commit: r1659067 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/
tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/
Author: lofwyr
Date: Wed Feb 11 21:01:50 2015
New Revision: 1659067
URL: http://svn.apache.org/r1659067
Log:
clean up deprecation
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRenderer.java
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java?rev=1659067&r1=1659066&r2=1659067&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java Wed Feb 11 21:01:50 2015
@@ -45,14 +45,6 @@ public abstract class TobagoResponseWrit
@Override
public abstract void startElement(String name, UIComponent component) throws IOException;
- /**
- * @deprecated Use {@link #startElement(String, UIComponent) startElement(name, null)} instead.
- */
- @Deprecated
- public void startElement(final String name) throws IOException {
- startElement(name, null);
- }
-
@Override
public abstract void endElement(String name) throws IOException;
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java?rev=1659067&r1=1659066&r2=1659067&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java Wed Feb 11 21:01:50 2015
@@ -376,14 +376,14 @@ public class PageRenderer extends PageRe
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.NAV);
+ writer.startElement(HtmlElements.NAV, null);
writer.writeClassAttribute(BootstrapClass.NAVBAR, BootstrapClass.NAVBAR_INVERSE, BootstrapClass.NAVBAR_FIXED_TOP);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.NAVIGATION.toString(), false);
- writer.startElement(HtmlElements.DIV);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(BootstrapClass.CONTAINER_FLUID);
- writer.startElement(HtmlElements.DIV);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(BootstrapClass.COLLAPSE, BootstrapClass.NAVBAR_COLLAPSE);
final UIMenuBar menuBar = ComponentUtils.findFacetDescendant(page, Facets.MENUBAR, UIMenuBar.class);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java?rev=1659067&r1=1659066&r2=1659067&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java Wed Feb 11 21:01:50 2015
@@ -47,12 +47,12 @@ public class PopupRenderer extends Layou
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
final UIPopup popup = (UIPopup) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.DIV);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(TobagoClass.POPUP, BootstrapClass.MODAL, BootstrapClass.FADE);
writer.writeIdAttribute(popup.getClientId(facesContext));
- writer.startElement(HtmlElements.DIV);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(BootstrapClass.MODAL_DIALOG);
- writer.startElement(HtmlElements.DIV);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(BootstrapClass.MODAL_CONTENT);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java?rev=1659067&r1=1659066&r2=1659067&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java Wed Feb 11 21:01:50 2015
@@ -75,8 +75,8 @@ public class SectionRenderer extends Lay
}
final String image = section.getImage();
if (image != null && image.startsWith("glyphicon-")) { // XXX hack: should be integrated in the resource manager
- writer.startElement(HtmlElements.SPAN);
- writer.writeClassAttribute(BootstrapClass.GLYPHICON, BootstrapClass.glyphicon(image));
+ writer.startElement(HtmlElements.SPAN, null);
+ writer.writeClassAttribute(BootstrapClass.GLYPHICON, BootstrapClass.glyphicon(image));
writer.endElement(HtmlElements.SPAN);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRenderer.java?rev=1659067&r1=1659066&r2=1659067&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRenderer.java Wed Feb 11 21:01:50 2015
@@ -52,29 +52,29 @@ public class ToolBarRenderer extends Lay
writer.writeClassAttribute(BootstrapClass.CONTAINER_FLUID);
// Brand and toggle get grouped for better mobile display
- writer.startElement(HtmlElements.DIV);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(BootstrapClass.NAVBAR_HEADER);
- writer.startElement(HtmlElements.BUTTON);
+ writer.startElement(HtmlElements.BUTTON, null);
writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON, false);
writer.writeClassAttribute(BootstrapClass.NAVBAR_TOGGLE);
writer.writeAttribute("data-toggle", "collapse", false);
writer.writeAttribute("data-target", "#" + toolBar.getClientId(facesContext).replace(":", "\\:"), true);
- writer.startElement(HtmlElements.SPAN);
+ writer.startElement(HtmlElements.SPAN, null);
writer.writeClassAttribute(BootstrapClass.SR_ONLY);
writer.writeText("Toggle navigation");
writer.endElement(HtmlElements.SPAN);
for (int i = 0; i < 3; i++) {
- writer.startElement(HtmlElements.SPAN);
+ writer.startElement(HtmlElements.SPAN, null);
writer.writeClassAttribute(BootstrapClass.ICON_BAR);
writer.endElement(HtmlElements.SPAN);
}
writer.endElement(HtmlElements.BUTTON);
- writer.startElement(HtmlElements.A);
+ writer.startElement(HtmlElements.A, null);
writer.writeClassAttribute(BootstrapClass.NAVBAR_BRAND);
writer.writeAttribute(HtmlAttributes.HREF, "#", false);
// writer.writeText("[LOGO]"); // fixme
@@ -82,7 +82,7 @@ public class ToolBarRenderer extends Lay
writer.endElement(HtmlElements.DIV);
- writer.startElement(HtmlElements.DIV);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(BootstrapClass.COLLAPSE, BootstrapClass.NAVBAR_COLLAPSE);
writer.writeIdAttribute(toolBar.getClientId(facesContext));
}