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 2018/08/23 11:30:44 UTC
[myfaces-tobago] 02/02: TOBAGO-1919: New attribute "plain" to
render only content, without out HTML element * cleanup and preparation
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
commit 690cfa3ad14bcfcde778be26ad6d4e45ec804a86
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Aug 23 13:30:31 2018 +0200
TOBAGO-1919: New attribute "plain" to render only content, without out HTML element
* cleanup and preparation
---
.../myfaces/tobago/internal/component/AbstractUIFlexLayout.java | 2 +-
.../myfaces/tobago/internal/component/AbstractUIFlowLayout.java | 4 +---
.../component/{AbstractUILayoutBase.java => AbstractUIFooter.java} | 7 +------
.../myfaces/tobago/internal/component/AbstractUIGridLayout.java | 4 +---
.../component/{AbstractUILayoutBase.java => AbstractUIHeader.java} | 7 +------
.../apache/myfaces/tobago/internal/component/AbstractUIImage.java | 3 +--
.../myfaces/tobago/internal/component/AbstractUILayoutBase.java | 4 +++-
.../myfaces/tobago/internal/component/AbstractUISegmentLayout.java | 3 +--
.../myfaces/tobago/internal/component/AbstractUISelectItem.java | 3 ++-
.../myfaces/tobago/internal/component/AbstractUITabGroup.java | 3 +--
.../tobago/internal/taglib/component/BarTagDeclaration.java | 2 +-
.../tobago/internal/taglib/component/FigureTagDeclaration.java | 3 +--
.../tobago/internal/taglib/component/FooterTagDeclaration.java | 2 +-
.../tobago/internal/taglib/component/HeaderTagDeclaration.java | 2 +-
.../tobago/internal/taglib/component/PanelTagDeclaration.java | 1 -
.../org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java | 6 +++---
16 files changed, 20 insertions(+), 36 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
index 1875f23..27c6e22 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
@@ -38,7 +38,7 @@ import javax.faces.event.PostAddToViewEvent;
* @since 3.0.0
*/
@ListenerFor(systemEventClass = PostAddToViewEvent.class)
-public abstract class AbstractUIFlexLayout extends AbstractUILayoutBase implements Visual {
+public abstract class AbstractUIFlexLayout extends AbstractUILayoutBase {
public static final String COMPONENT_FAMILY = "org.apache.myfaces.tobago.FlexLayout";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java
index 1aade96..45d93e1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java
@@ -19,12 +19,10 @@
package org.apache.myfaces.tobago.internal.component;
-import org.apache.myfaces.tobago.component.Visual;
-
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.FlowLayoutTagDeclaration}
*/
-public abstract class AbstractUIFlowLayout extends AbstractUILayoutBase implements Visual {
+public abstract class AbstractUIFlowLayout extends AbstractUILayoutBase {
public static final String COMPONENT_FAMILY = "org.apache.myfaces.tobago.FlowLayout";
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFooter.java
similarity index 83%
copy from tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java
copy to tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFooter.java
index 9fef2b1..fddd8c5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFooter.java
@@ -19,10 +19,5 @@
package org.apache.myfaces.tobago.internal.component;
-import javax.faces.component.UIComponentBase;
-
-/**
- * Base class for the layout manager components.
- */
-public abstract class AbstractUILayoutBase extends UIComponentBase {
+public abstract class AbstractUIFooter extends AbstractUIPanelBase {
}
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 bba45c5..324f129 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.LabelLayout;
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.util.StyleRenderUtils;
import org.apache.myfaces.tobago.layout.GridSpan;
import org.apache.myfaces.tobago.layout.MeasureList;
@@ -53,8 +52,7 @@ import java.util.Map;
*/
@Preliminary
@ListenerFor(systemEventClass = PreRenderComponentEvent.class)
-public abstract class AbstractUIGridLayout extends AbstractUILayoutBase
- implements Visual, ComponentSystemEventListener {
+public abstract class AbstractUIGridLayout extends AbstractUILayoutBase implements ComponentSystemEventListener {
private static final Logger LOG = LoggerFactory.getLogger(AbstractUIGridLayout.class);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIHeader.java
similarity index 83%
copy from tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java
copy to tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIHeader.java
index 9fef2b1..abc08f2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIHeader.java
@@ -19,10 +19,5 @@
package org.apache.myfaces.tobago.internal.component;
-import javax.faces.component.UIComponentBase;
-
-/**
- * Base class for the layout manager components.
- */
-public abstract class AbstractUILayoutBase extends UIComponentBase {
+public abstract class AbstractUIHeader extends AbstractUIPanelBase {
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIImage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIImage.java
index 8ac7e84..1c63959 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIImage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIImage.java
@@ -26,8 +26,7 @@ import javax.faces.component.UIGraphic;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.ImageTagDeclaration}
*/
-public abstract class AbstractUIImage extends UIGraphic
- implements Visual {
+public abstract class AbstractUIImage extends UIGraphic implements Visual {
public abstract boolean isDisabled();
public abstract String getAlt();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java
index 9fef2b1..8b2b10d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java
@@ -19,10 +19,12 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.component.Visual;
+
import javax.faces.component.UIComponentBase;
/**
* Base class for the layout manager components.
*/
-public abstract class AbstractUILayoutBase extends UIComponentBase {
+public abstract class AbstractUILayoutBase extends UIComponentBase implements Visual {
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISegmentLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISegmentLayout.java
index bfc0ef8..ccfc4ee 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISegmentLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISegmentLayout.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.internal.component;
-import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.layout.MeasureList;
/**
@@ -27,7 +26,7 @@ import org.apache.myfaces.tobago.layout.MeasureList;
*
* @since 3.0.0
*/
-public abstract class AbstractUISegmentLayout extends AbstractUILayoutBase implements Visual {
+public abstract class AbstractUISegmentLayout extends AbstractUILayoutBase {
public static final String COMPONENT_FAMILY = "org.apache.myfaces.tobago.SegmentLayout";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java
index afdb3bf..ada1195 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java
@@ -19,6 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,7 +31,7 @@ import javax.faces.context.FacesContext;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.SelectItemTagDeclaration}
*/
-public class AbstractUISelectItem extends UISelectItem {
+public abstract class AbstractUISelectItem extends UISelectItem implements Visual {
private static final Logger LOG = LoggerFactory.getLogger(AbstractUISelectItem.class);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
index 896effd..353cb88 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UITab;
-import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.event.TabChangeEvent;
import org.apache.myfaces.tobago.event.TabChangeListener;
import org.apache.myfaces.tobago.event.TabChangeSource;
@@ -48,7 +47,7 @@ import java.util.List;
* {@link org.apache.myfaces.tobago.internal.taglib.component.TabGroupTagDeclaration}
*/
public abstract class AbstractUITabGroup extends AbstractUIPanelBase
- implements TabChangeSource, TobagoActionSource, ClientBehaviorHolder, Visual {
+ implements TabChangeSource, TobagoActionSource, ClientBehaviorHolder {
private static final Logger LOG = LoggerFactory.getLogger(AbstractUITabGroup.class);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BarTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BarTagDeclaration.java
index ac6e78f..75f377d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BarTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BarTagDeclaration.java
@@ -37,7 +37,7 @@ import javax.faces.component.UIPanel;
@Tag(name = "bar")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIBar",
- uiComponentBaseClass = "javax.faces.component.UIPanel",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIBar",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.BAR,
interfaces = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FigureTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FigureTagDeclaration.java
index d969ee5..bdd5c0f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FigureTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FigureTagDeclaration.java
@@ -43,8 +43,7 @@ import javax.faces.component.UIPanel;
rendererType = RendererTypes.FIGURE,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder",
- "org.apache.myfaces.tobago.component.Visual"
+ "javax.faces.component.behavior.ClientBehaviorHolder"
},
facets = {
@Facet(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FooterTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FooterTagDeclaration.java
index b378d3a..790b081 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FooterTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FooterTagDeclaration.java
@@ -36,7 +36,7 @@ import javax.faces.component.UIPanel;
@Tag(name = "footer")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIFooter",
- uiComponentBaseClass = "javax.faces.component.UIPanel",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIFooter",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.FOOTER,
interfaces = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HeaderTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HeaderTagDeclaration.java
index 4cd9376..1bc3c65 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HeaderTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HeaderTagDeclaration.java
@@ -36,7 +36,7 @@ import javax.faces.component.UIPanel;
@Tag(name = "header")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIHeader",
- uiComponentBaseClass = "javax.faces.component.UIPanel",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIHeader",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.HEADER,
interfaces = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
index 9b68547..448ee01 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
@@ -46,7 +46,6 @@ import javax.faces.component.UIPanel;
uiComponentFacesClass = "javax.faces.component.UIPanel",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.PANEL,
- interfaces = "org.apache.myfaces.tobago.component.Visual",
facets = {
@Facet(name = Facets.RELOAD, description = "Contains an instance of UIReload",
allowedChildComponenents = "org.apache.myfaces.tobago.Reload"),
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
index c7ea5e3..c1c6a71 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
@@ -169,9 +169,9 @@ public class ClassesGenerator extends AbstractGenerator {
final ComponentPropertyInfo componentPropertyInfo = (ComponentPropertyInfo) info.fill(new ComponentPropertyInfo());
componentInfo.addImport(componentPropertyInfo.getUnmodifiedType());
componentInfo.addImport("javax.faces.context.FacesContext");
- if ("markup".equals(info.getName())) {
- componentInfo.addInterface("org.apache.myfaces.tobago.component.Visual");
- }
+// if ("markup".equals(info.getName())) {
+// componentInfo.addInterface("org.apache.myfaces.tobago.component.Visual");
+// }
if ("requiredMessage".equals(info.getName())) {
componentInfo.setMessages(true);
}