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/12/07 17:25:45 UTC
svn commit: r887983 -
/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
Author: lofwyr
Date: Mon Dec 7 16:25:44 2009
New Revision: 887983
URL: http://svn.apache.org/viewvc?rev=887983&view=rev
Log:
compilable
Modified:
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java?rev=887983&r1=887982&r2=887983&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java Mon Dec 7 16:25:44 2009
@@ -20,9 +20,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-/*
- * Date: 23.01.2008 20:21:08
- */
public final class PixelMeasure extends Measure {
private static final Log LOG = LogFactory.getLog(PixelMeasure.class);
@@ -39,7 +36,7 @@
return new PixelMeasure(pixel + m.getPixel());
}
- public Measure substractNotNegative(Measure m) {
+ public Measure subtractNotNegative(Measure m) {
if (m.getPixel() > pixel) {
LOG.warn("Not enough space! value=" + pixel);
return NULL;
@@ -48,6 +45,11 @@
}
}
+ @Deprecated
+ public Measure substractNotNegative(Measure m) {
+ return subtractNotNegative(m);
+ }
+
public int getPixel() {
return pixel;
}