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 2009/06/26 14:36:08 UTC
svn commit: r788675 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/layout/
core/src/main/java/org/apache/myfaces/tobago/layout/grid/
core/src/main/java/org/apache/myfaces...
Author: lofwyr
Date: Fri Jun 26 12:36:07 2009
New Revision: 788675
URL: http://svn.apache.org/viewvc?rev=788675&view=rev
Log:
TOBAGO-606: Layout-Manager
- rename classes for better unterstanding
Added:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java (contents, props changed)
- copied, changed from r788668, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Component.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java (contents, props changed)
- copied, changed from r788668, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Container.java
Removed:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Component.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Container.java
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIButton.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUILabel.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIOut.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPanel.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroup.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroupLayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInputBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContext.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutManager.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/Cell.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/PseudoCell.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/RealCell.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutConstraintTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockComponent.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockContainer.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIButton.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIButton.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIButton.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIButton.java Fri Jun 26 12:36:07 2009
@@ -17,8 +17,8 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.layout.Component;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
-public abstract class AbstractUIButton extends AbstractUICommand implements Component {
+public abstract class AbstractUIButton extends AbstractUICommand implements LayoutComponent {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java Fri Jun 26 12:36:07 2009
@@ -20,10 +20,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.OnComponentCreated;
-import org.apache.myfaces.tobago.layout.Component;
-import org.apache.myfaces.tobago.layout.Container;
import org.apache.myfaces.tobago.layout.Display;
import org.apache.myfaces.tobago.layout.FixedLayoutToken;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
+import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.LayoutContext;
import org.apache.myfaces.tobago.layout.LayoutManager;
import org.apache.myfaces.tobago.layout.LayoutToken;
@@ -69,7 +69,7 @@
grid = new Grid(columnTokens.getSize(), rowTokens.getSize());
}
- public void collect(LayoutContext layoutContext, Container container, int horizontalIndex, int verticalIndex) {
+ public void collect(LayoutContext layoutContext, LayoutContainer container, int horizontalIndex, int verticalIndex) {
// horizontal
EquationManager horizontal = layoutContext.getHorizontal();
@@ -79,8 +79,8 @@
EquationManager vertical = layoutContext.getVertical();
int[] verticalIndices = vertical.divide(verticalIndex, rowTokens.getSize());
- List<Component> components = container.getComponents();
- for (Component component1 : components) {
+ List<LayoutComponent> components = container.getComponents();
+ for (LayoutComponent component1 : components) {
grid.add(new RealCell(component1), component1.getColumnSpan(), component1.getRowSpan());
LOG.debug("\n" + grid);
}
@@ -93,7 +93,7 @@
org.apache.myfaces.tobago.layout.grid.Cell temp = grid.get(i, j);
if (temp instanceof RealCell) {
RealCell cell = (RealCell) temp;
- Component component = temp.getComponent();
+ LayoutComponent component = temp.getComponent();
// horizontal
int hIndex = horizontal.addComponent(horizontalIndices[i], cell.getColumnSpan());
@@ -103,8 +103,8 @@
int vIndex = vertical.addComponent(verticalIndices[j], cell.getRowSpan());
cell.getComponent().setVerticalIndex(vIndex);
- if (component instanceof Container) {
- Container subContainer = (Container) component;
+ if (component instanceof LayoutContainer) {
+ LayoutContainer subContainer = (LayoutContainer) component;
LayoutManager layoutManager = subContainer.getLayoutManager();
layoutManager.collect(layoutContext, subContainer, hIndex, vIndex);
}
@@ -113,7 +113,7 @@
}
}
- public void distribute(LayoutContext layoutContext, Container container) {
+ public void distribute(LayoutContext layoutContext, LayoutContainer container) {
distributeSizes(layoutContext);
distributePositions();
@@ -126,7 +126,7 @@
Cell temp = grid.get(i, j);
if (temp instanceof RealCell) {
RealCell cell = (RealCell) temp;
- Component component = temp.getComponent();
+ LayoutComponent component = temp.getComponent();
component.setDisplay(Display.BLOCK);
@@ -142,9 +142,9 @@
component.setWidth(width);
component.setHeight(height);
- if (component instanceof Container) {
+ if (component instanceof LayoutContainer) {
- Container subContainer = (Container) component;
+ LayoutContainer subContainer = (LayoutContainer) component;
LayoutManager layoutManager = subContainer.getLayoutManager();
if (layoutManager != null) {
layoutManager.distribute(layoutContext, subContainer);
@@ -165,7 +165,7 @@
if (cell == null) {
continue; // XXX why this can happen?
}
- Component component = cell.getComponent();
+ LayoutComponent component = cell.getComponent();
if (cell instanceof RealCell) {
component.setLeft(left);
}
@@ -183,7 +183,7 @@
if (cell == null) {
continue; // XXX why this can happen?
}
- Component component = cell.getComponent();
+ LayoutComponent component = cell.getComponent();
if (cell instanceof RealCell) {
component.setTop(top);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUILabel.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUILabel.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUILabel.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUILabel.java Fri Jun 26 12:36:07 2009
@@ -19,13 +19,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.layout.Component;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import java.io.IOException;
-public abstract class AbstractUILabel extends javax.faces.component.UIOutput implements Component {
+public abstract class AbstractUILabel extends javax.faces.component.UIOutput implements LayoutComponent {
private static final Log LOG = LogFactory.getLog(AbstractUILabel.class);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIOut.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIOut.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIOut.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIOut.java Fri Jun 26 12:36:07 2009
@@ -17,9 +17,9 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.layout.Component;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
import javax.faces.component.UIOutput;
-public abstract class AbstractUIOut extends UIOutput implements Component {
+public abstract class AbstractUIOut extends UIOutput implements LayoutComponent {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java Fri Jun 26 12:36:07 2009
@@ -25,8 +25,8 @@
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.compat.InvokeOnComponent;
import org.apache.myfaces.tobago.layout.Box;
-import org.apache.myfaces.tobago.layout.Component;
-import org.apache.myfaces.tobago.layout.Container;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
+import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.LayoutManager;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.model.PageState;
@@ -48,7 +48,7 @@
import java.util.List;
import java.util.StringTokenizer;
-public abstract class AbstractUIPage extends AbstractUIForm implements InvokeOnComponent, Container {
+public abstract class AbstractUIPage extends AbstractUIForm implements InvokeOnComponent, LayoutContainer {
private static final Log LOG = LogFactory.getLog(AbstractUIPage.class);
@@ -332,11 +332,11 @@
}
// LAYOUT Begin
- public List<Component> getComponents() {
- List<Component> result = new ArrayList<Component>();
+ public List<LayoutComponent> getComponents() {
+ List<LayoutComponent> result = new ArrayList<LayoutComponent>();
for (UIComponent uiComponent : (List<UIComponent>) getChildren()) {
- if (uiComponent instanceof Component) {
- result.add((Component) uiComponent);
+ if (uiComponent instanceof LayoutComponent) {
+ result.add((LayoutComponent) uiComponent);
}
}
return result;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPanel.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPanel.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPanel.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPanel.java Fri Jun 26 12:36:07 2009
@@ -20,8 +20,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.OnComponentCreated;
-import org.apache.myfaces.tobago.layout.Component;
-import org.apache.myfaces.tobago.layout.Container;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
+import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.LayoutManager;
import javax.faces.component.UIComponent;
@@ -30,7 +30,7 @@
import java.util.ArrayList;
import java.util.List;
-public abstract class AbstractUIPanel extends UIPanelBase implements Container {
+public abstract class AbstractUIPanel extends UIPanelBase implements LayoutContainer {
private static final Log LOG = LogFactory.getLog(AbstractUIPanel.class);
@@ -75,11 +75,11 @@
super.encodeEnd(facesContext);
}
- public List<Component> getComponents() {
- List<Component> result = new ArrayList<Component>();
+ public List<LayoutComponent> getComponents() {
+ List<LayoutComponent> result = new ArrayList<LayoutComponent>();
for (UIComponent uiComponent : (List<UIComponent>) getChildren()) {
- if (uiComponent instanceof Component) {
- result.add((Component) uiComponent);
+ if (uiComponent instanceof LayoutComponent) {
+ result.add((LayoutComponent) uiComponent);
}
}
return result;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroup.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroup.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroup.java Fri Jun 26 12:36:07 2009
@@ -26,8 +26,8 @@
import org.apache.myfaces.tobago.event.TabChangeEvent;
import org.apache.myfaces.tobago.event.TabChangeListener;
import org.apache.myfaces.tobago.event.TabChangeSource;
-import org.apache.myfaces.tobago.layout.Component;
-import org.apache.myfaces.tobago.layout.Container;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
+import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.LayoutManager;
import javax.faces.component.ActionSource;
@@ -46,7 +46,7 @@
import java.util.List;
public abstract class AbstractUITabGroup extends UIPanelBase
- implements TabChangeSource, ActionSource, AjaxComponent, Container, OnComponentCreated {
+ implements TabChangeSource, ActionSource, AjaxComponent, LayoutContainer, OnComponentCreated {
private static final Log LOG = LogFactory.getLog(AbstractUITabGroup.class);
@@ -313,11 +313,11 @@
}
// LAYOUT Begin
- public List<Component> getComponents() {
- List<Component> result = new ArrayList<Component>();
+ public List<LayoutComponent> getComponents() {
+ List<LayoutComponent> result = new ArrayList<LayoutComponent>();
for (UIComponent uiComponent : (List<UIComponent>) getChildren()) {
- if (uiComponent instanceof Component) {
- result.add((Component) uiComponent);
+ if (uiComponent instanceof LayoutComponent) {
+ result.add((LayoutComponent) uiComponent);
}
}
return result;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroupLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroupLayout.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroupLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroupLayout.java Fri Jun 26 12:36:07 2009
@@ -18,7 +18,7 @@
*/
import org.apache.myfaces.tobago.OnComponentCreated;
-import org.apache.myfaces.tobago.layout.Container;
+import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.LayoutContext;
import org.apache.myfaces.tobago.layout.LayoutManager;
@@ -31,10 +31,10 @@
public void onComponentCreated(FacesContext context, UIComponent component) {
}
- public void collect(LayoutContext layoutContext, Container container, int horizontalIndex, int verticalIndex) {
+ public void collect(LayoutContext layoutContext, LayoutContainer container, int horizontalIndex, int verticalIndex) {
}
- public void distribute(LayoutContext layoutContext, Container container) {
+ public void distribute(LayoutContext layoutContext, LayoutContainer container) {
}
@Override
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java Fri Jun 26 12:36:07 2009
@@ -17,7 +17,7 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.layout.Component;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
import org.apache.myfaces.tobago.model.MixedTreeModel;
import org.apache.myfaces.tobago.util.ComponentUtil;
@@ -32,7 +32,7 @@
import java.util.Iterator;
import java.util.List;
-public abstract class AbstractUITree extends UIInput implements NamingContainer, Component {
+public abstract class AbstractUITree extends UIInput implements NamingContainer, LayoutComponent {
public static final String MESSAGE_NOT_LEAF = "tobago.tree.MESSAGE_NOT_LEAF";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInputBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInputBase.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInputBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInputBase.java Fri Jun 26 12:36:07 2009
@@ -19,14 +19,14 @@
import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
-import org.apache.myfaces.tobago.layout.Component;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
import org.apache.myfaces.tobago.util.ComponentUtil;
import javax.faces.context.FacesContext;
import java.io.IOException;
public abstract class UIInputBase extends javax.faces.component.UIInput
- implements AjaxComponent, SupportsMarkup, Component {
+ implements AjaxComponent, SupportsMarkup, LayoutComponent {
// TODO can this removed?
public void updateModel(FacesContext facesContext) {
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java (from r788668, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Component.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Component.java&r1=788668&r2=788675&rev=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Component.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java Fri Jun 26 12:36:07 2009
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-// XXX rename to LayoutComponent
-public interface Component {
+public interface LayoutComponent {
Integer getColumnSpan();
void setColumnSpan(Integer columnSpan);
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java (from r788668, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Container.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Container.java&r1=788668&r2=788675&rev=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Container.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java Fri Jun 26 12:36:07 2009
@@ -19,10 +19,9 @@
import java.util.List;
-// XXX rename to LayoutContainer
-public interface Container extends Component {
+public interface LayoutContainer extends LayoutComponent {
- List<Component> getComponents();
+ List<LayoutComponent> getComponents();
LayoutManager getLayoutManager();
}
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContext.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContext.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContext.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContext.java Fri Jun 26 12:36:07 2009
@@ -23,9 +23,9 @@
private EquationManager horizontal;
private EquationManager vertical;
- private Container container;
+ private LayoutContainer container;
- public LayoutContext(Container container) {
+ public LayoutContext(LayoutContainer container) {
this.horizontal = new EquationManager();
this.vertical = new EquationManager();
this.container = container;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutManager.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutManager.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutManager.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutManager.java Fri Jun 26 12:36:07 2009
@@ -19,7 +19,7 @@
public interface LayoutManager {
- void collect(LayoutContext layoutContext, Container container, int horizontalIndex, int verticalIndex);
+ void collect(LayoutContext layoutContext, LayoutContainer container, int horizontalIndex, int verticalIndex);
- void distribute(LayoutContext layoutContext, Container container);
+ void distribute(LayoutContext layoutContext, LayoutContainer container);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/Cell.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/Cell.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/Cell.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/Cell.java Fri Jun 26 12:36:07 2009
@@ -17,11 +17,11 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.layout.Component;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
public interface Cell {
- Component getComponent();
+ LayoutComponent getComponent();
RealCell getRealCell();
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/PseudoCell.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/PseudoCell.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/PseudoCell.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/PseudoCell.java Fri Jun 26 12:36:07 2009
@@ -17,7 +17,7 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.layout.Component;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
public class PseudoCell implements Cell {
@@ -31,7 +31,7 @@
this.inFirstRow = inFirstRow;
}
- public Component getComponent() {
+ public LayoutComponent getComponent() {
return realCell.getComponent();
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/RealCell.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/RealCell.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/RealCell.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/grid/RealCell.java Fri Jun 26 12:36:07 2009
@@ -17,19 +17,19 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.layout.Component;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
public class RealCell implements Cell {
- private Component component;
+ private LayoutComponent component;
private int columnSpan;
private int rowSpan;
- public RealCell(Component component) {
+ public RealCell(LayoutComponent component) {
this.component = component;
}
- public Component getComponent() {
+ public LayoutComponent getComponent() {
return component;
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutConstraintTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutConstraintTag.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutConstraintTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutConstraintTag.java Fri Jun 26 12:36:07 2009
@@ -23,7 +23,7 @@
import org.apache.myfaces.tobago.apt.annotation.TagGeneration;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.layout.Component;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
import org.apache.myfaces.tobago.layout.Measure;
import javax.faces.component.UIComponent;
@@ -131,14 +131,14 @@
throw new JspException("Component Instance is null");
}
- if (!(component instanceof Component)) {
+ if (!(component instanceof LayoutComponent)) {
// TODO Message resource i18n
throw new JspException("Component Instance is not a LayoutComponent");
}
if (isColumnSpanSet()) {
if (isColumnSpanLiteral()) {
- ((Component) component).setColumnSpan(Integer.valueOf(getColumnSpanExpression()));
+ ((LayoutComponent) component).setColumnSpan(Integer.valueOf(getColumnSpanExpression()));
} else {
component.setValueBinding(Attributes.COLUMN_SPAN, (ValueBinding) getColumnSpanAsBindingOrExpression());
}
@@ -146,7 +146,7 @@
if (isRowSpanSet()) {
if (isRowSpanLiteral()) {
- ((Component) component).setRowSpan(Integer.valueOf(getRowSpanExpression()));
+ ((LayoutComponent) component).setRowSpan(Integer.valueOf(getRowSpanExpression()));
} else {
component.setValueBinding(Attributes.ROW_SPAN, (ValueBinding) getRowSpanAsBindingOrExpression());
}
@@ -154,7 +154,7 @@
if (isWidthSet()) {
if (isWidthLiteral()) {
- ((Component) component).setWidth(Measure.parse(getWidthExpression()));
+ ((LayoutComponent) component).setWidth(Measure.parse(getWidthExpression()));
} else {
component.setValueBinding(Attributes.WIDTH, (ValueBinding) getWidthAsBindingOrExpression());
}
@@ -162,7 +162,7 @@
if (isHeightSet()) {
if (isHeightLiteral()) {
- ((Component) component).setHeight(Measure.parse(getHeightExpression()));
+ ((LayoutComponent) component).setHeight(Measure.parse(getHeightExpression()));
} else {
component.setValueBinding(Attributes.HEIGHT, (ValueBinding) getHeightAsBindingOrExpression());
}
@@ -170,7 +170,7 @@
if (isMinimumWidthSet()) {
if (isMinimumWidthLiteral()) {
- ((Component) component).setMinimumWidth(Measure.parse(getMinimumWidthExpression()));
+ ((LayoutComponent) component).setMinimumWidth(Measure.parse(getMinimumWidthExpression()));
} else {
component.setValueBinding(Attributes.MINIMUM_WIDTH, (ValueBinding) getMinimumWidthAsBindingOrExpression());
}
@@ -178,7 +178,7 @@
if (isMinimumHeightSet()) {
if (isMinimumHeightLiteral()) {
- ((Component) component).setMinimumHeight(Measure.parse(getMinimumHeightExpression()));
+ ((LayoutComponent) component).setMinimumHeight(Measure.parse(getMinimumHeightExpression()));
} else {
component.setValueBinding(Attributes.MINIMUM_WIDTH, (ValueBinding) getMinimumHeightAsBindingOrExpression());
}
@@ -186,7 +186,7 @@
if (isPreferredWidthSet()) {
if (isPreferredWidthLiteral()) {
- ((Component) component).setPreferredWidth(Measure.parse(getPreferredWidthExpression()));
+ ((LayoutComponent) component).setPreferredWidth(Measure.parse(getPreferredWidthExpression()));
} else {
component.setValueBinding(Attributes.PREFERRED_WIDTH, (ValueBinding) getPreferredWidthAsBindingOrExpression());
}
@@ -194,7 +194,7 @@
if (isPreferredHeightSet()) {
if (isPreferredHeightLiteral()) {
- ((Component) component).setPreferredHeight(Measure.parse(getPreferredHeightExpression()));
+ ((LayoutComponent) component).setPreferredHeight(Measure.parse(getPreferredHeightExpression()));
} else {
component.setValueBinding(Attributes.PREFERRED_WIDTH, (ValueBinding) getPreferredHeightAsBindingOrExpression());
}
@@ -202,7 +202,7 @@
if (isMaximumWidthSet()) {
if (isMaximumWidthLiteral()) {
- ((Component) component).setMaximumWidth(Measure.parse(getMaximumWidthExpression()));
+ ((LayoutComponent) component).setMaximumWidth(Measure.parse(getMaximumWidthExpression()));
} else {
component.setValueBinding(Attributes.MAXIMUM_WIDTH, (ValueBinding) getMaximumWidthAsBindingOrExpression());
}
@@ -210,7 +210,7 @@
if (isMaximumHeightSet()) {
if (isMaximumHeightLiteral()) {
- ((Component) component).setMaximumHeight(Measure.parse(getMaximumHeightExpression()));
+ ((LayoutComponent) component).setMaximumHeight(Measure.parse(getMaximumHeightExpression()));
} else {
component.setValueBinding(Attributes.MAXIMUM_WIDTH, (ValueBinding) getMaximumHeightAsBindingOrExpression());
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java Fri Jun 26 12:36:07 2009
@@ -21,8 +21,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.layout.Component;
import org.apache.myfaces.tobago.layout.Display;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.css.CssProperties;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -411,8 +411,8 @@
}
private HtmlStyleMap addLayout(HtmlStyleMap styles) {
- if (component instanceof Component) {
- Component layoutComponent = (Component) component;
+ if (component instanceof LayoutComponent) {
+ LayoutComponent layoutComponent = (LayoutComponent) component;
Measure width = layoutComponent.getWidth();
if (width != null) {
styles = ensureHtmlStyleMap(component, styles);
Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockComponent.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockComponent.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockComponent.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockComponent.java Fri Jun 26 12:36:07 2009
@@ -17,7 +17,7 @@
* limitations under the License.
*/
-public class MockComponent implements Component {
+public class MockComponent implements LayoutComponent {
private Integer columnSpan = 1;
Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockContainer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockContainer.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockContainer.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockContainer.java Fri Jun 26 12:36:07 2009
@@ -20,17 +20,17 @@
import java.util.ArrayList;
import java.util.List;
-public class MockContainer extends MockComponent implements Container {
+public class MockContainer extends MockComponent implements LayoutContainer {
private LayoutManager layoutManager;
- private List<Component> components;
+ private List<LayoutComponent> components;
public MockContainer() {
- components = new ArrayList<Component>();
+ components = new ArrayList<LayoutComponent>();
}
- public List<Component> getComponents() {
+ public List<LayoutComponent> getComponents() {
return components;
}
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java?rev=788675&r1=788674&r2=788675&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java Fri Jun 26 12:36:07 2009
@@ -24,7 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.layout.Component;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
import org.apache.myfaces.tobago.layout.Measure;
import javax.el.ELException;
@@ -68,8 +68,8 @@
public void apply(FaceletContext faceletContext, UIComponent parent)
throws IOException, FacesException, ELException {
- if (parent instanceof Component) {
- Component component = (Component) parent;
+ if (parent instanceof LayoutComponent) {
+ LayoutComponent component = (LayoutComponent) parent;
if (columnSpan != null) {
LOG.error(columnSpan.getValue());