You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ax...@apache.org on 2019/11/12 15:47:46 UTC
svn commit: r1869705 - in
/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter:
AbstractWordUtils.java WordToHtmlConverter.java
Author: axh
Date: Tue Nov 12 15:47:46 2019
New Revision: 1869705
URL: http://svn.apache.org/viewvc?rev=1869705&view=rev
Log:
Replace AbstractWordUtils.equals with Objects.equals
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java?rev=1869705&r1=1869704&r2=1869705&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java Tue Nov 12 15:47:46 2019
@@ -20,10 +20,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFDocumentCore;
@@ -101,8 +98,8 @@ public class AbstractWordUtils
Element element1 = (Element) node1;
Element element2 = (Element) node2;
- if ( !equals( requiredTagName, element1.getTagName() )
- || !equals( requiredTagName, element2.getTagName() ) )
+ if ( !Objects.equals( requiredTagName, element1.getTagName() )
+ || !Objects.equals( requiredTagName, element2.getTagName() ) )
return false;
NamedNodeMap attributes1 = element1.getAttributes();
@@ -122,7 +119,7 @@ public class AbstractWordUtils
attr2 = (Attr) attributes2.getNamedItem( attr1.getName() );
if ( attr2 == null
- || !equals( attr1.getTextContent(), attr2.getTextContent() ) )
+ || !Objects.equals( attr1.getTextContent(), attr2.getTextContent() ) )
return false;
}
@@ -157,11 +154,6 @@ public class AbstractWordUtils
}
}
- static boolean equals( String str1, String str2 )
- {
- return str1 == null ? str2 == null : str1.equals( str2 );
- }
-
public static String getBorderType( BorderCode borderCode )
{
if ( borderCode == null )
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java?rev=1869705&r1=1869704&r2=1869705&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java Tue Nov 12 15:47:46 2019
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.Deque;
import java.util.LinkedList;
import java.util.List;
+import java.util.Objects;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
@@ -200,7 +201,7 @@ public class WordToHtmlConverter extends
Triplet triplet = getCharacterRunTriplet( characterRun );
if ( AbstractWordUtils.isNotEmpty( triplet.fontName )
- && !AbstractWordUtils.equals( triplet.fontName,
+ && !Objects.equals( triplet.fontName,
blockProperies.pFontName ) )
{
style.append("font-family:").append(triplet.fontName).append(";");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org