You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2013/11/26 10:28:34 UTC
svn commit: r1545577 - in /commons/proper/imaging/trunk/src:
main/java/org/apache/commons/imaging/common/
main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/
main/java/org/apache/commons/imaging/formats/tiff/write/
test/java/org/apache/common...
Author: ebourg
Date: Tue Nov 26 09:28:34 2013
New Revision: 1545577
URL: http://svn.apache.org/r1545577
Log:
Renamed RationalNumber.getRationalNumber() to valueOf()
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RationalNumber.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRational.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RationalNumber.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RationalNumber.java?rev=1545577&r1=1545576&r2=1545577&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RationalNumber.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RationalNumber.java Tue Nov 26 09:28:34 2013
@@ -150,7 +150,7 @@ public class RationalNumber extends Numb
//
// calculate rational number using successive approximations.
//
- public static RationalNumber getRationalNumber(double value) {
+ public static RationalNumber valueOf(double value) {
if (value >= Integer.MAX_VALUE) {
return new RationalNumber(Integer.MAX_VALUE, 1);
} else if (value <= -Integer.MAX_VALUE) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRational.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRational.java?rev=1545577&r1=1545576&r2=1545577&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRational.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRational.java Tue Nov 26 09:28:34 2013
@@ -47,14 +47,14 @@ public class FieldTypeRational extends F
byteOrder);
} else if (o instanceof Number) {
final Number number = (Number) o;
- final RationalNumber rationalNumber = RationalNumber.getRationalNumber(number.doubleValue());
+ final RationalNumber rationalNumber = RationalNumber.valueOf(number.doubleValue());
return ByteConversions.toBytes(rationalNumber, byteOrder);
} else if (o instanceof Number[]) {
final Number numbers[] = (Number[]) o;
final RationalNumber rationalNumbers[] = new RationalNumber[numbers.length];
for (int i = 0; i < numbers.length; i++) {
final Number number = numbers[i];
- rationalNumbers[i] = RationalNumber.getRationalNumber(number.doubleValue());
+ rationalNumbers[i] = RationalNumber.valueOf(number.doubleValue());
}
return ByteConversions.toBytes(rationalNumbers, byteOrder);
} else if (o instanceof double[]) {
@@ -62,7 +62,7 @@ public class FieldTypeRational extends F
final RationalNumber rationalNumbers[] = new RationalNumber[numbers.length];
for (int i = 0; i < numbers.length; i++) {
final double number = numbers[i];
- rationalNumbers[i] = RationalNumber.getRationalNumber(number);
+ rationalNumbers[i] = RationalNumber.valueOf(number);
}
return ByteConversions.toBytes(rationalNumbers, byteOrder);
} else {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java?rev=1545577&r1=1545576&r2=1545577&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java Tue Nov 26 09:28:34 2013
@@ -435,23 +435,23 @@ public abstract class TiffImageWriterBas
directory.add(TiffTagConstants.TIFF_TAG_RESOLUTION_UNIT,
(short) 0);
directory.add(TiffTagConstants.TIFF_TAG_XRESOLUTION,
- RationalNumber.getRationalNumber(pixelDensity.getRawHorizontalDensity()));
+ RationalNumber.valueOf(pixelDensity.getRawHorizontalDensity()));
directory.add(TiffTagConstants.TIFF_TAG_YRESOLUTION,
- RationalNumber.getRationalNumber(pixelDensity.getRawVerticalDensity()));
+ RationalNumber.valueOf(pixelDensity.getRawVerticalDensity()));
} else if (pixelDensity.isInInches()) {
directory.add(TiffTagConstants.TIFF_TAG_RESOLUTION_UNIT,
(short) 2);
directory.add(TiffTagConstants.TIFF_TAG_XRESOLUTION,
- RationalNumber.getRationalNumber(pixelDensity.horizontalDensityInches()));
+ RationalNumber.valueOf(pixelDensity.horizontalDensityInches()));
directory.add(TiffTagConstants.TIFF_TAG_YRESOLUTION,
- RationalNumber.getRationalNumber(pixelDensity.verticalDensityInches()));
+ RationalNumber.valueOf(pixelDensity.verticalDensityInches()));
} else {
directory.add(TiffTagConstants.TIFF_TAG_RESOLUTION_UNIT,
(short) 1);
directory.add(TiffTagConstants.TIFF_TAG_XRESOLUTION,
- RationalNumber.getRationalNumber(pixelDensity.horizontalDensityCentimetres()));
+ RationalNumber.valueOf(pixelDensity.horizontalDensityCentimetres()));
directory.add(TiffTagConstants.TIFF_TAG_YRESOLUTION,
- RationalNumber.getRationalNumber(pixelDensity.verticalDensityCentimetres()));
+ RationalNumber.valueOf(pixelDensity.verticalDensityCentimetres()));
}
if (t4Options != 0) {
directory.add(TiffTagConstants.TIFF_TAG_T4_OPTIONS, t4Options);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java?rev=1545577&r1=1545576&r2=1545577&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java Tue Nov 26 09:28:34 2013
@@ -162,9 +162,9 @@ public final class TiffOutputSet impleme
gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE);
gpsDirectory
.add(GpsTagConstants.GPS_TAG_GPS_LONGITUDE,
- RationalNumber.getRationalNumber(longitudeDegrees),
- RationalNumber.getRationalNumber(longitudeMinutes),
- RationalNumber.getRationalNumber(longitudeSeconds));
+ RationalNumber.valueOf(longitudeDegrees),
+ RationalNumber.valueOf(longitudeMinutes),
+ RationalNumber.valueOf(longitudeSeconds));
}
{
@@ -179,9 +179,9 @@ public final class TiffOutputSet impleme
gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_LATITUDE);
gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_LATITUDE,
- RationalNumber.getRationalNumber(latitudeDegrees),
- RationalNumber.getRationalNumber(latitudeMinutes),
- RationalNumber.getRationalNumber(latitudeSeconds));
+ RationalNumber.valueOf(latitudeDegrees),
+ RationalNumber.valueOf(latitudeMinutes),
+ RationalNumber.valueOf(latitudeSeconds));
}
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java?rev=1545577&r1=1545576&r2=1545577&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java Tue Nov 26 09:28:34 2013
@@ -100,7 +100,7 @@ public class RationalNumberTest extends
};
for (final double value : testValues) {
- final RationalNumber rational = RationalNumber.getRationalNumber(value);
+ final RationalNumber rational = RationalNumber.valueOf(value);
final double difference = Math.abs(value - rational.doubleValue());
final NumberFormat nf = DecimalFormat.getInstance();