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/09/23 11:32:38 UTC
svn commit: r1704794 [5/5] - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/config/
tobago-core/src/main/java/org/apache/myfaces/tobago/contex...
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/TreeRenderer.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/TreeRenderer.java?rev=1704794&r1=1704793&r2=1704794&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/TreeRenderer.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/TreeRenderer.java Wed Sep 23 09:32:35 2015
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.model.E
import org.apache.myfaces.tobago.model.Selectable;
import org.apache.myfaces.tobago.model.SelectedState;
import org.apache.myfaces.tobago.model.TreePath;
-import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
+import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -44,7 +44,7 @@ import javax.faces.component.UIComponent
import javax.faces.context.FacesContext;
import java.io.IOException;
-public class TreeRenderer extends LayoutComponentRendererBase {
+public class TreeRenderer extends RendererBase {
private static final Logger LOG = LoggerFactory.getLogger(TreeRenderer.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/VerbatimRenderer.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/VerbatimRenderer.java?rev=1704794&r1=1704793&r2=1704794&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/VerbatimRenderer.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/VerbatimRenderer.java Wed Sep 23 09:32:35 2015
@@ -19,10 +19,8 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
+import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -31,14 +29,9 @@ import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import java.io.IOException;
-public class VerbatimRenderer extends LayoutComponentRendererBase {
+public class VerbatimRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(VerbatimRenderer.class);
-
- public void encodeEnd(final FacesContext facesContext,
- final UIComponent component) throws IOException {
-
- LOG.info("HI! " + component.getClientId(facesContext), new Exception());
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final ResponseWriter writer = facesContext.getResponseWriter();
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.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/util/HtmlRendererUtils.java?rev=1704794&r1=1704793&r2=1704794&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java Wed Sep 23 09:32:35 2015
@@ -20,7 +20,7 @@
package org.apache.myfaces.tobago.renderkit.html.util;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.component.SupportsMarkup;
+import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.component.UIColumnEvent;
import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.UIForm;
@@ -261,7 +261,7 @@ public final class HtmlRendererUtils {
writer.writeStyleAttribute(style);
}
}
- Markup markup = item instanceof SupportsMarkup ? ((SupportsMarkup) item).getMarkup() : Markup.NULL;
+ Markup markup = item instanceof Visual ? ((Visual) item).getMarkup() : Markup.NULL;
if (onlySelected == null && contains) {
writer.writeAttribute(HtmlAttributes.SELECTED, true);
markup = Markup.SELECTED.add(markup);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.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/util/RenderUtils.java?rev=1704794&r1=1704793&r2=1704794&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java Wed Sep 23 09:32:35 2015
@@ -20,7 +20,7 @@
package org.apache.myfaces.tobago.renderkit.util;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.config.Configurable;
+import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import org.apache.myfaces.tobago.internal.component.AbstractUICommand;
import org.apache.myfaces.tobago.internal.component.AbstractUIData;
@@ -170,25 +170,25 @@ public class RenderUtils {
public static Measure calculateStringWidth(
final FacesContext facesContext, final UIComponent component, final String text) {
- return calculateStringWidth(facesContext, (Configurable) component, text, "tobago.font.widths");
+ return calculateStringWidth(facesContext, (Visual) component, text, "tobago.font.widths");
}
public static Measure calculateStringWidth2(
final FacesContext facesContext, final UIComponent component, final String text) {
- return calculateStringWidth(facesContext, (Configurable) component, text, "tobago.font2.widths");
+ return calculateStringWidth(facesContext, (Visual) component, text, "tobago.font2.widths");
}
private static Measure calculateStringWidth(
- final FacesContext facesContext, final Configurable component, final String text, final String type) {
+ final FacesContext facesContext, final Visual visual, final String text, final String type) {
if (text == null) {
return Measure.ZERO;
}
int width = 0;
int defaultCharWidth = 10;
try {
- defaultCharWidth = ResourceManagerUtils.getThemeMeasure(facesContext, component, "fontWidth").getPixel();
+ defaultCharWidth = ResourceManagerUtils.getThemeMeasure(facesContext, visual, "fontWidth").getPixel();
} catch (final NullPointerException e) {
- LOG.warn("no value for 'fontWidth' for type '" + component.getRendererType() + "' found in theme-config");
+ LOG.warn("no value for 'fontWidth' for type '" + visual.getRendererType() + "' found in theme-config");
}
final String fontWidths = ResourceManagerUtils.getProperty(facesContext, "tobago", type);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/SelectItemUtils.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/util/SelectItemUtils.java?rev=1704794&r1=1704793&r2=1704794&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/SelectItemUtils.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/SelectItemUtils.java Wed Sep 23 09:32:35 2015
@@ -20,7 +20,7 @@
package org.apache.myfaces.tobago.renderkit.util;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.component.SupportsMarkup;
+import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.context.Markup;
import javax.el.ValueExpression;
@@ -241,8 +241,8 @@ public class SelectItemUtils {
final Boolean itemDisabled = getBooleanAttribute(currentUISelectItems, Attributes.ITEM_DISABLED, false);
final String itemImage = (String) attributeMap.get(Attributes.ITEM_IMAGE);
final Markup markup;
- if (currentUISelectItems instanceof SupportsMarkup) {
- markup = ((SupportsMarkup) currentUISelectItems).getCurrentMarkup();
+ if (currentUISelectItems instanceof Visual) {
+ markup = ((Visual) currentUISelectItems).getCurrentMarkup();
} else {
markup = Markup.NULL;
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java?rev=1704794&r1=1704793&r2=1704794&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java Wed Sep 23 09:32:35 2015
@@ -45,10 +45,6 @@ public @interface UIComponentTag {
String displayName() default "";
- boolean isLayout() default false;
-
- boolean isTransparentForLayout() default false;
-
String[] interfaces() default {};
Facet[] facets() default {};
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java?rev=1704794&r1=1704793&r2=1704794&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java Wed Sep 23 09:32:35 2015
@@ -152,10 +152,7 @@ public class ClassesGenerator extends Ab
componentInfo.addImport(componentPropertyInfo.getUnmodifiedType());
componentInfo.addImport("javax.faces.context.FacesContext");
if ("markup".equals(info.getName())) {
- componentInfo.addInterface("org.apache.myfaces.tobago.component.SupportsMarkup");
- }
- if ("css".equals(info.getName())) {
- componentInfo.addInterface("org.apache.myfaces.tobago.component.SupportsCss");
+ componentInfo.addInterface("org.apache.myfaces.tobago.component.Visual");
}
if ("requiredMessage".equals(info.getName())) {
componentInfo.setMessages(true);
@@ -177,13 +174,7 @@ public class ClassesGenerator extends Ab
}
renderer.add(className);
final RendererInfo info = new RendererInfo(declaration.getQualifiedName().toString(), className, rendererType);
- if (componentTag.isLayout()) {
- info.setSuperClass("org.apache.myfaces.tobago.renderkit.AbstractLayoutRendererWrapper");
- } else if (componentTag.isTransparentForLayout()) {
- info.setSuperClass("org.apache.myfaces.tobago.renderkit.AbstractRendererBaseWrapper");
- } else {
- info.setSuperClass("org.apache.myfaces.tobago.renderkit.AbstractLayoutableRendererBaseWrapper");
- }
+ info.setSuperClass("org.apache.myfaces.tobago.renderkit.AbstractRendererBaseWrapper");
final StringTemplate stringTemplate = rendererStringTemplateGroup.getInstanceOf("renderer");
stringTemplate.setAttribute("renderInfo", info);
writeFile(info, stringTemplate);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg?rev=1704794&r1=1704793&r2=1704794&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg Wed Sep 23 09:32:35 2015
@@ -43,8 +43,6 @@ package <componentInfo.packageName>;
import org.apache.myfaces.tobago.internal.util.ArrayUtils;
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.internal.util.Deprecation;
-import org.apache.myfaces.tobago.renderkit.MarginValues;
-import org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer;
import javax.el.ELException;
import javax.faces.FacesException;
import java.util.ArrayList;