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 2020/12/11 12:13:25 UTC
svn commit: r1884308 - in /pdfbox/branches/2.0:
fontbox/src/main/java/org/apache/fontbox/ttf/
xmpbox/src/test/java/org/apache/xmpbox/schema/
Author: msahyoun
Date: Fri Dec 11 12:13:24 2020
New Revision: 1884308
URL: http://svn.apache.org/viewvc?rev=1884308&view=rev
Log:
PDFBOX-5040: fix typo in NameRecord as suggested by NekoCaffeine
Modified:
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/NameRecord.java
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/NamingTable.java
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
pdfbox/branches/2.0/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractSchemaTester.java
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/NameRecord.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/NameRecord.java?rev=1884308&r1=1884307&r2=1884308&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/NameRecord.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/NameRecord.java Fri Dec 11 12:13:24 2020
@@ -38,7 +38,7 @@ public class NameRecord
public static final int ENCODING_UNICODE_2_0_FULL = 4;
// Unicode encoding ids
- public static final int LANGUGAE_UNICODE = 0;
+ public static final int LANGUAGE_UNICODE = 0;
// Windows encoding ids
public static final int ENCODING_WINDOWS_SYMBOL = 0;
@@ -46,13 +46,13 @@ public class NameRecord
public static final int ENCODING_WINDOWS_UNICODE_UCS4 = 10;
// Windows language ids
- public static final int LANGUGAE_WINDOWS_EN_US = 0x0409;
+ public static final int LANGUAGE_WINDOWS_EN_US = 0x0409;
// Macintosh encoding ids
public static final int ENCODING_MACINTOSH_ROMAN = 0;
// Macintosh language ids
- public static final int LANGUGAE_MACINTOSH_ENGLISH = 0;
+ public static final int LANGUAGE_MACINTOSH_ENGLISH = 0;
// name ids
public static final int NAME_COPYRIGHT = 0;
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/NamingTable.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/NamingTable.java?rev=1884308&r1=1884307&r2=1884308&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/NamingTable.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/NamingTable.java Fri Dec 11 12:13:24 2020
@@ -151,13 +151,13 @@ public class NamingTable extends TTFTabl
psName = getName(NameRecord.NAME_POSTSCRIPT_NAME,
NameRecord.PLATFORM_MACINTOSH,
NameRecord.ENCODING_MACINTOSH_ROMAN,
- NameRecord.LANGUGAE_MACINTOSH_ENGLISH);
+ NameRecord.LANGUAGE_MACINTOSH_ENGLISH);
if (psName == null)
{
psName = getName(NameRecord.NAME_POSTSCRIPT_NAME,
NameRecord.PLATFORM_WINDOWS,
NameRecord.ENCODING_WINDOWS_UNICODE_BMP,
- NameRecord.LANGUGAE_WINDOWS_EN_US);
+ NameRecord.LANGUAGE_WINDOWS_EN_US);
}
if (psName != null)
{
@@ -179,7 +179,7 @@ public class NamingTable extends TTFTabl
getName(nameId,
NameRecord.PLATFORM_UNICODE,
i,
- NameRecord.LANGUGAE_UNICODE);
+ NameRecord.LANGUAGE_UNICODE);
if (nameUni != null)
{
return nameUni;
@@ -191,7 +191,7 @@ public class NamingTable extends TTFTabl
getName(nameId,
NameRecord.PLATFORM_WINDOWS,
NameRecord.ENCODING_WINDOWS_UNICODE_BMP,
- NameRecord.LANGUGAE_WINDOWS_EN_US);
+ NameRecord.LANGUAGE_WINDOWS_EN_US);
if (nameWin != null)
{
return nameWin;
@@ -202,7 +202,7 @@ public class NamingTable extends TTFTabl
getName(nameId,
NameRecord.PLATFORM_MACINTOSH,
NameRecord.ENCODING_MACINTOSH_ROMAN,
- NameRecord.LANGUGAE_MACINTOSH_ENGLISH);
+ NameRecord.LANGUAGE_MACINTOSH_ENGLISH);
if (nameMac != null)
{
return nameMac;
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java?rev=1884308&r1=1884307&r2=1884308&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java Fri Dec 11 12:13:24 2020
@@ -272,7 +272,7 @@ public final class TTFSubsetter
{
return nr.getPlatformId() == NameRecord.PLATFORM_WINDOWS
&& nr.getPlatformEncodingId() == NameRecord.ENCODING_WINDOWS_UNICODE_BMP
- && nr.getLanguageId() == NameRecord.LANGUGAE_WINDOWS_EN_US
+ && nr.getLanguageId() == NameRecord.LANGUAGE_WINDOWS_EN_US
&& nr.getNameId() >= 0 && nr.getNameId() < 7;
}
Modified: pdfbox/branches/2.0/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractSchemaTester.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractSchemaTester.java?rev=1884308&r1=1884307&r2=1884308&view=diff
==============================================================================
--- pdfbox/branches/2.0/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractSchemaTester.java (original)
+++ pdfbox/branches/2.0/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractSchemaTester.java Fri Dec 11 12:13:24 2020
@@ -254,11 +254,15 @@ public abstract class AbstractSchemaTest
return;
}
XMPSchema schema = getSchema();
+
+ System.out.println(fieldName);
+
// add value
String setter = "add" + calculateFieldNameForMethod(fieldName);
// TypeDescription<AbstractSimpleProperty> td =
// typeMapping.getSimpleDescription(type);
Object value1 = getJavaValue(type);
+ System.out.println(type);
Method set = getSchemaClass().getMethod(setter, getJavaType(type));
set.invoke(schema, value1);
// retrieve complex property
@@ -268,6 +272,7 @@ public abstract class AbstractSchemaTest
Assert.assertTrue(ocp instanceof ArrayProperty);
ArrayProperty cp = (ArrayProperty) ocp;
// check size is ok (1)
+ System.out.println(cp.getContainer().getAllProperties());
Assert.assertEquals(1, cp.getContainer().getAllProperties().size());
// add a new one
Object value2 = getJavaValue(type);