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 2013/03/08 13:18:32 UTC
svn commit: r1454339 - in
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago:
internal/component/AbstractUIGridLayout.java layout/PixelLayoutToken.java
layout/PixelMeasure.java
Author: lofwyr
Date: Fri Mar 8 12:18:32 2013
New Revision: 1454339
URL: http://svn.apache.org/r1454339
Log:
minor code optimization
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelLayoutToken.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java?rev=1454339&r1=1454338&r2=1454339&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java Fri Mar 8 12:18:32 2013
@@ -148,8 +148,7 @@ public abstract class AbstractUIGridLayo
if (token instanceof PixelLayoutToken) {
if (head.isRendered()) {
- int pixel = ((PixelLayoutToken) token).getPixel();
- heads[i].setCurrent(Measure.valueOf(pixel)); // XXX refactor
+ heads[i].setCurrent(((PixelLayoutToken) token).getMeasure());
} else {
heads[i].setCurrent(Measure.ZERO);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelLayoutToken.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelLayoutToken.java?rev=1454339&r1=1454338&r2=1454339&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelLayoutToken.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelLayoutToken.java Fri Mar 8 12:18:32 2013
@@ -24,13 +24,21 @@ public class PixelLayoutToken extends La
static final String SUFFIX = "px";
- private int pixel = 0;
+ private final PixelMeasure pixel;
public PixelLayoutToken(int pixel) {
+ this(PixelMeasure.pixelValueOf(pixel));
+ }
+
+ public PixelLayoutToken(PixelMeasure pixel) {
this.pixel = pixel;
}
public int getPixel() {
+ return pixel.getPixel();
+ }
+
+ public PixelMeasure getMeasure() {
return pixel;
}
@@ -56,6 +64,6 @@ public class PixelLayoutToken extends La
}
public int hashCode() {
- return pixel;
+ return pixel.hashCode();
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java?rev=1454339&r1=1454338&r2=1454339&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java Fri Mar 8 12:18:32 2013
@@ -26,11 +26,11 @@ public final class PixelMeasure extends
private static final Logger LOG = LoggerFactory.getLogger(PixelMeasure.class);
- static final Measure[] PIXEL_CACHE;
+ static final PixelMeasure[] PIXEL_CACHE;
static final int PIXEL_CACHE_MAX = 4000;
static {
- PIXEL_CACHE = new Measure[PIXEL_CACHE_MAX + 1];
+ PIXEL_CACHE = new PixelMeasure[PIXEL_CACHE_MAX + 1];
for (int i = 0; i < PIXEL_CACHE.length; i++) {
PIXEL_CACHE[i] = new PixelMeasure(i);
}
@@ -42,7 +42,7 @@ public final class PixelMeasure extends
this.pixel = pixel;
}
- static Measure pixelValueOf(int value) {
+ static PixelMeasure pixelValueOf(int value) {
if (value >= 0 && value <= PixelMeasure.PIXEL_CACHE_MAX) {
return PixelMeasure.PIXEL_CACHE[value];
}