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/08/31 17:54:05 UTC
svn commit: r809640 - in
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago:
component/AbstractUIGridLayout.java layout/LayoutContext2.java
layout/Measure.java
Author: lofwyr
Date: Mon Aug 31 15:54:04 2009
New Revision: 809640
URL: http://svn.apache.org/viewvc?rev=809640&view=rev
Log:
TOBAGO-606: Layout-Manager
- respect the min and max of the controls
Modified:
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/layout/LayoutContext2.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
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=809640&r1=809639&r2=809640&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 Mon Aug 31 15:54:04 2009
@@ -43,6 +43,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import java.util.Arrays;
import java.util.List;
public abstract class AbstractUIGridLayout extends UILayout implements OnComponentCreated, LayoutManager {
@@ -224,11 +225,7 @@
size = size.add(pixelMeasures[i + k]);
size = size.add(getSpacing(orientation));
}
- if (orientation) {
- component.setWidth(size);
- } else {
- component.setHeight(size);
- }
+ setSize(orientation, component, size);
}
// call sub layout manager
@@ -497,6 +494,26 @@
return ((LayoutContainer) getParent());
}
+ private void setSize(boolean orientation, LayoutComponent component, Measure size) {
+ if (orientation) {
+ if (size.greaterThan(component.getMaximumWidth())) {
+ size = component.getMaximumWidth();
+ }
+ if (size.lessThan(component.getMinimumWidth())) {
+ size = component.getMinimumWidth();
+ }
+ component.setWidth(size);
+ } else {
+ if (size.greaterThan(component.getMaximumHeight())) {
+ size = component.getMaximumHeight();
+ }
+ if (size.lessThan(component.getMinimumHeight())) {
+ size = component.getMinimumHeight();
+ }
+ component.setHeight(size);
+ }
+ }
+
protected Grid getGrid() {
return grid;
}
@@ -517,4 +534,10 @@
public boolean getRendersChildren() {
return false;
}
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName()
+ + "(" + Arrays.toString(grid.getWidths()) + ", " + Arrays.toString(grid.getHeights()) + ")";
+ }
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContext2.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContext2.java?rev=809640&r1=809639&r2=809640&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContext2.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContext2.java Mon Aug 31 15:54:04 2009
@@ -17,6 +17,12 @@
* limitations under the License.
*/
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.component.AbstractUIGridLayout;
+
+import javax.faces.component.UIComponent;
+
/*
An alternative algorithm to the SystemOfEquations ...
@@ -39,6 +45,8 @@
*/
public class LayoutContext2 {
+ private static final Log LOG = LogFactory.getLog(LayoutContext2.class);
+
private LayoutContainer container;
public LayoutContext2(LayoutContainer container) {
@@ -57,5 +65,34 @@
layoutManager.mainProcessing(false);
layoutManager.postProcessing(true);
layoutManager.postProcessing(false);
+
+ StringBuffer buffer = new StringBuffer("\n");
+ debug(buffer, container, 0);
+ LOG.info(buffer);
+ }
+
+ private void debug(StringBuffer buffer, LayoutObject component, int depth) {
+ for (int i = 0; i < depth; i++) {
+ buffer.append(" ");
+ }
+ buffer.append(component.getClass().getSimpleName());
+ buffer.append("(");
+ buffer.append(component.getWidth());
+ buffer.append(", ");
+ buffer.append(component.getHeight());
+ buffer.append(")");
+ if (component instanceof LayoutContainer) {
+ LayoutManager layoutManager = ((LayoutContainer) component).getLayoutManager();
+ if (layoutManager instanceof AbstractUIGridLayout) {
+ buffer.append(" ");
+ buffer.append(layoutManager.toString());
+ }
+ }
+ buffer.append("\n");
+ for (Object o : ((UIComponent) component).getChildren()) {
+ if (o instanceof LayoutObject) {
+ debug(buffer, (LayoutObject) o, depth + 2);
+ }
+ }
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java?rev=809640&r1=809639&r2=809640&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java Mon Aug 31 15:54:04 2009
@@ -49,5 +49,13 @@
public abstract Measure substractNotNegative(Measure m);
+ public boolean greaterThan(Measure measure) {
+ return measure != null && getPixel() > measure.getPixel();
+ }
+
+ public boolean lessThan(Measure measure) {
+ return measure != null && getPixel() < measure.getPixel();
+ }
+
public abstract int getPixel();
}