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 2016/02/11 15:45:18 UTC
svn commit: r1729846 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/
tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/ren...
Author: lofwyr
Date: Thu Feb 11 14:45:17 2016
New Revision: 1729846
URL: http://svn.apache.org/viewvc?rev=1729846&view=rev
Log:
cleanup: remove code from "prepareRender" as preparation of TOBAGO-1524
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.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/ColumnRenderer.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/MenuRenderer.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/SelectManyCheckboxRenderer.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/SelectOneRadioRenderer.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/ToolBarRendererBase.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/TreeCommandRenderer.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/TreeListboxNodeRenderer.java
Modified: myfaces/tobago/branches/tobago-3.0.x/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/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java?rev=1729846&r1=1729845&r2=1729846&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java Thu Feb 11 14:45:17 2016
@@ -43,16 +43,6 @@ public class NumberSliderRenderer extend
private static final String SLIDER_WIDTH_PERCENT = "sliderWidthPercent";
- public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
- super.prepareRender(facesContext, component);
-/* todo: use e. g. jQuery
- if (facesContext instanceof TobagoFacesContext) {
- final String[] scripts = new String[]{"script/scriptaculous.js"};
- ((TobagoFacesContext) facesContext).getScriptFiles().add(scripts[0]);
- }
-*/
- }
-
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUINumberSlider slider = (AbstractUINumberSlider) component;
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/ColumnRenderer.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/ColumnRenderer.java?rev=1729846&r1=1729845&r2=1729846&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/ColumnRenderer.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/ColumnRenderer.java Thu Feb 11 14:45:17 2016
@@ -22,11 +22,9 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.component.UIColumn;
import org.apache.myfaces.tobago.component.UILink;
import org.apache.myfaces.tobago.component.UIOut;
-import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.internal.component.AbstractUIMenu;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.util.EncodeUtils;
-import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.FacetUtils;
import javax.faces.component.UIComponent;
@@ -35,16 +33,6 @@ import java.io.IOException;
public class ColumnRenderer extends RendererBase {
- @Override
- public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
- super.prepareRender(facesContext, component);
-
- final UIColumn column = (UIColumn) component;
- if (isPure(column)) {
- ComponentUtils.addCurrentMarkup(column, Markup.PURE);
- }
- }
-
/**
* Differ between simple content and complex content.
* Decide if the content of a cell needs usually the whole possible space or
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/MenuRenderer.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/MenuRenderer.java?rev=1729846&r1=1729845&r2=1729846&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/MenuRenderer.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/MenuRenderer.java Thu Feb 11 14:45:17 2016
@@ -42,17 +42,6 @@ import java.io.IOException;
public class MenuRenderer extends RendererBase {
@Override
- public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
- super.prepareRender(facesContext, component);
-
- final UIMenu menu = (UIMenu) component;
- final boolean firstLevel = !RendererTypes.MENU.equals(menu.getParent().getRendererType());
- if (firstLevel) {
- ComponentUtils.addCurrentMarkup(menu, Markup.TOP);
- }
- }
-
- @Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIMenu menu = (UIMenu) component;
@@ -64,6 +53,9 @@ public class MenuRenderer extends Render
final boolean isParentMenu = menu.getChildCount() > 0; // todo: may be not correct
writer.startElement(HtmlElements.LI);
+ if (firstLevel) {
+ ComponentUtils.addCurrentMarkup(menu, Markup.TOP);
+ }
writer.writeClassAttribute(Classes.create(menu), BootstrapClass.DROPDOWN, menu.getCustomClass());
StringBuilder backgroundImage = null;
StringBuilder backgroundPosition = null;
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/SelectManyCheckboxRenderer.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/SelectManyCheckboxRenderer.java?rev=1729846&r1=1729845&r2=1729846&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/SelectManyCheckboxRenderer.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/SelectManyCheckboxRenderer.java Thu Feb 11 14:45:17 2016
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
import org.apache.myfaces.tobago.component.UISelectManyCheckbox;
-import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.renderkit.SelectManyRendererBase;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.css.Classes;
@@ -40,14 +39,6 @@ import java.io.IOException;
public class SelectManyCheckboxRenderer extends SelectManyRendererBase {
- public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
- final UISelectManyCheckbox select = (UISelectManyCheckbox) component;
- super.prepareRender(facesContext, select);
- if (select.isInline()) {
- ComponentUtils.addCurrentMarkup(select, Markup.INLINE);
- }
- }
-
@Override
public void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISelectManyCheckbox select = (UISelectManyCheckbox) component;
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/SelectOneRadioRenderer.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/SelectOneRadioRenderer.java?rev=1729846&r1=1729845&r2=1729846&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/SelectOneRadioRenderer.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/SelectOneRadioRenderer.java Thu Feb 11 14:45:17 2016
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
import org.apache.myfaces.tobago.component.UISelectOneRadio;
-import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import org.apache.myfaces.tobago.internal.util.ObjectUtils;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
@@ -35,21 +34,12 @@ import org.apache.myfaces.tobago.util.Co
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
-import javax.faces.component.UISelectOne;
import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
import java.io.IOException;
public class SelectOneRadioRenderer extends SelectOneRendererBase {
- public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
- final UISelectOne select = (UISelectOne) component;
- super.prepareRender(facesContext, select);
- if (select instanceof UISelectOneRadio && ((UISelectOneRadio) select).isInline()) {
- ComponentUtils.addCurrentMarkup(((UISelectOneRadio) select), Markup.INLINE);
- }
- }
-
protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
final UISelectOneRadio select = (UISelectOneRadio) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
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/ToolBarRendererBase.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/ToolBarRendererBase.java?rev=1729846&r1=1729845&r2=1729846&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/ToolBarRendererBase.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/ToolBarRendererBase.java Thu Feb 11 14:45:17 2016
@@ -63,21 +63,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);
-
- final UIToolBar toolBar = (UIToolBar) component;
-
- if ("big".equals(getIconSize(toolBar))) {
- ComponentUtils.addCurrentMarkup(toolBar, Markup.BIG);
- }
- if ("right".equals(getLabelPosition(toolBar))) {
- ComponentUtils.addCurrentMarkup(toolBar, Markup.RIGHT);
- }
- }
-
protected String getLabelPosition(final UIComponent component) {
return ComponentUtils.getStringAttribute(component, Attributes.labelPosition);
}
@@ -92,6 +77,19 @@ public abstract class ToolBarRendererBas
}
@Override
+ public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
+ super.encodeBegin(context, component);
+
+ final UIToolBar toolBar = (UIToolBar) component;
+ if ("big".equals(getIconSize(toolBar))) {
+ ComponentUtils.addCurrentMarkup(toolBar, Markup.BIG);
+ }
+ if ("right".equals(getLabelPosition(toolBar))) {
+ ComponentUtils.addCurrentMarkup(toolBar, Markup.RIGHT);
+ }
+ }
+
+ @Override
public void encodeEnd(final FacesContext context, final UIComponent component) throws IOException {
final UIToolBar toolBar = (UIToolBar) component;
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/TreeCommandRenderer.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/TreeCommandRenderer.java?rev=1729846&r1=1729845&r2=1729846&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/TreeCommandRenderer.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/TreeCommandRenderer.java Thu Feb 11 14:45:17 2016
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
import org.apache.myfaces.tobago.component.UITreeCommand;
-import org.apache.myfaces.tobago.component.UITreeNode;
import org.apache.myfaces.tobago.internal.component.AbstractUIData;
import org.apache.myfaces.tobago.internal.component.AbstractUITreeNodeBase;
import org.apache.myfaces.tobago.internal.util.AccessKeyLogger;
@@ -50,15 +49,6 @@ public class TreeCommandRenderer extends
private static final Logger LOG = LoggerFactory.getLogger(TreeCommandRenderer.class);
@Override
- public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
- final UITreeCommand command = (UITreeCommand) component;
- final UITreeNode node = ComponentUtils.findAncestor(command, UITreeNode.class);
- // Todo: use an expression?
- command.setDisabled(node.isDisabled());
- super.prepareRender(facesContext, component);
- }
-
- @Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final UITreeCommand command = (UITreeCommand) component;
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/TreeListboxNodeRenderer.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/TreeListboxNodeRenderer.java?rev=1729846&r1=1729845&r2=1729846&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/TreeListboxNodeRenderer.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/TreeListboxNodeRenderer.java Thu Feb 11 14:45:17 2016
@@ -98,18 +98,6 @@ public class TreeListboxNodeRenderer ext
}
@Override
- public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
- super.prepareRender(facesContext, component);
-
- final UITreeNode node = (UITreeNode) component;
-/* XXX check
- if (node.isMarked()) {
- node.setMarkup(Markup.MARKED.add(node.getMarkup()));
- }
-*/
- }
-
- @Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final UITreeNode node = (UITreeNode) component;
final boolean folder = node.isFolder();