Author: centic
Date: Mon Feb 12 15:34:11 2018
New Revision: 1823988
URL: http://svn.apache.org/viewvc?rev=1823988&view=rev
Log:
Fix some IntelliJ warnings in XDGF area
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFCell.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
Mon Feb 12 15:34:11 2018
@@ -27,7 +27,6 @@ import java.util.Map;
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.Internal;
import org.apache.poi.xdgf.exceptions.XDGFException;
import org.apache.poi.xdgf.usermodel.shape.ShapeRenderer;
@@ -112,7 +111,7 @@ public class XDGFBaseContents extends XD
/**
* Draws the contents of a page onto a Graphics2D object
*
- * @param graphics
+ * @param graphics The context to draw on.
*/
public void draw(Graphics2D graphics) {
visitShapes(new ShapeRenderer(graphics));
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFCell.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFCell.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFCell.java Mon
Feb 12 15:34:11 2018
@@ -102,7 +102,7 @@ public class XDGFCell {
}
/**
- * @param cell
+ * @param cell The type of the cell
* @return A value converted to inches
*/
public static Double parseVLength(CellType cell) {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
Mon Feb 12 15:34:11 2018
@@ -47,9 +47,7 @@ public class XDGFMasterContents extends
try {
_pageContents =
MasterContentsDocument.Factory.parse(getPackagePart().getInputStream()).getMasterContents();
- } catch (XmlException e) {
- throw new POIXMLException(e);
- } catch (IOException e) {
+ } catch (XmlException | IOException e) {
throw new POIXMLException(e);
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java Mon
Feb 12 15:34:11 2018
@@ -62,9 +62,7 @@ public class XDGFMasters extends XDGFXML
try {
try {
_mastersObject =
MastersDocument.Factory.parse(getPackagePart().getInputStream()).getMasters();
- } catch (XmlException e) {
- throw new POIXMLException(e);
- } catch (IOException e) {
+ } catch (XmlException | IOException e) {
throw new POIXMLException(e);
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
Mon Feb 12 15:34:11 2018
@@ -46,9 +46,7 @@ public class XDGFPageContents extends XD
try {
try {
_pageContents =
PageContentsDocument.Factory.parse(getPackagePart().getInputStream()).getPageContents();
- } catch (XmlException e) {
- throw new POIXMLException(e);
- } catch (IOException e) {
+ } catch (XmlException | IOException e) {
throw new POIXMLException(e);
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java Mon
Feb 12 15:34:11 2018
@@ -61,9 +61,7 @@ public class XDGFPages extends XDGFXMLDo
try {
try {
_pagesObject =
PagesDocument.Factory.parse(getPackagePart().getInputStream()).getPages();
- } catch (XmlException e) {
- throw new POIXMLException(e);
- } catch (IOException e) {
+ } catch (XmlException | IOException e) {
throw new POIXMLException(e);
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java Mon
Feb 12 15:34:11 2018
@@ -127,7 +127,7 @@ public abstract class XDGFSheet {
}
public Color getFontColor() {
- Color fontColor = null;
+ Color fontColor;
if (_character != null) {
fontColor = _character.getFontColor();
@@ -143,7 +143,7 @@ public abstract class XDGFSheet {
}
public Double getFontSize() {
- Double fontSize = null;
+ Double fontSize;
if (_character != null) {
fontSize = _character.getFontSize();
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
Mon Feb 12 15:34:11 2018
@@ -26,7 +26,6 @@ import java.util.List;
import org.apache.poi.POIXMLDocument;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
@@ -67,9 +66,7 @@ public class XmlVisioDocument extends PO
try {
document =
VisioDocumentDocument1.Factory.parse(getPackagePart().getInputStream()).getVisioDocument();
- } catch (XmlException e) {
- throw new POIXMLException(e);
- } catch (IOException e) {
+ } catch (XmlException | IOException e) {
throw new POIXMLException(e);
}
@@ -84,7 +81,7 @@ public class XmlVisioDocument extends PO
}
@Override
- protected void onDocumentRead() throws IOException {
+ protected void onDocumentRead() {
// by the time this gets called, all other document parts should
// have been loaded, so it's safe to build the document structure
@@ -112,7 +109,7 @@ public class XmlVisioDocument extends PO
* Not currently implemented
*/
@Override
- public List<PackagePart> getAllEmbedds() throws OpenXML4JException {
+ public List<PackagePart> getAllEmbedds() {
return new ArrayList<>();
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java
Mon Feb 12 15:34:11 2018
@@ -55,9 +55,7 @@ public abstract class XDGFSection {
_sectionTypes.put("Reviewer", GenericSection.class,
SectionType.class, XDGFSheet.class);
_sectionTypes.put("Annotation", GenericSection.class,
SectionType.class, XDGFSheet.class);
_sectionTypes.put("ActionTag", GenericSection.class,
SectionType.class, XDGFSheet.class);
- } catch (NoSuchMethodException e) {
- throw new POIXMLException("Internal error");
- } catch (SecurityException e) {
+ } catch (NoSuchMethodException | SecurityException e) {
throw new POIXMLException("Internal error");
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
Mon Feb 12 15:34:11 2018
@@ -71,10 +71,7 @@ public class ArcTo implements GeometryRo
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
Mon Feb 12 15:34:11 2018
@@ -82,10 +82,7 @@ public class Ellipse implements Geometry
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
Mon Feb 12 15:34:11 2018
@@ -94,10 +94,7 @@ public class EllipticalArcTo implements
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java
Mon Feb 12 15:34:11 2018
@@ -48,9 +48,7 @@ public class GeometryRowFactory {
_rowTypes.put("RelQuadBezTo", RelQuadBezTo.class, RowType.class);
_rowTypes.put("SplineKnot", SplineKnot.class, RowType.class);
_rowTypes.put("SplineStart", SplineStart.class, RowType.class);
- } catch (NoSuchMethodException e) {
- throw new POIXMLException("Internal error", e);
- } catch (SecurityException e) {
+ } catch (NoSuchMethodException | SecurityException e) {
throw new POIXMLException("Internal error", e);
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
Mon Feb 12 15:34:11 2018
@@ -80,10 +80,7 @@ public class InfiniteLine implements Geo
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java
Mon Feb 12 15:34:11 2018
@@ -63,10 +63,7 @@ public class LineTo implements GeometryR
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java
Mon Feb 12 15:34:11 2018
@@ -68,10 +68,7 @@ public class MoveTo implements GeometryR
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
Mon Feb 12 15:34:11 2018
@@ -93,10 +93,7 @@ public class NURBSTo implements Geometry
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
Mon Feb 12 15:34:11 2018
@@ -67,10 +67,7 @@ public class PolyLineTo implements Geome
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
Mon Feb 12 15:34:11 2018
@@ -89,10 +89,7 @@ public class RelCubBezTo implements Geom
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
Mon Feb 12 15:34:11 2018
@@ -86,10 +86,7 @@ public class RelEllipticalArcTo implemen
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java
Mon Feb 12 15:34:11 2018
@@ -62,10 +62,7 @@ public class RelLineTo implements Geomet
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java
Mon Feb 12 15:34:11 2018
@@ -58,10 +58,7 @@ public class RelMoveTo implements Geomet
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
Mon Feb 12 15:34:11 2018
@@ -81,10 +81,7 @@ public class RelQuadBezTo implements Geo
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
Mon Feb 12 15:34:11 2018
@@ -70,10 +70,7 @@ public class SplineKnot implements Geome
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java?rev=1823988&r1=1823987&r2=1823988&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
Mon Feb 12 15:34:11 2018
@@ -84,10 +84,7 @@ public class SplineStart implements Geom
if (deleted != null)
return deleted;
- if (_master != null)
- return _master.getDel();
-
- return false;
+ return _master != null && _master.getDel();
}
public Double getX() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
