You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2020/12/01 06:57:05 UTC
svn commit: r1883971 - in /pdfbox/trunk/pdfbox/src:
main/java/org/apache/pdfbox/cos/ main/java/org/apache/pdfbox/pdmodel/common/
main/java/org/apache/pdfbox/pdmodel/fdf/
main/java/org/apache/pdfbox/pdmodel/font/
main/java/org/apache/pdfbox/pdmodel/grap...
Author: lehmi
Date: Tue Dec 1 06:57:05 2020
New Revision: 1883971
URL: http://svn.apache.org/viewvc?rev=1883971&view=rev
Log:
PDFBOX-4954: rename static convert methods as proposed by Maruan on JIRA
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1FontEmbedder.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDButton.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoice.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSArray.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFFieldTest.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java?rev=1883971&r1=1883970&r2=1883971&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java Tue Dec 1 06:57:05 2020
@@ -677,7 +677,7 @@ public class COSArray extends COSBase im
*
* @return An array of COSInteger objects
*/
- public static COSArray withCOSIntegers(List<Integer> integer)
+ public static COSArray ofCOSIntegers(List<Integer> integer)
{
COSArray retval = new COSArray();
integer.forEach(s -> retval.add(COSInteger.get(s.longValue())));
@@ -691,7 +691,7 @@ public class COSArray extends COSBase im
*
* @return An array of COSName objects
*/
- public static COSArray withCOSNames(List<String> strings)
+ public static COSArray ofCOSNames(List<String> strings)
{
COSArray retval = new COSArray();
strings.forEach(s -> retval.add(COSName.getPDFName(s)));
@@ -705,7 +705,7 @@ public class COSArray extends COSBase im
*
* @return An array of COSName objects
*/
- public static COSArray withCOSStrings(List<String> strings)
+ public static COSArray ofCOSStrings(List<String> strings)
{
COSArray retval = new COSArray();
strings.forEach(s -> retval.add(new COSString(s)));
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDStream.java?rev=1883971&r1=1883970&r2=1883971&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDStream.java Tue Dec 1 06:57:05 2020
@@ -367,7 +367,7 @@ public class PDStream implements COSObje
*/
public void setFileFilters(List<String> filters)
{
- COSBase obj = COSArray.withCOSNames(filters);
+ COSBase obj = COSArray.ofCOSNames(filters);
stream.setItem(COSName.F_FILTER, obj);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java?rev=1883971&r1=1883970&r2=1883971&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java Tue Dec 1 06:57:05 2020
@@ -295,7 +295,7 @@ public class FDFField implements COSObje
COSBase cos = null;
if (value instanceof List)
{
- cos = COSArray.withCOSStrings((List<String>) value);
+ cos = COSArray.ofCOSStrings((List<String>) value);
}
else if (value instanceof String)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java?rev=1883971&r1=1883970&r2=1883971&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java Tue Dec 1 06:57:05 2020
@@ -108,7 +108,7 @@ final class PDTrueTypeFontEmbedder exten
font.setInt(COSName.FIRST_CHAR, firstChar);
font.setInt(COSName.LAST_CHAR, lastChar);
- font.setItem(COSName.WIDTHS, COSArray.withCOSIntegers(widths));
+ font.setItem(COSName.WIDTHS, COSArray.ofCOSIntegers(widths));
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1FontEmbedder.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1FontEmbedder.java?rev=1883971&r1=1883970&r2=1883971&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1FontEmbedder.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1FontEmbedder.java Tue Dec 1 06:57:05 2020
@@ -97,7 +97,7 @@ class PDType1FontEmbedder
dict.setInt(COSName.FIRST_CHAR, 0);
dict.setInt(COSName.LAST_CHAR, 255);
- dict.setItem(COSName.WIDTHS, COSArray.withCOSIntegers(widths));
+ dict.setItem(COSName.WIDTHS, COSArray.ofCOSIntegers(widths));
dict.setItem(COSName.ENCODING, encoding);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java?rev=1883971&r1=1883970&r2=1883971&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java Tue Dec 1 06:57:05 2020
@@ -484,7 +484,7 @@ public class PDDeviceN extends PDSpecial
*/
public void setColorantNames(List<String> names)
{
- COSArray namesArray = COSArray.withCOSNames(names);
+ COSArray namesArray = COSArray.ofCOSNames(names);
array.set(COLORANT_NAMES, namesArray);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java?rev=1883971&r1=1883970&r2=1883971&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java Tue Dec 1 06:57:05 2020
@@ -263,7 +263,7 @@ public final class PDInlineImage impleme
*/
public void setFilters(List<String> filters)
{
- COSBase obj = COSArray.withCOSNames(filters);
+ COSBase obj = COSArray.ofCOSNames(filters);
parameters.setItem(COSName.F, obj);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java?rev=1883971&r1=1883970&r2=1883971&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java Tue Dec 1 06:57:05 2020
@@ -297,7 +297,7 @@ public class PDSeedValue implements COSO
public void setSubFilter(List<String> subfilter)
{
dictionary.setItem(COSName.SUB_FILTER,
- COSArray.withCOSNames(subfilter));
+ COSArray.ofCOSNames(subfilter));
}
/**
@@ -341,7 +341,7 @@ public class PDSeedValue implements COSO
}
}
dictionary.setItem(COSName.DIGEST_METHOD,
- COSArray.withCOSNames(digestMethod));
+ COSArray.ofCOSNames(digestMethod));
}
/**
@@ -402,7 +402,7 @@ public class PDSeedValue implements COSO
*/
public void setReasons(List<String> reasons)
{
- dictionary.setItem(COSName.REASONS, COSArray.withCOSStrings(reasons));
+ dictionary.setItem(COSName.REASONS, COSArray.ofCOSStrings(reasons));
}
/**
@@ -538,6 +538,6 @@ public class PDSeedValue implements COSO
public void setLegalAttestation(List<String> legalAttestation)
{
dictionary.setItem(COSName.LEGAL_ATTESTATION,
- COSArray.withCOSStrings(legalAttestation));
+ COSArray.ofCOSStrings(legalAttestation));
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java?rev=1883971&r1=1883970&r2=1883971&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java Tue Dec 1 06:57:05 2020
@@ -372,7 +372,7 @@ public class PDSeedValueCertificate impl
public void setKeyUsage(List<String> keyUsageExtensions)
{
dictionary.setItem(COSName.KEY_USAGE,
- COSArray.withCOSStrings(keyUsageExtensions));
+ COSArray.ofCOSStrings(keyUsageExtensions));
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDButton.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDButton.java?rev=1883971&r1=1883970&r2=1883971&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDButton.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDButton.java Tue Dec 1 06:57:05 2020
@@ -271,7 +271,7 @@ public abstract class PDButton extends P
COSArray cosValues;
if (values != null && !values.isEmpty())
{
- cosValues = COSArray.withCOSStrings(values);
+ cosValues = COSArray.ofCOSStrings(values);
getCOSObject().setItem(COSName.OPT, cosValues);
}
else
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoice.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoice.java?rev=1883971&r1=1883970&r2=1883971&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoice.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoice.java Tue Dec 1 06:57:05 2020
@@ -114,7 +114,7 @@ public abstract class PDChoice extends P
Collections.sort(displayValues);
}
getCOSObject().setItem(COSName.OPT,
- COSArray.withCOSStrings(displayValues));
+ COSArray.ofCOSStrings(displayValues));
}
else
{
@@ -253,7 +253,7 @@ public abstract class PDChoice extends P
throw new IllegalArgumentException(
"Setting the indices is not allowed for choice fields not allowing multiple selections.");
}
- getCOSObject().setItem(COSName.I, COSArray.withCOSIntegers(values));
+ getCOSObject().setItem(COSName.I, COSArray.ofCOSIntegers(values));
}
else
{
@@ -414,7 +414,7 @@ public abstract class PDChoice extends P
throw new IllegalArgumentException("The values are not contained in the selectable options.");
}
getCOSObject().setItem(COSName.V,
- COSArray.withCOSStrings(values));
+ COSArray.ofCOSStrings(values));
updateSelectedOptionsIndex(values);
}
else
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSArray.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSArray.java?rev=1883971&r1=1883970&r2=1883971&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSArray.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSArray.java Tue Dec 1 06:57:05 2020
@@ -56,7 +56,7 @@ class TestCOSArray
@Test
void testConvertString2COSNameAndBack()
{
- COSArray cosArray = COSArray.withCOSNames(
+ COSArray cosArray = COSArray.ofCOSNames(
Arrays.asList(COSName.A.getName(), COSName.B.getName(), COSName.C.getName()));
assertEquals(3, cosArray.size());
assertEquals(COSName.A, cosArray.get(0));
@@ -74,7 +74,7 @@ class TestCOSArray
void testConvertString2COSStringAndBack()
{
COSArray cosArray = COSArray
- .withCOSStrings(Arrays.asList("A", "B", "C"));
+ .ofCOSStrings(Arrays.asList("A", "B", "C"));
assertEquals(3, cosArray.size());
assertEquals("A", cosArray.getString(0));
assertEquals("B", cosArray.getString(1));
@@ -90,7 +90,7 @@ class TestCOSArray
@Test
void testConvertInteger2COSStringAndBack()
{
- COSArray cosArray = COSArray.withCOSIntegers(Arrays.asList(1, 2, 3));
+ COSArray cosArray = COSArray.ofCOSIntegers(Arrays.asList(1, 2, 3));
assertEquals(3, cosArray.size());
assertEquals(1, cosArray.getInt(0));
assertEquals(2, cosArray.getInt(1));
@@ -228,11 +228,11 @@ class TestCOSArray
void testRemove()
{
COSArray cosArray = COSArray
- .withCOSIntegers(Arrays.asList(1, 2, 3, 4, 5, 6));
+ .ofCOSIntegers(Arrays.asList(1, 2, 3, 4, 5, 6));
cosArray.clear();
assertEquals(0, cosArray.size());
- cosArray = COSArray.withCOSIntegers(Arrays.asList(1, 2, 3, 4, 5, 6));
+ cosArray = COSArray.ofCOSIntegers(Arrays.asList(1, 2, 3, 4, 5, 6));
assertEquals(COSInteger.get(3), cosArray.remove(2));
// 1,2,4,5,6 should be left
assertEquals(5, cosArray.size());
@@ -246,14 +246,14 @@ class TestCOSArray
assertEquals(4, cosArray.getInt(2));
assertEquals(6, cosArray.getInt(3));
- cosArray = COSArray.withCOSIntegers(Arrays.asList(1, 2, 3, 4, 5, 6));
+ cosArray = COSArray.ofCOSIntegers(Arrays.asList(1, 2, 3, 4, 5, 6));
cosArray.removeAll(Arrays.asList(COSInteger.get(3), COSInteger.get(4)));
// 1,2,5,6 should be left
assertEquals(4, cosArray.size());
assertEquals(2, cosArray.getInt(1));
assertEquals(5, cosArray.getInt(2));
- cosArray = COSArray.withCOSIntegers(Arrays.asList(1, 2, 3, 4, 5, 6));
+ cosArray = COSArray.ofCOSIntegers(Arrays.asList(1, 2, 3, 4, 5, 6));
cosArray.retainAll(Arrays.asList(COSInteger.get(3), COSInteger.get(4)));
// 3,4 should be left
assertEquals(2, cosArray.size());
@@ -287,7 +287,7 @@ class TestCOSArray
void testToList()
{
COSArray cosArray = COSArray
- .withCOSIntegers(Arrays.asList(0, 1, 2, 3, 4, 5));
+ .ofCOSIntegers(Arrays.asList(0, 1, 2, 3, 4, 5));
List<? extends COSBase> list = cosArray.toList();
assertEquals(6, list.size());
assertEquals(COSInteger.get(0), list.get(0));
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFFieldTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFFieldTest.java?rev=1883971&r1=1883970&r2=1883971&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFFieldTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFFieldTest.java Tue Dec 1 06:57:05 2020
@@ -83,7 +83,7 @@ class FDFFieldTest
testList.add("A");
testList.add("B");
- COSArray testCOSArray = COSArray.withCOSStrings(testList);
+ COSArray testCOSArray = COSArray.ofCOSStrings(testList);
FDFField field = new FDFField();
field.setValue(testCOSArray);