You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by gb...@apache.org on 2012/07/28 10:48:04 UTC
svn commit: r1366613 - in /pdfbox/trunk:
preflight/src/main/java/org/apache/padaf/preflight/font/
preflight/src/main/java/org/apache/pdfbox/preflight/font/util/
xmpbox/src/main/java/org/apache/padaf/xmpbox/
xmpbox/src/main/java/org/apache/padaf/xmpbox/...
Author: gbailleul
Date: Sat Jul 28 08:48:02 2012
New Revision: 1366613
URL: http://svn.apache.org/viewvc?rev=1366613&view=rev
Log:
PDFBOX-1366: break cyclic dependency, changed unappropriate class names
Added:
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/FieldDescription.java
- copied, changed from r1366609, pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/FieldDescription.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/NSMapping.java
- copied, changed from r1366609, pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/NSMapping.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/ValueTypeDescription.java
- copied, changed from r1366609, pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ValueTypeDescription.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ArrayProperty.java
- copied, changed from r1366609, pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ComplexProperty.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PropertyType.java
- copied, changed from r1366604, pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PropertyType.java
Removed:
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/NSMapping.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PropertyType.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ComplexProperty.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/FieldDescription.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ValueTypeDescription.java
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/font/FontMetaDataValidation.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/FontMetaDataValidation.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/BuildPDFExtensionSchemaHelper.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/PDFAExtentionSchemaPreprocessor.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/StructuredPropertyParser.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMLValueTypeDescriptionManager.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMPDocumentBuilder.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMPDocumentPreprocessor.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/AdobePDFSchema.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/DublinCoreSchema.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAExtensionSchema.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAFieldDescription.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAIdentificationSchema.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PhotoshopSchema.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/SchemaMapping.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPBasicJobTicketSchema.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPBasicSchema.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPMediaManagementSchema.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPRightsManagementSchema.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPSchema.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/JobType.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/LayerType.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceEventType.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceRefType.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ThumbnailType.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/TypeMapping.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/TypeUtil.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/VersionType.java
pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/BirthCertificateSchemaWithXMLDescriptions.java
pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/parser/XMLValueTypeDescriptionManagerTest.java
pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/AbstractSchemaTester.java
pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/AbstractXMPSchemaTest.java
pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/XMPSchemaTest.java
pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TestAbstractStructuredType.java
pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TypeTestingHelper.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/font/FontMetaDataValidation.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/font/FontMetaDataValidation.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/font/FontMetaDataValidation.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/font/FontMetaDataValidation.java Sat Jul 28 08:48:02 2012
@@ -34,7 +34,7 @@ import org.apache.padaf.xmpbox.schema.Du
import org.apache.padaf.xmpbox.schema.XMPRightsManagementSchema;
import org.apache.padaf.xmpbox.type.AbstractField;
import org.apache.padaf.xmpbox.type.BooleanType;
-import org.apache.padaf.xmpbox.type.ComplexProperty;
+import org.apache.padaf.xmpbox.type.ArrayProperty;
import org.apache.padaf.xmpbox.type.TextType;
import org.apache.pdfbox.pdmodel.font.PDFontDescriptor;
@@ -156,7 +156,7 @@ public class FontMetaDataValidation {
DublinCoreSchema dc = metadata.getDublinCoreSchema();
if (dc != null) {
- ComplexProperty copyrights = dc.getRightsProperty();
+ ArrayProperty copyrights = dc.getRightsProperty();
if (copyrights == null || copyrights.getContainer() == null
|| copyrights.getContainer().getAllProperties().isEmpty()) {
ve
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/FontMetaDataValidation.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/FontMetaDataValidation.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/FontMetaDataValidation.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/FontMetaDataValidation.java Sat Jul 28 08:48:02 2012
@@ -31,7 +31,7 @@ import org.apache.padaf.xmpbox.schema.Du
import org.apache.padaf.xmpbox.schema.XMPRightsManagementSchema;
import org.apache.padaf.xmpbox.type.AbstractField;
import org.apache.padaf.xmpbox.type.BooleanType;
-import org.apache.padaf.xmpbox.type.ComplexProperty;
+import org.apache.padaf.xmpbox.type.ArrayProperty;
import org.apache.padaf.xmpbox.type.TextType;
import org.apache.pdfbox.pdmodel.font.PDFontDescriptor;
import org.apache.pdfbox.preflight.PreflightConstants;
@@ -151,7 +151,7 @@ public class FontMetaDataValidation {
DublinCoreSchema dc = metadata.getDublinCoreSchema();
if (dc != null) {
- ComplexProperty copyrights = dc.getRightsProperty();
+ ArrayProperty copyrights = dc.getRightsProperty();
if (copyrights == null || copyrights.getContainer() == null
|| copyrights.getContainer().getAllProperties().isEmpty()) {
ve
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/BuildPDFExtensionSchemaHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/BuildPDFExtensionSchemaHelper.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/BuildPDFExtensionSchemaHelper.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/BuildPDFExtensionSchemaHelper.java Sat Jul 28 08:48:02 2012
@@ -29,13 +29,13 @@ import org.apache.padaf.xmpbox.parser.XM
import org.apache.padaf.xmpbox.parser.XMLValueTypeDescriptionManager;
import org.apache.padaf.xmpbox.schema.PDFAExtensionSchema;
import org.apache.padaf.xmpbox.schema.PropertyExtensionDefinition;
-import org.apache.padaf.xmpbox.schema.PropertyType;
import org.apache.padaf.xmpbox.schema.SchemaDescription;
import org.apache.padaf.xmpbox.schema.SchemaExtensionDefinition;
+import org.apache.padaf.xmpbox.schema.ValueTypeDescription;
import org.apache.padaf.xmpbox.schema.XMPSchema;
import org.apache.padaf.xmpbox.type.BadFieldValueException;
import org.apache.padaf.xmpbox.type.PropertyDescription;
-import org.apache.padaf.xmpbox.type.ValueTypeDescription;
+import org.apache.padaf.xmpbox.type.PropertyType;
/**
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/PDFAExtentionSchemaPreprocessor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/PDFAExtentionSchemaPreprocessor.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/PDFAExtentionSchemaPreprocessor.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/PDFAExtentionSchemaPreprocessor.java Sat Jul 28 08:48:02 2012
@@ -27,6 +27,7 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamReader;
import org.apache.padaf.xmpbox.XMPMetadata;
+import org.apache.padaf.xmpbox.schema.NSMapping;
import org.apache.padaf.xmpbox.schema.PDFAExtensionSchema;
import org.apache.padaf.xmpbox.type.BadFieldValueException;
import org.apache.padaf.xmpbox.type.TypeMapping;
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/StructuredPropertyParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/StructuredPropertyParser.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/StructuredPropertyParser.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/StructuredPropertyParser.java Sat Jul 28 08:48:02 2012
@@ -33,11 +33,11 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamReader;
import org.apache.padaf.xmpbox.XMPMetadata;
-import org.apache.padaf.xmpbox.schema.PropertyType;
import org.apache.padaf.xmpbox.type.AbstractField;
import org.apache.padaf.xmpbox.type.AbstractSimpleProperty;
import org.apache.padaf.xmpbox.type.AbstractStructuredType;
import org.apache.padaf.xmpbox.type.ComplexPropertyContainer;
+import org.apache.padaf.xmpbox.type.PropertyType;
import org.apache.padaf.xmpbox.type.TypeDescription;
import org.apache.padaf.xmpbox.type.TypeMapping;
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMLValueTypeDescriptionManager.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMLValueTypeDescriptionManager.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMLValueTypeDescriptionManager.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMLValueTypeDescriptionManager.java Sat Jul 28 08:48:02 2012
@@ -27,9 +27,9 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.padaf.xmpbox.BuildPDFAExtensionSchemaDescriptionException;
+import org.apache.padaf.xmpbox.schema.FieldDescription;
+import org.apache.padaf.xmpbox.schema.ValueTypeDescription;
import org.apache.padaf.xmpbox.schema.XMPSchema;
-import org.apache.padaf.xmpbox.type.FieldDescription;
-import org.apache.padaf.xmpbox.type.ValueTypeDescription;
import org.apache.pdfbox.io.IOUtils;
import com.thoughtworks.xstream.XStream;
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMPDocumentBuilder.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMPDocumentBuilder.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMPDocumentBuilder.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMPDocumentBuilder.java Sat Jul 28 08:48:02 2012
@@ -42,6 +42,7 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.padaf.xmpbox.CreateXMPMetadataException;
import org.apache.padaf.xmpbox.XMPMetadata;
import org.apache.padaf.xmpbox.XmpConstants;
+import org.apache.padaf.xmpbox.schema.NSMapping;
import org.apache.padaf.xmpbox.schema.PDFAExtensionSchema;
import org.apache.padaf.xmpbox.schema.PDFAFieldDescription;
import org.apache.padaf.xmpbox.schema.SchemaDescription;
@@ -51,7 +52,7 @@ import org.apache.padaf.xmpbox.type.Abst
import org.apache.padaf.xmpbox.type.AbstractStructuredType;
import org.apache.padaf.xmpbox.type.Attribute;
import org.apache.padaf.xmpbox.type.BadFieldValueException;
-import org.apache.padaf.xmpbox.type.ComplexProperty;
+import org.apache.padaf.xmpbox.type.ArrayProperty;
import org.apache.padaf.xmpbox.type.ComplexPropertyContainer;
import org.apache.padaf.xmpbox.type.TextType;
import org.apache.padaf.xmpbox.type.TypeDescription;
@@ -655,7 +656,7 @@ public class XMPDocumentBuilder {
expectNextSpecificTag(XMLStreamReader.START_ELEMENT, "schemas",
"Cannot find container declaration of schemas descriptions ");
// <rdf:Bag>
- expectNextSpecificTag(XMLStreamReader.START_ELEMENT, ComplexProperty.UNORDERED_ARRAY,
+ expectNextSpecificTag(XMLStreamReader.START_ELEMENT, ArrayProperty.UNORDERED_ARRAY,
"Cannot find bag declaration for container of schemas descriptions");
// now work on each rdf:li corresponding to each schema description
int type = reader.get().nextTag();
@@ -758,7 +759,7 @@ public class XMPDocumentBuilder {
XMPMetadata metadata) throws XmpParsingException,
XMLStreamException {
// <rdf:Seq>
- expectNextSpecificTag(XMLStreamReader.START_ELEMENT, ComplexProperty.ORDERED_ARRAY,
+ expectNextSpecificTag(XMLStreamReader.START_ELEMENT, ArrayProperty.ORDERED_ARRAY,
"Expected Seq Declaration");
int elmtType = reader.get().nextTag();
String type, namespaceURI, prefix, description;
@@ -820,7 +821,7 @@ public class XMPDocumentBuilder {
XMLStreamException {
List<PDFAFieldDescription> fields = new ArrayList<PDFAFieldDescription>();
// <rdf:Seq>
- expectNextSpecificTag(XMLStreamReader.START_ELEMENT, ComplexProperty.ORDERED_ARRAY,
+ expectNextSpecificTag(XMLStreamReader.START_ELEMENT, ArrayProperty.ORDERED_ARRAY,
"Expected Seq Declaration");
int elmtType = reader.get().nextTag();
String name, type, description;
@@ -880,7 +881,7 @@ public class XMPDocumentBuilder {
private void parsePropertyDefinition(SchemaDescription desc)
throws XmpParsingException, XMLStreamException, BadFieldValueException {
// <rdf:Seq>
- expectNextSpecificTag(XMLStreamReader.START_ELEMENT, ComplexProperty.ORDERED_ARRAY, "Expected Seq Declaration");
+ expectNextSpecificTag(XMLStreamReader.START_ELEMENT, ArrayProperty.ORDERED_ARRAY, "Expected Seq Declaration");
// Each property definition
int elmtType = reader.get().nextTag();
while (elmtType == XMLStreamReader.START_ELEMENT) {
@@ -1037,7 +1038,7 @@ public class XMPDocumentBuilder {
throws XmpUnexpectedTypeException, XmpParsingException,
XMLStreamException, XmpUnknownPropertyTypeException,
XmpPropertyFormatException {
- ComplexProperty cp = new ComplexProperty(metadata,null,
+ ArrayProperty cp = new ArrayProperty(metadata,null,
name.getPrefix(), name.getLocalPart(),
ctype);
container.addProperty(cp);
@@ -1065,7 +1066,7 @@ public class XMPDocumentBuilder {
throws XmpUnexpectedTypeException, XmpParsingException,
XMLStreamException, XmpUnknownPropertyTypeException,
XmpPropertyFormatException {
- ComplexProperty cp = new ComplexProperty(metadata,null,
+ ArrayProperty cp = new ArrayProperty(metadata,null,
name.getPrefix(), name.getLocalPart(),
ctype);
container.addProperty(cp);
@@ -1095,7 +1096,7 @@ public class XMPDocumentBuilder {
if (type.equals("Lang alt")) {
parseSimplePropertyArray(metadata, reader.get().getName(),
- ComplexProperty.ALTERNATIVE_ARRAY, TextType.class, container);
+ ArrayProperty.ALTERNATIVE_ARRAY, TextType.class, container);
} else if (TypeMapping.isSimpleType(typeDesc.getType())) {
Class<? extends AbstractSimpleProperty> tcn = (Class<? extends AbstractSimpleProperty>)typeDesc.getTypeClass();
parseSimpleProperty(metadata, reader.get().getName(),
@@ -1170,7 +1171,7 @@ public class XMPDocumentBuilder {
String type;
int elmtType = reader.get().nextTag();
while ((elmtType != XMLStreamReader.END_ELEMENT)
- && !reader.get().getName().getLocalPart().equals(ComplexProperty.ORDERED_ARRAY)) {
+ && !reader.get().getName().getLocalPart().equals(ArrayProperty.ORDERED_ARRAY)) {
type = getPropertyDeclarationInNamespaces(schema, reader.get()
.getName());
@@ -1241,7 +1242,7 @@ public class XMPDocumentBuilder {
}
}
} else if (type.equals("Lang Alt")) {
- parseSimplePropertyArray(metadata, propertyName, ComplexProperty.ALTERNATIVE_ARRAY, TextType.class, schema.getContent());
+ parseSimplePropertyArray(metadata, propertyName, ArrayProperty.ALTERNATIVE_ARRAY, TextType.class, schema.getContent());
} else if (TypeMapping.isSimpleType(type)) {
TypeDescription tclass = TypeMapping.getTypeDescription(type);
Class<? extends AbstractSimpleProperty> tcn = (Class<? extends AbstractSimpleProperty>)tclass.getTypeClass();
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMPDocumentPreprocessor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMPDocumentPreprocessor.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMPDocumentPreprocessor.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XMPDocumentPreprocessor.java Sat Jul 28 08:48:02 2012
@@ -21,6 +21,7 @@
package org.apache.padaf.xmpbox.parser;
+import org.apache.padaf.xmpbox.schema.NSMapping;
import org.apache.padaf.xmpbox.type.BadFieldValueException;
public interface XMPDocumentPreprocessor {
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/AdobePDFSchema.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/AdobePDFSchema.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/AdobePDFSchema.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/AdobePDFSchema.java Sat Jul 28 08:48:02 2012
@@ -23,6 +23,7 @@ package org.apache.padaf.xmpbox.schema;
import org.apache.padaf.xmpbox.XMPMetadata;
import org.apache.padaf.xmpbox.type.AbstractField;
+import org.apache.padaf.xmpbox.type.PropertyType;
import org.apache.padaf.xmpbox.type.TextType;
/**
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/DublinCoreSchema.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/DublinCoreSchema.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/DublinCoreSchema.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/DublinCoreSchema.java Sat Jul 28 08:48:02 2012
@@ -25,8 +25,9 @@ import java.util.Calendar;
import java.util.List;
import org.apache.padaf.xmpbox.XMPMetadata;
-import org.apache.padaf.xmpbox.type.ComplexProperty;
+import org.apache.padaf.xmpbox.type.ArrayProperty;
import org.apache.padaf.xmpbox.type.MIMEType;
+import org.apache.padaf.xmpbox.type.PropertyType;
import org.apache.padaf.xmpbox.type.TextType;
@@ -411,8 +412,8 @@ public class DublinCoreSchema extends XM
*
* @return Contributor property
*/
- public ComplexProperty getContributorsProperty() {
- return (ComplexProperty) getUnqualifiedProperty(CONTRIBUTOR);
+ public ArrayProperty getContributorsProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(CONTRIBUTOR);
}
/**
@@ -449,8 +450,8 @@ public class DublinCoreSchema extends XM
*
* @return Creator property
*/
- public ComplexProperty getCreatorsProperty() {
- return (ComplexProperty) getUnqualifiedProperty(CREATOR);
+ public ArrayProperty getCreatorsProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(CREATOR);
}
/**
@@ -467,8 +468,8 @@ public class DublinCoreSchema extends XM
*
* @return date property
*/
- public ComplexProperty getDatesProperty() {
- return (ComplexProperty) getUnqualifiedProperty(DATE);
+ public ArrayProperty getDatesProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(DATE);
}
/**
@@ -485,8 +486,8 @@ public class DublinCoreSchema extends XM
*
* @return Description property
*/
- public ComplexProperty getDescriptionProperty() {
- return (ComplexProperty) getUnqualifiedProperty(DESCRIPTION);
+ public ArrayProperty getDescriptionProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(DESCRIPTION);
}
/**
@@ -564,8 +565,8 @@ public class DublinCoreSchema extends XM
*
* @return language property
*/
- public ComplexProperty getLanguagesProperty() {
- return (ComplexProperty) getUnqualifiedProperty(LANGUAGE);
+ public ArrayProperty getLanguagesProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(LANGUAGE);
}
/**
@@ -582,8 +583,8 @@ public class DublinCoreSchema extends XM
*
* @return publisher property
*/
- public ComplexProperty getPublishersProperty() {
- return (ComplexProperty) getUnqualifiedProperty(PUBLISHER);
+ public ArrayProperty getPublishersProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(PUBLISHER);
}
/**
@@ -600,8 +601,8 @@ public class DublinCoreSchema extends XM
*
* @return relation property
*/
- public ComplexProperty getRelationsProperty() {
- return (ComplexProperty) getUnqualifiedProperty(RELATION);
+ public ArrayProperty getRelationsProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(RELATION);
}
/**
@@ -628,8 +629,8 @@ public class DublinCoreSchema extends XM
*
* @return rights property
*/
- public ComplexProperty getRightsProperty() {
- return (ComplexProperty) getUnqualifiedProperty(RIGHTS);
+ public ArrayProperty getRightsProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(RIGHTS);
}
/**
@@ -686,8 +687,8 @@ public class DublinCoreSchema extends XM
*
* @return the subject property
*/
- public ComplexProperty getSubjectsProperty() {
- return (ComplexProperty) getUnqualifiedProperty(SUBJECT);
+ public ArrayProperty getSubjectsProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(SUBJECT);
}
/**
@@ -704,8 +705,8 @@ public class DublinCoreSchema extends XM
*
* @return the title property
*/
- public ComplexProperty getTitleProperty() {
- return (ComplexProperty) getUnqualifiedProperty(TITLE);
+ public ArrayProperty getTitleProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(TITLE);
}
/**
@@ -744,8 +745,8 @@ public class DublinCoreSchema extends XM
*
* @return the type property
*/
- public ComplexProperty getTypesProperty() {
- return (ComplexProperty) getUnqualifiedProperty(TYPE);
+ public ArrayProperty getTypesProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(TYPE);
}
/**
Copied: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/FieldDescription.java (from r1366609, pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/FieldDescription.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/FieldDescription.java?p2=pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/FieldDescription.java&p1=pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/FieldDescription.java&r1=1366609&r2=1366613&rev=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/FieldDescription.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/FieldDescription.java Sat Jul 28 08:48:02 2012
@@ -19,10 +19,9 @@
*
****************************************************************************/
-package org.apache.padaf.xmpbox.type;
+package org.apache.padaf.xmpbox.schema;
import org.apache.padaf.xmpbox.XMPMetadata;
-import org.apache.padaf.xmpbox.schema.PDFAFieldDescription;
/**
* Represents one Property Description described in xml file in order to be use
Copied: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/NSMapping.java (from r1366609, pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/NSMapping.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/NSMapping.java?p2=pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/NSMapping.java&p1=pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/NSMapping.java&r1=1366609&r2=1366613&rev=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/NSMapping.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/NSMapping.java Sat Jul 28 08:48:02 2012
@@ -19,7 +19,7 @@
*
****************************************************************************/
-package org.apache.padaf.xmpbox.parser;
+package org.apache.padaf.xmpbox.schema;
import java.util.HashMap;
import java.util.List;
@@ -29,12 +29,10 @@ import java.util.Map.Entry;
import javax.xml.namespace.QName;
import org.apache.padaf.xmpbox.XMPMetadata;
-import org.apache.padaf.xmpbox.schema.PDFAFieldDescription;
-import org.apache.padaf.xmpbox.schema.PDFAPropertyDescription;
-import org.apache.padaf.xmpbox.schema.PDFAValueTypeDescription;
-import org.apache.padaf.xmpbox.schema.SchemaDescription;
-import org.apache.padaf.xmpbox.schema.SchemaMapping;
-import org.apache.padaf.xmpbox.schema.XMPSchema;
+import org.apache.padaf.xmpbox.parser.PropMapping;
+import org.apache.padaf.xmpbox.parser.XMPSchemaFactory;
+import org.apache.padaf.xmpbox.parser.XmpSchemaException;
+import org.apache.padaf.xmpbox.parser.XmpUnknownValueTypeException;
import org.apache.padaf.xmpbox.type.TypeMapping;
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAExtensionSchema.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAExtensionSchema.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAExtensionSchema.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAExtensionSchema.java Sat Jul 28 08:48:02 2012
@@ -32,6 +32,7 @@ import org.apache.padaf.xmpbox.XMPMetada
import org.apache.padaf.xmpbox.parser.XmpSchemaException;
import org.apache.padaf.xmpbox.type.Attribute;
import org.apache.padaf.xmpbox.type.Elementable;
+import org.apache.padaf.xmpbox.type.PropertyType;
import org.w3c.dom.Element;
/**
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAFieldDescription.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAFieldDescription.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAFieldDescription.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAFieldDescription.java Sat Jul 28 08:48:02 2012
@@ -27,6 +27,7 @@ import org.apache.padaf.xmpbox.XMPMetada
import org.apache.padaf.xmpbox.type.AbstractField;
import org.apache.padaf.xmpbox.type.Attribute;
import org.apache.padaf.xmpbox.type.ComplexPropertyContainer;
+import org.apache.padaf.xmpbox.type.PropertyType;
import org.apache.padaf.xmpbox.type.TextType;
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAIdentificationSchema.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAIdentificationSchema.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAIdentificationSchema.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PDFAIdentificationSchema.java Sat Jul 28 08:48:02 2012
@@ -26,6 +26,7 @@ import org.apache.padaf.xmpbox.type.Abst
import org.apache.padaf.xmpbox.type.Attribute;
import org.apache.padaf.xmpbox.type.BadFieldValueException;
import org.apache.padaf.xmpbox.type.IntegerType;
+import org.apache.padaf.xmpbox.type.PropertyType;
import org.apache.padaf.xmpbox.type.TextType;
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PhotoshopSchema.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PhotoshopSchema.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PhotoshopSchema.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PhotoshopSchema.java Sat Jul 28 08:48:02 2012
@@ -27,11 +27,12 @@ import java.util.List;
import org.apache.padaf.xmpbox.XMPMetadata;
import org.apache.padaf.xmpbox.type.AbstractField;
import org.apache.padaf.xmpbox.type.BadFieldValueException;
-import org.apache.padaf.xmpbox.type.ComplexProperty;
+import org.apache.padaf.xmpbox.type.ArrayProperty;
import org.apache.padaf.xmpbox.type.DateType;
import org.apache.padaf.xmpbox.type.IntegerType;
import org.apache.padaf.xmpbox.type.LayerType;
import org.apache.padaf.xmpbox.type.ProperNameType;
+import org.apache.padaf.xmpbox.type.PropertyType;
import org.apache.padaf.xmpbox.type.TextType;
import org.apache.padaf.xmpbox.type.URIType;
@@ -103,7 +104,7 @@ public class PhotoshopSchema extends XMP
@PropertyType(propertyType = "seq Layer")
public static final String TEXT_LAYERS = "TextLayers";
- private ComplexProperty seqLayer;
+ private ArrayProperty seqLayer;
@PropertyType(propertyType = "Text")
public static final String TRANSMISSION_REFERENCE = "TransmissionReference";
@@ -277,8 +278,8 @@ public class PhotoshopSchema extends XMP
addQualifiedBagValue(DOCUMENT_ANCESTORS, text);
}
- public ComplexProperty getDocumentAncestorsProperty() {
- return (ComplexProperty) getUnqualifiedProperty(DOCUMENT_ANCESTORS);
+ public ArrayProperty getDocumentAncestorsProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(DOCUMENT_ANCESTORS);
}
public List<String> getDocumentAncestors() {
@@ -418,8 +419,8 @@ public class PhotoshopSchema extends XMP
- public ComplexProperty getSupplementalCategoriesProperty() {
- return (ComplexProperty) getUnqualifiedProperty(SUPPLEMENTAL_CATEGORIES);
+ public ArrayProperty getSupplementalCategoriesProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(SUPPLEMENTAL_CATEGORIES);
}
public List<String> getSupplementalCategories() {
@@ -428,8 +429,8 @@ public class PhotoshopSchema extends XMP
public void addTextLayers(String layerName, String layerText) {
if (seqLayer == null) {
- seqLayer = new ComplexProperty(getMetadata(), null, getLocalPrefix(), TEXT_LAYERS,
- ComplexProperty.ORDERED_ARRAY);
+ seqLayer = new ArrayProperty(getMetadata(), null, getLocalPrefix(), TEXT_LAYERS,
+ ArrayProperty.ORDERED_ARRAY);
addProperty(seqLayer);
}
LayerType layer = new LayerType(getMetadata());
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/SchemaMapping.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/SchemaMapping.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/SchemaMapping.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/SchemaMapping.java Sat Jul 28 08:48:02 2012
@@ -31,6 +31,7 @@ import org.apache.padaf.xmpbox.XMPMetada
import org.apache.padaf.xmpbox.parser.PropMapping;
import org.apache.padaf.xmpbox.parser.XMPSchemaFactory;
import org.apache.padaf.xmpbox.parser.XmpSchemaException;
+import org.apache.padaf.xmpbox.type.PropertyType;
public final class SchemaMapping {
Copied: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/ValueTypeDescription.java (from r1366609, pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ValueTypeDescription.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/ValueTypeDescription.java?p2=pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/ValueTypeDescription.java&p1=pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ValueTypeDescription.java&r1=1366609&r2=1366613&rev=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ValueTypeDescription.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/ValueTypeDescription.java Sat Jul 28 08:48:02 2012
@@ -19,13 +19,12 @@
*
****************************************************************************/
-package org.apache.padaf.xmpbox.type;
+package org.apache.padaf.xmpbox.schema;
import java.util.ArrayList;
import java.util.List;
import org.apache.padaf.xmpbox.XMPMetadata;
-import org.apache.padaf.xmpbox.schema.PDFAFieldDescription;
/**
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPBasicJobTicketSchema.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPBasicJobTicketSchema.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPBasicJobTicketSchema.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPBasicJobTicketSchema.java Sat Jul 28 08:48:02 2012
@@ -28,8 +28,9 @@ import org.apache.padaf.xmpbox.XMPMetada
import org.apache.padaf.xmpbox.type.AbstractField;
import org.apache.padaf.xmpbox.type.Attribute;
import org.apache.padaf.xmpbox.type.BadFieldValueException;
-import org.apache.padaf.xmpbox.type.ComplexProperty;
+import org.apache.padaf.xmpbox.type.ArrayProperty;
import org.apache.padaf.xmpbox.type.JobType;
+import org.apache.padaf.xmpbox.type.PropertyType;
public class XMPBasicJobTicketSchema extends XMPSchema {
@@ -40,7 +41,7 @@ public class XMPBasicJobTicketSchema ext
@PropertyType(propertyType = "bag Job")
public static final String JOB_REF = "JobRef";
- private ComplexProperty bagJobs;
+ private ArrayProperty bagJobs;
public XMPBasicJobTicketSchema(XMPMetadata metadata) {
@@ -69,8 +70,8 @@ public class XMPBasicJobTicketSchema ext
public void addJob (JobType job) {
// create bag if not existing
if (bagJobs == null) {
- bagJobs = new ComplexProperty(getMetadata(), null, getLocalPrefix(), JOB_REF,
- ComplexProperty.UNORDERED_ARRAY);
+ bagJobs = new ArrayProperty(getMetadata(), null, getLocalPrefix(), JOB_REF,
+ ArrayProperty.UNORDERED_ARRAY);
addProperty(bagJobs);
}
// add job
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPBasicSchema.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPBasicSchema.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPBasicSchema.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPBasicSchema.java Sat Jul 28 08:48:02 2012
@@ -29,9 +29,10 @@ import org.apache.padaf.xmpbox.XMPMetada
import org.apache.padaf.xmpbox.type.AbstractField;
import org.apache.padaf.xmpbox.type.AgentNameType;
import org.apache.padaf.xmpbox.type.BadFieldValueException;
-import org.apache.padaf.xmpbox.type.ComplexProperty;
+import org.apache.padaf.xmpbox.type.ArrayProperty;
import org.apache.padaf.xmpbox.type.DateType;
import org.apache.padaf.xmpbox.type.IntegerType;
+import org.apache.padaf.xmpbox.type.PropertyType;
import org.apache.padaf.xmpbox.type.TextType;
import org.apache.padaf.xmpbox.type.ThumbnailType;
import org.apache.padaf.xmpbox.type.URLType;
@@ -82,7 +83,7 @@ public class XMPBasicSchema extends XMPS
@PropertyType(propertyType = "Alt Thumbnail")
public static final String THUMBNAILS = "Thumbnails";
- private ComplexProperty altThumbs;
+ private ArrayProperty altThumbs;
/**
* Constructor of XMPBasic schema with preferred prefix
@@ -123,8 +124,8 @@ public class XMPBasicSchema extends XMPS
public void addThumbnails(Integer height, Integer width, String format,
String img) {
if (altThumbs == null) {
- altThumbs = new ComplexProperty(getMetadata(), null, getLocalPrefix(), THUMBNAILS,
- ComplexProperty.ALTERNATIVE_ARRAY);
+ altThumbs = new ArrayProperty(getMetadata(), null, getLocalPrefix(), THUMBNAILS,
+ ArrayProperty.ALTERNATIVE_ARRAY);
addProperty(altThumbs);
}
ThumbnailType thumb = new ThumbnailType(getMetadata());
@@ -344,8 +345,8 @@ public class XMPBasicSchema extends XMPS
*
* @return the advisory property
*/
- public ComplexProperty getAdvisoryProperty() {
- return (ComplexProperty) getUnqualifiedProperty(ADVISORY);
+ public ArrayProperty getAdvisoryProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(ADVISORY);
}
/**
@@ -434,8 +435,8 @@ public class XMPBasicSchema extends XMPS
*
* @return the Identifier property
*/
- public ComplexProperty getIdentifiersProperty() {
- return (ComplexProperty) getUnqualifiedProperty(IDENTIFIER);
+ public ArrayProperty getIdentifiersProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(IDENTIFIER);
}
/**
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPMediaManagementSchema.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPMediaManagementSchema.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPMediaManagementSchema.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPMediaManagementSchema.java Sat Jul 28 08:48:02 2012
@@ -25,7 +25,8 @@ import java.util.List;
import org.apache.padaf.xmpbox.XMPMetadata;
import org.apache.padaf.xmpbox.type.AgentNameType;
-import org.apache.padaf.xmpbox.type.ComplexProperty;
+import org.apache.padaf.xmpbox.type.ArrayProperty;
+import org.apache.padaf.xmpbox.type.PropertyType;
import org.apache.padaf.xmpbox.type.RenditionClassType;
import org.apache.padaf.xmpbox.type.ResourceRefType;
import org.apache.padaf.xmpbox.type.TextType;
@@ -622,8 +623,8 @@ public class XMPMediaManagementSchema ex
*
* @return version property to set
*/
- public ComplexProperty getVersionsProperty() {
- return (ComplexProperty) getUnqualifiedProperty(VERSIONS);
+ public ArrayProperty getVersionsProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(VERSIONS);
}
// /**
@@ -657,8 +658,8 @@ public class XMPMediaManagementSchema ex
*
* @return History Property
*/
- public ComplexProperty getHistoryProperty() {
- return (ComplexProperty) getUnqualifiedProperty(HISTORY);
+ public ArrayProperty getHistoryProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(HISTORY);
}
/**
@@ -691,8 +692,8 @@ public class XMPMediaManagementSchema ex
*
* @return Ingredients property
*/
- public ComplexProperty getIngredientsProperty() {
- return (ComplexProperty) getUnqualifiedProperty(INGREDIENTS);
+ public ArrayProperty getIngredientsProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(INGREDIENTS);
}
/**
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPRightsManagementSchema.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPRightsManagementSchema.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPRightsManagementSchema.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPRightsManagementSchema.java Sat Jul 28 08:48:02 2012
@@ -25,7 +25,8 @@ import java.util.List;
import org.apache.padaf.xmpbox.XMPMetadata;
import org.apache.padaf.xmpbox.type.BooleanType;
-import org.apache.padaf.xmpbox.type.ComplexProperty;
+import org.apache.padaf.xmpbox.type.ArrayProperty;
+import org.apache.padaf.xmpbox.type.PropertyType;
import org.apache.padaf.xmpbox.type.TextType;
import org.apache.padaf.xmpbox.type.URLType;
@@ -97,8 +98,8 @@ public class XMPRightsManagementSchema e
*
* @return owners property
*/
- public ComplexProperty getOwnersProperty() {
- return (ComplexProperty) getUnqualifiedProperty(OWNER);
+ public ArrayProperty getOwnersProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(OWNER);
}
/**
@@ -189,8 +190,8 @@ public class XMPRightsManagementSchema e
*
* @return usageterms property
*/
- public ComplexProperty getUsageTermsProperty() {
- return (ComplexProperty) getUnqualifiedProperty(USAGETERMS);
+ public ArrayProperty getUsageTermsProperty() {
+ return (ArrayProperty) getUnqualifiedProperty(USAGETERMS);
}
/**
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPSchema.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPSchema.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPSchema.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/XMPSchema.java Sat Jul 28 08:48:02 2012
@@ -34,7 +34,7 @@ import org.apache.padaf.xmpbox.type.Abst
import org.apache.padaf.xmpbox.type.Attribute;
import org.apache.padaf.xmpbox.type.BadFieldValueException;
import org.apache.padaf.xmpbox.type.BooleanType;
-import org.apache.padaf.xmpbox.type.ComplexProperty;
+import org.apache.padaf.xmpbox.type.ArrayProperty;
import org.apache.padaf.xmpbox.type.ComplexPropertyContainer;
import org.apache.padaf.xmpbox.type.DateType;
import org.apache.padaf.xmpbox.type.Elementable;
@@ -629,7 +629,7 @@ public class XMPSchema implements Elemen
*/
private void removeUnqualifiedArrayValue(String arrayName, String fieldValue) {
String qualifiedArrayName = getQualifiedName(arrayName);
- ComplexProperty array = (ComplexProperty) getAbstractProperty(qualifiedArrayName);
+ ArrayProperty array = (ArrayProperty) getAbstractProperty(qualifiedArrayName);
if (array != null) {
ArrayList<AbstractField> toDelete = new ArrayList<AbstractField>();
Iterator<AbstractField> it = array.getContainer()
@@ -676,14 +676,14 @@ public class XMPSchema implements Elemen
private void internalAddBagValue(String qualifiedBagName, String bagValue) {
String[] splittedQualifiedName = qualifiedBagName.split(":");
- ComplexProperty bag = (ComplexProperty) getAbstractProperty(qualifiedBagName);
+ ArrayProperty bag = (ArrayProperty) getAbstractProperty(qualifiedBagName);
TextType li = new TextType(metadata,null, "rdf", "li", bagValue);
if (bag != null) {
bag.getContainer().addProperty(li);
} else {
- ComplexProperty newBag = new ComplexProperty(metadata,null,
+ ArrayProperty newBag = new ArrayProperty(metadata,null,
splittedQualifiedName[0], splittedQualifiedName[1],
- ComplexProperty.UNORDERED_ARRAY);
+ ArrayProperty.UNORDERED_ARRAY);
newBag.getContainer().addProperty(li);
content.addProperty(newBag);
}
@@ -709,7 +709,7 @@ public class XMPSchema implements Elemen
* @return String list which represents content of array property
*/
private List<String> getArrayListToString(String qualifiedArrayName) {
- ComplexProperty array = (ComplexProperty) getAbstractProperty(qualifiedArrayName);
+ ArrayProperty array = (ArrayProperty) getAbstractProperty(qualifiedArrayName);
return TypeUtil.getArrayListToString(array);
}
@@ -766,7 +766,7 @@ public class XMPSchema implements Elemen
public void removeUnqualifiedArrayValue(String arrayName,
Elementable fieldValue) {
String qualifiedArrayName = getQualifiedName(arrayName);
- ComplexProperty array = (ComplexProperty) getAbstractProperty(qualifiedArrayName);
+ ArrayProperty array = (ArrayProperty) getAbstractProperty(qualifiedArrayName);
if (array != null) {
ArrayList<AbstractField> toDelete = new ArrayList<AbstractField>();
Iterator<AbstractField> it = array.getContainer()
@@ -811,14 +811,14 @@ public class XMPSchema implements Elemen
public void addUnqualifiedSequenceValue(String simpleSeqName, String seqValue) {
String qualifiedSeqName = getQualifiedName(simpleSeqName);
String[] splittedQualifiedName = qualifiedSeqName.split(":");
- ComplexProperty seq = (ComplexProperty) getAbstractProperty(qualifiedSeqName);
+ ArrayProperty seq = (ArrayProperty) getAbstractProperty(qualifiedSeqName);
TextType li = new TextType(metadata,null, "rdf", "li", seqValue);
if (seq != null) {
seq.getContainer().addProperty(li);
} else {
- ComplexProperty newSeq = new ComplexProperty(metadata,null,
+ ArrayProperty newSeq = new ArrayProperty(metadata,null,
splittedQualifiedName[0], splittedQualifiedName[1],
- ComplexProperty.ORDERED_ARRAY);
+ ArrayProperty.ORDERED_ARRAY);
newSeq.getContainer().addProperty(li);
content.addProperty(newSeq);
}
@@ -837,13 +837,13 @@ public class XMPSchema implements Elemen
public void addBagValue(String qualifiedSeqName, AbstractField seqValue) {
String[] splittedQualifiedName = qualifiedSeqName.split(":");
- ComplexProperty bag = (ComplexProperty) getAbstractProperty(qualifiedSeqName);
+ ArrayProperty bag = (ArrayProperty) getAbstractProperty(qualifiedSeqName);
if (bag != null) {
bag.getContainer().addProperty(seqValue);
} else {
- ComplexProperty newBag = new ComplexProperty(metadata,null,
+ ArrayProperty newBag = new ArrayProperty(metadata,null,
splittedQualifiedName[0], splittedQualifiedName[1],
- ComplexProperty.UNORDERED_ARRAY);
+ ArrayProperty.UNORDERED_ARRAY);
newBag.getContainer().addProperty(seqValue);
content.addProperty(newBag);
}
@@ -873,13 +873,13 @@ public class XMPSchema implements Elemen
public void addUnqualifiedSequenceValue(String seqName, AbstractField seqValue) {
String qualifiedSeqName = getQualifiedName(seqName);
String[] splittedQualifiedName = qualifiedSeqName.split(":");
- ComplexProperty seq = (ComplexProperty) getAbstractProperty(qualifiedSeqName);
+ ArrayProperty seq = (ArrayProperty) getAbstractProperty(qualifiedSeqName);
if (seq != null) {
seq.getContainer().addProperty(seqValue);
} else {
- ComplexProperty newSeq = new ComplexProperty(metadata,null,
+ ArrayProperty newSeq = new ArrayProperty(metadata,null,
splittedQualifiedName[0], splittedQualifiedName[1],
- ComplexProperty.ORDERED_ARRAY);
+ ArrayProperty.ORDERED_ARRAY);
newSeq.getContainer().addProperty(seqValue);
content.addProperty(newSeq);
}
@@ -910,7 +910,7 @@ public class XMPSchema implements Elemen
*/
public void removeUnqualifiedSequenceDateValue(String seqName, Calendar date) {
String qualifiedSeqName = getQualifiedName(seqName);
- ComplexProperty seq = (ComplexProperty) getAbstractProperty(qualifiedSeqName);
+ ArrayProperty seq = (ArrayProperty) getAbstractProperty(qualifiedSeqName);
if (seq != null) {
ArrayList<AbstractField> toDelete = new ArrayList<AbstractField>();
Iterator<AbstractField> it = seq.getContainer().getAllProperties()
@@ -972,7 +972,7 @@ public class XMPSchema implements Elemen
public List<Calendar> getUnqualifiedSequenceDateValueList(String seqName) {
String qualifiedSeqName = getQualifiedName(seqName);
List<Calendar> retval = null;
- ComplexProperty seq = (ComplexProperty) getAbstractProperty(qualifiedSeqName);
+ ArrayProperty seq = (ArrayProperty) getAbstractProperty(qualifiedSeqName);
if (seq != null) {
retval = new ArrayList<Calendar>();
Iterator<AbstractField> it = seq.getContainer().getAllProperties()
@@ -1054,11 +1054,11 @@ public class XMPSchema implements Elemen
String value) {
String qualifiedName = getQualifiedName(name);
AbstractField property = getAbstractProperty(qualifiedName);
- ComplexProperty prop;
+ ArrayProperty prop;
if (property != null) {
// Analyzing content of property
- if (property instanceof ComplexProperty) {
- prop = (ComplexProperty) property;
+ if (property instanceof ArrayProperty) {
+ prop = (ArrayProperty) property;
Iterator<AbstractField> itCplx = prop.getContainer()
.getAllProperties().iterator();
// try to find the same lang definition
@@ -1097,8 +1097,8 @@ public class XMPSchema implements Elemen
}
} else {
String[] splittedQualifiedName = qualifiedName.split(":");
- prop = new ComplexProperty(metadata, null, splittedQualifiedName[0],
- splittedQualifiedName[1], ComplexProperty.ALTERNATIVE_ARRAY);
+ prop = new ArrayProperty(metadata, null, splittedQualifiedName[0],
+ splittedQualifiedName[1], ArrayProperty.ALTERNATIVE_ARRAY);
TextType langValue;
langValue = new TextType(metadata,null, "rdf", "li", value);
langValue
@@ -1124,8 +1124,8 @@ public class XMPSchema implements Elemen
String language = (expectedLanguage!=null)?expectedLanguage:"x-default";
AbstractField property = getAbstractProperty(qualifiedName);
if (property != null) {
- if (property instanceof ComplexProperty) {
- ComplexProperty prop = (ComplexProperty) property;
+ if (property instanceof ArrayProperty) {
+ ArrayProperty prop = (ArrayProperty) property;
Iterator<AbstractField> langsDef = prop.getContainer()
.getAllProperties().iterator();
AbstractField tmp;
@@ -1166,8 +1166,8 @@ public class XMPSchema implements Elemen
AbstractField property = getAbstractProperty(qualifiedName);
if (property != null) {
- if (property instanceof ComplexProperty) {
- ComplexProperty prop = (ComplexProperty) property;
+ if (property instanceof ArrayProperty) {
+ ArrayProperty prop = (ArrayProperty) property;
Iterator<AbstractField> langsDef = prop.getContainer()
.getAllProperties().iterator();
AbstractField tmp;
@@ -1222,7 +1222,7 @@ public class XMPSchema implements Elemen
while (itProp.hasNext()) {
prop = itProp.next();
if (prop.getPrefix().equals(getPrefix())) {
- if (prop instanceof ComplexProperty) {
+ if (prop instanceof ArrayProperty) {
analyzedPropQualifiedName = prop.getQualifiedName();
Iterator<AbstractField> itActualEmbeddedProperties = content
.getAllProperties().iterator();
@@ -1238,16 +1238,16 @@ public class XMPSchema implements Elemen
while (itActualEmbeddedProperties.hasNext()) {
tmpEmbeddedProperty = itActualEmbeddedProperties.next();
- if (tmpEmbeddedProperty instanceof ComplexProperty) {
+ if (tmpEmbeddedProperty instanceof ArrayProperty) {
if (tmpEmbeddedProperty.getQualifiedName().equals(
analyzedPropQualifiedName)) {
- itNewValues = ((ComplexProperty) prop)
+ itNewValues = ((ArrayProperty) prop)
.getContainer().getAllProperties()
.iterator();
// Merge a complex property
while (itNewValues.hasNext()) {
tmpNewValue = (TextType) itNewValues.next();
- itOldValues = ((ComplexProperty) tmpEmbeddedProperty)
+ itOldValues = ((ArrayProperty) tmpEmbeddedProperty)
.getContainer().getAllProperties()
.iterator();
while (itOldValues.hasNext()
@@ -1263,7 +1263,7 @@ public class XMPSchema implements Elemen
}
}
if (!alreadyPresent) {
- ((ComplexProperty) tmpEmbeddedProperty)
+ ((ArrayProperty) tmpEmbeddedProperty)
.getContainer().addProperty(
tmpNewValue);
}
@@ -1292,14 +1292,14 @@ public class XMPSchema implements Elemen
public List<AbstractField> getUnqualifiedArrayList(String name)
throws BadFieldValueException {
String qualifiedName = getQualifiedName(name);
- ComplexProperty array = null;
+ ArrayProperty array = null;
Iterator<AbstractField> itProp = content.getAllProperties().iterator();
AbstractField tmp;
while (itProp.hasNext()) {
tmp = itProp.next();
if (tmp.getQualifiedName().equals(qualifiedName)) {
- if (tmp instanceof ComplexProperty) {
- array = (ComplexProperty) tmp;
+ if (tmp instanceof ArrayProperty) {
+ array = (ArrayProperty) tmp;
break;
} else {
throw new BadFieldValueException(
Copied: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ArrayProperty.java (from r1366609, pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ComplexProperty.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ArrayProperty.java?p2=pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ArrayProperty.java&p1=pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ComplexProperty.java&r1=1366609&r2=1366613&rev=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ComplexProperty.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ArrayProperty.java Sat Jul 28 08:48:02 2012
@@ -30,7 +30,7 @@ import org.apache.padaf.xmpbox.XMPMetada
* @author a183132
*
*/
-public class ComplexProperty extends AbstractField {
+public class ArrayProperty extends AbstractField {
public static final String UNORDERED_ARRAY = "Bag";
@@ -54,7 +54,7 @@ public class ComplexProperty extends Abs
* @param type
* type of complexProperty (Bag, Seq, Alt)
*/
- public ComplexProperty(XMPMetadata metadata, String namespace,
+ public ArrayProperty(XMPMetadata metadata, String namespace,
String prefix, String propertyName, String type) {
super(metadata, namespace, prefix, propertyName);
container = new ComplexPropertyContainer(metadata,null, "rdf", type);
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/JobType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/JobType.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/JobType.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/JobType.java Sat Jul 28 08:48:02 2012
@@ -23,7 +23,6 @@ package org.apache.padaf.xmpbox.type;
import org.apache.padaf.xmpbox.XMPMetadata;
import org.apache.padaf.xmpbox.XmpConstants;
-import org.apache.padaf.xmpbox.schema.PropertyType;
import org.apache.padaf.xmpbox.schema.XMPSchema;
public class JobType extends AbstractStructuredType {
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/LayerType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/LayerType.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/LayerType.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/LayerType.java Sat Jul 28 08:48:02 2012
@@ -23,7 +23,6 @@ package org.apache.padaf.xmpbox.type;
import org.apache.padaf.xmpbox.XMPMetadata;
import org.apache.padaf.xmpbox.XmpConstants;
-import org.apache.padaf.xmpbox.schema.PropertyType;
public class LayerType extends AbstractStructuredType {
Copied: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PropertyType.java (from r1366604, pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PropertyType.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PropertyType.java?p2=pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PropertyType.java&p1=pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PropertyType.java&r1=1366604&r2=1366613&rev=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/schema/PropertyType.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PropertyType.java Sat Jul 28 08:48:02 2012
@@ -19,7 +19,7 @@
*
****************************************************************************/
-package org.apache.padaf.xmpbox.schema;
+package org.apache.padaf.xmpbox.type;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceEventType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceEventType.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceEventType.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceEventType.java Sat Jul 28 08:48:02 2012
@@ -25,7 +25,6 @@ import java.util.Calendar;
import org.apache.padaf.xmpbox.XMPMetadata;
import org.apache.padaf.xmpbox.XmpConstants;
-import org.apache.padaf.xmpbox.schema.PropertyType;
import org.apache.padaf.xmpbox.schema.XMPSchema;
public class ResourceEventType extends AbstractStructuredType {
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceRefType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceRefType.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceRefType.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceRefType.java Sat Jul 28 08:48:02 2012
@@ -26,7 +26,6 @@ import java.util.List;
import org.apache.padaf.xmpbox.XMPMetadata;
import org.apache.padaf.xmpbox.XmpConstants;
-import org.apache.padaf.xmpbox.schema.PropertyType;
import org.apache.padaf.xmpbox.schema.XMPSchema;
public class ResourceRefType extends AbstractStructuredType {
@@ -294,11 +293,11 @@ public class ResourceRefType extends Abs
}
public void addAlternatePath(String value) {
- ComplexProperty seq = (ComplexProperty) getFirstEquivalentProperty(ALTERNATE_PATHS, ComplexProperty.class);
+ ArrayProperty seq = (ArrayProperty) getFirstEquivalentProperty(ALTERNATE_PATHS, ArrayProperty.class);
if (seq==null) {
- seq = new ComplexProperty(getMetadata(), null,
+ seq = new ArrayProperty(getMetadata(), null,
PREFERRED_PREFIX, ALTERNATE_PATHS,
- ComplexProperty.ORDERED_ARRAY);
+ ArrayProperty.ORDERED_ARRAY);
addProperty(seq);
}
TextType tt = (TextType)TypeMapping.instanciateSimpleProperty(getMetadata(), null, "rdf", "li", value, "Text");
@@ -310,8 +309,8 @@ public class ResourceRefType extends Abs
*
* @return version property to set
*/
- public ComplexProperty getAlternatePathsProperty() {
- return (ComplexProperty) getFirstEquivalentProperty(ALTERNATE_PATHS, ComplexProperty.class);
+ public ArrayProperty getAlternatePathsProperty() {
+ return (ArrayProperty) getFirstEquivalentProperty(ALTERNATE_PATHS, ArrayProperty.class);
}
/**
@@ -320,7 +319,7 @@ public class ResourceRefType extends Abs
* @return List of Versions values
*/
public List<String> getAlternatePaths() {
- ComplexProperty seq = (ComplexProperty) getFirstEquivalentProperty(ALTERNATE_PATHS, ComplexProperty.class);
+ ArrayProperty seq = (ArrayProperty) getFirstEquivalentProperty(ALTERNATE_PATHS, ArrayProperty.class);
if (seq!=null) {
return TypeUtil.getArrayListToString(seq);
} else {
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ThumbnailType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ThumbnailType.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ThumbnailType.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ThumbnailType.java Sat Jul 28 08:48:02 2012
@@ -23,7 +23,6 @@ package org.apache.padaf.xmpbox.type;
import org.apache.padaf.xmpbox.XMPMetadata;
import org.apache.padaf.xmpbox.XmpConstants;
-import org.apache.padaf.xmpbox.schema.PropertyType;
/**
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/TypeMapping.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/TypeMapping.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/TypeMapping.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/TypeMapping.java Sat Jul 28 08:48:02 2012
@@ -28,7 +28,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.padaf.xmpbox.XMPMetadata;
-import org.apache.padaf.xmpbox.schema.PropertyType;
import org.apache.padaf.xmpbox.type.TypeDescription.BasicType;
public final class TypeMapping {
@@ -282,12 +281,12 @@ public final class TypeMapping {
return null;
} else {
String first = type.substring(0,pos);
- if (first.equalsIgnoreCase(ComplexProperty.UNORDERED_ARRAY)) {
- return ComplexProperty.UNORDERED_ARRAY;
- } else if (first.equalsIgnoreCase(ComplexProperty.ORDERED_ARRAY)) {
- return ComplexProperty.ORDERED_ARRAY;
- } else if (first.equalsIgnoreCase(ComplexProperty.ALTERNATIVE_ARRAY)) {
- return ComplexProperty.ALTERNATIVE_ARRAY;
+ if (first.equalsIgnoreCase(ArrayProperty.UNORDERED_ARRAY)) {
+ return ArrayProperty.UNORDERED_ARRAY;
+ } else if (first.equalsIgnoreCase(ArrayProperty.ORDERED_ARRAY)) {
+ return ArrayProperty.ORDERED_ARRAY;
+ } else if (first.equalsIgnoreCase(ArrayProperty.ALTERNATIVE_ARRAY)) {
+ return ArrayProperty.ALTERNATIVE_ARRAY;
} else {
// else not an array
return null;
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/TypeUtil.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/TypeUtil.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/TypeUtil.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/TypeUtil.java Sat Jul 28 08:48:02 2012
@@ -37,7 +37,7 @@ public final class TypeUtil {
*
* @return String list which represents content of array property
*/
- public static List<String> getArrayListToString(ComplexProperty array) {
+ public static List<String> getArrayListToString(ArrayProperty array) {
List<String> retval = null;
if (array != null) {
retval = new ArrayList<String>();
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/VersionType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/VersionType.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/VersionType.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/VersionType.java Sat Jul 28 08:48:02 2012
@@ -25,7 +25,6 @@ import java.util.Calendar;
import org.apache.padaf.xmpbox.XMPMetadata;
import org.apache.padaf.xmpbox.XmpConstants;
-import org.apache.padaf.xmpbox.schema.PropertyType;
import org.apache.padaf.xmpbox.schema.XMPSchema;
public class VersionType extends AbstractStructuredType {
Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/BirthCertificateSchemaWithXMLDescriptions.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/BirthCertificateSchemaWithXMLDescriptions.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/BirthCertificateSchemaWithXMLDescriptions.java (original)
+++ pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/BirthCertificateSchemaWithXMLDescriptions.java Sat Jul 28 08:48:02 2012
@@ -25,12 +25,12 @@ import java.util.Calendar;
import java.util.Iterator;
import org.apache.padaf.xmpbox.schema.PropertyExtensionDefinition;
-import org.apache.padaf.xmpbox.schema.PropertyType;
import org.apache.padaf.xmpbox.schema.SchemaExtensionDefinition;
import org.apache.padaf.xmpbox.schema.XMPSchema;
import org.apache.padaf.xmpbox.type.AbstractField;
import org.apache.padaf.xmpbox.type.Attribute;
import org.apache.padaf.xmpbox.type.ComplexPropertyContainer;
+import org.apache.padaf.xmpbox.type.PropertyType;
import org.apache.padaf.xmpbox.type.TextType;
Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/parser/XMLValueTypeDescriptionManagerTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/parser/XMLValueTypeDescriptionManagerTest.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/parser/XMLValueTypeDescriptionManagerTest.java (original)
+++ pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/parser/XMLValueTypeDescriptionManagerTest.java Sat Jul 28 08:48:02 2012
@@ -29,8 +29,8 @@ import java.util.List;
import junit.framework.Assert;
-import org.apache.padaf.xmpbox.type.FieldDescription;
-import org.apache.padaf.xmpbox.type.ValueTypeDescription;
+import org.apache.padaf.xmpbox.schema.FieldDescription;
+import org.apache.padaf.xmpbox.schema.ValueTypeDescription;
import org.apache.pdfbox.io.IOUtils;
import org.junit.Test;
Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/AbstractSchemaTester.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/AbstractSchemaTester.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/AbstractSchemaTester.java (original)
+++ pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/AbstractSchemaTester.java Sat Jul 28 08:48:02 2012
@@ -28,7 +28,7 @@ import junit.framework.Assert;
import org.apache.padaf.xmpbox.XMPMetadata;
import org.apache.padaf.xmpbox.type.AbstractSimpleProperty;
-import org.apache.padaf.xmpbox.type.ComplexProperty;
+import org.apache.padaf.xmpbox.type.ArrayProperty;
import org.apache.padaf.xmpbox.type.TypeDescription;
import org.apache.padaf.xmpbox.type.TypeMapping;
import org.apache.padaf.xmpbox.type.TypeTestingHelper;
@@ -171,8 +171,8 @@ public abstract class AbstractSchemaTest
String getter = TypeTestingHelper.calculateArrayGetter(fieldName)+"Property";
Method getcp = getSchemaClass().getMethod(getter, new Class[0]);
Object ocp = getcp.invoke(getSchema(), new Object[0]);
- Assert.assertTrue(ocp instanceof ComplexProperty);
- ComplexProperty cp = (ComplexProperty)ocp;
+ Assert.assertTrue(ocp instanceof ArrayProperty);
+ ArrayProperty cp = (ArrayProperty)ocp;
// check size is ok (1)
Assert.assertEquals(1,cp.getContainer().getAllProperties().size());
// add a new one
Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/AbstractXMPSchemaTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/AbstractXMPSchemaTest.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/AbstractXMPSchemaTest.java (original)
+++ pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/AbstractXMPSchemaTest.java Sat Jul 28 08:48:02 2012
@@ -34,6 +34,7 @@ import org.apache.padaf.xmpbox.XMPMetada
import org.apache.padaf.xmpbox.type.BooleanType;
import org.apache.padaf.xmpbox.type.DateType;
import org.apache.padaf.xmpbox.type.IntegerType;
+import org.apache.padaf.xmpbox.type.PropertyType;
import org.apache.padaf.xmpbox.type.TextType;
import org.apache.padaf.xmpbox.type.ThumbnailType;
import org.apache.padaf.xmpbox.type.URIType;
Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/XMPSchemaTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/XMPSchemaTest.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/XMPSchemaTest.java (original)
+++ pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/XMPSchemaTest.java Sat Jul 28 08:48:02 2012
@@ -34,7 +34,7 @@ import org.apache.padaf.xmpbox.type.Abst
import org.apache.padaf.xmpbox.type.Attribute;
import org.apache.padaf.xmpbox.type.BadFieldValueException;
import org.apache.padaf.xmpbox.type.BooleanType;
-import org.apache.padaf.xmpbox.type.ComplexProperty;
+import org.apache.padaf.xmpbox.type.ArrayProperty;
import org.apache.padaf.xmpbox.type.DateType;
import org.apache.padaf.xmpbox.type.IntegerType;
import org.apache.padaf.xmpbox.type.TextType;
@@ -88,8 +88,8 @@ public class XMPSchemaTest {
@Test
public void testArrayList() throws Exception {
- ComplexProperty newSeq = new ComplexProperty(parent, null, "nsSchem",
- "seqType", ComplexProperty.ORDERED_ARRAY);
+ ArrayProperty newSeq = new ArrayProperty(parent, null, "nsSchem",
+ "seqType", ArrayProperty.ORDERED_ARRAY);
TextType li1 = new TextType(parent,null, "rdf", "li", "valeur1");
TextType li2 = new TextType(parent,null, "rdf", "li", "valeur2");
newSeq.getContainer().addProperty(li1);
Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TestAbstractStructuredType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TestAbstractStructuredType.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TestAbstractStructuredType.java (original)
+++ pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TestAbstractStructuredType.java Sat Jul 28 08:48:02 2012
@@ -26,7 +26,6 @@ import java.util.Calendar;
import junit.framework.Assert;
import org.apache.padaf.xmpbox.XMPMetadata;
-import org.apache.padaf.xmpbox.schema.PropertyType;
import org.junit.Before;
import org.junit.Test;
Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TypeTestingHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TypeTestingHelper.java?rev=1366613&r1=1366612&r2=1366613&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TypeTestingHelper.java (original)
+++ pdfbox/trunk/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TypeTestingHelper.java Sat Jul 28 08:48:02 2012
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Random;
import java.util.UUID;
-import org.apache.padaf.xmpbox.schema.PropertyType;
public final class TypeTestingHelper {