try to use IllegalStateException instead of RuntimeException

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1904051 13f79535-47bb-0310-9956-ffa450edef68

37 files changed, 69 insertions, 69 deletions

diff --git a/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java
index c5a36d74b5..3709fddf4e 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java
@@ -273,7 +273,7 @@ public class POIXMLPropertiesTextExtractor implements POIXMLTextExtractor {
                             getExtendedPropertiesText() +
                             getCustomPropertiesText();
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            throw new IllegalStateException(e);
         }
     }
 
diff --git a/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
index 4625a940ed..d1d8b344f7 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
@@ -1413,7 +1413,7 @@ public abstract class OPCPackage implements RelationshipSource, Closeable {
         try {
             partMarshallers.remove(new ContentType(contentType));
         } catch (InvalidFormatException e) {
-            throw new RuntimeException(e);
+            throw new IllegalStateException(e);
         }
     }
 
@@ -1427,7 +1427,7 @@ public abstract class OPCPackage implements RelationshipSource, Closeable {
         try {
             partUnmarshallers.remove(new ContentType(contentType));
         } catch (InvalidFormatException e) {
-            throw new RuntimeException(e);
+            throw new IllegalStateException(e);
         }
     }
 
diff --git a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
index 942c22ca22..3c300d7e8d 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
@@ -493,7 +493,7 @@ public class SignatureInfo {
          */
         String signatureId = signatureConfig.getPackageSignatureId();
         if (!signatureId.equals(document.getDocumentElement().getAttribute("Id"))) {
-            throw new RuntimeException("ds:Signature not found for @Id: " + signatureId);
+            throw new IllegalStateException("ds:Signature not found for @Id: " + signatureId);
         }
 
         /*
@@ -501,7 +501,7 @@ public class SignatureInfo {
          */
         final Element signatureNode = getDsigElement(document, "SignatureValue");
         if (signatureNode == null) {
-            throw new RuntimeException("preSign has to be called before postSign");
+            throw new IllegalStateException("preSign has to be called before postSign");
         }
         signatureNode.setTextContent(signatureValue);
 
@@ -675,7 +675,7 @@ public class SignatureInfo {
                 RelationshipTransformService.registerDsigProvider();
                 CryptoFunctions.registerBouncyCastle();
             } catch (Exception e) {
-                throw new RuntimeException("Xml & BouncyCastle-Provider initialization failed", e);
+                throw new IllegalStateException("Xml & BouncyCastle-Provider initialization failed", e);
             }
         }
 
@@ -710,7 +710,7 @@ public class SignatureInfo {
         }
 
         private RuntimeException providerNotFound() {
-            return new RuntimeException("JRE doesn't support default xml signature provider - set jsr105Provider system property!");
+            return new IllegalStateException("JRE doesn't support default xml signature provider - set jsr105Provider system property!");
         }
     }
 
diff --git a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
index 84cccecb77..43be4656c3 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
@@ -84,7 +84,7 @@ public class KeyInfoSignatureFacet implements SignatureFacet {
             try {
                 keyValue = keyInfoFactory.newKeyValue(signingCertificate.getPublicKey());
             } catch (KeyException e) {
-                throw new RuntimeException("key exception: " + e.getMessage(), e);
+                throw new IllegalStateException("key exception: " + e.getMessage(), e);
             }
             keyInfoContent.add(keyValue);
         }
@@ -137,7 +137,7 @@ public class KeyInfoSignatureFacet implements SignatureFacet {
         if (nextSibling != null) {
             NodeList kiNl = document.getElementsByTagNameNS(XML_DIGSIG_NS, "KeyInfo");
             if (kiNl.getLength() != 1) {
-                throw new RuntimeException("KeyInfo wasn't set");
+                throw new IllegalStateException("KeyInfo wasn't set");
             }
             nextSibling.getParentNode().insertBefore(kiNl.item(0), nextSibling);
         }
diff --git a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
index b87bd95055..f69bb33e1e 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
@@ -169,7 +169,7 @@ public class XAdESSignatureFacet implements SignatureFacet {
         SignatureConfig signatureConfig = signatureInfo.getSignatureConfig();
         List<X509Certificate> chain = signatureConfig.getSigningCertificateChain();
         if (chain == null || chain.isEmpty()) {
-            throw new RuntimeException("no signing certificate chain available");
+            throw new IllegalStateException("no signing certificate chain available");
         }
         CertIDListType signingCertificates = signedSignatureProperties.addNewSigningCertificate();
         CertIDType certId = signingCertificates.addNewCert();
@@ -332,7 +332,7 @@ public class XAdESSignatureFacet implements SignatureFacet {
         try {
             encodedCertificate = certificate.getEncoded();
         } catch (CertificateEncodingException e) {
-            throw new RuntimeException("certificate encoding error: "
+            throw new IllegalStateException("certificate encoding error: "
                     + e.getMessage(), e);
         }
         DigestAlgAndValueType certDigest = certId.addNewCertDigest();
diff --git a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
index a83d291229..a9d0a4171e 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
@@ -94,7 +94,7 @@ public class XAdESXLSignatureFacet implements SignatureFacet {
         try {
             this.certificateFactory = CertificateFactory.getInstance("X.509");
         } catch (CertificateException e) {
-            throw new RuntimeException("X509 JCA error: " + e.getMessage(), e);
+            throw new IllegalStateException("X509 JCA error: " + e.getMessage(), e);
         }
     }
 
@@ -225,7 +225,7 @@ public class XAdESXLSignatureFacet implements SignatureFacet {
                     crl = (X509CRL) this.certificateFactory
                         .generateCRL(new UnsynchronizedByteArrayInputStream(encodedCrl));
                 } catch (CRLException e) {
-                    throw new RuntimeException("CRL parse error: " + e.getMessage(), e);
+                    throw new IllegalStateException("CRL parse error: " + e.getMessage(), e);
                 }
 
                 CRLIdentifierType crlIdentifier = crlRef.addNewCRLIdentifier();
@@ -277,7 +277,7 @@ public class XAdESXLSignatureFacet implements SignatureFacet {
                         responderId.setByName(nameStr);
                     }
                 } catch (Exception e) {
-                    throw new RuntimeException("OCSP decoding error: " + e.getMessage(), e);
+                    throw new IllegalStateException("OCSP decoding error: " + e.getMessage(), e);
                 }
             }
         }
@@ -294,7 +294,7 @@ public class XAdESXLSignatureFacet implements SignatureFacet {
                 certificateValues.addNewEncapsulatedX509Certificate().setByteArrayValue(certificate.getEncoded());
             }
         } catch (CertificateEncodingException e) {
-            throw new RuntimeException("certificate encoding error: " + e.getMessage(), e);
+            throw new IllegalStateException("certificate encoding error: " + e.getMessage(), e);
         }
     }
 
@@ -312,7 +312,7 @@ public class XAdESXLSignatureFacet implements SignatureFacet {
         } catch (RuntimeException e) {
             throw e;
         } catch (Exception e) {
-            throw new RuntimeException("c14n error: " + e.getMessage(), e);
+            throw new IllegalStateException("c14n error: " + e.getMessage(), e);
         }
     }
 
@@ -330,7 +330,7 @@ public class XAdESXLSignatureFacet implements SignatureFacet {
                 return integer.getPositiveValue();
             }
         } catch (IOException e) {
-            throw new RuntimeException("I/O error: " + e.getMessage(), e);
+            throw new IllegalStateException("I/O error: " + e.getMessage(), e);
         }
     }
 
@@ -346,7 +346,7 @@ public class XAdESXLSignatureFacet implements SignatureFacet {
         try {
             timeStampToken = signatureConfig.getTspService().timeStamp(signatureInfo, c14nSignatureValueElement, revocationData);
         } catch (Exception e) {
-            throw new RuntimeException("error while creating a time-stamp: "
+            throw new IllegalStateException("error while creating a time-stamp: "
                 + e.getMessage(), e);
         }
 
diff --git a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java
index 0f55312458..2e845e20d7 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java
@@ -133,7 +133,7 @@ public class TSPTimeStampService implements TimeStampService {
         byte[] responseBytes = response.getResponseBytes();
 
         if (responseBytes.length == 0) {
-            throw new RuntimeException("Content-Length is zero");
+            throw new IllegalStateException("Content-Length is zero");
         }
 
         // TSP response parsing and validation
@@ -150,7 +150,7 @@ public class TSPTimeStampService implements TimeStampService {
                     LOG.atDebug().log("unaccepted policy");
                 }
             }
-            throw new RuntimeException("timestamp response status != 0: "
+            throw new IllegalStateException("timestamp response status != 0: "
                     + timeStampResponse.getStatus());
         }
         TimeStampToken timeStampToken = timeStampResponse.getTimeStampToken();
@@ -171,7 +171,7 @@ public class TSPTimeStampService implements TimeStampService {
             .filter(h -> signerCertIssuer.equals(h.getIssuer())
                 && signerCertSerialNumber.equals(h.getSerialNumber()))
             .findFirst()
-            .orElseThrow(() -> new RuntimeException("TSP response token has no signer certificate"));
+            .orElseThrow(() -> new IllegalStateException("TSP response token has no signer certificate"));
 
         JcaX509CertificateConverter x509converter = new JcaX509CertificateConverter();
         x509converter.setProvider("BC");
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
index 3392f3a02b..3a6b4c6007 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
@@ -279,7 +279,7 @@ public class XMLSlideShow extends POIXMLDocument
         try {
             return getPackage().getUnusedPartIndex(relationType.getDefaultFileName());
         } catch (InvalidFormatException e) {
-            throw new RuntimeException(e);
+            throw new IllegalStateException(e);
         }
     }
 
@@ -695,14 +695,14 @@ public class XMLSlideShow extends POIXMLDocument
     String importBlip(String blipId, POIXMLDocumentPart parent, POIXMLDocumentPart target) {
         OPCPackage targetPackage = target.getPackagePart().getPackage();
         if (targetPackage != getPackage()) {
-            throw new RuntimeException("the target document part is not a child of this package");
+            throw new IllegalStateException("the target document part is not a child of this package");
         }
         final POIXMLDocumentPart docPart = parent.getRelationPartById(blipId).getDocumentPart();
         XSLFPictureData parData;
         if (docPart instanceof XSLFPictureData) {
             parData = (XSLFPictureData)docPart;
         } else {
-            throw new RuntimeException("cannot import blip " + blipId + " - its document part is not XSLFPictureData");
+            throw new IllegalStateException("cannot import blip " + blipId + " - its document part is not XSLFPictureData");
         }
         final XSLFPictureData pictureData;
         if (targetPackage == parent.getPackagePart().getPackage()) {
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java
index 1e7462113e..70ce9e522e 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java
@@ -212,7 +212,7 @@ public class XSLFFontInfo implements FontInfo {
                 try {
                     fntDataIdx = ppt.getPackage().getUnusedPartIndex(fntRel.getDefaultFileName());
                 } catch (InvalidFormatException e) {
-                    throw new RuntimeException(e);
+                    throw new IllegalStateException(e);
                 }
 
                 POIXMLDocumentPart.RelationPart rp = ppt.createRelationship(fntRel, XSLFFactory.getInstance(), fntDataIdx, false);
@@ -235,7 +235,7 @@ public class XSLFFontInfo implements FontInfo {
                     header.init(buf, 0, buf.length);
                 } catch (IOException e) {
                     // TODO: better exception class
-                    throw new RuntimeException(e);
+                    throw new IllegalStateException(e);
                 }
             }
         }
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java
index c0b1f1488d..bb9c04e862 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java
@@ -84,7 +84,7 @@ public class XSLFTexturePaint implements PaintStyle.TexturePaint {
         try {
             return getPart().getInputStream();
         } catch (Exception e) {
-            throw new RuntimeException("Failed to read image data", e);
+            throw new IllegalStateException("Failed to read image data", e);
         }
     }
 
@@ -97,7 +97,7 @@ public class XSLFTexturePaint implements PaintStyle.TexturePaint {
         try {
             return getPart().getContentType();
         } catch (InvalidFormatException e) {
-            throw new RuntimeException("Failed to read package part", e);
+            throw new IllegalStateException("Failed to read package part", e);
         }
     }
 
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java
index c1cf538c8f..b090c34cc3 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java
@@ -37,7 +37,7 @@ public class DummyFormat implements OutputFormat {
             bos = new UnsynchronizedByteArrayOutputStream();
             dummy2d = new DummyGraphics2d(new PrintStream(bos, true, StandardCharsets.UTF_8.name()));
         } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
+            throw new IllegalStateException(e);
         }
     }
 
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PPTHandler.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PPTHandler.java
index 5a70ea9767..48de2bd69d 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PPTHandler.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PPTHandler.java
@@ -179,7 +179,7 @@ class PPTHandler extends MFProxy {
                 return IOUtils.toByteArray(is);
             } catch (IOException e) {
                 // TODO: change to custom runtime exception
-                throw new RuntimeException(e);
+                throw new IllegalStateException(e);
             }
         });
         return embed;
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
index 2fc9cfe01b..fd008f3a3d 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
@@ -245,7 +245,7 @@ public class XSSFEventBasedExcelExtractor
             sheetParser.setContentHandler(handler);
             sheetParser.parse(sheetSource);
         } catch (ParserConfigurationException e) {
-            throw new RuntimeException("SAX parser appears to be broken - " + e.getMessage());
+            throw new IllegalStateException("SAX parser appears to be broken - " + e.getMessage());
         }
     }
 
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java
index 42e7d2aca2..4baa90bc7d 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java
@@ -48,7 +48,7 @@ public class DeferredSXSSFSheet extends SXSSFSheet {
      */
     @Override
     public InputStream getWorksheetXMLInputStream() throws IOException {
-        throw new RuntimeException("Not supported by DeferredSXSSFSheet");
+        throw new IllegalStateException("Not supported by DeferredSXSSFSheet");
     }
 
     /**
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java
index 6483a33bbd..37186f876d 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java
@@ -58,7 +58,7 @@ public class DeferredSXSSFWorkbook extends SXSSFWorkbook {
     @NotImplemented
     @Override
     protected SheetDataWriter createSheetDataWriter() throws IOException {
-        throw new RuntimeException("Not supported by DeferredSXSSFWorkbook");
+        throw new IllegalStateException("Not supported by DeferredSXSSFWorkbook");
     }
 
     protected StreamingSheetWriter createSheetDataWriter(OutputStream out) throws IOException {
@@ -79,7 +79,7 @@ public class DeferredSXSSFWorkbook extends SXSSFWorkbook {
         try {
             sxSheet = new DeferredSXSSFSheet(this, xSheet);
         } catch (IOException ioe) {
-            throw new RuntimeException(ioe);
+            throw new IllegalStateException(ioe);
         }
         registerSheetMapping(sxSheet, xSheet);
         return sxSheet;
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
index c0007cfcdc..748117d8e1 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
@@ -154,7 +154,7 @@ public class SXSSFSheet implements Sheet, OoxmlSheetExtensions {
             try {
                 flushRows(_randomAccessWindowSize);
             } catch (IOException ioe) {
-                throw new RuntimeException(ioe);
+                throw new IllegalStateException(ioe);
             }
         }
         return newRow;
@@ -981,7 +981,7 @@ public class SXSSFSheet implements Sheet, OoxmlSheetExtensions {
     @NotImplemented
     @Override
     public void shiftRows(int startRow, int endRow, int n) {
-        throw new RuntimeException("Not Implemented");
+        throw new IllegalStateException("Not Implemented");
     }
 
     /**
@@ -1005,7 +1005,7 @@ public class SXSSFSheet implements Sheet, OoxmlSheetExtensions {
     @NotImplemented
     @Override
     public void shiftRows(int startRow, int endRow, int n, boolean copyRowHeight, boolean resetOriginalRowHeight) {
-        throw new RuntimeException("Not Implemented");
+        throw new IllegalStateException("Not Implemented");
     }
 
     /**
@@ -1361,7 +1361,7 @@ public class SXSSFSheet implements Sheet, OoxmlSheetExtensions {
             collapseRow(row);
         } else {
             //expandRow(rowIndex);
-            throw new RuntimeException("Unable to expand row: Not Implemented");
+            throw new IllegalStateException("Unable to expand row: Not Implemented");
         }
     }
 
@@ -1761,7 +1761,7 @@ public class SXSSFSheet implements Sheet, OoxmlSheetExtensions {
         // corrupted .xlsx files as rows appear multiple times in the resulting sheetX.xml files
         // return _sh.setArrayFormula(formula, range);
 
-        throw new RuntimeException("Not Implemented");
+        throw new IllegalStateException("Not Implemented");
     }
 
     /**
@@ -1776,7 +1776,7 @@ public class SXSSFSheet implements Sheet, OoxmlSheetExtensions {
         // corrupted .xlsx files as rows appear multiple times in the resulting sheetX.xml files
         // return _sh.removeArrayFormula(cell);
 
-        throw new RuntimeException("Not Implemented");
+        throw new IllegalStateException("Not Implemented");
     }
 
     @Override
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
index 560c196f89..e8b881f3a4 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
@@ -725,7 +725,7 @@ public class SXSSFWorkbook implements Workbook {
         try {
             sxSheet = new SXSSFSheet(this,xSheet);
         } catch (IOException ioe) {
-            throw new RuntimeException(ioe);
+            throw new IllegalStateException(ioe);
         }
         registerSheetMapping(sxSheet,xSheet);
         return sxSheet;
@@ -755,7 +755,7 @@ public class SXSSFWorkbook implements Workbook {
     @Override
     @NotImplemented
     public Sheet cloneSheet(int sheetNum) {
-        throw new RuntimeException("Not Implemented");
+        throw new IllegalStateException("Not Implemented");
     }
 
 
@@ -1320,7 +1320,7 @@ public class SXSSFWorkbook implements Workbook {
     @Override
     @NotImplemented
     public int linkExternalWorkbook(String name, Workbook workbook) {
-        throw new RuntimeException("Not Implemented");
+        throw new IllegalStateException("Not Implemented");
     }
 
     /**
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java
index bd500bff25..91b7b95f86 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java
@@ -41,7 +41,7 @@ public class StreamingSheetWriter extends SheetDataWriter {
     private boolean closed = false;
 
     public StreamingSheetWriter() throws IOException {
-        throw new RuntimeException("StreamingSheetWriter requires OutputStream");
+        throw new IllegalStateException("StreamingSheetWriter requires OutputStream");
     }
 
     public StreamingSheetWriter(OutputStream out) throws IOException {
@@ -51,12 +51,12 @@ public class StreamingSheetWriter extends SheetDataWriter {
 
     @Override
     public File createTempFile() throws IOException {
-        throw new RuntimeException("Not supported with StreamingSheetWriter");
+        throw new IllegalStateException("Not supported with StreamingSheetWriter");
     }
 
     @Override
     public Writer createWriter(File fd) throws IOException {
-        throw new RuntimeException("Not supported with StreamingSheetWriter");
+        throw new IllegalStateException("Not supported with StreamingSheetWriter");
     }
 
     /**
@@ -77,7 +77,7 @@ public class StreamingSheetWriter extends SheetDataWriter {
 
     @Override
     public InputStream getWorksheetXMLInputStream() throws IOException {
-        throw new RuntimeException("Not supported with StreamingSheetWriter");
+        throw new IllegalStateException("Not supported with StreamingSheetWriter");
     }
 
     @Override
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
index c1b5eb1042..c21f0593de 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
@@ -131,7 +131,7 @@ public abstract class BaseXSSFEvaluationWorkbook implements FormulaRenderingWork
         }
 
         // Not properly referenced
-        throw new RuntimeException("Book not linked for filename " + bookName);
+        throw new IllegalStateException("Book not linked for filename " + bookName);
     }
     /* This is case-sensitive. Is that correct? */
     private int findExternalLinkIndex(String bookName, List<ExternalLinksTable> tables) {
@@ -317,7 +317,7 @@ public abstract class BaseXSSFEvaluationWorkbook implements FormulaRenderingWork
     @Override
     @NotImplemented
     public int getExternalSheetIndex(String workbookName, String sheetName) {
-        throw new RuntimeException("not implemented yet");
+        throw new IllegalStateException("not implemented yet");
     }
     @Override
     public int getSheetIndex(String sheetName) {
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
index 8b3eef1bc4..f47d255c4a 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
@@ -75,7 +75,7 @@ public abstract class BaseXSSFFormulaEvaluator extends BaseFormulaEvaluator {
         if (eval instanceof ErrorEval) {
             return CellValue.getError(((ErrorEval)eval).getErrorCode());
         }
-        throw new RuntimeException("Unexpected eval class (" + eval.getClass().getName() + ")");
+        throw new IllegalStateException("Unexpected eval class (" + eval.getClass().getName() + ")");
     }
 
     /**
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java
index 347f1895eb..63ef92a707 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java
@@ -416,7 +416,7 @@ public enum XSSFBuiltinTableStyle {
                 styleMap.put(builtIn, new XSSFBuiltinTypeStyleStyle(builtIn, styles.getExplicitTableStyle(styleName)));
             }
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            throw new IllegalStateException(e);
         }
     }
 
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
index bbd8c261b4..6f0b5e1169 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
@@ -99,7 +99,7 @@ public class XSSFChartSheet extends XSSFSheet  {
         try {
             new XSSFSheet().write(out);
         } catch (IOException e){
-            throw new RuntimeException(e);
+            throw new IllegalStateException(e);
         }
         return out.toByteArray();
     }
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
index 7a588ecb0f..c649cd74d1 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
@@ -1918,13 +1918,13 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Date1904Su
     @Override
     @NotImplemented
     public boolean isHidden() {
-        throw new RuntimeException("Not implemented yet");
+        throw new IllegalStateException("Not implemented yet");
     }
 
     @Override
     @NotImplemented
     public void setHidden(boolean hiddenFlag) {
-        throw new RuntimeException("Not implemented yet");
+        throw new IllegalStateException("Not implemented yet");
     }
 
     @Override
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
index 2b08c4ef6b..d747e44cf9 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
@@ -629,7 +629,7 @@ public class XWPFParagraph implements IBodyElement, IRunBody, ISDTContents, Para
     public void setBorderTop(Borders border) {
         CTPBdr ct = getCTPBrd(true);
         if (ct == null) {
-            throw new RuntimeException("invalid paragraph state");
+            throw new IllegalStateException("invalid paragraph state");
         }
 
         CTBorder pr = (ct.isSetTop()) ? ct.getTop() : ct.addNewTop();
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTable.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
index 33548e791d..82c08e260c 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
@@ -1218,7 +1218,7 @@ public class XWPFTable implements IBodyElement, ISDTContents {
      */
     protected static void setWidthValue(String widthValue, CTTblWidth ctWidth) {
         if (!widthValue.matches(REGEX_WIDTH_VALUE)) {
-            throw new RuntimeException("Table width value \"" + widthValue + "\" "
+            throw new IllegalStateException("Table width value \"" + widthValue + "\" "
                     + "must match regular expression \"" + REGEX_WIDTH_VALUE + "\".");
         }
         if (widthValue.matches("auto")) {
@@ -1250,7 +1250,7 @@ public class XWPFTable implements IBodyElement, ISDTContents {
         } else if (widthValue.matches("[0-9]+")) {
             ctWidth.setW(new BigInteger(widthValue));
         } else {
-            throw new RuntimeException("setWidthPercentage(): Width value must be a percentage (\"33.3%\" or an integer, was \"" + widthValue + "\"");
+            throw new IllegalStateException("setWidthPercentage(): Width value must be a percentage (\"33.3%\" or an integer, was \"" + widthValue + "\"");
         }
     }
 
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java
index 2d8f3b0e45..dfa4685fe1 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java
@@ -103,7 +103,7 @@ public class HemfPlusGDIImageRenderer extends BitmapImageRenderer {
                 bOffs = new int[]{2, 1, 0};
                 break;
             default:
-                throw new RuntimeException("not yet implemented");
+                throw new IllegalStateException("not yet implemented");
         }
 
         ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java
index 2553102d11..ebeb0f1d0f 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java
@@ -205,7 +205,7 @@ public class HemfPlusObject {
                 ) {
                     other.linkContinuedObject(objectData);
                 } else {
-                    throw new RuntimeException("can't find previous record for continued record");
+                    throw new IllegalStateException("can't find previous record for continued record");
                 }
             } else {
                 ctx.addPlusObjectTableEntry(this, getObjectId());
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java
index 0faf461808..d6d2b536f4 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java
@@ -299,7 +299,7 @@ public class HemfEmbeddedIterator implements Iterator<HwmfEmbedded> {
             emb.setData(bos.toByteArray());
         } catch (IOException e) {
             // TODO: throw appropriate exception
-            throw new RuntimeException(e);
+            throw new IllegalStateException(e);
         }
     }
 
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
index de90c60c8d..814c82e788 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
@@ -329,7 +329,7 @@ public class TextPropCollection implements GenericRecord, Duplicatable {
 
     public void setIndentLevel(short indentLevel) {
         if (textPropType == TextPropType.character) {
-            throw new RuntimeException("trying to set an indent on a character collection.");
+            throw new IllegalStateException("trying to set an indent on a character collection.");
         }
         this.indentLevel = indentLevel;
     }
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java
index 2111d5387a..4739ddb907 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java
@@ -241,7 +241,7 @@ public final class HSLFObjectShape extends HSLFPictureShape implements ObjectSha
     public OutputStream updateObjectData(final Application application, final ObjectMetaData metaData) {
         final ObjectMetaData md = (application != null) ? application.getMetaData() : metaData;
         if (md == null) {
-            throw new RuntimeException("either application or metaData needs to be set");
+            throw new IllegalStateException("either application or metaData needs to be set");
         }
 
         // can't use UnsynchronizedByteArrayOutputStream here, because it's final
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
index 643463e191..52a0a962c3 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
@@ -278,7 +278,7 @@ public class MAPIMessage extends POIReadOnlyDocument {
             );
             return rtf.getDataString();
         } catch (IOException e) {
-            throw new RuntimeException("Shouldn't happen", e);
+            throw new IllegalStateException("Shouldn't happen", e);
         }
     }
 
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMisc.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMisc.java
index dc307614ea..da669354df 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMisc.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMisc.java
@@ -528,7 +528,7 @@ public class HwmfMisc {
             case BS_DIBPATTERN8X8:
             case BS_MONOPATTERN:
             case BS_PATTERN8X8:
-                throw new RuntimeException("pattern not supported");
+                throw new IllegalStateException("pattern not supported");
             }
             return size;
         }
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java
index b9d9f7ed2b..dd5c7e0c80 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java
@@ -429,7 +429,7 @@ public enum HwmfTernaryRasterOp {
                     stack[stackPnt++] = "all black";
                     break;
                 default:
-                    throw new RuntimeException("unknown cmd '"+c+"'.");
+                    throw new IllegalStateException("unknown cmd '"+c+"'.");
             }
         }
 
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java
index 0ac072ddd2..7098f2811d 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java
@@ -208,7 +208,7 @@ public class HwmfPicture implements Iterable<HwmfRecord>, GenericRecord {
         if (inner != null) {
             return inner;
         }
-        throw new RuntimeException("invalid wmf file - window records are incomplete.");
+        throw new IllegalStateException("invalid wmf file - window records are incomplete.");
     }
 
     /**
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java
index 55657f72b3..52ae97a3ed 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java
@@ -263,7 +263,7 @@ public final class HWPFLister {
             }
         }
         catch ( IOException e ) {
-            throw new RuntimeException( e );
+            throw new IllegalStateException( e );
         }
     }
 
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
index 9c8dc8b568..880c4e2d38 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
@@ -259,7 +259,7 @@ public final class WordExtractor implements POIOLE2TextExtractor {
         } catch (RuntimeException e) {
             throw e;
         } catch ( Exception exc ) {
-            throw new RuntimeException( exc );
+            throw new IllegalStateException( exc );
         }
     }
 
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java
index 2c30f29a01..bf3fd50c3e 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java
@@ -116,7 +116,7 @@ public final class SprmUtils {
                 break;
             default:
                 //should never happen
-                throw new RuntimeException("Invalid sprm type");
+                throw new IllegalStateException("Invalid sprm type");
         }
         LittleEndian.putShort(sprm, 0, instruction);
         list.add(sprm);