You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2019/12/25 11:36:21 UTC
svn commit: r1871961 - in /pdfbox/branches/2.0/pdfbox/src:
main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java
test/java/org/apache/pdfbox/pdmodel/common/COSArrayListTest.java
Author: msahyoun
Date: Wed Dec 25 11:36:21 2019
New Revision: 1871961
URL: http://svn.apache.org/viewvc?rev=1871961&view=rev
Log:
PDFBOX-4669: simplify code for remove; enhance unit test
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/COSArrayListTest.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java?rev=1871961&r1=1871960&r2=1871961&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java Wed Dec 25 11:36:21 2019
@@ -652,10 +652,8 @@ public class COSArrayList<E> implements
throw new UnsupportedOperationException("removing entries from a filtered List is not permitted");
}
- E toBeRemoved = actual.get(index);
array.remove(index);
- actual.remove(index);
- return toBeRemoved;
+ return actual.remove(index);
}
/**
Modified: pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/COSArrayListTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/COSArrayListTest.java?rev=1871961&r1=1871960&r2=1871961&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/COSArrayListTest.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/COSArrayListTest.java Wed Dec 25 11:36:21 2019
@@ -147,8 +147,9 @@ public class COSArrayListTest {
COSArrayList<PDAnnotation> cosArrayList = new COSArrayList<PDAnnotation>(annotationsList, annotationsArray);
int positionToRemove = 2;
- cosArrayList.remove(positionToRemove);
+ PDAnnotation toBeRemoved = cosArrayList.get(positionToRemove);
+ assertEquals("Remove operation shall return the removed object",toBeRemoved, cosArrayList.remove(positionToRemove));
assertTrue("List size shall be 3", cosArrayList.size() == 3);
assertTrue("COSArray size shall be 3", annotationsArray.size() == 3);