svn commit: r1687676 - /pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/

2015-06-26 Thread msahyoun
Author: msahyoun
Date: Fri Jun 26 06:33:09 2015
New Revision: 1687676

URL: http://svn.apache.org/r1687676
Log:
empty javadocs

Added:
pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/



svn commit: r956030 - in /websites/staging/pdfbox/trunk/content: ./ docs/2.0.0-SNAPSHOT/javadocs/

2015-06-26 Thread buildbot
Author: buildbot
Date: Fri Jun 26 06:33:43 2015
New Revision: 956030

Log:
Staging update by buildbot for pdfbox

Removed:
websites/staging/pdfbox/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/
Modified:
websites/staging/pdfbox/trunk/content/   (props changed)

Propchange: websites/staging/pdfbox/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Jun 26 06:33:43 2015
@@ -1 +1 @@
-1679875
+1687676




buildbot success in ASF Buildbot on pdfbox-site-staging

2015-06-26 Thread buildbot
The Buildbot has detected a restored build on builder pdfbox-site-staging while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/pdfbox-site-staging/builds/127

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The AnyBranchScheduler scheduler named 'on-pdfbox-site-commit' 
triggered this build
Build Source Stamp: [branch pdfbox/cmssite] 1687676
Blamelist: msahyoun

Build succeeded!

Sincerely,
 -The Buildbot





svn commit: r1687677 - /pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/

2015-06-26 Thread msahyoun
Author: msahyoun
Date: Fri Jun 26 06:35:27 2015
New Revision: 1687677

URL: http://svn.apache.org/r1687677
Log:
new snapshot dir

Added:
pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/



svn commit: r956031 - in /websites/staging/pdfbox/trunk/content: ./ docs/2.0.0-SNAPSHOT/

2015-06-26 Thread buildbot
Author: buildbot
Date: Fri Jun 26 06:35:42 2015
New Revision: 956031

Log:
Staging update by buildbot for pdfbox

Removed:
websites/staging/pdfbox/trunk/content/docs/2.0.0-SNAPSHOT/
Modified:
websites/staging/pdfbox/trunk/content/   (props changed)

Propchange: websites/staging/pdfbox/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Jun 26 06:35:42 2015
@@ -1 +1 @@
-1687676
+1687677




svn commit: r1687678 - in /pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs: ./ org/ org/apache/ org/apache/pdfbox/ org/apache/pdfbox/contentstream/ org/apache/pdfbox/contentstream/class-use/

2015-06-26 Thread msahyoun
Author: msahyoun
Date: Fri Jun 26 06:38:20 2015
New Revision: 1687678

URL: http://svn.apache.org/r1687678
Log:
updated javadocs


[This commit notification would consist of 266 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]


svn commit: r956032 - in /websites/staging/pdfbox/trunk/content: ./ docs/2.0.0-SNAPSHOT/ docs/2.0.0-SNAPSHOT/javadocs/ docs/2.0.0-SNAPSHOT/javadocs/org/ docs/2.0.0-SNAPSHOT/javadocs/org/apache/ docs/2

2015-06-26 Thread buildbot
Author: buildbot
Date: Fri Jun 26 06:39:41 2015
New Revision: 956032

Log:
Staging update by buildbot for pdfbox


[This commit notification would consist of 264 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]


svn commit: r956033 - /websites/production/pdfbox/content/

2015-06-26 Thread msahyoun
Author: msahyoun
Date: Fri Jun 26 06:41:06 2015
New Revision: 956033

Log:
update javadoc

Added:
websites/production/pdfbox/content/
  - copied from r956032, websites/staging/pdfbox/trunk/content/



svn commit: r1687802 - in /pdfbox/trunk/pdfbox/src: main/java/org/apache/pdfbox/io/SequenceRandomAccessRead.java test/java/org/apache/pdfbox/io/TestRandomAccessBuffer.java

2015-06-26 Thread lehmi
Author: lehmi
Date: Fri Jun 26 16:22:12 2015
New Revision: 1687802

URL: http://svn.apache.org/r1687802
Log:
PDFBOX-2301: bugfix buffer switch, improve test cases

Modified:

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/SequenceRandomAccessRead.java

pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/io/TestRandomAccessBuffer.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/SequenceRandomAccessRead.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/SequenceRandomAccessRead.java?rev=1687802r1=1687801r2=1687802view=diff
==
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/SequenceRandomAccessRead.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/SequenceRandomAccessRead.java
 Fri Jun 26 16:22:12 2015
@@ -91,8 +91,7 @@ public class SequenceRandomAccessRead im
 {
 if (currentIndex  maxIndex)
 {
-currentIndex++;
-switchBuffer(currentIndex, false);
+switchBuffer(currentIndex + 1);
 return true;
 }
 return false;
@@ -102,24 +101,16 @@ public class SequenceRandomAccessRead im
  * Switch to buffer with the given index.
  * 
  * @param index the index of the buffer to be switched to
- * @param calculatePosition calculate the new position if set to true
  * 
  * @throws IOException if the given index exceeds the available number of 
buffers
  */
-private void switchBuffer(int index, boolean calculatePosition) throws 
IOException
+private void switchBuffer(int index) throws IOException
 {
+currentIndex = index;
 currentBuffer = source.get(index);
 currentBufferPosition = 0;
-currentBuffer.seek(currentBufferPosition);
 currentBufferLength = sourceLength.get(index);
-if (calculatePosition)
-{
-currentPosition = 0;
-for (int i = 0; i  index; i++)
-{
-currentPosition += sourceLength.get(i);
-}
-}
+currentBuffer.seek(currentBufferPosition);
 }
 
 /** Returns offset in file at which next byte would be read. */
@@ -144,7 +135,7 @@ public class SequenceRandomAccessRead im
 // new position beyond EOF
 if (newPosition = bufferLength)
 {
-switchBuffer(maxIndex, false);
+switchBuffer(maxIndex);
 currentBufferPosition = sourceLength.get(currentIndex);
 currentPosition = newPosition;
 currentBuffer.seek(currentBufferPosition);
@@ -159,8 +150,13 @@ public class SequenceRandomAccessRead im
 }
 if (currentIndex != index)
 {
-switchBuffer(index, true);
-currentBufferPosition = newPosition - currentPosition;
+switchBuffer(index);
+long startPostion = 0;
+for (int i = 0; i  index; i++)
+{
+startPostion += sourceLength.get(i);
+}
+currentBufferPosition = newPosition - startPostion;
 }
 else
 {
@@ -211,7 +207,7 @@ public class SequenceRandomAccessRead im
 int bytesRead = bytesReadTotal;
 while (bytesReadTotal  len  bytesRead  0)
 {
-bytesRead = read(b, bytesRead, len - bytesRead);
+bytesRead = read(b, off + bytesRead, len - bytesRead);
 bytesReadTotal += bytesRead;
 }
 return bytesReadTotal;

Modified: 
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/io/TestRandomAccessBuffer.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/io/TestRandomAccessBuffer.java?rev=1687802r1=1687801r2=1687802view=diff
==
--- 
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/io/TestRandomAccessBuffer.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/io/TestRandomAccessBuffer.java
 Fri Jun 26 16:22:12 2015
@@ -287,15 +287,18 @@ public class TestRandomAccessBuffer exte
 public void testSequenceRandomAccessRead() throws IOException
 {
 RandomAccessBuffer buffer1 = new RandomAccessBuffer();
-buffer1.write(new byte[] {1,2,3});
+buffer1.write(new byte[] {0,1,2,3});
 RandomAccessBuffer buffer2 = new RandomAccessBuffer();
-buffer2.write(new byte[] {4,5,6,7});
+buffer2.write(new byte[] {4});
 RandomAccessBuffer buffer3 = new RandomAccessBuffer();
-buffer3.write(new byte[] {8,9,10,11,12});
+buffer3.write(new byte[] {5,6,7});
+RandomAccessBuffer buffer4 = new RandomAccessBuffer();
+buffer4.write(new byte[] {8,9,10,11,12});
 VectorRandomAccessRead buffers = new VectorRandomAccessRead();
 

svn commit: r1687838 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java

2015-06-26 Thread lehmi
Author: lehmi
Date: Fri Jun 26 19:02:29 2015
New Revision: 1687838

URL: http://svn.apache.org/r1687838
Log:
PDFBOX-2301: omit empty streams

Modified:

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java?rev=1687838r1=1687837r2=1687838view=diff
==
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java
 Fri Jun 26 19:02:29 2015
@@ -173,12 +173,17 @@ public class COSStreamArray extends COSS
 for( int i=0;istreams.size(); i++ )
 {
 COSStream stream = (COSStream)streams.getObject( i );
-input.add( stream.getUnfilteredRandomAccess() );
-//handle the case where there is no whitespace in the
-//between streams in the contents array, without this
-//it is possible that two operators will get concatenated
-//together
-input.add( new RandomAccessBuffer( inbetweenStreamBytes ) );
+RandomAccessRead randomAccess = stream.getUnfilteredRandomAccess();
+// omit empty streams
+if (randomAccess.length()  0)
+{
+input.add( randomAccess );
+//handle the case where there is no whitespace in the
+//between streams in the contents array, without this
+//it is possible that two operators will get concatenated
+//together
+input.add( new RandomAccessBuffer( inbetweenStreamBytes ) );
+}
 }
 return new SequenceRandomAccessRead(input);
 }




svn commit: r1687878 [1/2] - in /pdfbox/trunk: fontbox/src/main/java/org/apache/fontbox/ fontbox/src/main/java/org/apache/fontbox/cff/ fontbox/src/main/java/org/apache/fontbox/ttf/ fontbox/src/main/ja

2015-06-26 Thread jahewson
Author: jahewson
Date: Sat Jun 27 00:18:21 2015
New Revision: 1687878

URL: http://svn.apache.org/r1687878
Log:
PDFBOX-2842: Overhaul font substitution

Added:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/EncodedFont.java   
(with props)
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/FontBoxFont.java   
(with props)

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/CIDFontMapping.java
   (with props)

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontCache.java 
  (with props)

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontFormat.java
   (with props)

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontInfo.java  
 (with props)

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapper.java
  - copied, changed from r1687667, 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ExternalFonts.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapping.java
   (with props)

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDVectorFont.java
   (with props)

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/BuiltInEncoding.java
   (with props)
Removed:

pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/Type1Equivalent.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ExternalFonts.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Equivalent.java

pdfbox/trunk/pdfbox/src/main/resources/org/apache/pdfbox/resources/otf/AdobeBlank.otf
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCIDFont.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFFont.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFType1Font.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/IndexData.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeFont.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Font.java
pdfbox/trunk/pdfbox/pom.xml
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontProvider.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDSystemInfo.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/CIDType0Glyph2D.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TTFGlyph2D.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/Type1Glyph2D.java

pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type1FontValidator.java

pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/container/Type1Container.java

pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/Type1DescriptorHelper.java

Added: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/EncodedFont.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/EncodedFont.java?rev=1687878view=auto
==
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/EncodedFont.java 
(added)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/EncodedFont.java Sat 
Jun 27 00:18:21 2015
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, 

svn commit: r1687879 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapper.java

2015-06-26 Thread jahewson
Author: jahewson
Date: Sat Jun 27 00:31:45 2015
New Revision: 1687879

URL: http://svn.apache.org/r1687879
Log:
PDFBOX-2842: Make FontMapper package-private

Modified:

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapper.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapper.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapper.java?rev=1687879r1=1687878r2=1687879view=diff
==
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapper.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapper.java
 Sat Jun 27 00:31:45 2015
@@ -41,7 +41,7 @@ import org.apache.fontbox.type1.Type1Fon
  *
  * @author John Hewson
  */
-public final class FontMapper
+final class FontMapper
 {
 private FontMapper() {}
 




svn commit: r1687867 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java

2015-06-26 Thread tilman
Author: tilman
Date: Fri Jun 26 22:26:11 2015
New Revision: 1687867

URL: http://svn.apache.org/r1687867
Log:
PDFBOX-2576: use interface

Modified:

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java?rev=1687867r1=1687866r2=1687867view=diff
==
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java
 Fri Jun 26 22:26:11 2015
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.SequenceInputStream;
+import java.util.List;
 import java.util.Vector;
 
 import org.apache.pdfbox.cos.COSArray;
@@ -167,7 +168,7 @@ public class COSStreamArray extends COSS
 @Override
 public RandomAccessRead getUnfilteredRandomAccess() throws IOException
 {
-VectorRandomAccessRead input = new VectorRandomAccessRead();
+ListRandomAccessRead input = new VectorRandomAccessRead();
 byte[] inbetweenStreamBytes = \n.getBytes(ISO-8859-1);
 
 for( int i=0;istreams.size(); i++ )




svn commit: r1687869 - /pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/pdfdebugger/flagbitspane/FlagBitsPane.java

2015-06-26 Thread tilman
Author: tilman
Date: Fri Jun 26 22:29:25 2015
New Revision: 1687869

URL: http://svn.apache.org/r1687869
Log:
PDFBOX-2530: set constant all caps

Modified:

pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/pdfdebugger/flagbitspane/FlagBitsPane.java

Modified: 
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/pdfdebugger/flagbitspane/FlagBitsPane.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/pdfdebugger/flagbitspane/FlagBitsPane.java?rev=1687869r1=1687868r2=1687869view=diff
==
--- 
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/pdfdebugger/flagbitspane/FlagBitsPane.java
 (original)
+++ 
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/pdfdebugger/flagbitspane/FlagBitsPane.java
 Fri Jun 26 22:29:25 2015
@@ -42,7 +42,7 @@ import org.apache.pdfbox.pdmodel.interac
  */
 public class FlagBitsPane
 {
-private final static String[] columnNames = {Bit\nPosition, Name, 
Status};
+private static final String[] COLUMNNAMES = {Bit\nPosition, Name, 
Status};
 private JPanel panel;
 
 /**
@@ -74,7 +74,7 @@ public class FlagBitsPane
 flagValueLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
 flagValueLabel.setFont(new Font(Font.MONOSPACED, Font.BOLD, 20));
 
-JTable table = new JTable(flagBits, columnNames);
+JTable table = new JTable(flagBits, COLUMNNAMES);
 JScrollPane scrollPane = new JScrollPane(table);
 table.setFillsViewportHeight(true);
 scrollPane.setAlignmentX(Component.LEFT_ALIGNMENT);




svn commit: r1687753 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form: PDButton.java PDPushButton.java

2015-06-26 Thread msahyoun
Author: msahyoun
Date: Fri Jun 26 11:14:54 2015
New Revision: 1687753

URL: http://svn.apache.org/r1687753
Log:
PDFBOX-2841: new method to get/set the fields export values

Modified:

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/PDPushButton.java

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=1687753r1=1687752r2=1687753view=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
 Fri Jun 26 11:14:54 2015
@@ -163,6 +163,61 @@ public abstract class PDButton extends P
 dictionary.setItem(COSName.OPT, cosValues);
 }
 
+
+/**
+ * This will get the export values.
+ * 
+ * pThe export values are defined in the field dictionaries /Opt key./p
+ * 
+ * pThe option values are used to define the export values
+ * for the field to 
+ * ul
+ *  lihold values in non-Latin writing systems as name objects, which 
represent the field value, are limited
+ *  to PDFDocEncoding
+ *  /li
+ *  liallow radio buttons having the same export value to be handled 
independently
+ *  /li
+ * /ul
+ * /p
+ * 
+ * @return List containing all possible export values. If there is no Opt 
entry an empty list will be returned.
+ */
+public ListString getExportValues()
+{
+COSBase value = getInheritableAttribute(COSName.OPT);
+if (value instanceof COSString)
+{
+ListString array = new ArrayListString();
+array.add(((COSString) value).getString());
+return array;
+}
+else if (value instanceof COSArray)
+{
+return 
COSArrayList.convertCOSStringCOSArrayToList((COSArray)value);
+}
+return Collections.emptyList();
+}
+
+/**
+ * This will set the export values.
+ * 
+ * @see #getExportValues()
+ * @param values List containing all possible export values. Supplying 
null or an empty list will remove the Opt entry.
+ */
+public void setExportValues(ListString values)
+{
+COSArray cosValues = null;
+if (values != null  !values.isEmpty())
+{
+cosValues = 
COSArrayList.convertStringListToCOSStringCOSArray(values);
+dictionary.setItem(COSName.OPT, cosValues);
+}
+else
+{
+dictionary.removeItem(COSName.OPT);
+}
+}
+
 @Override
 void constructAppearances() throws IOException
 {

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDPushButton.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDPushButton.java?rev=1687753r1=1687752r2=1687753view=diff
==
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDPushButton.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDPushButton.java
 Fri Jun 26 11:14:54 2015
@@ -68,6 +68,21 @@ public class PDPushButton extends PDButt
 }
 
 @Override
+public ListString getExportValues()
+{
+return Collections.emptyList();
+}
+
+@Override
+public void setExportValues(ListString values)
+{
+if (values != null  !values.isEmpty())
+{
+throw new IllegalArgumentException(A PDPushButton shall not use 
the Opt entry in the field dictionary);
+}
+}
+
+@Override
 public String getValueAsString()
 {
 return ;




svn commit: r1687747 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoice.java

2015-06-26 Thread msahyoun
Author: msahyoun
Date: Fri Jun 26 10:52:56 2015
New Revision: 1687747

URL: http://svn.apache.org/r1687747
Log:
PDFBOX-2576: correct javadoc

Modified:

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoice.java

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=1687747r1=1687746r2=1687747view=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
 Fri Jun 26 10:52:56 2015
@@ -425,7 +425,7 @@ public abstract class PDChoice extends P
 }
 
 /**
- * Returns the selected values, or an empty string. This list always 
contains a single item
+ * Returns the selected values, or an empty List. This list always 
contains a single item
  * unless {@link #isMultiSelect()} is true.
  *
  * @return A non-null string.
@@ -436,7 +436,7 @@ public abstract class PDChoice extends P
 }
 
 /**
- * Returns the default values, or an empty string. This list always 
contains a single item
+ * Returns the default values, or an empty List. This list always contains 
a single item
  * unless {@link #isMultiSelect()} is true.
  *
  * @return A non-null string.
@@ -447,7 +447,7 @@ public abstract class PDChoice extends P
 }
 
 /**
- * Returns the selected values, or an empty string, for the given key.
+ * Returns the selected values, or an empty List, for the given key.
  */
 private ListString getValueFor(COSName name)
 {