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 2014/12/26 00:12:54 UTC
svn commit: r1647923 - in
/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox:
schema/XMPMediaManagementSchema.java schema/XMPSchema.java
type/ComplexPropertyContainer.java type/PropertyType.java
type/TypeMapping.java xml/DomXmpParser.java
Author: msahyoun
Date: Thu Dec 25 23:12:53 2014
New Revision: 1647923
URL: http://svn.apache.org/r1647923
Log:
PDFBOX-2576 remove commented-out code
Modified:
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/schema/XMPMediaManagementSchema.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/schema/XMPSchema.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/ComplexPropertyContainer.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/PropertyType.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/schema/XMPMediaManagementSchema.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/schema/XMPMediaManagementSchema.java?rev=1647923&r1=1647922&r2=1647923&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/schema/XMPMediaManagementSchema.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/schema/XMPMediaManagementSchema.java Thu Dec 25 23:12:53 2014
@@ -509,18 +509,6 @@ public class XMPMediaManagementSchema ex
@PropertyType(type = Types.ResourceRef, card = Cardinality.Simple)
public static final String MANAGED_FROM = "ManagedFrom";
- // /**
- // * set ManageFrom Value
- // *
- // * @param url
- // * ManageFrom Value to set
- // */
- // public void setManagedFrom(ResourceRefType resourceRef) {
- //
- // setManagedFromProperty(new TextType(metadata, localPrefix, MANAGED_FROM,
- // url));
- // }
-
/**
* set ManageFrom Property
*
@@ -542,16 +530,6 @@ public class XMPMediaManagementSchema ex
return (ResourceRefType) getProperty(MANAGED_FROM);
}
- // /**
- // * Get ManageFrom value
- // *
- // * @return ManageFrom value
- // */
- // public String getManagedFrom() {
- // TextType tt = getManagedFromProperty();
- // return tt != null ? tt.getStringValue() : null;
- // }
-
// --------------------------------------- OriginalDocumentID
// ----------------------------
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/schema/XMPSchema.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/schema/XMPSchema.java?rev=1647923&r1=1647922&r2=1647923&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/schema/XMPSchema.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/schema/XMPSchema.java Thu Dec 25 23:12:53 2014
@@ -1048,7 +1048,7 @@ public class XMPSchema extends AbstractS
while (itCplx.hasNext())
{
tmp = itCplx.next();
- // System.err.println(tmp.getAttribute("xml:lang").getStringValue());
+
if (tmp.getAttribute(XmpConstants.LANG_NAME).getValue().equals(language))
{
// the same language has been found
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/ComplexPropertyContainer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/ComplexPropertyContainer.java?rev=1647923&r1=1647922&r2=1647923&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/ComplexPropertyContainer.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/ComplexPropertyContainer.java Thu Dec 25 23:12:53 2014
@@ -32,13 +32,11 @@ import java.util.List;
* @author a183132
*
*/
-public class ComplexPropertyContainer /* extends AbstractField */
+public class ComplexPropertyContainer
{
private List<AbstractField> properties;
- // private Map<String, Attribute> attributes;
-
/**
* Complex Property type constructor (namespaceURI is given)
*
@@ -46,71 +44,8 @@ public class ComplexPropertyContainer /*
public ComplexPropertyContainer()
{
properties = new ArrayList<AbstractField>();
- // attributes = new HashMap<String, Attribute>();
}
- // /**
- // * Get an attribute with its name in this entity
- // *
- // * @param qualifiedName
- // * the full qualified name of the attribute wanted
- // * @return The attribute property
- // */
- // public Attribute getAttribute(String qualifiedName) {
- // return attributes.get(qualifiedName);
- // }
-
- // /**
- // * Get attributes list defined for this entity
- // *
- // * @return Attributes list
- // */
- // public List<Attribute> getAllAttributes() {
- // return new ArrayList<Attribute>(attributes.values());
- // }
-
- // /**
- // * Set a new attribute for this entity
- // *
- // * @param value
- // * The Attribute property to add
- // */
- // public void setAttribute(Attribute value) {
- // if (attributes.containsKey(value.getQualifiedName())) {
- // // if same name in element, attribute will be replaced
- // attributes.remove(value.getQualifiedName());
- // }
- // if (value.getNamespace() == null) {
- // attributes.put(value.getQualifiedName(), value);
- // } else {
- // attributes.put(value.getQualifiedName(), value);
- // }
- // }
-
- // /**
- // * Remove an attribute of this entity
- // *
- // * @param qualifiedName
- // * the full qualified name of the attribute wanted
- // */
- // public void removeAttribute(String qualifiedName) {
- // if (containsAttribute(qualifiedName)) {
- // attributes.remove(qualifiedName);
- // }
- //
- // }
-
- // /**
- // * Check if an attribute is declared for this entity
- // *
- // * @param qualifiedName
- // * the full qualified name of the attribute concerned
- // * @return true if attribute is present
- // */
- // public boolean containsAttribute(String qualifiedName) {
- // return attributes.containsKey(qualifiedName);
- // }
-
/**
* Give the first property found in this container with type and localname expected
*
@@ -260,5 +195,4 @@ public class ComplexPropertyContainer /*
properties.remove(property);
}
}
-
}
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/PropertyType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/PropertyType.java?rev=1647923&r1=1647922&r2=1647923&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/PropertyType.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/PropertyType.java Thu Dec 25 23:12:53 2014
@@ -43,7 +43,6 @@ public @interface PropertyType
*
*
*/
- // String propertyType();
Types type();
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java?rev=1647923&r1=1647922&r2=1647923&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java Thu Dec 25 23:12:53 2014
@@ -239,16 +239,6 @@ public final class TypeMapping
return definedStructuredNamespaces.containsKey(namespace);
}
- // public String getTypeInArray (String type) {
- // int pos = type.indexOf(' ');
- // if (pos<0) {
- // // not array
- // return null;
- // } else {
- // return type.substring(pos+1);
- // }
- // }
-
public boolean isDefinedType(String name)
{
return this.definedStructuredMappings.containsKey(name);
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java?rev=1647923&r1=1647922&r2=1647923&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java Thu Dec 25 23:12:53 2014
@@ -121,7 +121,7 @@ public class DomXmpParser
{
throw new XmpParsingException(ErrorType.Undefined, "Failed to parse", e);
}
- // document.normalizeDocument();
+
XMPMetadata xmp = null;
// Start reading