Author: norman
Date: Mon Jun 20 06:15:30 2011
New Revision: 1137514
URL: http://svn.apache.org/viewvc?rev=1137514&view=rev
Log:
Remove AbstractComparableProperty as there is no need to sort the properties.
See MAILBOX-98
Removed:
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractComparableProperty.java
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java?rev=1137514&r1=1137513&r2=1137514&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
(original)
+++
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
Mon Jun 20 06:15:30 2011
@@ -120,9 +120,8 @@ public class JCRMessage extends Abstract
this.subType = propertyBuilder.getSubType();
final List<Property> properties = propertyBuilder.toProperties();
this.properties = new ArrayList<JCRProperty>(properties.size());
- int order = 0;
for (final Property property:properties) {
- this.properties.add(new JCRProperty(property, order++, logger));
+ this.properties.add(new JCRProperty(property,logger));
}
}
@@ -156,9 +155,8 @@ public class JCRMessage extends Abstract
this.subType = message.getSubType();
final List<Property> properties = pBuilder.toProperties();
this.properties = new ArrayList<JCRProperty>(properties.size());
- int order = 0;
for (final Property property:properties) {
- this.properties.add(new JCRProperty(property, order++, logger));
+ this.properties.add(new JCRProperty(property, logger));
}
}
@@ -326,7 +324,7 @@ public class JCRMessage extends Abstract
List<Property> newProperites = new ArrayList<Property>();
for (int i = 0; i < currentProperties.size(); i++) {
Property prop = currentProperties.get(i);
- newProperites.add(new JCRProperty(prop, i, logger));
+ newProperites.add(new JCRProperty(prop, logger));
}
// remove old properties, we will add a bunch of new ones
NodeIterator iterator = node.getNodes("messageProperty");
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java?rev=1137514&r1=1137513&r2=1137514&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
(original)
+++
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
Mon Jun 20 06:15:30 2011
@@ -23,7 +23,6 @@ import javax.jcr.RepositoryException;
import org.apache.james.mailbox.jcr.JCRImapConstants;
import org.apache.james.mailbox.jcr.Persistent;
-import org.apache.james.mailbox.store.mail.model.AbstractComparableProperty;
import org.apache.james.mailbox.store.mail.model.Property;
import org.slf4j.Logger;
@@ -31,7 +30,7 @@ import org.slf4j.Logger;
* JCR implementation of {@link Property}
*
*/
-public class JCRProperty extends AbstractComparableProperty<JCRProperty>
implements JCRImapConstants, Persistent {
+public class JCRProperty implements JCRImapConstants, Persistent, Property {
private Node node;
private final Logger logger;
@@ -50,16 +49,15 @@ public class JCRProperty extends Abstrac
this.logger = logger;
}
- public JCRProperty(final String namespace, final String localName, final
String value, final int order, Logger logger) {
+ public JCRProperty(final String namespace, final String localName, final
String value, Logger logger) {
this.namespace = namespace;
this.localName = localName;
this.value = value;
- this.order = order;
this.logger = logger;
}
- public JCRProperty(Property property, int order, Logger logger) {
- this(property.getNamespace(), property.getLocalName(),
property.getValue(), order, logger);
+ public JCRProperty(Property property, Logger logger) {
+ this(property.getNamespace(), property.getLocalName(),
property.getValue(), logger);
}
/*
* (non-Javadoc)
Modified:
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java?rev=1137514&r1=1137513&r2=1137514&view=diff
==============================================================================
---
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java
(original)
+++
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java
Mon Jun 20 06:15:30 2011
@@ -25,12 +25,11 @@ import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.james.mailbox.store.mail.model.AbstractComparableProperty;
import org.apache.james.mailbox.store.mail.model.Property;
@Entity(name="Property")
@Table(name="JAMES_MAIL_PROPERTY")
-public class JPAProperty extends AbstractComparableProperty<JPAProperty> {
+public class JPAProperty implements Property {
/** The system unique key */
@Id
Modified:
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java?rev=1137514&r1=1137513&r2=1137514&view=diff
==============================================================================
---
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
(original)
+++
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
Mon Jun 20 06:15:30 2011
@@ -54,9 +54,9 @@ import org.apache.james.mailbox.store.tr
import org.slf4j.Logger;
/**
- * This abstract base class of an {@link MailboxManager} implementation
provides a high-level api for writing your own
+ * This base class of an {@link MailboxManager} implementation provides a
high-level api for writing your own
* {@link MailboxManager} implementation. If you plan to write your own {@link
MailboxManager} its most times so easiest
- * to extend just this class.
+ * to extend just this class or use it directly.
*
* If you need a more low-level api just implement {@link MailboxManager}
directly
*
Modified:
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java?rev=1137514&r1=1137513&r2=1137514&view=diff
==============================================================================
---
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java
(original)
+++
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java
Mon Jun 20 06:15:30 2011
@@ -56,17 +56,14 @@ public class PropertyBuilder {
private static final int INITIAL_CAPACITY = 32;
- private int order = 0;
-
private Long textualLineCount;
private final List<SimpleProperty> properties;
public PropertyBuilder(final List<Property> props) {
textualLineCount = null;
properties = new ArrayList<SimpleProperty>(props.size());
- int i = 0;
for (final Property property:props) {
- properties.add(new SimpleProperty(property, i++));
+ properties.add(new SimpleProperty(property));
}
}
@@ -144,7 +141,7 @@ public class PropertyBuilder {
}
if (value != null) {
- properties.add(new SimpleProperty(namespace, localName, value,
order++));
+ properties.add(new SimpleProperty(namespace, localName, value));
}
}
@@ -164,7 +161,7 @@ public class PropertyBuilder {
}
if (values !=null) {
for(final String value:values) {
- properties.add(new SimpleProperty(namespace, localName, value,
order++));
+ properties.add(new SimpleProperty(namespace, localName,
value));
}
}
}
@@ -200,7 +197,7 @@ public class PropertyBuilder {
}
}
for (final Map.Entry<String, String>
valueByLocalName:valuesByLocalName.entrySet()) {
- properties.add(new SimpleProperty(namespace,
valueByLocalName.getKey().toLowerCase(), valueByLocalName.getValue(), order++));
+ properties.add(new SimpleProperty(namespace,
valueByLocalName.getKey().toLowerCase(), valueByLocalName.getValue()));
}
}
Modified:
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java?rev=1137514&r1=1137513&r2=1137514&view=diff
==============================================================================
---
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
(original)
+++
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
Mon Jun 20 06:15:30 2011
@@ -92,9 +92,8 @@ public class SimpleMessage<Id> extends A
this.subType = original.getSubType();
final List<Property> properties = pBuilder.toProperties();
this.properties = new ArrayList<Property>(properties.size());
- int order = 0;
for (final Property property:properties) {
- this.properties.add(new SimpleProperty(property, order++));
+ this.properties.add(new SimpleProperty(property));
}
}
Modified:
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java?rev=1137514&r1=1137513&r2=1137514&view=diff
==============================================================================
---
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java
(original)
+++
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java
Mon Jun 20 06:15:30 2011
@@ -18,14 +18,12 @@
****************************************************************/
package org.apache.james.mailbox.store.mail.model.impl;
-import org.apache.james.mailbox.store.mail.model.AbstractComparableProperty;
import org.apache.james.mailbox.store.mail.model.Property;
-public final class SimpleProperty extends
AbstractComparableProperty<SimpleProperty> {
+public final class SimpleProperty implements Property {
private String namespace;
private String localName;
private String value;
- private int order;
/**
* Construct a property.
@@ -33,24 +31,37 @@ public final class SimpleProperty extend
* @param localName not null
* @param value not null
*/
- public SimpleProperty(String namespace, String localName, String value,
int order) {
+ public SimpleProperty(String namespace, String localName, String value) {
super();
this.namespace = namespace;
this.localName = localName;
this.value = value;
- this.order = order;
}
- public SimpleProperty(Property property, int order) {
- this(property.getNamespace(), property.getLocalName(),
property.getValue(), order);
+ public SimpleProperty(Property property) {
+ this(property.getNamespace(), property.getLocalName(),
property.getValue());
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.store.mail.model.Property#getLocalName()
+ */
public String getLocalName() {
return localName;
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.store.mail.model.Property#getNamespace()
+ */
public String getNamespace() {
return namespace;
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.store.mail.model.Property#getValue()
+ */
public String getValue() {
return value;
}
@@ -91,9 +102,4 @@ public final class SimpleProperty extend
+ "' value='" + this.value
+ "')";
}
-
- @Override
- public int getOrder() {
- return order;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
