svn commit: r1809635 - in /poi/trunk/src: examples/src/org/apache/poi/xssf/eventusermodel/ examples/src/org/apache/poi/xssf/streaming/examples/ ooxml/java/org/apache/poi/xssf/eventusermodel/ ooxml/java/org/apache/poi/xssf/extractor/

[centic]

Author: centic
Date: Mon Sep 25 14:45:14 2017
New Revision: 1809635

URL: http://svn.apache.org/viewvc?rev=1809635&view=rev
Log:
Replace the incompatible new interface method endSheet() with a Java 8 default 
method so existing implementations do not need to be adjusted. Also use this 
for headerFooter() and remove the empty implementations that are now obsolete.

Modified:
    poi/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java
    
poi/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/HybridStreaming.java
    
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
    
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java

Modified: 
poi/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java?rev=1809635&r1=1809634&r2=1809635&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java 
(original)
+++ poi/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java 
Mon Sep 25 14:45:14 2017
@@ -135,15 +135,6 @@ public class XLSX2CSV {
                 output.append('"');
             }
         }
-
-        @Override
-        public void headerFooter(String text, boolean isHeader, String 
tagName) {
-            // Skip, no headers or footers in CSV
-        }
-
-        @Override
-        public void endSheet() {
-        }
     }
 
 

Modified: 
poi/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/HybridStreaming.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/HybridStreaming.java?rev=1809635&r1=1809634&r2=1809635&view=diff
==============================================================================
--- 
poi/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/HybridStreaming.java
 (original)
+++ 
poi/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/HybridStreaming.java
 Mon Sep 25 14:45:14 2017
@@ -65,22 +65,12 @@ public class HybridStreaming {
             }
             
             @Override
-            public void headerFooter(String text, boolean isHeader, String 
tagName) {
-            }
-            
-            @Override
             public void endRow(int rowNum) {
             }
             
             @Override
             public void cell(String cellReference, String formattedValue, 
XSSFComment comment) {
             }
-
-            @Override
-            public void endSheet() {
-
-            }
         };
     }
-
 }

Modified: 
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java?rev=1809635&r1=1809634&r2=1809635&view=diff
==============================================================================
--- 
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
 (original)
+++ 
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
 Mon Sep 25 14:45:14 2017
@@ -515,9 +515,9 @@ public class XSSFSheetXMLHandler extends
       public void cell(String cellReference, String formattedValue, 
XSSFComment comment);
 
       /** A header or footer has been encountered */
-      public void headerFooter(String text, boolean isHeader, String tagName);
+      public default void headerFooter(String text, boolean isHeader, String 
tagName) {}
 
       /** Signal that the end of a sheet was been reached */
-      public void endSheet();
+      public default void endSheet() {}
    }
 }

Modified: 
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java?rev=1809635&r1=1809634&r2=1809635&view=diff
==============================================================================
--- 
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
 (original)
+++ 
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
 Mon Sep 25 14:45:14 2017
@@ -343,10 +343,6 @@ public class XSSFEventBasedExcelExtracto
         }
 
         @Override
-        public void endSheet() {
-        }
-
-        @Override
         public void cell(String cellRef, String formattedValue, XSSFComment 
comment) {
             if(firstCellOfRow) {
                 firstCellOfRow = false;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org