poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From one...@apache.org
Subject svn commit: r1751044 - in /poi/trunk/src: java/org/apache/poi/hssf/model/ java/org/apache/poi/hssf/usermodel/ java/org/apache/poi/hssf/util/ java/org/apache/poi/ss/usermodel/ java/org/apache/poi/ss/util/ ooxml/java/org/apache/poi/xssf/streaming/ ooxml/...
Date Sat, 02 Jul 2016 09:00:14 GMT
Author: onealj
Date: Sat Jul  2 09:00:13 2016
New Revision: 1751044

URL: http://svn.apache.org/viewvc?rev=1751044&view=rev
Log:
bug 59781: promote to Common SS: move PaneInformation from o.a.p.hssf.util to o.a.p.ss.util

Added:
    poi/trunk/src/java/org/apache/poi/ss/util/PaneInformation.java
      - copied, changed from r1751032, poi/trunk/src/java/org/apache/poi/hssf/util/PaneInformation.java
Modified:
    poi/trunk/src/java/org/apache/poi/hssf/model/InternalSheet.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
    poi/trunk/src/java/org/apache/poi/hssf/util/PaneInformation.java
    poi/trunk/src/java/org/apache/poi/ss/usermodel/Sheet.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java

Modified: poi/trunk/src/java/org/apache/poi/hssf/model/InternalSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/model/InternalSheet.java?rev=1751044&r1=1751043&r2=1751044&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/model/InternalSheet.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/model/InternalSheet.java Sat Jul  2 09:00:13 2016
@@ -70,9 +70,9 @@ import org.apache.poi.hssf.record.aggreg
 import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
 import org.apache.poi.hssf.record.aggregates.RowRecordsAggregate;
 import org.apache.poi.hssf.record.aggregates.WorksheetProtectionBlock;
-import org.apache.poi.hssf.util.PaneInformation;
 import org.apache.poi.ss.formula.FormulaShifter;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.PaneInformation;
 import org.apache.poi.util.Internal;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=1751044&r1=1751043&r2=1751044&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java Sat Jul  2 09:00:13 2016
@@ -51,7 +51,6 @@ import org.apache.poi.hssf.record.aggreg
 import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
 import org.apache.poi.hssf.record.aggregates.WorksheetProtectionBlock;
 import org.apache.poi.hssf.usermodel.helpers.HSSFRowShifter;
-import org.apache.poi.hssf.util.PaneInformation;
 import org.apache.poi.ss.SpreadsheetVersion;
 import org.apache.poi.ss.formula.FormulaShifter;
 import org.apache.poi.ss.formula.FormulaType;
@@ -70,6 +69,7 @@ import org.apache.poi.ss.util.CellAddres
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.ss.util.CellReference;
+import org.apache.poi.ss.util.PaneInformation;
 import org.apache.poi.ss.util.SSCellRange;
 import org.apache.poi.ss.util.SheetUtil;
 import org.apache.poi.util.Configurator;

Modified: poi/trunk/src/java/org/apache/poi/hssf/util/PaneInformation.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/util/PaneInformation.java?rev=1751044&r1=1751043&r2=1751044&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/util/PaneInformation.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/util/PaneInformation.java Sat Jul  2 09:00:13 2016
@@ -19,87 +19,12 @@ package org.apache.poi.hssf.util;
 
 /**
  * Holds information regarding a split plane or freeze plane for a sheet.
- *
+ * @deprecated POI 3.15 beta 3. Use {@link org.apache.poi.ss.util.PaneInformation} instead.
  */
-public class PaneInformation
+public class PaneInformation extends org.apache.poi.ss.util.PaneInformation
 {
-	/** Constant for active pane being the lower right*/
-    public static final byte PANE_LOWER_RIGHT = (byte)0;
-    /** Constant for active pane being the upper right*/
-    public static final byte PANE_UPPER_RIGHT = (byte)1;
-    /** Constant for active pane being the lower left*/
-    public static final byte PANE_LOWER_LEFT = (byte)2;
-    /** Constant for active pane being the upper left*/
-    public static final byte PANE_UPPER_LEFT = (byte)3;
-    
-	private short x;
-	private short y;
-	private short topRow;
-	private short leftColumn;
-	private byte activePane;
-	private boolean frozen = false;
-	
-	public PaneInformation(short x, short y, short top, short left, byte active, boolean frozen)
{
-		this.x = x;
-		this.y = y;
-		this.topRow = top;
-		this.leftColumn = left;
-		this.activePane = active;
-		this.frozen = frozen;
-	}
+        public PaneInformation(short x, short y, short top, short left, byte active, boolean
frozen) {
+                super(x, y, top, left, active, frozen);
+        }
 
-
-	/**
-	 * Returns the vertical position of the split.
-	 * @return 0 if there is no vertical spilt,
-	 *         or for a freeze pane the number of columns in the TOP pane,
-	 *         or for a split plane the position of the split in 1/20th of a point.
-	 */
-	public short getVerticalSplitPosition() {
-	  return x;
-	}
-	
-	/**
-	 * Returns the horizontal position of the split.
-	 * @return 0 if there is no horizontal spilt,
-	 *         or for a freeze pane the number of rows in the LEFT pane,
-	 *         or for a split plane the position of the split in 1/20th of a point.
-	 */
-	public short getHorizontalSplitPosition() {
-	  return y;
-	}
-	
-	/**
-	 * For a horizontal split returns the top row in the BOTTOM pane.
-	 * @return 0 if there is no horizontal split, or the top row of the bottom pane.
-	 */
-	public short getHorizontalSplitTopRow() {
-	  return topRow;
-	}
-	
-	/**
-	 * For a vertical split returns the left column in the RIGHT pane.
-	 * @return 0 if there is no vertical split, or the left column in the RIGHT pane.
-	 */
-	public short getVerticalSplitLeftColumn() {
-	  return leftColumn;
-	}
-	
-	/**
-	 * Returns the active pane
-	 * @see #PANE_LOWER_RIGHT
-	 * @see #PANE_UPPER_RIGHT
-	 * @see #PANE_LOWER_LEFT
-	 * @see #PANE_UPPER_LEFT
-	 * @return the active pane.
-	 */
-	public byte getActivePane() {
-	  return activePane;
-	}
-	
-	/** Returns true if this is a Freeze pane, false if it is a split pane.
-	 */
-	public boolean isFreezePane() {
-		return frozen;
-	}
 }

Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/Sheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/Sheet.java?rev=1751044&r1=1751043&r2=1751044&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/Sheet.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/Sheet.java Sat Jul  2 09:00:13 2016
@@ -22,9 +22,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.poi.hssf.util.PaneInformation;
 import org.apache.poi.ss.util.CellAddress;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.PaneInformation;
 
 /**
  * High level representation of a Excel worksheet.

Copied: poi/trunk/src/java/org/apache/poi/ss/util/PaneInformation.java (from r1751032, poi/trunk/src/java/org/apache/poi/hssf/util/PaneInformation.java)
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/PaneInformation.java?p2=poi/trunk/src/java/org/apache/poi/ss/util/PaneInformation.java&p1=poi/trunk/src/java/org/apache/poi/hssf/util/PaneInformation.java&r1=1751032&r2=1751044&rev=1751044&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/util/PaneInformation.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/PaneInformation.java Sat Jul  2 09:00:13 2016
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.util;
+package org.apache.poi.ss.util;
 
 /**
  * Holds information regarding a split plane or freeze plane for a sheet.
@@ -23,7 +23,7 @@ package org.apache.poi.hssf.util;
  */
 public class PaneInformation
 {
-	/** Constant for active pane being the lower right*/
+    /** Constant for active pane being the lower right*/
     public static final byte PANE_LOWER_RIGHT = (byte)0;
     /** Constant for active pane being the upper right*/
     public static final byte PANE_UPPER_RIGHT = (byte)1;
@@ -32,12 +32,12 @@ public class PaneInformation
     /** Constant for active pane being the upper left*/
     public static final byte PANE_UPPER_LEFT = (byte)3;
     
-	private short x;
-	private short y;
-	private short topRow;
-	private short leftColumn;
-	private byte activePane;
-	private boolean frozen = false;
+	private final short x;
+	private final short y;
+	private final short topRow;
+	private final short leftColumn;
+	private final byte activePane;
+	private final boolean frozen;
 	
 	public PaneInformation(short x, short y, short top, short left, byte active, boolean frozen)
{
 		this.x = x;

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java?rev=1751044&r1=1751043&r2=1751044&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java Sat Jul  2 09:00:13
2016
@@ -26,7 +26,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.apache.poi.hssf.util.PaneInformation;
 import org.apache.poi.ss.SpreadsheetVersion;
 import org.apache.poi.ss.usermodel.AutoFilter;
 import org.apache.poi.ss.usermodel.Cell;
@@ -44,6 +43,7 @@ import org.apache.poi.ss.usermodel.Sheet
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellAddress;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.PaneInformation;
 import org.apache.poi.ss.util.SheetUtil;
 import org.apache.poi.util.Internal;
 import org.apache.poi.util.NotImplemented;

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java?rev=1751044&r1=1751043&r2=1751044&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java Sat Jul  2 09:00:13
2016
@@ -43,7 +43,7 @@ import javax.xml.namespace.QName;
 
 import org.apache.poi.POIXMLDocumentPart;
 import org.apache.poi.POIXMLException;
-import org.apache.poi.hssf.util.PaneInformation;
+
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.exceptions.PartAlreadyExistsException;
 import org.apache.poi.openxml4j.opc.PackagePart;
@@ -71,6 +71,7 @@ import org.apache.poi.ss.util.CellAddres
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.ss.util.CellReference;
+import org.apache.poi.ss.util.PaneInformation;
 import org.apache.poi.ss.util.SSCellRange;
 import org.apache.poi.ss.util.SheetUtil;
 import org.apache.poi.util.Beta;

Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java?rev=1751044&r1=1751043&r2=1751044&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java Sat Jul
 2 09:00:13 2016
@@ -18,10 +18,10 @@
 package org.apache.poi.ss.usermodel;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.PaneInformation;
 import org.apache.poi.ss.ITestDataProvider;
 import org.apache.poi.ss.SpreadsheetVersion;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.PaneInformation;
 import org.apache.poi.ss.util.SheetUtil;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;

Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java?rev=1751044&r1=1751043&r2=1751044&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java Sat Jul  2 09:00:13
2016
@@ -39,11 +39,11 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.poi.hssf.util.PaneInformation;
 import org.apache.poi.ss.ITestDataProvider;
 import org.apache.poi.ss.SpreadsheetVersion;
 import org.apache.poi.ss.util.CellAddress;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.PaneInformation;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;



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


Mime
View raw message