Author: gbailleul
Date: Tue Jun 18 11:00:49 2013
New Revision: 1494099
URL: http://svn.apache.org/r1494099
Log:
PDFBOX-1644:
Fix wasted time in merge
Patch without label
Modified:
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/schema/XMPSchema.java
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=1494099&r1=1494098&r2=1494099&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
Tue Jun 18 11:00:49 2013
@@ -59,8 +59,6 @@ public class XMPSchema extends AbstractS
*
* @param metadata
* The parent XMP metadata that this schema will be part of.
- * @param namespaceName
- * The name of the namespace, ie pdf,dc,...
* @param namespaceURI
* The URI of the namespace, ie "http://ns.adobe.com/pdf/1.3/";
*
@@ -289,14 +287,11 @@ public class XMPSchema extends AbstractS
/**
* Get a TextProperty Type from its name
*
- * @param qualifiedName
- * The full qualified name of the property wanted
* @return The Text Type property wanted
*/
public TextType getUnqualifiedTextProperty(String name)
{
- String qualifiedName = name;
- AbstractField prop = getAbstractProperty(qualifiedName);
+ AbstractField prop = getAbstractProperty(name);
if (prop != null)
{
if (prop instanceof TextType)
@@ -314,9 +309,6 @@ public class XMPSchema extends AbstractS
/**
* Get the value of a simple text property.
*
- * @param qualifiedName
- * The name of the property to get, it must include the
namespace prefix. ie "pdf:Keywords".
- *
* @return The value of the text property or the null if there is no value.
*
*/
@@ -633,8 +625,6 @@ public class XMPSchema extends AbstractS
/**
* Generic array property removing
*
- * @param qualifiedArrayName
- * the full qualified name of property wanted
* @param fieldValue
* the field value
*/
@@ -666,8 +656,6 @@ public class XMPSchema extends AbstractS
/**
* Remove all matching entries with the given value from the bag.
*
- * @param qualifiedBagName
- * The name of the bag, it must include the namespace prefix.
ie "pdf:Keywords".
* @param bagValue
* The value to remove from the bagList.
*/
@@ -722,9 +710,6 @@ public class XMPSchema extends AbstractS
* Get all the values of the bag property. This will return a list of
java.lang.String objects, this is a read-only
* list.
*
- * @param qualifiedBagName
- * The name of the bag property to get without namespace prefix.
- *
* @return All values of the bag property in a list.
*/
public List<String> getUnqualifiedBagValueList(String bagName)
@@ -756,8 +741,8 @@ public class XMPSchema extends AbstractS
/**
* Generic method to remove a field from an array with an Elementable
Object
*
- * @param qualifiedArrayName
- * the full qualified name of the property concerned
+ * @param arrayName
+ * the name of the property concerned
* @param fieldValue
* the elementable field value
*/
@@ -802,7 +787,7 @@ public class XMPSchema extends AbstractS
/**
* Add a new value to a sequence property.
*
- * @param qualifiedSeqName
+ * @param simpleSeqName
* The name of the sequence property without the namespace
prefix
* @param seqValue
* The value to add to the sequence.
@@ -850,7 +835,7 @@ public class XMPSchema extends AbstractS
/**
* Add a new value to a sequence property.
*
- * @param qualifiedSeqName
+ * @param seqName
* The name of the sequence property, it must include the
namespace prefix. ie "pdf:Keywords"
* @param seqValue
* The value to add to the sequence.
@@ -874,7 +859,7 @@ public class XMPSchema extends AbstractS
/**
* Get all the values in a sequence property.
*
- * @param qualifiedSeqName
+ * @param seqName
* The name of the sequence property without namespace prefix.
*
* @return A read-only list of java.lang.String objects or null if the
property does not exist.
@@ -895,7 +880,7 @@ public class XMPSchema extends AbstractS
/**
* Remove a date sequence value from the list.
*
- * @param qualifiedSeqName
+ * @param seqName
* The name of the sequence property, it must include the
namespace prefix. ie "pdf:Keywords"
* @param date
* The date to remove from the sequence property.
@@ -945,7 +930,7 @@ public class XMPSchema extends AbstractS
/**
* Add a date sequence value to the list.
*
- * @param qualifiedSeqName
+ * @param seqName
* The name of the sequence property, it must include the
namespace prefix. ie "pdf:Keywords"
* @param date
* The date to add to the sequence property.
@@ -961,7 +946,7 @@ public class XMPSchema extends AbstractS
/**
* Get all the date values in a sequence property.
*
- * @param qualifiedSeqName
+ * @param seqName
* The name of the sequence property, it must include the
namespace prefix. ie "pdf:Keywords".
*
* @return A read-only list of java.util.Calendar objects or null if the
property does not exist.
@@ -1048,7 +1033,7 @@ public class XMPSchema extends AbstractS
/**
* Set the value of a multi-lingual property.
*
- * @param qualifiedName
+ * @param name
* The name of the property, it must include the namespace
prefix. ie "pdf:Keywords"
* @param language
* The language code of the value. If null then "x-default" is
assumed.
@@ -1118,9 +1103,9 @@ public class XMPSchema extends AbstractS
/**
* Get the value of a multi-lingual property.
*
- * @param qualifiedName
+ * @param name
* The name of the property, without the namespace prefix.
- * @param language
+ * @param expectedLanguage
* The language code of the value. If null then "x-default" is
assumed.
*
* @return The value of the language property.
@@ -1162,7 +1147,7 @@ public class XMPSchema extends AbstractS
/**
* Get a list of all languages that are currently defined for a specific
property.
*
- * @param qualifiedName
+ * @param name
* The name of the property, it must include the namespace
prefix. ie "pdf:Keywords"
*
* @return A list of all languages, this will return an non-null empty
list if none have been defined.
@@ -1270,7 +1255,7 @@ public class XMPSchema extends AbstractS
tmpOldValue = (TextType)
itOldValues.next();
if
(tmpOldValue.getStringValue().equals(tmpNewValue.getStringValue()))
{
- alreadyPresent = true;
+ return;
}
}
if (!alreadyPresent)
@@ -1294,7 +1279,7 @@ public class XMPSchema extends AbstractS
/**
* Get an AbstractField list corresponding to the content of an array
Return null if the property is unknown
*
- * @param nam
+ * @param name
* the property name whitout namespace;
* @return List of property contained in the complex property
* @throws BadFieldValueException
