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 2014/01/13 12:00:52 UTC
svn commit: r1557677 - in /myfaces/tobago/trunk/tobago-theme:
tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/
tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speysid...
Author: lofwyr
Date: Mon Jan 13 11:00:51 2014
New Revision: 1557677
URL: http://svn.apache.org/r1557677
Log:
TOBAGO-1357 - Removing Dojo DND calls from renderers
Modified:
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/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/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/TextareaRenderer.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/TreeNodeRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
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=1557677&r1=1557676&r2=1557677&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 Mon Jan 13 11:00:51 2014
@@ -87,7 +87,6 @@ public class ButtonRenderer extends Comm
final Style style = new Style(facesContext, button);
writer.writeStyleAttribute(style);
- HtmlRendererUtils.renderDojoDndItem(component, writer, true);
writer.writeClassAttribute(Classes.create(button));
if (((UIButton) component).isDefaultCommand()) {
final AbstractUIForm form = ComponentUtils.findAncestor(component, AbstractUIForm.class);
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=1557677&r1=1557676&r2=1557677&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 Mon Jan 13 11:00:51 2014
@@ -41,11 +41,6 @@ public class ImageRenderer extends Layou
private static final Logger LOG = LoggerFactory.getLogger(ImageRenderer.class);
- public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
- super.prepareRender(facesContext, component);
- HtmlRendererUtils.renderDojoDndSource(facesContext, component);
- }
-
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
@@ -89,7 +84,6 @@ public class ImageRenderer extends Layou
writer.writeAttribute(HtmlAttributes.BORDER, border, false);
final Style style = new Style(facesContext, image);
writer.writeStyleAttribute(style);
- HtmlRendererUtils.renderDojoDndItem(image, writer, true);
writer.writeClassAttribute(Classes.create(image));
writer.endElement(HtmlElements.IMG);
}
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=1557677&r1=1557676&r2=1557677&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 Mon Jan 13 11:00:51 2014
@@ -120,7 +120,6 @@ public class InRenderer extends InputRen
writer.writeAttribute(HtmlAttributes.AUTOCOMPLETE, "off", false);
}
- HtmlRendererUtils.renderDojoDndItem(component, writer, true);
writer.writeClassAttribute(Classes.create(input));
/*if (component instanceof AbstractUIInput) {
String onchange = HtmlUtils.generateOnchange((AbstractUIInput) component, facesContext);
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=1557677&r1=1557676&r2=1557677&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 Mon Jan 13 11:00:51 2014
@@ -69,7 +69,6 @@ public class LabelRenderer extends Layou
final String clientId = label.getClientId(facesContext);
writer.startElement(HtmlElements.LABEL, label);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, label);
- HtmlRendererUtils.renderDojoDndItem(label, writer, true);
final Classes classes = Classes.create(label);
writer.writeClassAttribute(classes);
writer.writeStyleAttribute(new Style(facesContext, 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=1557677&r1=1557676&r2=1557677&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 Mon Jan 13 11:00:51 2014
@@ -85,7 +85,6 @@ public class LinkRenderer extends Comman
HtmlRendererUtils.writeDataAttributes(facesContext, writer, link);
final Style style = new Style(facesContext, link);
writer.writeStyleAttribute(style);
- HtmlRendererUtils.renderDojoDndItem(component, writer, true);
writer.writeClassAttribute(Classes.create(link));
writer.writeIdAttribute(clientId);
writer.writeNameAttribute(clientId);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.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/OutRenderer.java?rev=1557677&r1=1557676&r2=1557677&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java Mon Jan 13 11:00:51 2014
@@ -57,7 +57,6 @@ public class OutRenderer extends LayoutC
HtmlRendererUtils.writeDataAttributes(facesContext, writer, out);
final Style style = new Style(facesContext, out);
writer.writeStyleAttribute(style);
- HtmlRendererUtils.renderDojoDndItem(out, writer, true);
writer.writeClassAttribute(Classes.create(out));
HtmlRendererUtils.renderTip(out, writer);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.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/PageRenderer.java?rev=1557677&r1=1557676&r2=1557677&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Mon Jan 13 11:00:51 2014
@@ -201,8 +201,6 @@ public class PageRenderer extends PageRe
final boolean preventFrameAttacks = tobagoConfig.isPreventFrameAttacks();
if (!FacesContextUtils.isAjax(facesContext)) {
- HtmlRendererUtils.renderDojoDndSource(facesContext, component);
-
final String title = (String) page.getAttributes().get(Attributes.LABEL);
writer.startElement(HtmlElements.HEAD, null);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.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/PanelRenderer.java?rev=1557677&r1=1557676&r2=1557677&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java Mon Jan 13 11:00:51 2014
@@ -48,12 +48,6 @@ public class PanelRenderer extends Layou
private static final Logger LOG = LoggerFactory.getLogger(PanelRenderer.class);
@Override
- public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
- super.prepareRender(facesContext, component);
- HtmlRendererUtils.renderDojoDndSource(facesContext, component);
- }
-
- @Override
public boolean getRendersChildren() {
return true;
}
@@ -75,7 +69,6 @@ public class PanelRenderer extends Layou
final String clientId = panel.getClientId(facesContext);
writer.startElement(HtmlElements.DIV, panel);
- HtmlRendererUtils.renderDojoDndItem(panel, writer, true);
writer.writeIdAttribute(clientId);
writer.writeClassAttribute(Classes.create(panel));
HtmlRendererUtils.writeDataAttributes(facesContext, writer, panel);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextareaRenderer.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/TextareaRenderer.java?rev=1557677&r1=1557676&r2=1557677&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextareaRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextareaRenderer.java Mon Jan 13 11:00:51 2014
@@ -75,7 +75,6 @@ public class TextareaRenderer extends In
if (tabIndex != null) {
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
- HtmlRendererUtils.renderDojoDndItem(component, writer, true);
writer.writeClassAttribute(Classes.create(input));
final Style style = new Style(facesContext, input);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.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/ToolBarRenderer.java?rev=1557677&r1=1557676&r2=1557677&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java Mon Jan 13 11:00:51 2014
@@ -46,7 +46,6 @@ public class ToolBarRenderer extends Too
writer.startElement(HtmlElements.DIV, toolBar);
writer.writeIdAttribute(toolBar.getClientId(facesContext));
HtmlRendererUtils.writeDataAttributes(facesContext, writer, toolBar);
- HtmlRendererUtils.renderDojoDndItem(toolBar, writer, true);
writer.writeClassAttribute(Classes.create(toolBar));
final Style style = new Style(facesContext, toolBar);
final boolean right = UIToolBar.ORIENTATION_RIGHT.equals(toolBar.getOrientation());
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.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/ToolBarRendererBase.java?rev=1557677&r1=1557676&r2=1557677&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java Mon Jan 13 11:00:51 2014
@@ -65,12 +65,6 @@ public abstract class ToolBarRendererBas
private static final Logger LOG = LoggerFactory.getLogger(ToolBarRendererBase.class);
- @Override
- public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
- super.prepareRender(facesContext, component);
- HtmlRendererUtils.renderDojoDndSource(facesContext, component);
- }
-
protected String getLabelPosition(final UIComponent component) {
return (String) component.getAttributes().get(Attributes.LABEL_POSITION);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.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/TreeNodeRenderer.java?rev=1557677&r1=1557676&r2=1557677&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Mon Jan 13 11:00:51 2014
@@ -67,9 +67,6 @@ public class TreeNodeRenderer extends Tr
// div id
writer.writeIdAttribute(clientId);
- if (!folder) {
- HtmlRendererUtils.renderDojoDndItem(node, writer, true);
- }
writer.writeClassAttribute(Classes.create(node));
HtmlRendererUtils.writeDataAttributes(facesContext, writer, node);
if (parentId != null) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?rev=1557677&r1=1557676&r2=1557677&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Mon Jan 13 11:00:51 2014
@@ -41,12 +41,6 @@ import java.io.IOException;
public class BoxRenderer extends BoxRendererBase {
- @Override
- public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
- super.prepareRender(facesContext, component);
- HtmlRendererUtils.renderDojoDndSource(facesContext, component);
- }
-
/*
with shadow
@@ -82,7 +76,6 @@ without shadow
final String clientId = box.getClientId(facesContext);
writer.startElement(HtmlElements.DIV, box);
- HtmlRendererUtils.renderDojoDndItem(box, writer, true);
writer.writeClassAttribute(Classes.create(box));
writer.writeIdAttribute(clientId);
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, box);