You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2022/07/16 10:13:18 UTC
svn commit: r1902772 - in /poi/trunk: poi-examples/src/main/java/org/apache/poi/examples/ss/ poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ poi-ooxml/src/main/java/org/apache/poi...
Author: fanningpj
Date: Sat Jul 16 10:13:18 2022
New Revision: 1902772
URL: http://svn.apache.org/viewvc?rev=1902772&view=rev
Log:
[github-345] Use switch instead of if. Thanks to XenoAmess. This closes #345
Modified:
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/LoadEmbedded.java
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java
Modified: poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/LoadEmbedded.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/LoadEmbedded.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/LoadEmbedded.java (original)
+++ poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/LoadEmbedded.java Sat Jul 16 10:13:18 2022
@@ -68,79 +68,96 @@ public final class LoadEmbedded {
for (HSSFObjectData obj : workbook.getAllEmbeddedObjects()) {
//the OLE2 Class Name of the object
String oleName = obj.getOLE2ClassName();
- if (oleName.equals("Worksheet")) {
- DirectoryNode dn = (DirectoryNode) obj.getDirectory();
- HSSFWorkbook embeddedWorkbook = new HSSFWorkbook(dn, false);
- embeddedWorkbook.close();
- } else if (oleName.equals("Document")) {
- DirectoryNode dn = (DirectoryNode) obj.getDirectory();
- HWPFDocument embeddedWordDocument = new HWPFDocument(dn);
- embeddedWordDocument.close();
- } else if (oleName.equals("Presentation")) {
- DirectoryNode dn = (DirectoryNode) obj.getDirectory();
- SlideShow<?,?> embeddedSlieShow = new HSLFSlideShow(dn);
- embeddedSlieShow.close();
- } else {
- if(obj.hasDirectoryEntry()){
- // The DirectoryEntry is a DocumentNode. Examine its entries to find out what it is
+ switch (oleName) {
+ case "Worksheet": {
DirectoryNode dn = (DirectoryNode) obj.getDirectory();
- for (Entry entry : dn) {
- //System.out.println(oleName + "." + entry.getName());
- }
- } else {
- // There is no DirectoryEntry
- // Recover the object's data from the HSSFObjectData instance.
- byte[] objectData = obj.getObjectData();
+ HSSFWorkbook embeddedWorkbook = new HSSFWorkbook(dn, false);
+ embeddedWorkbook.close();
+ break;
+ }
+ case "Document": {
+ DirectoryNode dn = (DirectoryNode) obj.getDirectory();
+ HWPFDocument embeddedWordDocument = new HWPFDocument(dn);
+ embeddedWordDocument.close();
+ break;
}
+ case "Presentation": {
+ DirectoryNode dn = (DirectoryNode) obj.getDirectory();
+ SlideShow<?, ?> embeddedSlieShow = new HSLFSlideShow(dn);
+ embeddedSlieShow.close();
+ break;
+ }
+ default:
+ if (obj.hasDirectoryEntry()) {
+ // The DirectoryEntry is a DocumentNode. Examine its entries to find out what it is
+ DirectoryNode dn = (DirectoryNode) obj.getDirectory();
+ for (Entry entry : dn) {
+ //System.out.println(oleName + "." + entry.getName());
+ }
+ } else {
+ // There is no DirectoryEntry
+ // Recover the object's data from the HSSFObjectData instance.
+ byte[] objectData = obj.getObjectData();
+ }
+ break;
}
}
}
- public static void loadEmbedded(XSSFWorkbook workbook) throws IOException, InvalidFormatException, OpenXML4JException, XmlException {
+ public static void loadEmbedded(XSSFWorkbook workbook) throws IOException, InvalidFormatException,
+ OpenXML4JException, XmlException {
for (PackagePart pPart : workbook.getAllEmbeddedParts()) {
String contentType = pPart.getContentType();
- if (contentType.equals("application/vnd.ms-excel")) {
- // Excel Workbook - either binary or OpenXML
- try (InputStream stream = pPart.getInputStream()) {
- HSSFWorkbook embeddedWorkbook = new HSSFWorkbook(stream);
- embeddedWorkbook.close();
- }
- } else if (contentType.equals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")) {
- // Excel Workbook - OpenXML file format
- try (InputStream stream = pPart.getInputStream()) {
- XSSFWorkbook embeddedWorkbook = new XSSFWorkbook(stream);
- embeddedWorkbook.close();
- }
- } else if (contentType.equals("application/msword")) {
- // Word Document - binary (OLE2CDF) file format
- try (InputStream stream = pPart.getInputStream()) {
- HWPFDocument document = new HWPFDocument(stream);
- document.close();
- }
- } else if (contentType.equals("application/vnd.openxmlformats-officedocument.wordprocessingml.document")) {
- // Word Document - OpenXML file format
- try (InputStream stream = pPart.getInputStream()) {
- XWPFDocument document = new XWPFDocument(stream);
- document.close();
- }
- } else if (contentType.equals("application/vnd.ms-powerpoint")) {
- // PowerPoint Document - binary file format
- try (InputStream stream = pPart.getInputStream()) {
- HSLFSlideShow slideShow = new HSLFSlideShow(stream);
- slideShow.close();
- }
- } else if (contentType.equals("application/vnd.openxmlformats-officedocument.presentationml.presentation")) {
- // PowerPoint Document - OpenXML file format
- try (InputStream stream = pPart.getInputStream()) {
- XMLSlideShow slideShow = new XMLSlideShow(stream);
- slideShow.close();
- }
- } else {
- // Any other type of embedded object.
- System.out.println("Unknown Embedded Document: " + contentType);
- try (InputStream inputStream = pPart.getInputStream()) {
+ switch (contentType) {
+ case "application/vnd.ms-excel":
+ // Excel Workbook - either binary or OpenXML
+ try (InputStream stream = pPart.getInputStream()) {
+ HSSFWorkbook embeddedWorkbook = new HSSFWorkbook(stream);
+ embeddedWorkbook.close();
+ }
+ break;
+ case "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet":
+ // Excel Workbook - OpenXML file format
+ try (InputStream stream = pPart.getInputStream()) {
+ XSSFWorkbook embeddedWorkbook = new XSSFWorkbook(stream);
+ embeddedWorkbook.close();
+ }
+ break;
+ case "application/msword":
+ // Word Document - binary (OLE2CDF) file format
+ try (InputStream stream = pPart.getInputStream()) {
+ HWPFDocument document = new HWPFDocument(stream);
+ document.close();
+ }
+ break;
+ case "application/vnd.openxmlformats-officedocument.wordprocessingml.document":
+ // Word Document - OpenXML file format
+ try (InputStream stream = pPart.getInputStream()) {
+ XWPFDocument document = new XWPFDocument(stream);
+ document.close();
+ }
+ break;
+ case "application/vnd.ms-powerpoint":
+ // PowerPoint Document - binary file format
+ try (InputStream stream = pPart.getInputStream()) {
+ HSLFSlideShow slideShow = new HSLFSlideShow(stream);
+ slideShow.close();
+ }
+ break;
+ case "application/vnd.openxmlformats-officedocument.presentationml.presentation":
+ // PowerPoint Document - OpenXML file format
+ try (InputStream stream = pPart.getInputStream()) {
+ XMLSlideShow slideShow = new XMLSlideShow(stream);
+ slideShow.close();
+ }
+ break;
+ default:
+ // Any other type of embedded object.
+ System.out.println("Unknown Embedded Document: " + contentType);
+ try (InputStream inputStream = pPart.getInputStream()) {
- }
+ }
+ break;
}
}
}
Modified: poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java (original)
+++ poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java Sat Jul 16 10:13:18 2022
@@ -37,27 +37,35 @@ public class EmbeddedObjects {
String contentType = pPart.getContentType();
try (InputStream is = pPart.getInputStream()) {
Closeable document;
- if (contentType.equals("application/vnd.ms-excel")) {
- // Excel Workbook - either binary or OpenXML
- document = new HSSFWorkbook(is);
- } else if (contentType.equals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")) {
- // Excel Workbook - OpenXML file format
- document = new XSSFWorkbook(is);
- } else if (contentType.equals("application/msword")) {
- // Word Document - binary (OLE2CDF) file format
- document = new HWPFDocument(is);
- } else if (contentType.equals("application/vnd.openxmlformats-officedocument.wordprocessingml.document")) {
- // Word Document - OpenXML file format
- document = new XWPFDocument(is);
- } else if (contentType.equals("application/vnd.ms-powerpoint")) {
- // PowerPoint Document - binary file format
- document = new HSLFSlideShow(is);
- } else if (contentType.equals("application/vnd.openxmlformats-officedocument.presentationml.presentation")) {
- // PowerPoint Document - OpenXML file format
- document = new XMLSlideShow(is);
- } else {
- // Any other type of embedded object.
- document = is;
+ switch (contentType) {
+ case "application/vnd.ms-excel":
+ // Excel Workbook - either binary or OpenXML
+ document = new HSSFWorkbook(is);
+ break;
+ case "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet":
+ // Excel Workbook - OpenXML file format
+ document = new XSSFWorkbook(is);
+ break;
+ case "application/msword":
+ // Word Document - binary (OLE2CDF) file format
+ document = new HWPFDocument(is);
+ break;
+ case "application/vnd.openxmlformats-officedocument.wordprocessingml.document":
+ // Word Document - OpenXML file format
+ document = new XWPFDocument(is);
+ break;
+ case "application/vnd.ms-powerpoint":
+ // PowerPoint Document - binary file format
+ document = new HSLFSlideShow(is);
+ break;
+ case "application/vnd.openxmlformats-officedocument.presentationml.presentation":
+ // PowerPoint Document - OpenXML file format
+ document = new XMLSlideShow(is);
+ break;
+ default:
+ // Any other type of embedded object.
+ document = is;
+ break;
}
document.close();
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java Sat Jul 16 10:13:18 2022
@@ -111,20 +111,22 @@ public final class ContentTypes {
public static String getContentTypeFromFileExtension(String filename) {
String extension = filename.substring(filename.lastIndexOf('.') + 1)
.toLowerCase(Locale.ROOT);
- if (extension.equals(EXTENSION_JPG_1)
- || extension.equals(EXTENSION_JPG_2))
- return IMAGE_JPEG;
- else if (extension.equals(EXTENSION_GIF))
- return IMAGE_GIF;
- else if (extension.equals(EXTENSION_PICT))
- return IMAGE_PICT;
- else if (extension.equals(EXTENSION_PNG))
- return IMAGE_PNG;
- else if (extension.equals(EXTENSION_TIFF))
- return IMAGE_TIFF;
- else if (extension.equals(EXTENSION_XML))
- return XML;
- else
- return null;
+ switch (extension) {
+ case EXTENSION_JPG_1:
+ case EXTENSION_JPG_2:
+ return IMAGE_JPEG;
+ case EXTENSION_GIF:
+ return IMAGE_GIF;
+ case EXTENSION_PICT:
+ return IMAGE_PICT;
+ case EXTENSION_PNG:
+ return IMAGE_PNG;
+ case EXTENSION_TIFF:
+ return IMAGE_TIFF;
+ case EXTENSION_XML:
+ return XML;
+ default:
+ return null;
+ }
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java Sat Jul 16 10:13:18 2022
@@ -53,15 +53,19 @@ public class ArcTo implements GeometryRo
for (CellType cell : row.getCellArray()) {
String cellName = cell.getN();
- if (cellName.equals("X")) {
- x = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("Y")) {
- y = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("A")) {
- a = XDGFCell.parseDoubleValue(cell);
- } else {
- throw new POIXMLException("Invalid cell '" + cellName
- + "' in ArcTo row");
+ switch (cellName) {
+ case "X":
+ x = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "Y":
+ y = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "A":
+ a = XDGFCell.parseDoubleValue(cell);
+ break;
+ default:
+ throw new POIXMLException("Invalid cell '" + cellName
+ + "' in ArcTo row");
}
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java Sat Jul 16 10:13:18 2022
@@ -59,21 +59,28 @@ public class Ellipse implements Geometry
for (CellType cell : row.getCellArray()) {
String cellName = cell.getN();
- if (cellName.equals("X")) {
- x = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("Y")) {
- y = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("A")) {
- a = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("B")) {
- b = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("C")) {
- c = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("D")) {
- d = XDGFCell.parseDoubleValue(cell);
- } else {
- throw new POIXMLException("Invalid cell '" + cellName
- + "' in Ellipse row");
+ switch (cellName) {
+ case "X":
+ x = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "Y":
+ y = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "A":
+ a = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "B":
+ b = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "C":
+ c = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "D":
+ d = XDGFCell.parseDoubleValue(cell);
+ break;
+ default:
+ throw new POIXMLException("Invalid cell '" + cellName
+ + "' in Ellipse row");
}
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java Sat Jul 16 10:13:18 2022
@@ -71,21 +71,28 @@ public class EllipticalArcTo implements
for (CellType cell : row.getCellArray()) {
String cellName = cell.getN();
- if (cellName.equals("X")) {
- x = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("Y")) {
- y = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("A")) {
- a = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("B")) {
- b = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("C")) {
- c = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("D")) {
- d = XDGFCell.parseDoubleValue(cell);
- } else {
- throw new POIXMLException("Invalid cell '" + cellName
- + "' in EllipticalArcTo row");
+ switch (cellName) {
+ case "X":
+ x = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "Y":
+ y = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "A":
+ a = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "B":
+ b = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "C":
+ c = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "D":
+ d = XDGFCell.parseDoubleValue(cell);
+ break;
+ default:
+ throw new POIXMLException("Invalid cell '" + cellName
+ + "' in EllipticalArcTo row");
}
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java Sat Jul 16 10:13:18 2022
@@ -61,17 +61,22 @@ public class InfiniteLine implements Geo
for (CellType cell : row.getCellArray()) {
String cellName = cell.getN();
- if (cellName.equals("X")) {
- x = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("Y")) {
- y = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("A")) {
- a = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("B")) {
- b = XDGFCell.parseDoubleValue(cell);
- } else {
- throw new POIXMLException("Invalid cell '" + cellName
- + "' in InfiniteLine row");
+ switch (cellName) {
+ case "X":
+ x = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "Y":
+ y = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "A":
+ a = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "B":
+ b = XDGFCell.parseDoubleValue(cell);
+ break;
+ default:
+ throw new POIXMLException("Invalid cell '" + cellName
+ + "' in InfiniteLine row");
}
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java Sat Jul 16 10:13:18 2022
@@ -68,23 +68,31 @@ public class NURBSTo implements Geometry
for (CellType cell : row.getCellArray()) {
String cellName = cell.getN();
- if (cellName.equals("X")) {
- x = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("Y")) {
- y = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("A")) {
- a = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("B")) {
- b = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("C")) {
- c = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("D")) {
- d = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("E")) {
- e = cell.getV();
- } else {
- throw new POIXMLException("Invalid cell '" + cellName
- + "' in NURBS row");
+ switch (cellName) {
+ case "X":
+ x = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "Y":
+ y = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "A":
+ a = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "B":
+ b = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "C":
+ c = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "D":
+ d = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "E":
+ e = cell.getV();
+ break;
+ default:
+ throw new POIXMLException("Invalid cell '" + cellName
+ + "' in NURBS row");
}
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java Sat Jul 16 10:13:18 2022
@@ -50,15 +50,19 @@ public class PolyLineTo implements Geome
for (CellType cell : row.getCellArray()) {
String cellName = cell.getN();
- if (cellName.equals("X")) {
- x = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("Y")) {
- y = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("A")) {
- a = cell.getV();
- } else {
- throw new POIXMLException("Invalid cell '" + cellName
- + "' in ArcTo row");
+ switch (cellName) {
+ case "X":
+ x = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "Y":
+ y = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "A":
+ a = cell.getV();
+ break;
+ default:
+ throw new POIXMLException("Invalid cell '" + cellName
+ + "' in ArcTo row");
}
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java Sat Jul 16 10:13:18 2022
@@ -66,21 +66,28 @@ public class RelCubBezTo implements Geom
for (CellType cell : row.getCellArray()) {
String cellName = cell.getN();
- if (cellName.equals("X")) {
- x = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("Y")) {
- y = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("A")) {
- a = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("B")) {
- b = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("C")) {
- c = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("D")) {
- d = XDGFCell.parseDoubleValue(cell);
- } else {
- throw new POIXMLException("Invalid cell '" + cellName
- + "' in RelCubBezTo row");
+ switch (cellName) {
+ case "X":
+ x = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "Y":
+ y = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "A":
+ a = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "B":
+ b = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "C":
+ c = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "D":
+ d = XDGFCell.parseDoubleValue(cell);
+ break;
+ default:
+ throw new POIXMLException("Invalid cell '" + cellName
+ + "' in RelCubBezTo row");
}
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java Sat Jul 16 10:13:18 2022
@@ -63,21 +63,28 @@ public class RelEllipticalArcTo implemen
for (CellType cell : row.getCellArray()) {
String cellName = cell.getN();
- if (cellName.equals("X")) {
- x = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("Y")) {
- y = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("A")) {
- a = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("B")) {
- b = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("C")) {
- c = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("D")) {
- d = XDGFCell.parseDoubleValue(cell);
- } else {
- throw new POIXMLException("Invalid cell '" + cellName
- + "' in RelEllipticalArcTo row");
+ switch (cellName) {
+ case "X":
+ x = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "Y":
+ y = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "A":
+ a = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "B":
+ b = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "C":
+ c = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "D":
+ d = XDGFCell.parseDoubleValue(cell);
+ break;
+ default:
+ throw new POIXMLException("Invalid cell '" + cellName
+ + "' in RelEllipticalArcTo row");
}
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java Sat Jul 16 10:13:18 2022
@@ -62,17 +62,22 @@ public class RelQuadBezTo implements Geo
for (CellType cell : row.getCellArray()) {
String cellName = cell.getN();
- if (cellName.equals("X")) {
- x = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("Y")) {
- y = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("A")) {
- a = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("B")) {
- b = XDGFCell.parseDoubleValue(cell);
- } else {
- throw new POIXMLException("Invalid cell '" + cellName
- + "' in RelQuadBezTo row");
+ switch (cellName) {
+ case "X":
+ x = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "Y":
+ y = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "A":
+ a = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "B":
+ b = XDGFCell.parseDoubleValue(cell);
+ break;
+ default:
+ throw new POIXMLException("Invalid cell '" + cellName
+ + "' in RelQuadBezTo row");
}
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java Sat Jul 16 10:13:18 2022
@@ -53,15 +53,19 @@ public class SplineKnot implements Geome
for (CellType cell : row.getCellArray()) {
String cellName = cell.getN();
- if (cellName.equals("X")) {
- x = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("Y")) {
- y = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("A")) {
- a = XDGFCell.parseDoubleValue(cell);
- } else {
- throw new POIXMLException("Invalid cell '" + cellName
- + "' in SplineKnot row");
+ switch (cellName) {
+ case "X":
+ x = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "Y":
+ y = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "A":
+ a = XDGFCell.parseDoubleValue(cell);
+ break;
+ default:
+ throw new POIXMLException("Invalid cell '" + cellName
+ + "' in SplineKnot row");
}
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java Sat Jul 16 10:13:18 2022
@@ -61,21 +61,28 @@ public class SplineStart implements Geom
for (CellType cell : row.getCellArray()) {
String cellName = cell.getN();
- if (cellName.equals("X")) {
- x = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("Y")) {
- y = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("A")) {
- a = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("B")) {
- b = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("C")) {
- c = XDGFCell.parseDoubleValue(cell);
- } else if (cellName.equals("D")) {
- d = XDGFCell.parseIntegerValue(cell);
- } else {
- throw new POIXMLException("Invalid cell '" + cellName
- + "' in SplineStart row");
+ switch (cellName) {
+ case "X":
+ x = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "Y":
+ y = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "A":
+ a = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "B":
+ b = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "C":
+ c = XDGFCell.parseDoubleValue(cell);
+ break;
+ case "D":
+ d = XDGFCell.parseIntegerValue(cell);
+ break;
+ default:
+ throw new POIXMLException("Invalid cell '" + cellName
+ + "' in SplineStart row");
}
}
}
Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java?rev=1902772&r1=1902771&r2=1902772&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java (original)
+++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java Sat Jul 16 10:13:18 2022
@@ -107,12 +107,17 @@ public class RecordUtil
byte numBits = 0;
int mask = (int) Long.parseLong( bitMask.substring( 2 ), 16 );
- if ( parentType.equals( "byte" ) )
- parentSize = 8;
- else if ( parentType.equals( "short" ) )
- parentSize = 16;
- else if ( parentType.equals( "int" ) )
- parentSize = 32;
+ switch (parentType) {
+ case "byte":
+ parentSize = 8;
+ break;
+ case "short":
+ parentSize = 16;
+ break;
+ case "int":
+ parentSize = 32;
+ break;
+ }
for ( int x = 0; x < parentSize; x++ )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org