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/09/05 17:29:26 UTC
svn commit: r1881500 - in /pdfbox/trunk/pdfbox/src:
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/graphics/color/ main/java/org/apache/...
Author: lehmi
Date: Sat Sep 5 17:29:26 2020
New Revision: 1881500
URL: http://svn.apache.org/viewvc?rev=1881500&view=rev
Log:
PDFBOX-4954: use moved methods from COSArray instead of those from COSArrayList
Modified:
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/PDFont.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/form/PDButton.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoice.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFFieldTest.java
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=1881500&r1=1881499&r2=1881500&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 Sat Sep 5 17:29:26 2020
@@ -356,13 +356,11 @@ public class PDStream implements COSObje
if (filters instanceof COSName)
{
COSName name = (COSName) filters;
- retval = new COSArrayList<>(name.getName(), name, stream,
- COSName.F_FILTER);
- }
+ return Collections.singletonList(name.getName());
+ }
else if (filters instanceof COSArray)
{
- retval = COSArrayList
- .convertCOSNameCOSArrayToList((COSArray) filters);
+ retval = ((COSArray) filters).toCOSNameStringList();
}
return retval;
}
@@ -374,7 +372,7 @@ public class PDStream implements COSObje
*/
public void setFileFilters(List<String> filters)
{
- COSBase obj = COSArrayList.convertStringListToCOSNameCOSArray(filters);
+ COSBase obj = COSArray.convertStringListToCOSNameCOSArray(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=1881500&r1=1881499&r2=1881500&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 Sat Sep 5 17:29:26 2020
@@ -231,7 +231,7 @@ public class FDFField implements COSObje
}
else if (value instanceof COSArray)
{
- return COSArrayList.convertCOSStringCOSArrayToList((COSArray) value);
+ return ((COSArray) value).toCOSStringStringList();
}
else if (value instanceof COSString)
{
@@ -295,7 +295,7 @@ public class FDFField implements COSObje
COSBase cos = null;
if (value instanceof List)
{
- cos = COSArrayList.convertStringListToCOSStringCOSArray((List<String>) value);
+ cos = COSArray.convertStringListToCOSStringCOSArray((List<String>) value);
}
else if (value instanceof String)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=1881500&r1=1881499&r2=1881500&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java Sat Sep 5 17:29:26 2020
@@ -519,7 +519,7 @@ public abstract class PDFont implements
COSArray array = dict.getCOSArray(COSName.WIDTHS);
if (array != null)
{
- widths = COSArrayList.convertFloatCOSArrayToList(array);
+ widths = array.toCOSNumberFloatList();
}
else
{
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=1881500&r1=1881499&r2=1881500&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 Sat Sep 5 17:29:26 2020
@@ -33,7 +33,6 @@ import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNull;
-import org.apache.pdfbox.pdmodel.common.COSArrayList;
import org.apache.pdfbox.pdmodel.common.function.PDFunction;
/**
@@ -467,8 +466,7 @@ public class PDDeviceN extends PDSpecial
*/
public List<String> getColorantNames()
{
- COSArray names = (COSArray)array.getObject(COLORANT_NAMES);
- return COSArrayList.convertCOSNameCOSArrayToList(names);
+ return ((COSArray) array.getObject(COLORANT_NAMES)).toCOSNameStringList();
}
/**
@@ -486,7 +484,7 @@ public class PDDeviceN extends PDSpecial
*/
public void setColorantNames(List<String> names)
{
- COSArray namesArray = COSArrayList.convertStringListToCOSNameCOSArray(names);
+ COSArray namesArray = COSArray.convertStringListToCOSNameCOSArray(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=1881500&r1=1881499&r2=1881500&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 Sat Sep 5 17:29:26 2020
@@ -35,7 +35,6 @@ import org.apache.pdfbox.filter.DecodeRe
import org.apache.pdfbox.filter.Filter;
import org.apache.pdfbox.filter.FilterFactory;
import org.apache.pdfbox.pdmodel.PDResources;
-import org.apache.pdfbox.pdmodel.common.COSArrayList;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
@@ -244,18 +243,17 @@ public final class PDInlineImage impleme
*/
public List<String> getFilters()
{
- List<String> names = Collections.emptyList();
COSBase filters = parameters.getDictionaryObject(COSName.F, COSName.FILTER);
if (filters instanceof COSName)
{
COSName name = (COSName) filters;
- names = new COSArrayList<>(name.getName(), name, parameters, COSName.FILTER);
+ return Collections.singletonList(name.getName());
}
else if (filters instanceof COSArray)
{
- names = COSArrayList.convertCOSNameCOSArrayToList((COSArray) filters);
+ return ((COSArray) filters).toCOSNameStringList();
}
- return names;
+ return Collections.emptyList();
}
/**
@@ -265,7 +263,7 @@ public final class PDInlineImage impleme
*/
public void setFilters(List<String> filters)
{
- COSBase obj = COSArrayList.convertStringListToCOSNameCOSArray(filters);
+ COSBase obj = COSArray.convertStringListToCOSNameCOSArray(filters);
parameters.setItem(COSName.F, obj);
}
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=1881500&r1=1881499&r2=1881500&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 Sat Sep 5 17:29:26 2020
@@ -21,10 +21,8 @@ import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSString;
-import org.apache.pdfbox.pdmodel.common.COSArrayList;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
@@ -234,13 +232,11 @@ public abstract class PDButton extends P
if (value instanceof COSString)
{
- List<String> array = new ArrayList<>();
- array.add(((COSString) value).getString());
- return array;
+ return Collections.singletonList(((COSString) value).getString());
}
else if (value instanceof COSArray)
{
- return COSArrayList.convertCOSStringCOSArrayToList((COSArray)value);
+ return ((COSArray) value).toCOSStringStringList();
}
return Collections.emptyList();
}
@@ -256,7 +252,7 @@ public abstract class PDButton extends P
COSArray cosValues;
if (values != null && !values.isEmpty())
{
- cosValues = COSArrayList.convertStringListToCOSStringCOSArray(values);
+ cosValues = COSArray.convertStringListToCOSStringCOSArray(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=1881500&r1=1881499&r2=1881500&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 Sat Sep 5 17:29:26 2020
@@ -114,7 +114,8 @@ public abstract class PDChoice extends P
{
Collections.sort(displayValues);
}
- getCOSObject().setItem(COSName.OPT, COSArrayList.convertStringListToCOSStringCOSArray(displayValues));
+ getCOSObject().setItem(COSName.OPT,
+ COSArray.convertStringListToCOSStringCOSArray(displayValues));
}
else
{
@@ -226,7 +227,7 @@ public abstract class PDChoice extends P
COSBase value = getCOSObject().getDictionaryObject(COSName.I);
if (value instanceof COSArray)
{
- return COSArrayList.convertIntegerCOSArrayToList((COSArray) value);
+ return ((COSArray) value).toCOSNumberIntegerList();
}
return Collections.emptyList();
}
@@ -413,7 +414,8 @@ public abstract class PDChoice extends P
{
throw new IllegalArgumentException("The values are not contained in the selectable options.");
}
- getCOSObject().setItem(COSName.V, COSArrayList.convertStringListToCOSStringCOSArray(values));
+ getCOSObject().setItem(COSName.V,
+ COSArray.convertStringListToCOSStringCOSArray(values));
updateSelectedOptionsIndex(values);
}
else
@@ -454,13 +456,11 @@ public abstract class PDChoice extends P
COSBase value = getCOSObject().getDictionaryObject(name);
if (value instanceof COSString)
{
- List<String> array = new ArrayList<>();
- array.add(((COSString) value).getString());
- return array;
+ return Collections.singletonList(((COSString) value).getString());
}
else if (value instanceof COSArray)
{
- return COSArrayList.convertCOSStringCOSArrayToList((COSArray)value);
+ return ((COSArray) value).toCOSStringStringList();
}
return Collections.emptyList();
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java?rev=1881500&r1=1881499&r2=1881500&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java Sat Sep 5 17:29:26 2020
@@ -260,7 +260,7 @@ public abstract class PDField implements
}
else if (fieldValue instanceof COSArray && this instanceof PDChoice)
{
- ((PDChoice) this).setValue(COSArrayList.convertCOSStringCOSArrayToList((COSArray) fieldValue));
+ ((PDChoice) this).setValue(((COSArray) fieldValue).toCOSStringStringList());
}
else
{
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=1881500&r1=1881499&r2=1881500&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 Sat Sep 5 17:29:26 2020
@@ -29,7 +29,6 @@ import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.cos.COSString;
-import org.apache.pdfbox.pdmodel.common.COSArrayList;
import org.junit.Test;
/*
@@ -84,7 +83,7 @@ public class FDFFieldTest
testList.add("A");
testList.add("B");
- COSArray testCOSArray = COSArrayList.convertStringListToCOSStringCOSArray(testList);
+ COSArray testCOSArray = COSArray.convertStringListToCOSStringCOSArray(testList);
FDFField field = new FDFField();
field.setValue(testCOSArray);