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/05 13:54:24 UTC
svn commit: r801143 - in
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago:
component/ config/ layout/math/
Author: lofwyr
Date: Wed Aug 5 11:54:24 2009
New Revision: 801143
URL: http://svn.apache.org/viewvc?rev=801143&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/AbstractUIImage.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationComparator.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationManager.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/PartitionEquation.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=801143&r1=801142&r2=801143&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 Wed Aug 5 11:54:24 2009
@@ -101,11 +101,13 @@
LayoutComponent component = temp.getComponent();
// horizontal
- int hIndex = horizontal.combine(horizontalIndices[i], cell.getColumnSpan(), getColumnSpacing(), component.getClass().getSimpleName());
+ int hIndex = horizontal.combine(horizontalIndices[i], cell.getColumnSpan(), getColumnSpacing(),
+ component.getClass().getSimpleName());
cell.getComponent().setHorizontalIndex(hIndex);
// vertical
- int vIndex = vertical.combine(verticalIndices[j], cell.getRowSpan(), getRowSpacing(), component.getClass().getSimpleName());
+ int vIndex = vertical.combine(verticalIndices[j], cell.getRowSpan(), getRowSpacing(),
+ component.getClass().getSimpleName());
cell.getComponent().setVerticalIndex(vIndex);
if (component instanceof LayoutContainer) {
@@ -225,7 +227,8 @@
LayoutToken layoutToken = columnTokens.get(i);
if (layoutToken instanceof PixelLayoutToken) {
Measure pixel = new PixelMeasure(((PixelLayoutToken) layoutToken).getPixel());
- layoutContext.getHorizontal().setFixedLength(i + horizontalIndexOffset, pixel, ClassUtils.getShortClassName(getParent(), "null"));
+ layoutContext.getHorizontal().setFixedLength(i + horizontalIndexOffset, pixel,
+ ClassUtils.getShortClassName(getParent(), "null"));
}
/*
if (layoutToken instanceof AutoLayoutToken) {
@@ -241,7 +244,8 @@
if (layoutToken instanceof PixelLayoutToken) {
// XXX PixelLayoutToken might be removed/changed
Measure pixel = new PixelMeasure(((PixelLayoutToken) layoutToken).getPixel());
- layoutContext.getVertical().setFixedLength(i + verticalIndexOffset, pixel, ClassUtils.getShortClassName(getParent(), "null"));
+ layoutContext.getVertical().setFixedLength(i + verticalIndexOffset, pixel,
+ ClassUtils.getShortClassName(getParent(), "null"));
}
/*
if (layoutToken instanceof AutoLayoutToken) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIImage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIImage.java?rev=801143&r1=801142&r2=801143&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIImage.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIImage.java Wed Aug 5 11:54:24 2009
@@ -22,4 +22,4 @@
import javax.faces.component.UIGraphic;
public abstract class AbstractUIImage extends UIGraphic implements LayoutComponent {
-}
\ No newline at end of file
+}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java?rev=801143&r1=801142&r2=801143&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java Wed Aug 5 11:54:24 2009
@@ -205,10 +205,10 @@
@Override
public String toString() {
- return "CacheKey(" + clientProperties +
- "," + locale +
- "," + rendererType +
- "," + name + ')';
+ return "CacheKey(" + clientProperties
+ + "," + locale
+ + "," + rendererType
+ + "," + name + ')';
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationComparator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationComparator.java?rev=801143&r1=801142&r2=801143&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationComparator.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationComparator.java Wed Aug 5 11:54:24 2009
@@ -1,5 +1,22 @@
package org.apache.myfaces.tobago.layout.math;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import java.util.Comparator;
public class EquationComparator implements Comparator<Equation> {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationManager.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationManager.java?rev=801143&r1=801142&r2=801143&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationManager.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationManager.java Wed Aug 5 11:54:24 2009
@@ -47,12 +47,14 @@
return partition(index, number, spacing, PixelMeasure.ZERO, PixelMeasure.ZERO, component);
}
- public int[] partition(int index, int number, Measure spacing, Measure beginOffset, Measure endOffset, String component) {
+ public int[] partition(
+ int index, int number, Measure spacing, Measure beginOffset, Measure endOffset, String component) {
assert number > 0;
int[] newIndices = equations.addVariables(number);
- equations.addEqualsEquation(new PartitionEquation(newIndices[0], number, index, spacing, beginOffset, endOffset, component));
+ equations.addEqualsEquation(
+ new PartitionEquation(newIndices[0], number, index, spacing, beginOffset, endOffset, component));
LOG.info(equations);
return newIndices;
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/PartitionEquation.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/PartitionEquation.java?rev=801143&r1=801142&r2=801143&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/PartitionEquation.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/PartitionEquation.java Wed Aug 5 11:54:24 2009
@@ -50,7 +50,8 @@
* @param endOffset offset after the last cell
* @param component
*/
- public PartitionEquation(int begin, int count, int parent, Measure spacing, Measure beginOffset, Measure endOffset, String component) {
+ public PartitionEquation(
+ int begin, int count, int parent, Measure spacing, Measure beginOffset, Measure endOffset, String component) {
assert spacing != null;
assert beginOffset != null;