You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2015/09/29 01:16:59 UTC

svn commit: r1705789 [2/2] - in /poi/trunk/src: integrationtest/org/apache/poi/hssf/usermodel/ java/org/apache/poi/ddf/ java/org/apache/poi/hssf/dev/ java/org/apache/poi/hssf/model/ java/org/apache/poi/hssf/record/ java/org/apache/poi/hssf/record/aggre...

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/Record.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/Record.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/Record.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/Record.java Mon Sep 28 23:16:58 2015
@@ -61,16 +61,8 @@ public abstract class Record extends Rec
     public abstract short getSid();
 
     @Override
-    public Object clone() {
-//        if (false) {
-//            // TODO - implement clone in a more standardised way
-//            try {
-//                return super.clone();
-//            } catch (CloneNotSupportedException e) {
-//                throw new RuntimeException(e);
-//            }
-//        }
-        throw new RuntimeException("The class "+getClass().getName()+" needs to define a clone method");
+    public Object clone() throws CloneNotSupportedException {
+        throw new CloneNotSupportedException("The class "+getClass().getName()+" needs to define a clone method");
     }
 
     /**

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java Mon Sep 28 23:16:58 2015
@@ -28,7 +28,7 @@ import org.apache.poi.hssf.record.Column
 /**
  * @author Glen Stampoultzis
  */
-public final class ColumnInfoRecordsAggregate extends RecordAggregate {
+public final class ColumnInfoRecordsAggregate extends RecordAggregate implements Cloneable {
 	/**
 	 * List of {@link ColumnInfoRecord}s assumed to be in order
 	 */
@@ -75,14 +75,11 @@ public final class ColumnInfoRecordsAggr
 		}
 	}
 
-	/**
-	 * Performs a deep clone of the record
-	 */
-	public Object clone() {
+	@Override
+	public ColumnInfoRecordsAggregate clone() {
 		ColumnInfoRecordsAggregate rec = new ColumnInfoRecordsAggregate();
-		for (int k = 0; k < records.size(); k++) {
-			ColumnInfoRecord ci = records.get(k);
-			rec.records.add((ColumnInfoRecord) ci.clone());
+		for (ColumnInfoRecord ci : records) {
+			rec.records.add(ci.clone());
 		}
 		return rec;
 	}
@@ -295,7 +292,7 @@ public final class ColumnInfoRecordsAggr
 	}
 
 	private static ColumnInfoRecord copyColInfo(ColumnInfoRecord ci) {
-		return (ColumnInfoRecord) ci.clone();
+		return ci.clone();
 	}
 
 

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java Mon Sep 28 23:16:58 2015
@@ -26,7 +26,7 @@ import org.apache.poi.util.LittleEndianO
 /**
  * Border Formatting Block of the Conditional Formatting Rule Record.
  */
-public final class BorderFormatting {
+public final class BorderFormatting implements Cloneable {
     /** No border */
     public final static short    BORDER_NONE                = 0x0;
     /** Thin border */
@@ -446,7 +446,8 @@ public final class BorderFormatting {
         return buffer.toString();
     }
 
-    public Object clone() {
+    @Override
+    public BorderFormatting clone() {
       BorderFormatting rec = new BorderFormatting();
       rec.field_13_border_styles1 = field_13_border_styles1;
       rec.field_14_border_styles2 = field_14_border_styles2;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java Mon Sep 28 23:16:58 2015
@@ -24,7 +24,7 @@ import org.apache.poi.util.LittleEndianO
  * Color Gradient / Color Scale specific Threshold / value (CFVO),
  *  for changes in Conditional Formatting
  */
-public final class ColorGradientThreshold extends Threshold {
+public final class ColorGradientThreshold extends Threshold implements Cloneable {
     private double position;
 
     public ColorGradientThreshold() {
@@ -49,7 +49,8 @@ public final class ColorGradientThreshol
         return super.getDataLength() + 8;
     }
 
-    public Object clone() {
+    @Override
+    public ColorGradientThreshold clone() {
       ColorGradientThreshold rec = new ColorGradientThreshold();
       super.copyTo(rec);
       rec.position = position;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java Mon Sep 28 23:16:58 2015
@@ -23,7 +23,7 @@ import org.apache.poi.util.LittleEndianI
  * Data Bar specific Threshold / value (CFVO),
  *  for changes in Conditional Formatting
  */
-public final class DataBarThreshold extends Threshold {
+public final class DataBarThreshold extends Threshold implements Cloneable {
     public DataBarThreshold() {
         super();
     }
@@ -33,7 +33,8 @@ public final class DataBarThreshold exte
         super(in);
     }
 
-    public Object clone() {
+    @Override
+    public DataBarThreshold clone() {
       DataBarThreshold rec = new DataBarThreshold();
       super.copyTo(rec);
       return rec;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java Mon Sep 28 23:16:58 2015
@@ -28,7 +28,7 @@ import org.apache.poi.util.LittleEndian;
 /**
  * Font Formatting Block of the Conditional Formatting Rule Record.
  */
-public final class FontFormatting {
+public final class FontFormatting implements Cloneable {
     private byte[] _rawData;
 
     private static final int OFFSET_FONT_NAME = 0;
@@ -541,7 +541,8 @@ public final class FontFormatting {
         return buffer.toString();
     }
 
-    public Object clone()
+    @Override
+    public FontFormatting clone()
     {
         byte[] rawData = _rawData.clone();
         return new FontFormatting(rawData);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java Mon Sep 28 23:16:58 2015
@@ -24,7 +24,7 @@ import org.apache.poi.util.LittleEndianO
  * Icon / Multi-State specific Threshold / value (CFVO),
  *  for changes in Conditional Formatting
  */
-public final class IconMultiStateThreshold extends Threshold {
+public final class IconMultiStateThreshold extends Threshold implements Cloneable {
     /**
      * Cell values that are equal to the threshold value do not pass the threshold
      */
@@ -60,7 +60,8 @@ public final class IconMultiStateThresho
         return super.getDataLength() + 5;
     }
 
-    public Object clone() {
+    @Override
+    public IconMultiStateThreshold clone() {
       IconMultiStateThreshold rec = new IconMultiStateThreshold();
       super.copyTo(rec);
       rec.equals = equals;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java Mon Sep 28 23:16:58 2015
@@ -29,7 +29,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class AreaFormatRecord extends StandardRecord {
+public final class AreaFormatRecord extends StandardRecord implements Cloneable {
     public final static short sid = 0x100A;
     
     private static final BitField automatic = BitFieldFactory.getInstance(0x1);
@@ -113,7 +113,8 @@ public final class AreaFormatRecord exte
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public AreaFormatRecord clone() {
         AreaFormatRecord rec = new AreaFormatRecord();
     
         rec.field_1_foregroundColor = field_1_foregroundColor;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java Mon Sep 28 23:16:58 2015
@@ -29,7 +29,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class AreaRecord extends StandardRecord {
+public final class AreaRecord extends StandardRecord implements Cloneable {
     public final static short      sid                             = 0x101A;
     private  short      field_1_formatFlags;
     private static final BitField stacked             = BitFieldFactory.getInstance(0x1);
@@ -78,7 +78,8 @@ public final class AreaRecord extends St
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public AreaRecord clone() {
         AreaRecord rec = new AreaRecord();
     
         rec.field_1_formatFlags = field_1_formatFlags;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java Mon Sep 28 23:16:58 2015
@@ -27,7 +27,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class AxisLineFormatRecord extends StandardRecord {
+public final class AxisLineFormatRecord extends StandardRecord implements Cloneable {
     public final static short      sid                             = 0x1021;
     private  short      field_1_axisType;
     public final static short       AXIS_TYPE_AXIS_LINE            = 0;
@@ -73,7 +73,8 @@ public final class AxisLineFormatRecord
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public AxisLineFormatRecord clone() {
         AxisLineFormatRecord rec = new AxisLineFormatRecord();
     
         rec.field_1_axisType = field_1_axisType;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java Mon Sep 28 23:16:58 2015
@@ -29,7 +29,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Andrew C. Oliver(acoliver at apache.org)
  */
-public final class AxisOptionsRecord extends StandardRecord {
+public final class AxisOptionsRecord extends StandardRecord implements Cloneable {
     public final static short sid = 0x1062;
 
     private static final BitField defaultMinimum      = BitFieldFactory.getInstance(0x01);
@@ -145,7 +145,8 @@ public final class AxisOptionsRecord ext
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public AxisOptionsRecord clone() {
         AxisOptionsRecord rec = new AxisOptionsRecord();
     
         rec.field_1_minimumCategory = field_1_minimumCategory;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java Mon Sep 28 23:16:58 2015
@@ -27,7 +27,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class AxisParentRecord extends StandardRecord {
+public final class AxisParentRecord extends StandardRecord implements Cloneable {
     public final static short      sid                             = 0x1041;
     private  short      field_1_axisType;
     public final static short       AXIS_TYPE_MAIN                 = 0;
@@ -99,7 +99,8 @@ public final class AxisParentRecord exte
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public AxisParentRecord clone() {
         AxisParentRecord rec = new AxisParentRecord();
     
         rec.field_1_axisType = field_1_axisType;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java Mon Sep 28 23:16:58 2015
@@ -27,7 +27,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class AxisRecord extends StandardRecord {
+public final class AxisRecord extends StandardRecord implements Cloneable {
     public final static short      sid                             = 0x101d;
     private  short      field_1_axisType;
     public final static short       AXIS_TYPE_CATEGORY_OR_X_AXIS   = 0;
@@ -100,7 +100,8 @@ public final class AxisRecord extends St
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public AxisRecord clone() {
         AxisRecord rec = new AxisRecord();
     
         rec.field_1_axisType = field_1_axisType;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java Mon Sep 28 23:16:58 2015
@@ -27,7 +27,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class AxisUsedRecord extends StandardRecord {
+public final class AxisUsedRecord extends StandardRecord implements Cloneable {
     public final static short      sid                             = 0x1046;
     private  short      field_1_numAxis;
 
@@ -69,7 +69,8 @@ public final class AxisUsedRecord extend
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public AxisUsedRecord clone() {
         AxisUsedRecord rec = new AxisUsedRecord();
     
         rec.field_1_numAxis = field_1_numAxis;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/BarRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/BarRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/BarRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/BarRecord.java Mon Sep 28 23:16:58 2015
@@ -29,7 +29,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class BarRecord extends StandardRecord {
+public final class BarRecord extends StandardRecord implements Cloneable {
     public final static short sid = 0x1017;
 
     private static final BitField   horizontal          = BitFieldFactory.getInstance(0x1);
@@ -95,7 +95,8 @@ public final class BarRecord extends Sta
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public BarRecord clone() {
         BarRecord rec = new BarRecord();
     
         rec.field_1_barSpace = field_1_barSpace;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java Mon Sep 28 23:16:58 2015
@@ -29,7 +29,7 @@ import org.apache.poi.util.LittleEndianO
  *
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class BeginRecord extends StandardRecord {
+public final class BeginRecord extends StandardRecord implements Cloneable {
     public static final short sid = 0x1033;
 
     public BeginRecord()
@@ -64,7 +64,8 @@ public final class BeginRecord extends S
         return sid;
     }
     
-    public Object clone() {
+    @Override
+    public BeginRecord clone() {
        BeginRecord br = new BeginRecord();
        // No data so nothing to copy
        return br;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java Mon Sep 28 23:16:58 2015
@@ -29,7 +29,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class CategorySeriesAxisRecord extends StandardRecord {
+public final class CategorySeriesAxisRecord extends StandardRecord implements Cloneable {
     public final static short sid = 0x1020;
 
     private static final BitField valueAxisCrossing = BitFieldFactory.getInstance(0x1);
@@ -100,7 +100,8 @@ public final class CategorySeriesAxisRec
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public CategorySeriesAxisRecord clone() {
         CategorySeriesAxisRecord rec = new CategorySeriesAxisRecord();
     
         rec.field_1_crossingPoint = field_1_crossingPoint;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java Mon Sep 28 23:16:58 2015
@@ -27,7 +27,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Patrick Cheng
  */
-public final class ChartEndBlockRecord extends StandardRecord {
+public final class ChartEndBlockRecord extends StandardRecord implements Cloneable {
 	public static final short sid = 0x0853;
 
 	private short rt;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java Mon Sep 28 23:16:58 2015
@@ -40,7 +40,7 @@ import org.apache.poi.util.LittleEndianO
  *  
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class ChartRecord extends StandardRecord {
+public final class ChartRecord extends StandardRecord implements Cloneable {
     public final static short sid = 0x1002;
     private int field_1_x;
     private int field_2_y;
@@ -87,7 +87,8 @@ public final class ChartRecord extends S
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public ChartRecord clone() {
         ChartRecord rec = new ChartRecord();
     
         rec.field_1_x = field_1_x;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java Mon Sep 28 23:16:58 2015
@@ -27,7 +27,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Patrick Cheng
  */
-public final class ChartStartBlockRecord extends StandardRecord {
+public final class ChartStartBlockRecord extends StandardRecord implements Cloneable {
 	public static final short sid = 0x0852;
 
 	private short rt;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/DatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/DatRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/DatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/DatRecord.java Mon Sep 28 23:16:58 2015
@@ -29,7 +29,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class DatRecord extends StandardRecord {
+public final class DatRecord extends StandardRecord implements Cloneable {
     public final static short sid = 0x1063;
 
     private static final BitField horizontalBorder = BitFieldFactory.getInstance(0x1);
@@ -81,9 +81,9 @@ public final class DatRecord extends Sta
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public DatRecord clone() {
         DatRecord rec = new DatRecord();
-    
         rec.field_1_options = field_1_options;
         return rec;
     }

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java Mon Sep 28 23:16:58 2015
@@ -29,7 +29,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class DataFormatRecord extends StandardRecord {
+public final class DataFormatRecord extends StandardRecord implements Cloneable {
     public final static short sid = 0x1006;
 
     private static final BitField useExcel4Colors = BitFieldFactory.getInstance(0x1);
@@ -96,7 +96,8 @@ public final class DataFormatRecord exte
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public DataFormatRecord clone() {
         DataFormatRecord rec = new DataFormatRecord();
     
         rec.field_1_pointNumber = field_1_pointNumber;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java Mon Sep 28 23:16:58 2015
@@ -27,7 +27,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class DefaultDataLabelTextPropertiesRecord extends StandardRecord {
+public final class DefaultDataLabelTextPropertiesRecord extends StandardRecord implements Cloneable {
     public final static short      sid                             = 0x1024;
     private  short      field_1_categoryDataType;
     public final static short       CATEGORY_DATA_TYPE_SHOW_LABELS_CHARACTERISTIC = 0;
@@ -72,7 +72,8 @@ public final class DefaultDataLabelTextP
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public DefaultDataLabelTextPropertiesRecord clone() {
         DefaultDataLabelTextPropertiesRecord rec = new DefaultDataLabelTextPropertiesRecord();
     
         rec.field_1_categoryDataType = field_1_categoryDataType;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java Mon Sep 28 23:16:58 2015
@@ -30,7 +30,7 @@ import org.apache.poi.util.LittleEndianO
  * @author Glen Stampoultzis (glens at apache.org)
  */
 
-public final class EndRecord extends StandardRecord {
+public final class EndRecord extends StandardRecord implements Cloneable {
     public static final short sid = 0x1034;
 
     public EndRecord()
@@ -65,7 +65,8 @@ public final class EndRecord extends Sta
         return sid;
     }
     
-    public Object clone() {
+    @Override
+    public EndRecord clone() {
        EndRecord er = new EndRecord();
        // No data so nothing to copy
        return er;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java Mon Sep 28 23:16:58 2015
@@ -27,8 +27,8 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class FontBasisRecord extends StandardRecord {
-    public final static short      sid                             = 0x1060;
+public final class FontBasisRecord extends StandardRecord implements Cloneable {
+    public final static short sid = 0x1060;
     private  short      field_1_xBasis;
     private  short      field_2_yBasis;
     private  short      field_3_heightBasis;
@@ -97,7 +97,8 @@ public final class FontBasisRecord exten
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public FontBasisRecord clone() {
         FontBasisRecord rec = new FontBasisRecord();
     
         rec.field_1_xBasis = field_1_xBasis;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java Mon Sep 28 23:16:58 2015
@@ -27,8 +27,8 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class FontIndexRecord extends StandardRecord {
-    public final static short      sid                             = 0x1026;
+public final class FontIndexRecord extends StandardRecord implements Cloneable {
+    public final static short sid = 0x1026;
     private  short      field_1_fontIndex;
 
 
@@ -69,7 +69,8 @@ public final class FontIndexRecord exten
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public FontIndexRecord clone() {
         FontIndexRecord rec = new FontIndexRecord();
     
         rec.field_1_fontIndex = field_1_fontIndex;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java Mon Sep 28 23:16:58 2015
@@ -29,7 +29,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class FrameRecord extends StandardRecord {
+public final class FrameRecord extends StandardRecord implements Cloneable {
     public final static short sid  = 0x1032;
 
     private static final BitField autoSize     = BitFieldFactory.getInstance(0x1);
@@ -86,7 +86,8 @@ public final class FrameRecord extends S
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public FrameRecord clone() {
         FrameRecord rec = new FrameRecord();
     
         rec.field_1_borderType = field_1_borderType;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java Mon Sep 28 23:16:58 2015
@@ -29,7 +29,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Andrew C. Oliver (acoliver at apache.org)
  */
-public final class LegendRecord extends StandardRecord {
+public final class LegendRecord extends StandardRecord implements Cloneable {
     public final static short sid = 0x1015;
 
     private static final BitField autoPosition     = BitFieldFactory.getInstance(0x01);
@@ -136,7 +136,8 @@ public final class LegendRecord extends
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public LegendRecord clone() {
         LegendRecord rec = new LegendRecord();
     
         rec.field_1_xAxisUpperLeft = field_1_xAxisUpperLeft;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java Mon Sep 28 23:16:58 2015
@@ -29,7 +29,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class LineFormatRecord extends StandardRecord {
+public final class LineFormatRecord extends StandardRecord implements Cloneable {
     public final static short sid = 0x1007;
 
     private static final BitField auto      = BitFieldFactory.getInstance(0x1);
@@ -121,7 +121,8 @@ public final class LineFormatRecord exte
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public LineFormatRecord clone() {
         LineFormatRecord rec = new LineFormatRecord();
     
         rec.field_1_lineColor = field_1_lineColor;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java Mon Sep 28 23:16:58 2015
@@ -31,7 +31,7 @@ import org.apache.poi.util.LittleEndianO
  *
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class LinkedDataRecord extends StandardRecord {
+public final class LinkedDataRecord extends StandardRecord implements Cloneable {
     public final static short sid  = 0x1051;
 
     private static final BitField customNumberFormat= BitFieldFactory.getInstance(0x1);
@@ -102,7 +102,8 @@ public final class LinkedDataRecord exte
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public LinkedDataRecord clone() {
         LinkedDataRecord rec = new LinkedDataRecord();
 
         rec.field_1_linkType = field_1_linkType;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java Mon Sep 28 23:16:58 2015
@@ -27,7 +27,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public final class NumberFormatIndexRecord extends StandardRecord {
+public final class NumberFormatIndexRecord extends StandardRecord implements Cloneable {
     public final static short      sid                             = 0x104E;
     private  short      field_1_formatIndex;
 
@@ -69,7 +69,8 @@ public final class NumberFormatIndexReco
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public NumberFormatIndexRecord clone() {
         NumberFormatIndexRecord rec = new NumberFormatIndexRecord();
     
         rec.field_1_formatIndex = field_1_formatIndex;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java Mon Sep 28 23:16:58 2015
@@ -27,7 +27,7 @@ import org.apache.poi.util.LittleEndianO
  * 
  * @author Andrew C. Oliver (acoliver at apache.org)
  */
-public final class ObjectLinkRecord extends StandardRecord {
+public final class ObjectLinkRecord extends StandardRecord implements Cloneable {
     public final static short      sid                             = 0x1027;
     private  short      field_1_anchorId;
     public final static short       ANCHOR_ID_CHART_TITLE          = 1;
@@ -89,7 +89,8 @@ public final class ObjectLinkRecord exte
         return sid;
     }
 
-    public Object clone() {
+    @Override
+    public ObjectLinkRecord clone() {
         ObjectLinkRecord rec = new ObjectLinkRecord();
     
         rec.field_1_anchorId = field_1_anchorId;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java Mon Sep 28 23:16:58 2015
@@ -30,7 +30,7 @@ import org.apache.poi.util.LittleEndianO
  *  Formatting, Sheet Extensions), this XSSF-style color record 
  *  can be used.
  */
-public final class ExtendedColor {
+public final class ExtendedColor implements Cloneable {
     public static final int TYPE_AUTO = 0;
     public static final int TYPE_INDEXED = 1;
     public static final int TYPE_RGB = 2;
@@ -147,7 +147,8 @@ public final class ExtendedColor {
         return buffer.toString();
     }
     
-    public Object clone()  {
+    @Override
+    public ExtendedColor clone()  {
         ExtendedColor exc = new ExtendedColor();
         exc.type = type;
         exc.tint = tint;

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/common/FtrHeader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/common/FtrHeader.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/common/FtrHeader.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/common/FtrHeader.java Mon Sep 28 23:16:58 2015
@@ -28,7 +28,7 @@ import org.apache.poi.util.LittleEndianO
  *  style record, which includes extra attributes above and
  *  beyond those of a traditional record. 
  */
-public final class FtrHeader {
+public final class FtrHeader implements Cloneable {
     /** This MUST match the type on the containing record */
     private short recordType;
     /** This is a FrtFlags */

Modified: poi/trunk/src/java/org/apache/poi/poifs/filesystem/BATManaged.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/BATManaged.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/filesystem/BATManaged.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/BATManaged.java Mon Sep 28 23:16:58 2015
@@ -35,7 +35,7 @@ public interface BATManaged
      * @return count of BigBlock instances
      */
 
-    public int countBlocks();
+    int countBlocks();
 
     /**
      * Set the start block for this instance
@@ -44,6 +44,6 @@ public interface BATManaged
      *              up the the filesystem
      */
 
-    public void setStartBlock(final int index);
+    void setStartBlock(final int index);
 }   // end public interface BATManaged
 

Modified: poi/trunk/src/java/org/apache/poi/poifs/storage/BlockList.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/storage/BlockList.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/storage/BlockList.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/storage/BlockList.java Mon Sep 28 23:16:58 2015
@@ -38,7 +38,7 @@ public interface BlockList
      *              out of range, that's ok
      */
 
-    public void zap(final int index);
+    void zap(final int index);
 
     /**
      * remove and return the specified block from the list
@@ -51,8 +51,7 @@ public interface BlockList
      *            already been removed
      */
 
-    public ListManagedBlock remove(final int index)
-        throws IOException;
+     ListManagedBlock remove(final int index) throws IOException;
 
     /**
      * get the blocks making up a particular stream in the list. The
@@ -66,7 +65,7 @@ public interface BlockList
      * @exception IOException if blocks are missing
      */
 
-    public ListManagedBlock [] fetchBlocks(final int startBlock, final int headerPropertiesStartBlock)
+     ListManagedBlock [] fetchBlocks(final int startBlock, final int headerPropertiesStartBlock)
         throws IOException;
 
     /**
@@ -77,9 +76,8 @@ public interface BlockList
      * @exception IOException
      */
 
-    public void setBAT(final BlockAllocationTableReader bat)
-        throws IOException;
+    void setBAT(final BlockAllocationTableReader bat) throws IOException;
     
-    public int blockCount();
+    int blockCount();
 }   // end public interface BlockList
 

Modified: poi/trunk/src/java/org/apache/poi/poifs/storage/BlockWritable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/storage/BlockWritable.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/storage/BlockWritable.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/storage/BlockWritable.java Mon Sep 28 23:16:58 2015
@@ -41,7 +41,6 @@ public interface BlockWritable
      *            stream
      */
 
-    public void writeBlocks(final OutputStream stream)
-        throws IOException;
+    void writeBlocks(final OutputStream stream) throws IOException;
 }   // end public interface BlockWritable
 

Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/Insets2D.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/usermodel/Insets2D.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/usermodel/Insets2D.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/usermodel/Insets2D.java Mon Sep 28 23:16:58 2015
@@ -21,7 +21,7 @@ package org.apache.poi.sl.usermodel;
  * This is a replacement for {@link java.awt.Insets} which works on doubles
  * instead of ints
  */
-public class Insets2D {
+public class Insets2D implements Cloneable {
 
     /**
      * The inset from the top.
@@ -131,13 +131,9 @@ public class Insets2D {
      * Create a copy of this object.
      * @return     a copy of this <code>Insets2D</code> object.
      */
-    public Object clone() { 
-        try { 
-            return super.clone();
-        } catch (CloneNotSupportedException e) { 
-            // this shouldn't happen, since we are Cloneable
-            throw new InternalError();
-        }
+    @Override
+    public Insets2D clone() {
+        return new Insets2D(top, left, bottom, right);
     }
     
 

Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaI.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaI.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaI.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaI.java Mon Sep 28 23:16:58 2015
@@ -24,22 +24,22 @@ public interface AreaI {
 	/**
 	 * @return the first row in the area
 	 */
-	public int getFirstRow();
+	int getFirstRow();
 
 	/**
 	 * @return last row in the range (x2 in x1,y1-x2,y2)
 	 */
-	public int getLastRow();
+	int getLastRow();
 
 	/**
 	 * @return the first column number in the area.
 	 */
-	public int getFirstColumn();
+	int getFirstColumn();
 
 	/**
 	 * @return lastcolumn in the area
 	 */
-	public int getLastColumn();
+	int getLastColumn();
 
 	class OffsetArea implements AreaI {
 

Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java Mon Sep 28 23:16:58 2015
@@ -25,33 +25,33 @@ package org.apache.poi.ss.usermodel;
  */
 public interface BorderFormatting {
     /** No border */
-    final static short    BORDER_NONE                = 0x0;
+    short BORDER_NONE                = 0x0;
     /** Thin border */
-    final static short    BORDER_THIN                = 0x1;
+    short BORDER_THIN                = 0x1;
     /** Medium border */
-    final static short    BORDER_MEDIUM              = 0x2;
+    short BORDER_MEDIUM              = 0x2;
     /** dash border */
-    final static short    BORDER_DASHED              = 0x3;
+    short BORDER_DASHED              = 0x3;
     /** dot border */
-    final static short    BORDER_HAIR                = 0x4;
+    short BORDER_HAIR                = 0x4;
     /** Thick border */
-    final static short    BORDER_THICK               = 0x5;
+    short BORDER_THICK               = 0x5;
     /** double-line border */
-    final static short    BORDER_DOUBLE              = 0x6;
+    short BORDER_DOUBLE              = 0x6;
     /** hair-line border */
-    final static short    BORDER_DOTTED              = 0x7;
+    short BORDER_DOTTED              = 0x7;
     /** Medium dashed border */
-    final static short    BORDER_MEDIUM_DASHED       = 0x8;
+    short BORDER_MEDIUM_DASHED       = 0x8;
     /** dash-dot border */
-    final static short    BORDER_DASH_DOT            = 0x9;
+    short BORDER_DASH_DOT            = 0x9;
     /** medium dash-dot border */
-    final static short    BORDER_MEDIUM_DASH_DOT     = 0xA;
+    short BORDER_MEDIUM_DASH_DOT     = 0xA;
     /** dash-dot-dot border */
-    final static short    BORDER_DASH_DOT_DOT        = 0xB;
+    short BORDER_DASH_DOT_DOT        = 0xB;
     /** medium dash-dot-dot border */
-    final static short    BORDER_MEDIUM_DASH_DOT_DOT = 0xC;
+    short BORDER_MEDIUM_DASH_DOT_DOT = 0xC;
     /** slanted dash-dot border */
-    final static short    BORDER_SLANTED_DASH_DOT    = 0xD;
+    short BORDER_SLANTED_DASH_DOT    = 0xD;
 
     short getBorderBottom();
 

Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/Cell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/Cell.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/Cell.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/Cell.java Mon Sep 28 23:16:58 2015
@@ -43,42 +43,42 @@ public interface Cell {
      * @see #setCellType(int)
      * @see #getCellType()
      */
-    public final static int CELL_TYPE_NUMERIC = 0;
+    int CELL_TYPE_NUMERIC = 0;
 
     /**
      * String Cell type (1)
      * @see #setCellType(int)
      * @see #getCellType()
      */
-    public final static int CELL_TYPE_STRING = 1;
+    int CELL_TYPE_STRING = 1;
 
     /**
      * Formula Cell type (2)
      * @see #setCellType(int)
      * @see #getCellType()
      */
-    public final static int CELL_TYPE_FORMULA = 2;
+    int CELL_TYPE_FORMULA = 2;
 
     /**
      * Blank Cell type (3)
      * @see #setCellType(int)
      * @see #getCellType()
      */
-    public final static int CELL_TYPE_BLANK = 3;
+    int CELL_TYPE_BLANK = 3;
 
     /**
      * Boolean Cell type (4)
      * @see #setCellType(int)
      * @see #getCellType()
      */
-    public final static int CELL_TYPE_BOOLEAN = 4;
+    int CELL_TYPE_BOOLEAN = 4;
 
     /**
      * Error Cell type (5)
      * @see #setCellType(int)
      * @see #getCellType()
      */
-    public final static int CELL_TYPE_ERROR = 5;
+    int CELL_TYPE_ERROR = 5;
 
     /**
      * Returns column index of this cell

Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/CellStyle.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/CellStyle.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/CellStyle.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/CellStyle.java Mon Sep 28 23:16:58 2015
@@ -23,208 +23,208 @@ public interface CellStyle {
      * general (normal) horizontal alignment
      */
 
-    public final static short ALIGN_GENERAL = 0x0;
+    short ALIGN_GENERAL = 0x0;
 
     /**
      * left-justified horizontal alignment
      */
 
-    public final static short ALIGN_LEFT = 0x1;
+    short ALIGN_LEFT = 0x1;
 
     /**
      * center horizontal alignment
      */
 
-    public final static short ALIGN_CENTER = 0x2;
+    short ALIGN_CENTER = 0x2;
 
     /**
      * right-justified horizontal alignment
      */
 
-    public final static short ALIGN_RIGHT = 0x3;
+    short ALIGN_RIGHT = 0x3;
 
     /**
      * fill? horizontal alignment
      */
 
-    public final static short ALIGN_FILL = 0x4;
+    short ALIGN_FILL = 0x4;
 
     /**
      * justified horizontal alignment
      */
 
-    public final static short ALIGN_JUSTIFY = 0x5;
+    short ALIGN_JUSTIFY = 0x5;
 
     /**
      * center-selection? horizontal alignment
      */
 
-    public final static short ALIGN_CENTER_SELECTION = 0x6;
+    short ALIGN_CENTER_SELECTION = 0x6;
 
     /**
      * top-aligned vertical alignment
      */
 
-    public final static short VERTICAL_TOP = 0x0;
+    short VERTICAL_TOP = 0x0;
 
     /**
      * center-aligned vertical alignment
      */
 
-    public final static short VERTICAL_CENTER = 0x1;
+    short VERTICAL_CENTER = 0x1;
 
     /**
      * bottom-aligned vertical alignment
      */
 
-    public final static short VERTICAL_BOTTOM = 0x2;
+    short VERTICAL_BOTTOM = 0x2;
 
     /**
      * vertically justified vertical alignment
      */
 
-    public final static short VERTICAL_JUSTIFY = 0x3;
+    short VERTICAL_JUSTIFY = 0x3;
 
     /**
      * No border
      */
 
-    public final static short BORDER_NONE = 0x0;
+    short BORDER_NONE = 0x0;
 
     /**
      * Thin border
      */
 
-    public final static short BORDER_THIN = 0x1;
+    short BORDER_THIN = 0x1;
 
     /**
      * Medium border
      */
 
-    public final static short BORDER_MEDIUM = 0x2;
+    short BORDER_MEDIUM = 0x2;
 
     /**
      * dash border
      */
 
-    public final static short BORDER_DASHED = 0x3;
+    short BORDER_DASHED = 0x3;
 
     /**
      * dot border
      */
 
-    public final static short BORDER_HAIR = 0x7;
+    short BORDER_HAIR = 0x7;
 
     /**
      * Thick border
      */
 
-    public final static short BORDER_THICK = 0x5;
+    short BORDER_THICK = 0x5;
 
     /**
      * double-line border
      */
 
-    public final static short BORDER_DOUBLE = 0x6;
+    short BORDER_DOUBLE = 0x6;
 
     /**
      * hair-line border
      */
 
-    public final static short BORDER_DOTTED = 0x4;
+    short BORDER_DOTTED = 0x4;
 
     /**
      * Medium dashed border
      */
 
-    public final static short BORDER_MEDIUM_DASHED = 0x8;
+    short BORDER_MEDIUM_DASHED = 0x8;
 
     /**
      * dash-dot border
      */
 
-    public final static short BORDER_DASH_DOT = 0x9;
+    short BORDER_DASH_DOT = 0x9;
 
     /**
      * medium dash-dot border
      */
 
-    public final static short BORDER_MEDIUM_DASH_DOT = 0xA;
+    short BORDER_MEDIUM_DASH_DOT = 0xA;
 
     /**
      * dash-dot-dot border
      */
 
-    public final static short BORDER_DASH_DOT_DOT = 0xB;
+    short BORDER_DASH_DOT_DOT = 0xB;
 
     /**
      * medium dash-dot-dot border
      */
 
-    public final static short BORDER_MEDIUM_DASH_DOT_DOT = 0xC;
+    short BORDER_MEDIUM_DASH_DOT_DOT = 0xC;
 
     /**
      * slanted dash-dot border
      */
 
-    public final static short BORDER_SLANTED_DASH_DOT = 0xD;
+    short BORDER_SLANTED_DASH_DOT = 0xD;
 
     /**  No background */
-    public final static short NO_FILL = 0;
+    short NO_FILL = 0;
 
     /**  Solidly filled */
-    public final static short SOLID_FOREGROUND = 1;
+    short SOLID_FOREGROUND = 1;
 
     /**  Small fine dots */
-    public final static short FINE_DOTS = 2;
+    short FINE_DOTS = 2;
 
     /**  Wide dots */
-    public final static short ALT_BARS = 3;
+    short ALT_BARS = 3;
 
     /**  Sparse dots */
-    public final static short SPARSE_DOTS = 4;
+    short SPARSE_DOTS = 4;
 
     /**  Thick horizontal bands */
-    public final static short THICK_HORZ_BANDS = 5;
+    short THICK_HORZ_BANDS = 5;
 
     /**  Thick vertical bands */
-    public final static short THICK_VERT_BANDS = 6;
+    short THICK_VERT_BANDS = 6;
 
     /**  Thick backward facing diagonals */
-    public final static short THICK_BACKWARD_DIAG = 7;
+    short THICK_BACKWARD_DIAG = 7;
 
     /**  Thick forward facing diagonals */
-    public final static short THICK_FORWARD_DIAG = 8;
+    short THICK_FORWARD_DIAG = 8;
 
     /**  Large spots */
-    public final static short BIG_SPOTS = 9;
+    short BIG_SPOTS = 9;
 
     /**  Brick-like layout */
-    public final static short BRICKS = 10;
+    short BRICKS = 10;
 
     /**  Thin horizontal bands */
-    public final static short THIN_HORZ_BANDS = 11;
+    short THIN_HORZ_BANDS = 11;
 
     /**  Thin vertical bands */
-    public final static short THIN_VERT_BANDS = 12;
+    short THIN_VERT_BANDS = 12;
 
     /**  Thin backward diagonal */
-    public final static short THIN_BACKWARD_DIAG = 13;
+    short THIN_BACKWARD_DIAG = 13;
 
     /**  Thin forward diagonal */
-    public final static short THIN_FORWARD_DIAG = 14;
+    short THIN_FORWARD_DIAG = 14;
 
     /**  Squares */
-    public final static short SQUARES = 15;
+    short SQUARES = 15;
 
     /**  Diamonds */
-    public final static short DIAMONDS = 16;
+    short DIAMONDS = 16;
 
     /**  Less Dots */
-    public final static short LESS_DOTS = 17;
+    short LESS_DOTS = 17;
 
     /**  Least Dots */
-    public final static short LEAST_DOTS = 18;
+    short LEAST_DOTS = 18;
 
     /**
      * get the index within the Workbook (sequence within the collection of ExtnededFormat objects)

Modified: poi/trunk/src/java/org/apache/poi/wp/usermodel/CharacterRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/wp/usermodel/CharacterRun.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/wp/usermodel/CharacterRun.java (original)
+++ poi/trunk/src/java/org/apache/poi/wp/usermodel/CharacterRun.java Mon Sep 28 23:16:58 2015
@@ -21,79 +21,79 @@ package org.apache.poi.wp.usermodel;
  * This class represents a run of text that share common properties.
  */
 public interface CharacterRun {
-    public boolean isBold();
-    public void setBold(boolean bold);
+    boolean isBold();
+    void setBold(boolean bold);
 
-    public boolean isItalic();
-    public void setItalic(boolean italic);
+    boolean isItalic();
+    void setItalic(boolean italic);
 
-    public boolean isSmallCaps();
-    public void setSmallCaps(boolean smallCaps);
+    boolean isSmallCaps();
+    void setSmallCaps(boolean smallCaps);
 
-    public boolean isCapitalized();
-    public void setCapitalized(boolean caps);
+    boolean isCapitalized();
+    void setCapitalized(boolean caps);
 
-    public boolean isStrikeThrough();
-    public void setStrikeThrough(boolean strike);
-    public boolean isDoubleStrikeThrough();
-    public void setDoubleStrikethrough(boolean dstrike);
+    boolean isStrikeThrough();
+    void setStrikeThrough(boolean strike);
+    boolean isDoubleStrikeThrough();
+    void setDoubleStrikethrough(boolean dstrike);
 
-    public boolean isShadowed();
-    public void setShadow(boolean shadow);
+    boolean isShadowed();
+    void setShadow(boolean shadow);
 
-    public boolean isEmbossed();
-    public void setEmbossed(boolean emboss);
+    boolean isEmbossed();
+    void setEmbossed(boolean emboss);
 
-    public boolean isImprinted();
-    public void setImprinted(boolean imprint);
+    boolean isImprinted();
+    void setImprinted(boolean imprint);
 
-    public int getFontSize();
-    public void setFontSize(int halfPoints);
+    int getFontSize();
+    void setFontSize(int halfPoints);
 
-    public int getCharacterSpacing();
-    public void setCharacterSpacing(int twips);
+    int getCharacterSpacing();
+    void setCharacterSpacing(int twips);
 
-    public int getKerning();
-    public void setKerning(int kern);
+    int getKerning();
+    void setKerning(int kern);
 
-    public String getFontName();
+    String getFontName();
     
     /**
      * @return The text of the run, including any tabs/spaces/etc
      */
-    public String text();
+    String text();
 
     // HWPF uses indexes, XWPF special
-//    public int getUnderlineCode();
-//    public void setUnderlineCode(int kul);
+//    int getUnderlineCode();
+//    void setUnderlineCode(int kul);
 
     // HWPF uses indexes, XWPF special vertical alignments
-//    public short getSubSuperScriptIndex();
-//    public void setSubSuperScriptIndex(short iss);
+//    short getSubSuperScriptIndex();
+//    void setSubSuperScriptIndex(short iss);
 
     // HWPF uses indexes, XWPF special vertical alignments
-//    public int getVerticalOffset();
-//    public void setVerticalOffset(int hpsPos);
+//    int getVerticalOffset();
+//    void setVerticalOffset(int hpsPos);
 
     // HWPF has colour indexes, XWPF colour names
-//    public int getColor();
-//    public void setColor(int color);
+//    int getColor();
+//    void setColor(int color);
 
     // TODO Review these, and add to XWPFRun if possible
 /*
-    public boolean isFldVanished();
-    public void setFldVanish(boolean fldVanish);
+    boolean isFldVanished();
+    void setFldVanish(boolean fldVanish);
     
-    public boolean isOutlined();
-    public void setOutline(boolean outlined);
+    boolean isOutlined();
+    void setOutline(boolean outlined);
     
-    public boolean isVanished();
-    public void setVanished(boolean vanish);
+    boolean isVanished();
+    void setVanished(boolean vanish);
 
-    public boolean isMarkedDeleted();
-    public void markDeleted(boolean mark);
+    boolean isMarkedDeleted();
+    void markDeleted(boolean mark);
 
-    public boolean isMarkedInserted();
-    public void markInserted(boolean mark);
+    boolean isMarkedInserted();
+    void markInserted(boolean mark);
 */
 }

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java?rev=1705789&r1=1705788&r2=1705789&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java Mon Sep 28 23:16:58 2015
@@ -81,7 +81,7 @@ public interface CharIndexTranslator {
      * @param bytePos
      * @return  first index greater or equal to bytePos that is in table
      */
-    public int lookIndexForward(int bytePos);
+    int lookIndexForward(int bytePos);
 
     /**
      * Return last index <= bytePos that is in table
@@ -89,6 +89,6 @@ public interface CharIndexTranslator {
      * @param bytePos
      * @return last index less of equal to bytePos that is in table
      */
-    public int lookIndexBackward(int bytePos);
+    int lookIndexBackward(int bytePos);
 
 }



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