You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2016/12/13 00:33:50 UTC
svn commit: r1773908 - in /poi/trunk/src:
ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
Author: kiwiwings
Date: Tue Dec 13 00:33:50 2016
New Revision: 1773908
URL: http://svn.apache.org/viewvc?rev=1773908&view=rev
Log:
SonarCube fix - make members private
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java?rev=1773908&r1=1773907&r2=1773908&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java Tue Dec 13 00:33:50 2016
@@ -343,11 +343,11 @@ public class ExtractorFactory {
// Stored in the Attachment blocks
MAPIMessage msg = ((OutlookTextExtactor)ext).getMAPIMessage();
for (AttachmentChunks attachment : msg.getAttachmentFiles()) {
- if (attachment.attachData != null) {
- byte[] data = attachment.attachData.getValue();
+ if (attachment.getAttachData() != null) {
+ byte[] data = attachment.getAttachData().getValue();
nonPOIFS.add( new ByteArrayInputStream(data) );
- } else if (attachment.attachmentDirectory != null) {
- dirs.add(attachment.attachmentDirectory.getDirectory());
+ } else if (attachment.getAttachmentDirectory() != null) {
+ dirs.add(attachment.getAttachmentDirectory().getDirectory());
}
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java?rev=1773908&r1=1773907&r2=1773908&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java Tue Dec 13 00:33:50 2016
@@ -191,7 +191,7 @@ public class MAPIMessage extends POIRead
* @throws ChunkNotFoundException
*/
public String getTextBody() throws ChunkNotFoundException {
- return getStringFromChunk(mainChunks.textBodyChunk);
+ return getStringFromChunk(mainChunks.getTextBodyChunk());
}
/**
@@ -201,10 +201,10 @@ public class MAPIMessage extends POIRead
* @throws ChunkNotFoundException
*/
public String getHtmlBody() throws ChunkNotFoundException {
- if(mainChunks.htmlBodyChunkBinary != null) {
- return mainChunks.htmlBodyChunkBinary.getAs7bitString();
+ if(mainChunks.getHtmlBodyChunkBinary() != null) {
+ return mainChunks.getHtmlBodyChunkBinary().getAs7bitString();
}
- return getStringFromChunk(mainChunks.htmlBodyChunkString);
+ return getStringFromChunk(mainChunks.getHtmlBodyChunkString());
}
@Deprecated
public String getHmtlBody() throws ChunkNotFoundException {
@@ -218,7 +218,7 @@ public class MAPIMessage extends POIRead
* @throws ChunkNotFoundException
*/
public String getRtfBody() throws ChunkNotFoundException {
- ByteChunk chunk = mainChunks.rtfBodyChunk;
+ ByteChunk chunk = mainChunks.getRtfBodyChunk();
if(chunk == null) {
if(returnNullOnMissingChunk) {
return null;
@@ -242,7 +242,7 @@ public class MAPIMessage extends POIRead
* @throws ChunkNotFoundException
*/
public String getSubject() throws ChunkNotFoundException {
- return getStringFromChunk(mainChunks.subjectChunk);
+ return getStringFromChunk(mainChunks.getSubjectChunk());
}
/**
@@ -251,7 +251,7 @@ public class MAPIMessage extends POIRead
* @throws ChunkNotFoundException
*/
public String getDisplayFrom() throws ChunkNotFoundException {
- return getStringFromChunk(mainChunks.displayFromChunk);
+ return getStringFromChunk(mainChunks.getDisplayFromChunk());
}
/**
@@ -264,7 +264,7 @@ public class MAPIMessage extends POIRead
* @throws ChunkNotFoundException
*/
public String getDisplayTo() throws ChunkNotFoundException {
- return getStringFromChunk(mainChunks.displayToChunk);
+ return getStringFromChunk(mainChunks.getDisplayToChunk());
}
/**
@@ -277,7 +277,7 @@ public class MAPIMessage extends POIRead
* @throws ChunkNotFoundException
*/
public String getDisplayCC() throws ChunkNotFoundException {
- return getStringFromChunk(mainChunks.displayCCChunk);
+ return getStringFromChunk(mainChunks.getDisplayCCChunk());
}
/**
@@ -291,7 +291,7 @@ public class MAPIMessage extends POIRead
* @throws ChunkNotFoundException
*/
public String getDisplayBCC() throws ChunkNotFoundException {
- return getStringFromChunk(mainChunks.displayBCCChunk);
+ return getStringFromChunk(mainChunks.getDisplayBCCChunk());
}
/**
@@ -516,7 +516,7 @@ public class MAPIMessage extends POIRead
* Returns all the headers, one entry per line
*/
public String[] getHeaders() throws ChunkNotFoundException {
- String headers = getStringFromChunk(mainChunks.messageHeaders);
+ String headers = getStringFromChunk(mainChunks.getMessageHeaders());
if(headers == null) {
return null;
}
@@ -529,7 +529,7 @@ public class MAPIMessage extends POIRead
* @throws ChunkNotFoundException
*/
public String getConversationTopic() throws ChunkNotFoundException {
- return getStringFromChunk(mainChunks.conversationTopic);
+ return getStringFromChunk(mainChunks.getConversationTopic());
}
/**
@@ -541,7 +541,7 @@ public class MAPIMessage extends POIRead
* @throws ChunkNotFoundException
*/
public String getMessageClass() throws ChunkNotFoundException {
- return getStringFromChunk(mainChunks.messageClass);
+ return getStringFromChunk(mainChunks.getMessageClass());
}
/**
@@ -549,8 +549,8 @@ public class MAPIMessage extends POIRead
* server on.
*/
public Calendar getMessageDate() throws ChunkNotFoundException {
- if (mainChunks.submissionChunk != null) {
- return mainChunks.submissionChunk.getAcceptedAtTime();
+ if (mainChunks.getSubmissionChunk() != null) {
+ return mainChunks.getSubmissionChunk().getAcceptedAtTime();
}
else {
// Try a few likely suspects...
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java?rev=1773908&r1=1773907&r2=1773908&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java Tue Dec 13 00:33:50 2016
@@ -151,13 +151,13 @@ public class OutlookTextExtactor extends
// Display attachment names
// To get the attachments, use ExtractorFactory
for(AttachmentChunks att : msg.getAttachmentFiles()) {
- StringChunk name = att.attachLongFileName;
- if (name == null) name = att.attachFileName;
+ StringChunk name = att.getAttachLongFileName();
+ if (name == null) name = att.getAttachFileName();
String attName = name == null ? null : name.getValue();
- if(att.attachMimeTag != null &&
- att.attachMimeTag.getValue() != null) {
- attName = att.attachMimeTag.getValue() + " = " + attName;
+ if(att.getAttachMimeTag() != null &&
+ att.getAttachMimeTag().getValue() != null) {
+ attName = att.getAttachMimeTag().getValue() + " = " + attName;
}
s.append("Attachment: " + attName + "\n");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org