You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2017/03/10 20:13:39 UTC
svn commit: r1786429 - in /poi/trunk/src: java/org/apache/poi/sl/draw/
java/org/apache/poi/ss/formula/functions/
ooxml/java/org/apache/poi/openxml4j/opc/
ooxml/testcases/org/apache/poi/xssf/usermodel/
Author: centic
Date: Fri Mar 10 20:13:39 2017
New Revision: 1786429
URL: http://svn.apache.org/viewvc?rev=1786429&view=rev
Log:
Remove unused import, IntelliJ warnings, duplicated code, improve some exception-texts
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/WeekNum.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java?rev=1786429&r1=1786428&r2=1786429&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java Fri Mar 10 20:13:39 2017
@@ -17,7 +17,6 @@
package org.apache.poi.sl.draw;
-import java.awt.AlphaComposite;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java?rev=1786429&r1=1786428&r2=1786429&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java Fri Mar 10 20:13:39 2017
@@ -585,20 +585,8 @@ public class DrawTextParagraph implement
fallbackFont = font;
}
} else {
- if (fontMap != null) {
- if (fontMap.containsKey(mappedFont)) {
- mappedFont = fontMap.get(mappedFont);
- } else if (fontMap.containsKey("*")) {
- mappedFont = fontMap.get("*");
- }
- }
- if (fallbackMap != null) {
- if (fallbackMap.containsKey(mappedFont)) {
- fallbackFont = fallbackMap.get(mappedFont);
- } else if (fallbackMap.containsKey("*")) {
- fallbackFont = fallbackMap.get("*");
- }
- }
+ mappedFont = getFontWithFallback(fontMap, mappedFont);
+ fallbackFont = getFontWithFallback(fallbackMap, mappedFont);
}
runText = mapFontCharset(runText,mappedFont);
@@ -688,6 +676,17 @@ public class DrawTextParagraph implement
return string;
}
+ private String getFontWithFallback(Map<String, String> fontMap, String mappedFont) {
+ if (fontMap != null) {
+ if (fontMap.containsKey(mappedFont)) {
+ mappedFont = fontMap.get(mappedFont);
+ } else if (fontMap.containsKey("*")) {
+ mappedFont = fontMap.get("*");
+ }
+ }
+ return mappedFont;
+ }
+
/**
* @return {@code true} if the HSLF implementation is used
*/
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/WeekNum.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/WeekNum.java?rev=1786429&r1=1786428&r2=1786429&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/WeekNum.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/WeekNum.java Fri Mar 10 20:13:39 2017
@@ -47,7 +47,7 @@ public class WeekNum extends Fixed2ArgFu
public static final FreeRefFunction instance = new WeekNum();
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval serialNumVE, ValueEval returnTypeVE) {
- double serialNum = 0.0;
+ double serialNum;
try {
serialNum = NumericFunction.singleOperandEvaluate(serialNumVE, srcRowIndex, srcColumnIndex);
} catch (EvaluationException e) {
@@ -56,7 +56,7 @@ public class WeekNum extends Fixed2ArgFu
Calendar serialNumCalendar = LocaleUtil.getLocaleCalendar();
serialNumCalendar.setTime(DateUtil.getJavaDate(serialNum, false));
- int returnType = 0;
+ int returnType;
try {
ValueEval ve = OperandResolver.getSingleValue(returnTypeVE, srcRowIndex, srcColumnIndex);
returnType = OperandResolver.coerceValueToInt(ve);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java?rev=1786429&r1=1786428&r2=1786429&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java Fri Mar 10 20:13:39 2017
@@ -149,7 +149,7 @@ public final class PackageRelationshipCo
this();
if (container == null)
- throw new IllegalArgumentException("container");
+ throw new IllegalArgumentException("container needs to be specified");
// Check if the specified part is not a relationship part
if (part != null && part.isRelationshipPart())
@@ -379,9 +379,7 @@ public final class PackageRelationshipCo
* @return All relationships of the type specified by the filter.
*/
public PackageRelationshipCollection getRelationships(String typeFilter) {
- PackageRelationshipCollection coll = new PackageRelationshipCollection(
- this, typeFilter);
- return coll;
+ return new PackageRelationshipCollection(this, typeFilter);
}
/**
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java?rev=1786429&r1=1786428&r2=1786429&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java Fri Mar 10 20:13:39 2017
@@ -16,17 +16,6 @@
==================================================================== */
package org.apache.poi.xssf.usermodel;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.util.List;
-
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.POIXMLDocumentPart.RelationPart;
import org.apache.poi.openxml4j.opc.OPCPackage;
@@ -42,6 +31,12 @@ import org.openxmlformats.schemas.drawin
import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType;
import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTDrawing;
+import java.awt.Color;
+import java.io.IOException;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
public class TestXSSFDrawing {
@Test
public void testRead() throws IOException {
@@ -628,6 +623,7 @@ public class TestXSSFDrawing {
String paraString10 = "Fifth Bullet";
XSSFTextParagraph para = shape.addNewTextParagraph(paraString1);
+ assertNotNull(para);
para = shape.addNewTextParagraph(paraString2);
para.setBullet(true);
@@ -639,6 +635,7 @@ public class TestXSSFDrawing {
para.setBullet(true);
para = shape.addNewTextParagraph(paraString5);
+ assertNotNull(para);
para = shape.addNewTextParagraph(paraString6);
para.setBullet(ListAutoNumber.ARABIC_PERIOD);
@@ -678,39 +675,38 @@ public class TestXSSFDrawing {
List<XSSFTextParagraph> paras = sshape.getTextParagraphs();
assertEquals(12, paras.size()); // this should be 12 as XSSFSimpleShape creates a default paragraph (no text), and then we added to that
- StringBuilder builder = new StringBuilder();
-
- builder.append(paraString1);
- builder.append("\n");
- builder.append("\u2022 ");
- builder.append(paraString2);
- builder.append("\n");
- builder.append("\t\u2022 ");
- builder.append(paraString3);
- builder.append("\n");
- builder.append("\u2022 ");
- builder.append(paraString4);
- builder.append("\n");
- builder.append(paraString5);
- builder.append("\n");
- builder.append("1. ");
- builder.append(paraString6);
- builder.append("\n");
- builder.append("\t3. ");
- builder.append(paraString7);
- builder.append("\n");
- builder.append("\t4. ");
- builder.append(paraString8);
- builder.append("\n");
- builder.append("\t"); // should be empty
- builder.append("\n");
- builder.append("\t5. ");
- builder.append(paraString9);
- builder.append("\n");
- builder.append("2. ");
- builder.append(paraString10);
+ String builder =
+ paraString1 +
+ "\n" +
+ "\u2022 " +
+ paraString2 +
+ "\n" +
+ "\t\u2022 " +
+ paraString3 +
+ "\n" +
+ "\u2022 " +
+ paraString4 +
+ "\n" +
+ paraString5 +
+ "\n" +
+ "1. " +
+ paraString6 +
+ "\n" +
+ "\t3. " +
+ paraString7 +
+ "\n" +
+ "\t4. " +
+ paraString8 +
+ "\n" +
+ "\t" + // should be empty
+ "\n" +
+ "\t5. " +
+ paraString9 +
+ "\n" +
+ "2. " +
+ paraString10;
- assertEquals(builder.toString(), sshape.getText());
+ assertEquals(builder, sshape.getText());
checkRewrite(wb2);
wb2.close();
@@ -727,18 +723,18 @@ public class TestXSSFDrawing {
List<XSSFShape> shapes = drawing.getShapes();
XSSFSimpleShape textbox = (XSSFSimpleShape) shapes.get(0);
String extracted = textbox.getText();
- StringBuilder sb = new StringBuilder();
- sb.append("1. content1A\n");
- sb.append("\t1. content1B\n");
- sb.append("\t2. content2B\n");
- sb.append("\t3. content3B\n");
- sb.append("2. content2A\n");
- sb.append("\t3. content2BStartAt3\n");
- sb.append("\t\n\t\n\t");
- sb.append("4. content2BStartAt3Incremented\n");
- sb.append("\t\n\t\n\t\n\t");
+ String sb =
+ "1. content1A\n" +
+ "\t1. content1B\n" +
+ "\t2. content2B\n" +
+ "\t3. content3B\n" +
+ "2. content2A\n" +
+ "\t3. content2BStartAt3\n" +
+ "\t\n\t\n\t" +
+ "4. content2BStartAt3Incremented\n" +
+ "\t\n\t\n\t\n\t";
- assertEquals(sb.toString(), extracted);
+ assertEquals(sb, extracted);
checkRewrite(wb);
wb.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org