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/09/10 11:40:36 UTC
svn commit: r1623957 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/
tobago-theme/tobago-theme-standard/s...
Author: lofwyr
Date: Wed Sep 10 09:40:36 2014
New Revision: 1623957
URL: http://svn.apache.org/r1623957
Log:
remove deprecated...
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanelBase.java
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMediator.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.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/TabGroupRenderer.java
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMediator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMediator.java?rev=1623957&r1=1623956&r2=1623957&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMediator.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMediator.java Wed Sep 10 09:40:36 2014
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.internal.component;
-import org.apache.myfaces.tobago.layout.LayoutComponent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,7 +28,7 @@ import javax.faces.event.FacesEvent;
import java.io.IOException;
import java.util.Map;
-public abstract class AbstractUIMediator extends AbstractUIPanelBase implements LayoutComponent {
+public abstract class AbstractUIMediator extends AbstractUIPanel {
private static final Logger LOG = LoggerFactory.getLogger(AbstractUIMediator.class);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java?rev=1623957&r1=1623956&r2=1623957&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java Wed Sep 10 09:40:36 2014
@@ -35,7 +35,7 @@ import javax.faces.context.FacesContext;
import java.io.IOException;
import java.util.List;
-public abstract class AbstractUIPanel extends AbstractUIPanelBase
+public abstract class AbstractUIPanel extends javax.faces.component.UIPanel
implements OnComponentPopulated, LayoutContainer, LayoutComponent {
@Override
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java?rev=1623957&r1=1623956&r2=1623957&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java Wed Sep 10 09:40:36 2014
@@ -47,7 +47,7 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.List;
-public abstract class AbstractUIPopup extends AbstractUIPanelBase
+public abstract class AbstractUIPopup extends AbstractUIPanel
implements OnComponentCreated, OnComponentPopulated, NamingContainer,
DeprecatedDimension, Position, LayoutContainer {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java?rev=1623957&r1=1623956&r2=1623957&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java Wed Sep 10 09:40:36 2014
@@ -51,7 +51,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-public abstract class AbstractUITabGroup extends AbstractUIPanelBase
+public abstract class AbstractUITabGroup extends AbstractUIPanel
implements TabChangeSource2, ActionSource2, LayoutContainer, LayoutComponent, OnComponentPopulated,
SupportsRenderedPartially {
@@ -112,21 +112,21 @@ public abstract class AbstractUITabGroup
}
}
- public AbstractUIPanelBase[] getTabs() {
- final List<AbstractUIPanelBase> tabs = new ArrayList<AbstractUIPanelBase>();
+ public AbstractUIPanel[] getTabs() {
+ final List<AbstractUIPanel> tabs = new ArrayList<AbstractUIPanel>();
for (final UIComponent kid : getChildren()) {
- if (kid instanceof AbstractUIPanelBase) {
+ if (kid instanceof AbstractUIPanel) {
//if (kid.isRendered()) {
- tabs.add((AbstractUIPanelBase) kid);
+ tabs.add((AbstractUIPanel) kid);
//}
} else {
LOG.error("Invalid component in UITabGroup: " + kid);
}
}
- return tabs.toArray(new AbstractUIPanelBase[tabs.size()]);
+ return tabs.toArray(new AbstractUIPanel[tabs.size()]);
}
- public AbstractUIPanelBase getActiveTab() {
+ public AbstractUIPanel getActiveTab() {
return getTab(getSelectedIndex());
}
@@ -183,7 +183,7 @@ public abstract class AbstractUITabGroup
if (!isRendered()) {
return;
}
- final AbstractUIPanelBase renderedTab = getRenderedTab();
+ final AbstractUIPanel renderedTab = getRenderedTab();
renderedTab.processValidators(context);
for (final UIComponent facet : getFacets().values()) {
facet.processValidators(context);
@@ -202,7 +202,7 @@ public abstract class AbstractUITabGroup
if (!isRendered()) {
return;
}
- final AbstractUIPanelBase renderedTab = getRenderedTab();
+ final AbstractUIPanel renderedTab = getRenderedTab();
renderedTab.processUpdates(context);
for (final UIComponent facet : getFacets().values()) {
facet.processUpdates(context);
@@ -276,12 +276,12 @@ public abstract class AbstractUITabGroup
public abstract String getSwitchType();
- private AbstractUIPanelBase getTab(final int index) {
+ private AbstractUIPanel getTab(final int index) {
int i = 0;
for (final UIComponent component : getChildren()) {
- if (component instanceof AbstractUIPanelBase) {
+ if (component instanceof AbstractUIPanel) {
if (i == index) {
- return (AbstractUIPanelBase) component;
+ return (AbstractUIPanel) component;
}
i++;
} else {
@@ -292,7 +292,7 @@ public abstract class AbstractUITabGroup
return null;
}
- private AbstractUIPanelBase getRenderedTab() {
+ private AbstractUIPanel getRenderedTab() {
return getTab(getRenderedIndex());
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java?rev=1623957&r1=1623956&r2=1623957&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java Wed Sep 10 09:40:36 2014
@@ -28,6 +28,7 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
+import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
import javax.faces.component.UIPanel;
@@ -44,7 +45,7 @@ import javax.faces.component.UIPanel;
rendererType = RendererTypes.MEDIATOR,
interfaces = {"org.apache.myfaces.tobago.component.SupportsMarkup"})
public interface MediatorTagDeclaration
- extends HasIdBindingAndRendered, IsGridLayoutComponent, HasMarkup, HasCurrentMarkup {
+ extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup {
/**
* Name of a request-scope attribute under which this component is accessible.
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/TabGroupRenderer.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/TabGroupRenderer.java?rev=1623957&r1=1623956&r2=1623957&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/TabGroupRenderer.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/TabGroupRenderer.java Wed Sep 10 09:40:36 2014
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import org.apache.myfaces.tobago.event.TabChangeEvent;
-import org.apache.myfaces.tobago.internal.component.AbstractUIPanelBase;
+import org.apache.myfaces.tobago.internal.component.AbstractUIPanel;
import org.apache.myfaces.tobago.internal.util.AccessKeyLogger;
import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
@@ -59,7 +59,6 @@ import javax.faces.component.UIPanel;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import java.io.IOException;
-import java.util.List;
import java.util.Map;
public class TabGroupRenderer extends LayoutComponentRendererBase {
@@ -141,9 +140,9 @@ public class TabGroupRenderer extends La
// ensure to select a rendered tab
int index = -1;
int closestRenderedTabIndex = -1;
- for (final UIComponent tab : (List<UIComponent>) tabGroup.getChildren()) {
+ for (final UIComponent tab : tabGroup.getChildren()) {
index++;
- if (tab instanceof AbstractUIPanelBase) {
+ if (tab instanceof AbstractUIPanel) {
if (index == activeIndex) {
if (tab.isRendered()) {
return index;