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 2017/11/23 14:49:11 UTC
[myfaces-tobago] branch master updated: TOBAGO-1782: Clean up
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new 49bb09b TOBAGO-1782: Clean up
new e01f840 Merge remote-tracking branch 'origin/master'
49bb09b is described below
commit 49bb09bc13fb3415e08b41cc33cea5e4f7e65e77
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Nov 23 15:26:43 2017 +0100
TOBAGO-1782: Clean up
---
.../internal/component/AbstractUIGridLayout.java | 3 +-
.../tobago/internal/component/AbstractUIPage.java | 33 ------------------
.../internal/component/AbstractUIPanelBase.java | 38 ---------------------
.../tobago/internal/layout/LayoutUtils.java | 39 ++++++++--------------
.../renderkit/renderer/SplitLayoutRenderer.java | 4 +--
.../apache/myfaces/tobago/util/ComponentUtils.java | 28 ++++++++++++++++
6 files changed, 44 insertions(+), 101 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
index 2797b6d..2707490 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
@@ -25,7 +25,6 @@ import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIPanel;
import org.apache.myfaces.tobago.component.UIStyle;
import org.apache.myfaces.tobago.component.Visual;
-import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
import org.apache.myfaces.tobago.layout.GridSpan;
import org.apache.myfaces.tobago.layout.MeasureList;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -78,7 +77,7 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase
layout(
MeasureList.parse(getColumns()).getSize(),
MeasureList.parse(getRows()).getSize(),
- LayoutUtils.findLayoutChildren(this));
+ ComponentUtils.findLayoutChildren(this));
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
index 9f27ac2..f4a3e38 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.internal.component;
-import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.DebugUtils;
import org.slf4j.Logger;
@@ -29,7 +28,6 @@ import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.context.FacesContext;
-import java.io.IOException;
import java.util.Iterator;
/**
@@ -58,37 +56,6 @@ public abstract class AbstractUIPage extends AbstractUIFormBase implements Clien
}
@Override
- public void encodeBegin(final FacesContext facesContext) throws IOException {
- super.encodeBegin(facesContext);
- final UIComponent layoutManager = LayoutUtils.getLayoutManager(this);
- if (layoutManager != null) {
- layoutManager.encodeBegin(facesContext);
- }
- }
-
- @Override
- public void encodeChildren(final FacesContext facesContext) throws IOException {
- final UIComponent layoutManager = LayoutUtils.getLayoutManager(this);
- if (layoutManager != null) {
- layoutManager.encodeChildren(facesContext);
- } else {
- super.encodeChildren(facesContext);
- }
- }
-
- @Override
- public void encodeEnd(final FacesContext facesContext) throws IOException {
- final UIComponent layoutManager = LayoutUtils.getLayoutManager(this);
- if (layoutManager != null) {
- layoutManager.encodeEnd(facesContext);
- }
- super.encodeEnd(facesContext);
- if (LOG.isTraceEnabled()) {
- LOG.trace(DebugUtils.toString(this.getParent(), 0));
- }
- }
-
- @Override
public void processDecodes(final FacesContext context) {
decode(context);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanelBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanelBase.java
index 7a8ae40..bef392f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanelBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanelBase.java
@@ -20,49 +20,11 @@
package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Visual;
-import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import java.io.IOException;
/**
* Base class for panels.
*/
public abstract class AbstractUIPanelBase extends javax.faces.component.UIPanel implements Visual {
- @Override
- public void encodeBegin(final FacesContext facesContext) throws IOException {
-
- super.encodeBegin(facesContext);
-
- final UIComponent layoutManager = LayoutUtils.getLayoutManager(this);
- if (layoutManager != null) {
- layoutManager.encodeBegin(facesContext);
- }
- }
-
- @Override
- public void encodeChildren(final FacesContext facesContext) throws IOException {
-
- final UIComponent layoutManager = LayoutUtils.getLayoutManager(this);
- if (layoutManager != null) {
- layoutManager.encodeChildren(facesContext);
- } else {
- super.encodeChildren(facesContext);
- }
- }
-
- @Override
- public void encodeEnd(final FacesContext facesContext) throws IOException {
-
- final UIComponent layoutManager = LayoutUtils.getLayoutManager(this);
- if (layoutManager != null) {
- layoutManager.encodeEnd(facesContext);
- }
-
- super.encodeEnd(facesContext);
- }
-
public abstract java.lang.String getTip();
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
index a1384ad..8f73b20 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
@@ -20,15 +20,17 @@
package org.apache.myfaces.tobago.internal.layout;
import org.apache.myfaces.tobago.component.Facets;
-import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.faces.component.UIComponent;
-import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
import java.util.regex.Pattern;
+/**
+ * @deprecated since 4.0.0
+ */
+@Deprecated
public final class LayoutUtils {
private static final Pattern TOKEN_PATTERN = Pattern.compile("^(\\d*px|\\d*\\*|\\d*%|auto|fixed)$");
@@ -37,6 +39,10 @@ public final class LayoutUtils {
// to prevent instantiation
}
+ /**
+ * @deprecated since 4.0.0
+ */
+ @Deprecated
public static boolean checkTokens(final String columns) {
final StringTokenizer st = new StringTokenizer(columns, ";");
while (st.hasMoreTokens()) {
@@ -48,31 +54,12 @@ public final class LayoutUtils {
return true;
}
+ /**
+ * @deprecated since 4.0.0
+ */
+ @Deprecated
public static List<UIComponent> findLayoutChildren(final UIComponent container) {
- final List<UIComponent> result = new ArrayList<>();
- addLayoutChildren(container, result);
- return result;
- }
-
- private static void addLayoutChildren(final UIComponent component, final List<UIComponent> result) {
- for (final UIComponent child : component.getChildren()) {
- if (child instanceof Visual) {
- result.add(child);
- } else {
- // Child seems to be transparent for layout, like UIForm.
- // So we try to add the inner components.
- addLayoutChildren(child, result);
- }
- }
-
- final UIComponent child = component.getFacet(UIComponent.COMPOSITE_FACET_NAME);
- if (child instanceof Visual) {
- result.add(child);
- } else if (child != null) {
- // Child seems to be transparent for layout, like UIForm.
- // So we try to add the inner components.
- addLayoutChildren(child, result);
- }
+ return ComponentUtils.findLayoutChildren(container);
}
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java
index 2b30bd0..f8160d5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java
@@ -21,13 +21,13 @@ package org.apache.myfaces.tobago.internal.renderkit.renderer;
import org.apache.myfaces.tobago.apt.annotation.Preliminary;
import org.apache.myfaces.tobago.internal.component.AbstractUISplitLayout;
-import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
import org.apache.myfaces.tobago.internal.util.JsonUtils;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
+import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -89,7 +89,7 @@ public class SplitLayoutRenderer extends RendererBase {
public void encodeChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
final AbstractUISplitLayout splitLayout = (AbstractUISplitLayout) component;
- final List<UIComponent> components = LayoutUtils.findLayoutChildren(splitLayout);
+ final List<UIComponent> components = ComponentUtils.findLayoutChildren(splitLayout);
if (components.size() != 2) {
LOG.warn("Illegal component count in splitLayout: {}", components.size());
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
index 8b122e9..69b9d1d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
@@ -22,6 +22,7 @@ package org.apache.myfaces.tobago.util;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.RendererTypes;
+import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.context.TransientStateHolder;
import org.apache.myfaces.tobago.internal.component.AbstractUIForm;
@@ -896,4 +897,31 @@ public final class ComponentUtils {
component.setId(clientId);
return component;
}
+
+ public static List<UIComponent> findLayoutChildren(final UIComponent container) {
+ final List<UIComponent> result = new ArrayList<>();
+ addLayoutChildren(container, result);
+ return result;
+ }
+
+ private static void addLayoutChildren(final UIComponent component, final List<UIComponent> result) {
+ for (final UIComponent child : component.getChildren()) {
+ if (child instanceof Visual) {
+ result.add(child);
+ } else {
+ // Child seems to be transparent for layout, like UIForm.
+ // So we try to add the inner components.
+ addLayoutChildren(child, result);
+ }
+ }
+
+ final UIComponent child = component.getFacet(UIComponent.COMPOSITE_FACET_NAME);
+ if (child instanceof Visual) {
+ result.add(child);
+ } else if (child != null) {
+ // Child seems to be transparent for layout, like UIForm.
+ // So we try to add the inner components.
+ addLayoutChildren(child, result);
+ }
+ }
}
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].