Bugfixes and new functions: hiding of workbook windows

resources/functions_de.properties

@@ -275,7 +275,6 @@ tanh=TANHYP
 tdist=TVERT
 terminate=KANAL.SCHLIESSEN
 text=TEXT
-text=BOX	TEXTFELD
 textref=TEXTPOS
 time=ZEIT
 timevalue=ZEITWERT

src/jxl/Cell.java

@@ -41,6 +41,10 @@ public interface Cell
    */
   public int getColumn();
 
+  public default CellCoordinate getCoordinate() {
+    return new CellCoordinate(getColumn(), getRow());
+  }
+
   /**
    * Returns the content type of this cell
    *

src/jxl/CellCoordinate.java

@@ -0,0 +1,59 @@
+
+package jxl;
+
+/**
+ * created 30.05.2020
+ * @author jan
+ */
+public class CellCoordinate implements Comparable<CellCoordinate> {
+
+  private final int column;
+  private final int row;
+
+  public CellCoordinate(int column, int row) {
+    this.column = column;
+    this.row = row;
+  }
+
+  public int getColumn() {
+    return column;
+  }
+
+  public int getRow() {
+    return row;
+  }
+
+  @Override
+  public int hashCode() {
+    int hash = 7;
+    hash = 37 * hash + this.column;
+    hash = 37 * hash + this.row;
+    return hash;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    return compareTo((CellCoordinate) obj) == 0;
+  }
+
+  @Override
+  public int compareTo(CellCoordinate that) {
+    int rowDiff = Integer.compare(this.row, that.row);
+    if (rowDiff != 0)
+      return rowDiff;
+    else
+      return Integer.compare(this.column, that.column);
+  }
+
+  @Override
+  public String toString() {
+    return "Coord(" + column + "," + row + ')';
+  }
+
+}

src/jxl/CellLocation.java

@@ -0,0 +1,61 @@
+package jxl;
+
+import java.util.*;
+import jxl.write.*;
+
+/**
+ * This class describes the locatation of a cell whithin a workbook.
+ * It realizes the value object pattern.
+ *
+ * created 2020-01-05
+ * @author jan
+ */
+public class CellLocation {
+
+  private final WritableSheet sheet;
+  private final int column, row;
+
+  public CellLocation(WritableSheet sheet, int column, int row) {
+    this.sheet = sheet;
+    this.column = column;
+    this.row = row;
+  }
+
+  public WritableSheet getSheet() {
+    return sheet;
+  }
+
+  public int getColumn() {
+    return column;
+  }
+
+  public int getRow() {
+    return row;
+  }
+
+  @Override
+  public int hashCode() {
+    int hash = 7;
+    hash = 37 * hash + Objects.hashCode(this.sheet);
+    hash = 37 * hash + this.column;
+    hash = 37 * hash + this.row;
+    return hash;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    final CellLocation other = (CellLocation) obj;
+    if (this.column != other.column)
+      return false;
+    if (this.row != other.row)
+      return false;
+    return Objects.equals(this.sheet, other.sheet);
+  }
+
+}

src/jxl/CellType.java

@@ -22,70 +22,33 @@
 /**
  * An enumeration type listing the available content types for a cell
  */
-public final class CellType
-{
-
-  /**
-   * The text description of this cell type
-   */
-  private String description;
-
-  /**
-   * Private constructor
-   * @param desc the description of this type
-   */
-  private CellType(String desc)
-  {
+public enum CellType {
+
+  // An empty cell can still contain formatting information and comments
+  EMPTY("Empty"),
+  LABEL("Label"),
+  NUMBER("Number"),
+  BOOLEAN("Boolean"),
+  ERROR("Error"),
+  NUMBER_FORMULA("Numerical Formula"),
+  DATE_FORMULA("Date Formula"),
+  STRING_FORMULA("String Formula"),
+  BOOLEAN_FORMULA("Boolean Formula"),
+  FORMULA_ERROR("Formula Error"),
+  DATE("Date");
+
+  private final String description;
+
+  private CellType(String desc) {
     description = desc;
   }
 
-  /**
-   * Returns a string description of this cell
-   *
-   * @return the string description for this type
-   */
+  @Override
   public String toString()
   {
     return description;
   }
 
-  /**
-   * An empty cell can still contain formatting information and comments
-   */
-  public static final CellType EMPTY           = new CellType("Empty");
-  /**
-   */
-  public static final CellType LABEL           = new CellType("Label");
-  /**
-   */
-  public static final CellType NUMBER          = new CellType("Number");
-  /**
-   */
-  public static final CellType BOOLEAN         = new CellType("Boolean");
-  /**
-   */
-  public static final CellType ERROR           = new CellType("Error");
-  /**
-   */
-  public static final CellType NUMBER_FORMULA  =
-                                         new CellType("Numerical Formula");
-  /**
-   */
-  public static final CellType DATE_FORMULA  = new CellType("Date Formula");
-  /**
-   */
-  public static final CellType STRING_FORMULA  = new CellType("String Formula");
-  /**
-   */
-  public static final CellType BOOLEAN_FORMULA =
-                                          new CellType("Boolean Formula");
-  /**
-   */
-  public static final CellType FORMULA_ERROR   = new CellType("Formula Error");
-  /**
-   */
-  public static final CellType DATE            = new CellType("Date");
-
 }
 
 

src/jxl/Hyperlink.java

@@ -19,8 +19,8 @@
 
 package jxl;
 
-import java.io.File;
 import java.net.URL;
+import java.nio.file.Path;
 
 /**
  * Hyperlink information.  Only URLs or file links are supported
@@ -102,6 +102,6 @@ public interface Hyperlink
    *
    * @return the file, or NULL if this hyperlink is not a file
    */
-  public File getFile();
+  public Path getFile();
 }
 

src/jxl/Image.java

@@ -19,10 +19,9 @@
 
 package jxl;
 
+import java.nio.file.Path;
 import jxl.common.LengthUnit;
 
-import java.io.File;
-
 /**
  * Accessor functions for an image
  */
@@ -61,7 +60,7 @@ public interface Image
    *
    * @return the file which the image references
    */
-  public File getImageFile();
+  public Path getImageFile();
 
   /**
    * Accessor for the image data

src/jxl/Sheet.java

@@ -19,8 +19,10 @@
 
 package jxl;
 
+import java.util.List;
 import java.util.regex.Pattern;
 import jxl.format.CellFormat;
+import jxl.read.biff.*;
 
 /**
  * Represents a sheet within a workbook.  Provides a handle to the individual
@@ -89,22 +91,6 @@ public interface Sheet
    */
   public String getName();
 
-  /**
-   * Determines whether the sheet is hidden
-   *
-   * @return whether or not the sheet is hidden
-   * @deprecated in favour of the getSettings() method
-   */
-  public boolean isHidden();
-
-  /**
-   * Determines whether the sheet is protected
-   *
-   * @return whether or not the sheet is protected
-   * @deprecated in favour of the getSettings() method
-   */
-  public boolean isProtected();
-
   /**
    * Gets the cell whose contents match the string passed in.
    * If no match is found, then null is returned.  The search is performed
@@ -121,7 +107,7 @@ public interface Sheet
    * If no match is found, then null is returned.  The search is performed
    * on a row by row basis, so the lower the row number, the more
    * efficiently the algorithm will perform
-   * 
+   *
    * @param contents the string to match
    * @param firstCol the first column within the range
    * @param firstRow the first row of the range
@@ -130,19 +116,19 @@ public interface Sheet
    * @param reverse indicates whether to perform a reverse search or not
    * @return the Cell whose contents match the parameter, null if not found
    */
-  public Cell findCell(String contents, 
-                       int firstCol, 
-                       int firstRow, 
-                       int lastCol, 
-                       int lastRow, 
+  public Cell findCell(String contents,
+                       int firstCol,
+                       int firstRow,
+                       int lastCol,
+                       int lastRow,
                        boolean reverse);
 
   /**
    * Gets the cell whose contents match the regular expressionstring passed in.
    * If no match is found, then null is returned.  The search is performed
    * on a row by row basis, so the lower the row number, the more
    * efficiently the algorithm will perform
-   * 
+   *
    * @param pattern the regular expression string to match
    * @param firstCol the first column within the range
    * @param firstRow the first row of the rang
@@ -151,11 +137,11 @@ public Cell findCell(String contents,
    * @param reverse indicates whether to perform a reverse search or not
    * @return the Cell whose contents match the parameter, null if not found
    */
-  public Cell findCell(Pattern pattern, 
-                       int firstCol, 
+  public Cell findCell(Pattern pattern,
+                       int firstCol,
                        int firstRow,
-                       int lastCol,  
-                       int lastRow, 
+                       int lastCol,
+                       int lastRow,
                        boolean reverse);
 
   /**
@@ -182,9 +168,9 @@ public Cell findCell(Pattern pattern,
   /**
    * Gets the cells which have been merged on this sheet
    *
-   * @return an array of range objects
+   * @return a List of range objects
    */
-  public Range[] getMergedCells();
+  public List<Range> getMergedCells();
 
   /**
    * Gets the settings used on a particular sheet
@@ -260,14 +246,14 @@ public Cell findCell(Pattern pattern,
    *
    * @return the page breaks on this sheet
    */
-  public int[] getRowPageBreaks();
+  public IHorizontalPageBreaks getRowPageBreaks();
 
   /**
    * Accessor for the page breaks on this sheet
    *
    * @return the page breaks on this sheet
    */
-  public int[] getColumnPageBreaks();
+  public IVerticalPageBreaks getColumnPageBreaks();
 
 }