Author: rdonkin
Date: Wed May 27 12:23:00 2009
New Revision: 779140

URL: http://svn.apache.org/viewvc?rev=779140&view=rev
Log:
IMAP-93 Improve naming https://issues.apache.org/jira/browse/IMAP-93

Modified:
    
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAHeader.java
    
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
    
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
    
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
    
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/Header.java
    
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleHeader.java
    
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java

Modified: 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAHeader.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAHeader.java?rev=779140&r1=779139&r2=779140&view=diff
==============================================================================
--- 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAHeader.java
 (original)
+++ 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAHeader.java
 Wed May 27 12:23:00 2009
@@ -65,9 +65,9 @@
     }
 
     /**
-     * @see org.apache.james.imap.store.mail.model.Header#getField()
+     * @see org.apache.james.imap.store.mail.model.Header#getFieldName()
      */
-    public String getField() {
+    public String getFieldName() {
         return field;
     }
 

Modified: 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java?rev=779140&r1=779139&r2=779140&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
 (original)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
 Wed May 27 12:23:00 2009
@@ -298,7 +298,7 @@
         boolean result = false;
         final List<Header> headers = message.getDocument().getHeaders();
         for (Header header:headers) {
-            final String name = header.getField();
+            final String name = header.getFieldName();
             if (headerName.equalsIgnoreCase(name)) {
                 result = true;
                 break;
@@ -313,7 +313,7 @@
         boolean result = false;
         final List<Header> headers = message.getDocument().getHeaders();
         for (Header header:headers) {
-            final String name = header.getField();
+            final String name = header.getFieldName();
             if (headerName.equalsIgnoreCase(name)) {
                 final String value = header.getValue();
                 if (value != null) {
@@ -360,7 +360,7 @@
         final List<Header> headers = message.getDocument().getHeaders();
         String value = null;
         for (Header header:headers) {
-            final String name = header.getField();
+            final String name = header.getFieldName();
             if (headerName.equalsIgnoreCase(name)) {
                 value = header.getValue();
                 break;

Modified: 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java?rev=779140&r1=779139&r2=779140&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
 (original)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
 Wed May 27 12:23:00 2009
@@ -41,7 +41,7 @@
     private final long size;
 
     public ResultHeader(final Header header) {
-        this(header.getField(), header.getValue());
+        this(header.getFieldName(), header.getValue());
     }
 
     public ResultHeader(String name, String value) {

Modified: 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java?rev=779140&r1=779139&r2=779140&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
 (original)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
 Wed May 27 12:23:00 2009
@@ -212,7 +212,7 @@
         final List<Header> headers = getSortedHeaders(document);
         final StringBuffer headersToString = new StringBuffer(headers.size() * 
50);
         for (Header header: headers) {
-            headersToString.append(header.getField());
+            headersToString.append(header.getFieldName());
             headersToString.append(": ");
             headersToString.append(header.getValue());
             headersToString.append("\r\n");

Modified: 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/Header.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/Header.java?rev=779140&r1=779139&r2=779140&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/Header.java
 (original)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/Header.java
 Wed May 27 12:23:00 2009
@@ -20,7 +20,7 @@
 
 public interface Header extends Comparable<Header> {
 
-    public abstract String getField();
+    public abstract String getFieldName();
 
     public abstract int getLineNumber();
 

Modified: 
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleHeader.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleHeader.java?rev=779140&r1=779139&r2=779140&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleHeader.java
 (original)
+++ 
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleHeader.java
 Wed May 27 12:23:00 2009
@@ -41,7 +41,7 @@
         this.value = value;
     }
 
-    public String getField() {
+    public String getFieldName() {
         return field;
     }
 

Modified: 
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java?rev=779140&r1=779139&r2=779140&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java
 (original)
+++ 
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java
 Wed May 27 12:23:00 2009
@@ -48,7 +48,7 @@
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         final Writer writer = new OutputStreamWriter(baos, "us-ascii");
         for (SimpleHeader header:headers) {
-            writer.write(header.getField());
+            writer.write(header.getFieldName());
             writer.write(": ");
             writer.write(header.getValue());
             writer.write(NEW_LINE);



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to