poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r1058116 [3/3] - in /poi/trunk/src/scratchpad: src/org/apache/poi/hsmf/datatypes/ src/org/apache/poi/hsmf/dev/ src/org/apache/poi/hsmf/parsers/ testcases/org/apache/poi/hsmf/datatypes/ testcases/org/apache/poi/hsmf/parsers/
Date Wed, 12 Jan 2011 12:45:53 GMT
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java?rev=1058116&r1=1058115&r2=1058116&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java Wed Jan
12 12:45:51 2011
@@ -32,12 +32,12 @@ import java.util.List;
 public final class RecipientChunks implements ChunkGroup {
    public static final String PREFIX = "__recip_version1.0_#";
    
-   public static final MAPIAttribute RECIPIENT_NAME   = MAPIAttribute.DISPLAY_NAME;
-   public static final MAPIAttribute DELIVERY_TYPE    = MAPIAttribute.ADDRTYPE;
-   public static final MAPIAttribute RECIPIENT_EMAIL_ADDRESS = MAPIAttribute.EMAIL_ADDRESS;
-   public static final MAPIAttribute RECIPIENT_SEARCH        = MAPIAttribute.SEARCH_KEY;
-   public static final MAPIAttribute RECIPIENT_SMTP_ADDRESS  = MAPIAttribute.SMTP_ADDRESS;
-   public static final MAPIAttribute RECIPIENT_DISPLAY_NAME  = MAPIAttribute.RECIPIENT_DISPLAY_NAME;
+   public static final MAPIProperty RECIPIENT_NAME   = MAPIProperty.DISPLAY_NAME;
+   public static final MAPIProperty DELIVERY_TYPE    = MAPIProperty.ADDRTYPE;
+   public static final MAPIProperty RECIPIENT_EMAIL_ADDRESS = MAPIProperty.EMAIL_ADDRESS;
+   public static final MAPIProperty RECIPIENT_SEARCH        = MAPIProperty.SEARCH_KEY;
+   public static final MAPIProperty RECIPIENT_SMTP_ADDRESS  = MAPIProperty.SMTP_ADDRESS;
+   public static final MAPIProperty RECIPIENT_DISPLAY_NAME  = MAPIProperty.RECIPIENT_DISPLAY_NAME;
    
    /** Our 0 based position in the list of recipients */
    public int recipientNumber;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java?rev=1058116&r1=1058115&r2=1058116&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java Wed Jan 12 12:45:51
2011
@@ -22,7 +22,7 @@ import java.io.IOException;
 
 import org.apache.poi.hsmf.datatypes.Chunk;
 import org.apache.poi.hsmf.datatypes.ChunkGroup;
-import org.apache.poi.hsmf.datatypes.MAPIAttribute;
+import org.apache.poi.hsmf.datatypes.MAPIProperty;
 import org.apache.poi.hsmf.datatypes.Types;
 import org.apache.poi.hsmf.parsers.POIFSChunkParser;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
@@ -41,10 +41,10 @@ public class HSMFDump {
       for(ChunkGroup chunks : chunkGroups) {
          System.out.println(chunks.getClass().getSimpleName());
          for(Chunk chunk : chunks.getChunks()) {
-            MAPIAttribute attr = MAPIAttribute.get(chunk.getChunkId());
+            MAPIProperty attr = MAPIProperty.get(chunk.getChunkId());
             
             String idName = attr.id + " - " + attr.name;
-            if(attr == MAPIAttribute.UNKNOWN) {
+            if(attr == MAPIProperty.UNKNOWN) {
                idName = chunk.getChunkId() + " - (unknown)";
             }
             

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java?rev=1058116&r1=1058115&r2=1058116&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java Wed Jan 12 12:45:51
2011
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
-import org.apache.poi.hsmf.datatypes.MAPIAttribute;
+import org.apache.poi.hsmf.datatypes.MAPIProperty;
 import org.apache.poi.hsmf.datatypes.Types;
 
 /**
@@ -32,18 +32,18 @@ public class TypesLister {
    public TypesLister() {}
    
    public void listByName(PrintStream out) {
-      ArrayList<MAPIAttribute> all = new ArrayList<MAPIAttribute>(MAPIAttribute.getAll());
-      Collections.sort(all, new Comparator<MAPIAttribute>() {
-         public int compare(MAPIAttribute a, MAPIAttribute b) {
+      ArrayList<MAPIProperty> all = new ArrayList<MAPIProperty>(MAPIProperty.getAll());
+      Collections.sort(all, new Comparator<MAPIProperty>() {
+         public int compare(MAPIProperty a, MAPIProperty b) {
             return a.name.compareTo(b.name);
          }
       });
       list(all, out);
    }
    public void listById(PrintStream out) {
-      ArrayList<MAPIAttribute> all = new ArrayList<MAPIAttribute>(MAPIAttribute.getAll());
-      Collections.sort(all, new Comparator<MAPIAttribute>() {
-         public int compare(MAPIAttribute a, MAPIAttribute b) {
+      ArrayList<MAPIProperty> all = new ArrayList<MAPIProperty>(MAPIProperty.getAll());
+      Collections.sort(all, new Comparator<MAPIProperty>() {
+         public int compare(MAPIProperty a, MAPIProperty b) {
             if(a.id < b.id) return -1;
             if(a.id > b.id) return +1;
             return 0;
@@ -51,8 +51,8 @@ public class TypesLister {
       });
       list(all, out);
    }
-   private void list(ArrayList<MAPIAttribute> list, PrintStream out) {
-      for(MAPIAttribute attr : list) {
+   private void list(ArrayList<MAPIProperty> list, PrintStream out) {
+      for(MAPIProperty attr : list) {
          String id = Integer.toHexString(attr.id);
          while(id.length() < 4) { id = "0"+id; }
          

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java?rev=1058116&r1=1058115&r2=1058116&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java Wed Jan
12 12:45:51 2011
@@ -26,7 +26,7 @@ import org.apache.poi.hsmf.datatypes.Chu
 import org.apache.poi.hsmf.datatypes.ChunkGroup;
 import org.apache.poi.hsmf.datatypes.Chunks;
 import org.apache.poi.hsmf.datatypes.DirectoryChunk;
-import org.apache.poi.hsmf.datatypes.MAPIAttribute;
+import org.apache.poi.hsmf.datatypes.MAPIProperty;
 import org.apache.poi.hsmf.datatypes.MessageSubmissionChunk;
 import org.apache.poi.hsmf.datatypes.NameIdChunks;
 import org.apache.poi.hsmf.datatypes.RecipientChunks;
@@ -135,7 +135,7 @@ public final class POIFSChunkParser {
          Chunk chunk = null;
          
          // Special cases based on the ID
-         if(chunkId == MAPIAttribute.MESSAGE_SUBMISSION_ID.id) {
+         if(chunkId == MAPIProperty.MESSAGE_SUBMISSION_ID.id) {
             chunk = new MessageSubmissionChunk(namePrefix, chunkId, type);
          } 
          else {

Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java?rev=1058116&r1=1058115&r2=1058116&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java Wed
Jan 12 12:45:51 2011
@@ -53,28 +53,28 @@ public final class TestChunkData extends
 
 	public void testTextBodyChunk() {
 		StringChunk chunk = new StringChunk(0x1000, Types.UNICODE_STRING);
-		assertEquals(chunk.getChunkId(), MAPIAttribute.BODY.id);
+		assertEquals(chunk.getChunkId(), MAPIProperty.BODY.id);
 	}
 
 	public void testDisplayToChunk() {
 		StringChunk chunk = new StringChunk(0x0E04, Types.UNICODE_STRING);
-      assertEquals(chunk.getChunkId(), MAPIAttribute.DISPLAY_TO.id);
+      assertEquals(chunk.getChunkId(), MAPIProperty.DISPLAY_TO.id);
 	}
 
 
 	public void testDisplayCCChunk() {
 		StringChunk chunk = new StringChunk(0x0E03, Types.UNICODE_STRING);
-      assertEquals(chunk.getChunkId(), MAPIAttribute.DISPLAY_CC.id);
+      assertEquals(chunk.getChunkId(), MAPIProperty.DISPLAY_CC.id);
 	}
 
 	public void testDisplayBCCChunk() {
 		StringChunk chunk = new StringChunk(0x0E02, Types.UNICODE_STRING);
-      assertEquals(chunk.getChunkId(), MAPIAttribute.DISPLAY_BCC.id);
+      assertEquals(chunk.getChunkId(), MAPIProperty.DISPLAY_BCC.id);
 	}
 
 	public void testSubjectChunk() {
 		Chunk chunk = new StringChunk(0x0037, Types.UNICODE_STRING);
-      assertEquals(chunk.getChunkId(), MAPIAttribute.SUBJECT.id);
+      assertEquals(chunk.getChunkId(), MAPIProperty.SUBJECT.id);
 	}
 
 }

Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java?rev=1058116&r1=1058115&r2=1058116&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
(original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
Wed Jan 12 12:45:51 2011
@@ -28,7 +28,7 @@ import org.apache.poi.hsmf.MAPIMessage;
 import org.apache.poi.hsmf.datatypes.AttachmentChunks;
 import org.apache.poi.hsmf.datatypes.ChunkGroup;
 import org.apache.poi.hsmf.datatypes.Chunks;
-import org.apache.poi.hsmf.datatypes.MAPIAttribute;
+import org.apache.poi.hsmf.datatypes.MAPIProperty;
 import org.apache.poi.hsmf.datatypes.NameIdChunks;
 import org.apache.poi.hsmf.datatypes.RecipientChunks;
 import org.apache.poi.hsmf.datatypes.RecipientChunks.RecipientChunksSorter;
@@ -57,10 +57,10 @@ public final class TestPOIFSChunkParser 
       
       // Check a few core things are present
       simple.getRoot().getEntry(
-            (new StringChunk(MAPIAttribute.SUBJECT.id, Types.ASCII_STRING)).getEntryName()
+            (new StringChunk(MAPIProperty.SUBJECT.id, Types.ASCII_STRING)).getEntryName()
       );
       simple.getRoot().getEntry(
-            (new StringChunk(MAPIAttribute.SENDER_NAME.id, Types.ASCII_STRING)).getEntryName()
+            (new StringChunk(MAPIProperty.SENDER_NAME.id, Types.ASCII_STRING)).getEntryName()
       );
       
       // Now load the file



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message