Author: lehmi
Date: Sat Feb 28 16:08:20 2015
New Revision: 1662954
URL: http://svn.apache.org/r1662954
Log:
PDFBOX-2576: removed double value, fixed 2 values
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.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/PDSignature.java
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java?rev=1662954&r1=1662953&r2=1662954&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
(original)
+++
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
Sat Feb 28 16:08:20 2015
@@ -90,7 +90,7 @@ public class ShowSignature
System.out.println( "Certificate found" );
System.out.println( "Name=" +
cert.getDictionaryObject( COSName.NAME ) );
System.out.println( "Modified=" +
cert.getDictionaryObject( COSName.M ) );
- COSName subFilter =
(COSName)cert.getDictionaryObject( COSName.SUBFILTER );
+ COSName subFilter =
(COSName)cert.getDictionaryObject( COSName.SUB_FILTER );
if( subFilter != null )
{
if( subFilter.getName().equals(
"adbe.x509.rsa_sha1" ) )
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java?rev=1662954&r1=1662953&r2=1662954&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java Sat
Feb 28 16:08:20 2015
@@ -203,8 +203,8 @@ public final class COSName extends COSBa
public static final COSName ENCODING = new COSName("Encoding");
public static final COSName ENCODING_90MS_RKSJ_H = new
COSName("90ms-RKSJ-H");
public static final COSName ENCODING_90MS_RKSJ_V = new
COSName("90ms-RKSJ-V");
- public static final COSName ENCODING_ETEN_B5_H = new COSName("ETen?B5?H");
- public static final COSName ENCODING_ETEN_B5_V = new COSName("ETen?B5?V");
+ public static final COSName ENCODING_ETEN_B5_H = new COSName("ETen-B5-H");
+ public static final COSName ENCODING_ETEN_B5_V = new COSName("ETen-B5-V");
public static final COSName ENCRYPT = new COSName("Encrypt");
public static final COSName ENCRYPT_META_DATA = new
COSName("EncryptMetadata");
public static final COSName END_OF_LINE = new COSName("EndOfLine");
@@ -445,7 +445,6 @@ public final class COSName extends COSBa
public static final COSName STRUCT_PARENTS = new COSName("StructParents");
public static final COSName STRUCT_TREE_ROOT = new
COSName("StructTreeRoot");
public static final COSName SUB_FILTER = new COSName("SubFilter");
- public static final COSName SUBFILTER = new COSName("SubFilter");
public static final COSName SUBJ = new COSName("Subj");
public static final COSName SUBJECT = new COSName("Subject");
public static final COSName SUBTYPE = new COSName("Subtype");
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=1662954&r1=1662953&r2=1662954&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
Sat Feb 28 16:08:20 2015
@@ -283,7 +283,7 @@ public class PDSeedValue implements COSO
public List<String> getSubFilter()
{
List<String> retval = null;
- COSArray fields =
(COSArray)dictionary.getDictionaryObject(COSName.SUBFILTER);
+ COSArray fields =
(COSArray)dictionary.getDictionaryObject(COSName.SUB_FILTER);
if (fields != null)
{
@@ -310,7 +310,7 @@ public class PDSeedValue implements COSO
*/
public void setSubFilter(List<COSName> subfilter)
{
- dictionary.setItem(COSName.SUBFILTER,
COSArrayList.converterToCOSArray(subfilter));
+ dictionary.setItem(COSName.SUB_FILTER,
COSArrayList.converterToCOSArray(subfilter));
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSignature.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSignature.java?rev=1662954&r1=1662953&r2=1662954&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSignature.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSignature.java
Sat Feb 28 16:08:20 2015
@@ -147,7 +147,7 @@ public class PDSignature implements COSO
*/
public void setSubFilter(COSName subfilter)
{
- dictionary.setItem(COSName.SUBFILTER, subfilter);
+ dictionary.setItem(COSName.SUB_FILTER, subfilter);
}
/**
@@ -214,7 +214,7 @@ public class PDSignature implements COSO
*/
public String getSubFilter()
{
- return dictionary.getNameAsString(COSName.SUBFILTER);
+ return dictionary.getNameAsString(COSName.SUB_FILTER);
}
/**
