#58204 - STYLE: ShapeContainer interface makes internal getShapesList() redundant

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

2 files changed, 4 insertions, 8 deletions

diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
index 12c0167ad9..41c08fdaa3 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
@@ -52,11 +52,6 @@ public class HSLFGroupShape extends HSLFShape implements GroupShape<HSLFShape> {
         super(escherRecord, parent);
     }
 
-    @Override
-    public List<HSLFShape> getShapes() {
-        return getShapeList();
-    }
-
     /**
      * Sets the anchor (the bounding box rectangle) of this shape.
      * All coordinates should be expressed in Master units (576 dpi).
@@ -238,7 +233,7 @@ public class HSLFGroupShape extends HSLFShape implements GroupShape<HSLFShape> {
     }
 
     public Iterator<HSLFShape> iterator() {
-        return getShapeList().iterator();
+        return getShapes().iterator();
     }
 
     public boolean removeShape(HSLFShape shape) {
@@ -249,7 +244,8 @@ public class HSLFGroupShape extends HSLFShape implements GroupShape<HSLFShape> {
     /**
      * @return the shapes contained in this group container
      */
-    protected List<HSLFShape> getShapeList() {
+    @Override
+    public List<HSLFShape> getShapes() {
         // Out escher container record should contain several
         //  SpContainers, the first of which is the group shape itself
         Iterator<EscherRecord> iter = _escherContainer.getChildIterator();
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java
index cad0dcd3d2..5cb5698a4f 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java
@@ -162,7 +162,7 @@ public final class HSLFTable extends HSLFGroupShape implements TableShape {
     }
 
     protected void initTable(){
-        List<HSLFShape> shapeList = getShapeList();
+        List<HSLFShape> shapeList = getShapes();
 
         Iterator<HSLFShape> shapeIter = shapeList.iterator();
         while (shapeIter.hasNext()) {