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/08/26 19:14:21 UTC

svn commit: r1377461 - in /pdfbox/branches/xmpbox-refactoring/xmpbox/src: main/java/org/apache/padaf/xmpbox/parser/ main/java/org/apache/padaf/xmpbox/type/ test/java/org/apache/padaf/xmpbox/schema/ test/java/org/apache/padaf/xmpbox/type/

Author: gbailleul
Date: Sun Aug 26 17:14:21 2012
New Revision: 1377461

URL: http://svn.apache.org/viewvc?rev=1377461&view=rev
Log:
PDFBOX-1343: Remove duplicate fields and methods in AbstractStructureType

Modified:
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XmpSerializer.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/AbstractStructuredType.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/DefinedStructuredType.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/JobType.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/LayerType.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFAFieldType.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFAPropertyType.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFASchemaType.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFATypeType.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceEventType.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceRefType.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ThumbnailType.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/VersionType.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/BasicJobTicketSchemaTest.java
    pdfbox/branches/xmpbox-refactoring/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TestAbstractStructuredType.java

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XmpSerializer.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XmpSerializer.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XmpSerializer.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/parser/XmpSerializer.java Sun Aug 26 17:14:21 2012
@@ -125,7 +125,7 @@ public class XmpSerializer {
 			} else if (field instanceof AbstractStructuredType) {
 				AbstractStructuredType structured = (AbstractStructuredType)field;
 				// element li
-				Element estructured = doc.createElement(structured.getPrefix()+":"+structured.getPropertyName());
+				Element estructured = doc.createElement("rdf"+":"+"li");
 				parent.appendChild(estructured);
 				// element description
 				Element econtainer = doc.createElement("rdf"+":"+"Description");

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/AbstractStructuredType.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/AbstractStructuredType.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/AbstractStructuredType.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/AbstractStructuredType.java Sun Aug 26 17:14:21 2012
@@ -29,30 +29,17 @@ public abstract class AbstractStructured
 
 	
 	
-	/** The prefix of the fields of the structure */
-	private String fieldPrefix = null;
-	
-	protected static final String STRUCTURE_ARRAY_PREFIX = "rdf";
-
 	protected static final  String STRUCTURE_ARRAY_NAME = "li"; 
 
 	public AbstractStructuredType(XMPMetadata metadata, String namespaceURI,
 			String fieldPrefix) {
-		super(metadata, namespaceURI, STRUCTURE_ARRAY_PREFIX, STRUCTURE_ARRAY_NAME);
-		this.fieldPrefix = fieldPrefix;
-	}
-
-	public abstract String getFieldsNamespace();
-	
-	public String getFieldPrefix () {
-		return this.fieldPrefix;
+		super(metadata, namespaceURI, fieldPrefix, STRUCTURE_ARRAY_NAME);
 	}
 
-
 	
 	protected void addSimpleProperty (String propertyName, Object value) {
 		TypeMapping tm = getMetadata().getTypeMapping();
-		AbstractSimpleProperty asp = tm.instanciateSimpleField(getClass(), getMetadata(),null,fieldPrefix,propertyName, value);
+		AbstractSimpleProperty asp = tm.instanciateSimpleField(getClass(), getMetadata(),null,getPrefix(),propertyName, value);
 		addProperty(asp);
 	}
 

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/DefinedStructuredType.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/DefinedStructuredType.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/DefinedStructuredType.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/DefinedStructuredType.java Sun Aug 26 17:14:21 2012
@@ -36,11 +36,6 @@ public class DefinedStructuredType exten
 		this.definedProperties = new HashMap<String, String>();
 	}
 
-	@Override
-	public String getFieldsNamespace() {
-		return getNamespace();
-	}
-
 	public void addProperty (String name, String type) {
 		definedProperties.put(name, type);
 	}

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/JobType.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/JobType.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/JobType.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/JobType.java Sun Aug 26 17:14:21 2012
@@ -46,7 +46,7 @@ public class JobType extends AbstractStr
     }
 
     public JobType(XMPMetadata metadata, String fieldPrefix) {
-        super(metadata, XmpConstants.RDF_NAMESPACE, fieldPrefix);
+        super(metadata, ELEMENT_NS, fieldPrefix);
 		setAttribute(new Attribute(XMPSchema.NS_NAMESPACE, "xmlns", fieldPrefix, ELEMENT_NS));
     }
 
@@ -74,10 +74,4 @@ public class JobType extends AbstractStr
     	return getPropertyValueAsString(URL);
     }
 
-	@Override
-	public String getFieldsNamespace() {
-		return ELEMENT_NS;
-	}
-
-    
 }

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/LayerType.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/LayerType.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/LayerType.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/LayerType.java Sun Aug 26 17:14:21 2012
@@ -38,7 +38,7 @@ public class LayerType extends AbstractS
 
 	
 	public LayerType(XMPMetadata metadata) {
-		super(metadata, XmpConstants.RDF_NAMESPACE, PREFERED_PREFIX);
+		super(metadata, ELEMENT_NS, PREFERED_PREFIX);
 		setAttribute(new Attribute(null, "rdf", "parseType", "Resource"));
 	}
 	
@@ -67,7 +67,7 @@ public class LayerType extends AbstractS
 	 *            the value of LayerName property to set
 	 */
 	public void setLayerName(String image) {
-		this.addProperty(new TextType(getMetadata(), null,getFieldPrefix(), LAYER_NAME, image));
+		this.addProperty(new TextType(getMetadata(), null,getPrefix(), LAYER_NAME, image));
 	}
 	
 	/**
@@ -95,13 +95,7 @@ public class LayerType extends AbstractS
 	 *            the value of LayerText property to set
 	 */
 	public void setLayerText(String image) {
-		this.addProperty(new TextType(getMetadata(), null,getFieldPrefix(), LAYER_TEXT, image));
+		this.addProperty(new TextType(getMetadata(), null,getPrefix(), LAYER_TEXT, image));
 	}
 
-	@Override
-	public String getFieldsNamespace() {
-		return ELEMENT_NS;
-	}
-
-
 }

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFAFieldType.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFAFieldType.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFAFieldType.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFAFieldType.java Sun Aug 26 17:14:21 2012
@@ -40,12 +40,7 @@ public class PDFAFieldType extends Abstr
 	public static final String DESCRIPTION = "description";
 
 	public PDFAFieldType(XMPMetadata metadata) {
-		super(metadata, XmpConstants.RDF_NAMESPACE, PREFERED_PREFIX);
-	}
-
-	@Override
-	public String getFieldsNamespace() {
-		return ELEMENT_NS;
+		super(metadata, ELEMENT_NS, PREFERED_PREFIX);
 	}
 
 	public String getName () {

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFAPropertyType.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFAPropertyType.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFAPropertyType.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFAPropertyType.java Sun Aug 26 17:14:21 2012
@@ -44,12 +44,7 @@ public class PDFAPropertyType extends Ab
 
 
 	public PDFAPropertyType(XMPMetadata metadata) {
-		super(metadata, XmpConstants.RDF_NAMESPACE, PREFERED_PREFIX);
-	}
-
-	@Override
-	public String getFieldsNamespace() {
-		return ELEMENT_NS;
+		super(metadata, ELEMENT_NS, PREFERED_PREFIX);
 	}
 
 	public String getName () {

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFASchemaType.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFASchemaType.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFASchemaType.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFASchemaType.java Sun Aug 26 17:14:21 2012
@@ -46,12 +46,7 @@ public class PDFASchemaType extends Abst
 	public static final String VALUE_TYPE = "valueType";
 
 	public PDFASchemaType(XMPMetadata metadata) {
-		super(metadata, XmpConstants.RDF_NAMESPACE, PREFERED_PREFIX);
-	}
-
-	@Override
-	public String getFieldsNamespace() {
-		return ELEMENT_NS;
+		super(metadata, ELEMENT_NS, PREFERED_PREFIX);
 	}
 
 	public String getNamespaceURI() {

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFATypeType.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFATypeType.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFATypeType.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/PDFATypeType.java Sun Aug 26 17:14:21 2012
@@ -47,12 +47,7 @@ public class PDFATypeType extends Abstra
 	public static final String FIELD = "field";
 
 	public PDFATypeType(XMPMetadata metadata) {
-		super(metadata, XmpConstants.RDF_NAMESPACE, PREFERED_PREFIX);
-	}
-
-	@Override
-	public String getFieldsNamespace() {
-		return ELEMENT_NS;
+		super(metadata, ELEMENT_NS, PREFERED_PREFIX);
 	}
 
 	public String getNamespaceURI() {

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceEventType.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceEventType.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceEventType.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceEventType.java Sun Aug 26 17:14:21 2012
@@ -64,7 +64,7 @@ public class ResourceEventType extends A
 	 *            The local Name of this thumbnail type
 	 */
 	public ResourceEventType(XMPMetadata metadata) {
-		super(metadata, XmpConstants.RDF_NAMESPACE, PREFERRED_PREFIX);
+		super(metadata, ELEMENT_NS, PREFERRED_PREFIX);
 		setAttribute(new Attribute(XMPSchema.NS_NAMESPACE, "xmlns", PREFERRED_PREFIX, ELEMENT_NS));
 	}
 	
@@ -117,11 +117,5 @@ public class ResourceEventType extends A
 	public void setParameters (String value) {
 		addSimpleProperty(PARAMETERS, value);
 	}
-
-	@Override
-	public String getFieldsNamespace() {
-		return ELEMENT_NS;
-	}
-
 	
 }

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceRefType.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceRefType.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceRefType.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ResourceRefType.java Sun Aug 26 17:14:21 2012
@@ -93,7 +93,7 @@ public class ResourceRefType extends Abs
 	 *            The local Name of this thumbnail type
 	 */
 	public ResourceRefType(XMPMetadata metadata) {
-		super(metadata, XmpConstants.RDF_NAMESPACE, PREFERRED_PREFIX);
+		super(metadata, ELEMENT_NS, PREFERRED_PREFIX);
 		setAttribute(new Attribute(XMPSchema.NS_NAMESPACE, "xmlns", PREFERRED_PREFIX, ELEMENT_NS));
 	}
 	
@@ -328,10 +328,4 @@ public class ResourceRefType extends Abs
         }
 	}
 
-	@Override
-	public String getFieldsNamespace() {
-		return ELEMENT_NS;
-	}
-
-
 }

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ThumbnailType.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ThumbnailType.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ThumbnailType.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/ThumbnailType.java Sun Aug 26 17:14:21 2012
@@ -60,7 +60,7 @@ public class ThumbnailType extends Abstr
 	 *            The local Name of this thumbnail type
 	 */
 	public ThumbnailType(XMPMetadata metadata) {
-		super(metadata, XmpConstants.RDF_NAMESPACE, PREFERRED_PREFIX);
+		super(metadata, ELEMENT_NS, PREFERRED_PREFIX);
 		setAttribute(new Attribute(null, "rdf", "parseType", "Resource"));
 	}
 
@@ -175,11 +175,5 @@ public class ThumbnailType extends Abstr
 	public void setFormat(String format) {
 		addSimpleProperty(FORMAT, format);
 	}
-
-	@Override
-	public String getFieldsNamespace() {
-		return ELEMENT_NS;
-	}
-
 	
 }

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/VersionType.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/VersionType.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/VersionType.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/main/java/org/apache/padaf/xmpbox/type/VersionType.java Sun Aug 26 17:14:21 2012
@@ -61,7 +61,7 @@ public class VersionType extends Abstrac
 	 *            The local Name of this thumbnail type
 	 */
 	public VersionType(XMPMetadata metadata) {
-		super(metadata, XmpConstants.RDF_NAMESPACE, PREFERRED_PREFIX);
+		super(metadata, ELEMENT_NS, PREFERRED_PREFIX);
 		setAttribute(new Attribute(XMPSchema.NS_NAMESPACE, "xmlns", PREFERRED_PREFIX, ELEMENT_NS));
 	}
 	
@@ -106,10 +106,4 @@ public class VersionType extends Abstrac
 		addSimpleProperty(MODIFIER, value);
 	}
 
-	@Override
-	public String getFieldsNamespace() {
-		return ELEMENT_NS;
-	}
-
-
 }

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/BasicJobTicketSchemaTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/BasicJobTicketSchemaTest.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/BasicJobTicketSchemaTest.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/test/java/org/apache/padaf/xmpbox/schema/BasicJobTicketSchemaTest.java Sun Aug 26 17:14:21 2012
@@ -104,8 +104,8 @@ public class BasicJobTicketSchemaTest {
 		Assert.assertEquals("zeid2", job.getId());
 		Assert.assertEquals("zename2", job.getName());
 		Assert.assertEquals("zeurl2", job.getUrl());
-		Assert.assertEquals(JobType.ELEMENT_NS, job.getFieldsNamespace());
-		Assert.assertEquals(JobType.PREFERED_PREFIX, job.getFieldPrefix());
+		Assert.assertEquals(JobType.ELEMENT_NS, job.getNamespace());
+		Assert.assertEquals(JobType.PREFERED_PREFIX, job.getPrefix());
 	
 	}
 
@@ -135,8 +135,8 @@ public class BasicJobTicketSchemaTest {
 		Assert.assertEquals("zeid2", job.getId());
 		Assert.assertEquals("zename2", job.getName());
 		Assert.assertEquals("zeurl2", job.getUrl());
-		Assert.assertEquals(JobType.ELEMENT_NS, job.getFieldsNamespace());
-		Assert.assertEquals("aaa", job.getFieldPrefix());
+		Assert.assertEquals(JobType.ELEMENT_NS, job.getNamespace());
+		Assert.assertEquals("aaa", job.getPrefix());
 	
 	}
 

Modified: pdfbox/branches/xmpbox-refactoring/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TestAbstractStructuredType.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/xmpbox-refactoring/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TestAbstractStructuredType.java?rev=1377461&r1=1377460&r2=1377461&view=diff
==============================================================================
--- pdfbox/branches/xmpbox-refactoring/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TestAbstractStructuredType.java (original)
+++ pdfbox/branches/xmpbox-refactoring/xmpbox/src/test/java/org/apache/padaf/xmpbox/type/TestAbstractStructuredType.java Sun Aug 26 17:14:21 2012
@@ -44,12 +44,6 @@ public class TestAbstractStructuredType 
 			super(metadata, namespaceURI, fieldPrefix);
 		}
 
-		@Override
-		public String getFieldsNamespace() {
-			return "test";
-		}
-
-		
 	}
 
 	
@@ -68,8 +62,8 @@ public class TestAbstractStructuredType 
 	@Test
 	public void validate () throws Exception {
 		Assert.assertEquals(MY_NS, st.getNamespace());
-		Assert.assertEquals(AbstractStructuredType.STRUCTURE_ARRAY_PREFIX, st.getPrefix());
-		Assert.assertEquals(MY_PREFIX, st.getFieldPrefix());
+		Assert.assertEquals(MY_PREFIX, st.getPrefix());
+		Assert.assertEquals(MY_PREFIX, st.getPrefix());
 	}
 
 	@Test