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/09/03 18:58:48 UTC
svn commit: r811028 - in
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago:
component/ layout/ layout/math/ renderkit/
Author: lofwyr
Date: Thu Sep 3 16:58:48 2009
New Revision: 811028
URL: http://svn.apache.org/viewvc?rev=811028&view=rev
Log:
checkstyle
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/component/AbstractUITabGroupLayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/FactorList.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/SystemOfEquations.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.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=811028&r1=811027&r2=811028&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 Thu Sep 3 16:58:48 2009
@@ -114,7 +114,7 @@
if (token instanceof PixelLayoutToken) {
int pixel = ((PixelLayoutToken) token).getPixel();
- grid.getSizes(orientation)[i] = new PixelMeasure(pixel);// XXX refactor
+ grid.getSizes(orientation)[i] = new PixelMeasure(pixel); // XXX refactor
}
IntervalList intervals = new IntervalList();
@@ -203,7 +203,7 @@
i++;
}
} else {
- LOG.warn("No width/height set but needed for *!");// todo: more information
+ LOG.warn("No width/height set but needed for *!"); // todo: more information
}
}
}
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=811028&r1=811027&r2=811028&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 Thu Sep 3 16:58:48 2009
@@ -93,29 +93,27 @@
public void mainProcessing(boolean orientation) {
// find *
- {
- if (orientation && !horizontalAuto || !orientation && !verticalAuto) {
- // find rest
- LayoutContainer container = getLayoutContainer();
- Measure available = LayoutUtils.getSize(orientation, container);
- if (available != null) {
- available = available.substractNotNegative(LayoutUtils.getBeginOffset(orientation, container));
- available = available.substractNotNegative(LayoutUtils.getEndOffset(orientation, container));
-
- for (LayoutComponent component : getLayoutContainer().getComponents()) {
-
- component.setDisplay(Display.BLOCK); // TODO: use CSS via classes and style.css
- LayoutUtils.setSize(orientation, component, available);
-
-
- // call sub layout manager
- if (component instanceof LayoutContainer) {
- ((LayoutContainer) component).getLayoutManager().mainProcessing(orientation);
- }
+ if (orientation && !horizontalAuto || !orientation && !verticalAuto) {
+ // find rest
+ LayoutContainer container = getLayoutContainer();
+ Measure available = LayoutUtils.getSize(orientation, container);
+ if (available != null) {
+ available = available.substractNotNegative(LayoutUtils.getBeginOffset(orientation, container));
+ available = available.substractNotNegative(LayoutUtils.getEndOffset(orientation, container));
+
+ for (LayoutComponent component : getLayoutContainer().getComponents()) {
+
+ component.setDisplay(Display.BLOCK); // TODO: use CSS via classes and style.css
+ LayoutUtils.setSize(orientation, component, available);
+
+
+ // call sub layout manager
+ if (component instanceof LayoutContainer) {
+ ((LayoutContainer) component).getLayoutManager().mainProcessing(orientation);
}
- } else {
- LOG.warn("No width/height set but needed for *!");// todo: more information
}
+ } else {
+ LOG.warn("No width/height set but needed for *!"); // todo: more information
}
}
}
@@ -146,11 +144,9 @@
}
public void collect(LayoutContext layoutContext, LayoutContainer container, int horizontalIndex, int verticalIndex) {
- //To change body of implemented methods use File | Settings | File Templates.
}
public void distribute(LayoutContext layoutContext, LayoutContainer container) {
- //To change body of implemented methods use File | Settings | File Templates.
}
private LayoutContainer getLayoutContainer() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/FactorList.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/FactorList.java?rev=811028&r1=811027&r2=811028&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/FactorList.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/FactorList.java Thu Sep 3 16:58:48 2009
@@ -40,13 +40,13 @@
double[] doubles = new double[size()];
int i = 0;
for (Integer integer : this) {
- doubles[i++] = integer * size.getPixel() / (double)sum;
+ doubles[i++] = integer * size.getPixel() / (double) sum;
}
MathUtils.adjustRemainders(doubles, 0.0);
for (double value : doubles) {
- result.add(new PixelMeasure((int)value));
+ result.add(new PixelMeasure((int) value));
}
return result;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/SystemOfEquations.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/SystemOfEquations.java?rev=811028&r1=811027&r2=811028&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/SystemOfEquations.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/SystemOfEquations.java Thu Sep 3 16:58:48 2009
@@ -326,7 +326,7 @@
data[j][j] = 1;
data[j][numberOfVariables] = 100.0; // todo: default
LOG.warn("Setting free (undefined) variable x_" + j + " to " + data[j][numberOfVariables]);
- equations.add(j, new ZeroEquation());// fixme
+ equations.add(j, new ZeroEquation()); // fixme
}
/**
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java?rev=811028&r1=811027&r2=811028&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java Thu Sep 3 16:58:48 2009
@@ -1,10 +1,5 @@
package org.apache.myfaces.tobago.renderkit;
-import org.apache.myfaces.tobago.layout.Measure;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -22,6 +17,11 @@
* limitations under the License.
*/
+import org.apache.myfaces.tobago.layout.Measure;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
public interface LayoutComponentRenderer {
Measure getWidth(FacesContext facesContext, UIComponent component);