From 8d54ec7cc7b485fd8866b8612b07beab455a5018 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 9 Dec 2020 18:04:56 +0000 Subject: [PATCH] remove more deprecated code git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884263 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/ddf/EscherProperties.java | 350 ------------------ src/java/org/apache/poi/ddf/EscherRecord.java | 15 - .../poi/hpsf/wellknown/SectionIDMap.java | 60 --- .../apache/poi/hssf/usermodel/HSSFFont.java | 20 +- .../hssf/usermodel/HSSFRichTextString.java | 2 +- .../org/apache/poi/ss/usermodel/Font.java | 22 +- .../org/apache/poi/ss/util/ImageUtils.java | 8 - .../apache/poi/xssf/usermodel/XSSFFont.java | 40 +- .../poi/xssf/usermodel/TestXSSFFont.java | 4 +- .../apache/poi/hslf/model/PPGraphics2D.java | 40 -- .../model/textproperties/BitMaskTextProp.java | 9 - .../model/textproperties/HSLFTabStop.java | 9 - .../HSLFTabStopPropCollection.java | 9 - .../poi/hslf/model/AllHSLFModelTests.java | 1 - .../poi/hslf/model/TestPPGraphics2D.java | 95 ----- .../apache/poi/ss/usermodel/BaseTestCell.java | 2 +- .../apache/poi/ss/usermodel/BaseTestFont.java | 12 +- .../apache/poi/ss/util/BaseTestCellUtil.java | 2 +- 18 files changed, 60 insertions(+), 640 deletions(-) delete mode 100644 src/java/org/apache/poi/ddf/EscherProperties.java delete mode 100644 src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java delete mode 100644 src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java delete mode 100644 src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java diff --git a/src/java/org/apache/poi/ddf/EscherProperties.java b/src/java/org/apache/poi/ddf/EscherProperties.java deleted file mode 100644 index 7cebea603b..0000000000 --- a/src/java/org/apache/poi/ddf/EscherProperties.java +++ /dev/null @@ -1,350 +0,0 @@ -/* ==================================================================== - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ==================================================================== */ - -package org.apache.poi.ddf; - -import org.apache.poi.util.Removal; - -/** - * Provides a list of all known escher properties including the description and type. - * - * @deprecated use {@link EscherPropertyTypes} enum instead - */ -@SuppressWarnings({"unused","java:S115"}) -@Deprecated -@Removal(version = "5.0.0") -public interface EscherProperties { - short TRANSFORM__ROTATION = EscherPropertyTypes.TRANSFORM__ROTATION.propNumber; - short PROTECTION__LOCKROTATION = EscherPropertyTypes.PROTECTION__LOCKROTATION.propNumber; - short PROTECTION__LOCKASPECTRATIO = EscherPropertyTypes.PROTECTION__LOCKASPECTRATIO.propNumber; - short PROTECTION__LOCKPOSITION = EscherPropertyTypes.PROTECTION__LOCKPOSITION.propNumber; - short PROTECTION__LOCKAGAINSTSELECT = EscherPropertyTypes.PROTECTION__LOCKAGAINSTSELECT.propNumber; - short PROTECTION__LOCKCROPPING = EscherPropertyTypes.PROTECTION__LOCKCROPPING.propNumber; - short PROTECTION__LOCKVERTICES = EscherPropertyTypes.PROTECTION__LOCKVERTICES.propNumber; - short PROTECTION__LOCKTEXT = EscherPropertyTypes.PROTECTION__LOCKTEXT.propNumber; - short PROTECTION__LOCKADJUSTHANDLES = EscherPropertyTypes.PROTECTION__LOCKADJUSTHANDLES.propNumber; - short PROTECTION__LOCKAGAINSTGROUPING = EscherPropertyTypes.PROTECTION__LOCKAGAINSTGROUPING.propNumber; - short TEXT__TEXTID = EscherPropertyTypes.TEXT__TEXTID.propNumber; - short TEXT__TEXTLEFT = EscherPropertyTypes.TEXT__TEXTLEFT.propNumber; - short TEXT__TEXTTOP = EscherPropertyTypes.TEXT__TEXTTOP.propNumber; - short TEXT__TEXTRIGHT = EscherPropertyTypes.TEXT__TEXTRIGHT.propNumber; - short TEXT__TEXTBOTTOM = EscherPropertyTypes.TEXT__TEXTBOTTOM.propNumber; - short TEXT__WRAPTEXT = EscherPropertyTypes.TEXT__WRAPTEXT.propNumber; - short TEXT__SCALETEXT = EscherPropertyTypes.TEXT__SCALETEXT.propNumber; - short TEXT__ANCHORTEXT = EscherPropertyTypes.TEXT__ANCHORTEXT.propNumber; - short TEXT__TEXTFLOW = EscherPropertyTypes.TEXT__TEXTFLOW.propNumber; - short TEXT__FONTROTATION = EscherPropertyTypes.TEXT__FONTROTATION.propNumber; - short TEXT__IDOFNEXTSHAPE = EscherPropertyTypes.TEXT__IDOFNEXTSHAPE.propNumber; - short TEXT__BIDIR = EscherPropertyTypes.TEXT__BIDIR.propNumber; - short TEXT__SINGLECLICKSELECTS = EscherPropertyTypes.TEXT__SINGLECLICKSELECTS.propNumber; - short TEXT__USEHOSTMARGINS = EscherPropertyTypes.TEXT__USEHOSTMARGINS.propNumber; - short TEXT__ROTATETEXTWITHSHAPE = EscherPropertyTypes.TEXT__ROTATETEXTWITHSHAPE.propNumber; - short TEXT__SIZESHAPETOFITTEXT = EscherPropertyTypes.TEXT__SIZESHAPETOFITTEXT.propNumber; - short TEXT__SIZE_TEXT_TO_FIT_SHAPE = EscherPropertyTypes.TEXT__SIZE_TEXT_TO_FIT_SHAPE.propNumber; - short GEOTEXT__UNICODE = EscherPropertyTypes.GEOTEXT__UNICODE.propNumber; - short GEOTEXT__RTFTEXT = EscherPropertyTypes.GEOTEXT__RTFTEXT.propNumber; - short GEOTEXT__ALIGNMENTONCURVE = EscherPropertyTypes.GEOTEXT__ALIGNMENTONCURVE.propNumber; - short GEOTEXT__DEFAULTPOINTSIZE = EscherPropertyTypes.GEOTEXT__DEFAULTPOINTSIZE.propNumber; - short GEOTEXT__TEXTSPACING = EscherPropertyTypes.GEOTEXT__TEXTSPACING.propNumber; - short GEOTEXT__FONTFAMILYNAME = EscherPropertyTypes.GEOTEXT__FONTFAMILYNAME.propNumber; - short GEOTEXT__REVERSEROWORDER = EscherPropertyTypes.GEOTEXT__REVERSEROWORDER.propNumber; - short GEOTEXT__HASTEXTEFFECT = EscherPropertyTypes.GEOTEXT__HASTEXTEFFECT.propNumber; - short GEOTEXT__ROTATECHARACTERS = EscherPropertyTypes.GEOTEXT__ROTATECHARACTERS.propNumber; - short GEOTEXT__KERNCHARACTERS = EscherPropertyTypes.GEOTEXT__KERNCHARACTERS.propNumber; - short GEOTEXT__TIGHTORTRACK = EscherPropertyTypes.GEOTEXT__TIGHTORTRACK.propNumber; - short GEOTEXT__STRETCHTOFITSHAPE = EscherPropertyTypes.GEOTEXT__STRETCHTOFITSHAPE.propNumber; - short GEOTEXT__CHARBOUNDINGBOX = EscherPropertyTypes.GEOTEXT__CHARBOUNDINGBOX.propNumber; - short GEOTEXT__SCALETEXTONPATH = EscherPropertyTypes.GEOTEXT__SCALETEXTONPATH.propNumber; - short GEOTEXT__STRETCHCHARHEIGHT = EscherPropertyTypes.GEOTEXT__STRETCHCHARHEIGHT.propNumber; - short GEOTEXT__NOMEASUREALONGPATH = EscherPropertyTypes.GEOTEXT__NOMEASUREALONGPATH.propNumber; - short GEOTEXT__BOLDFONT = EscherPropertyTypes.GEOTEXT__BOLDFONT.propNumber; - short GEOTEXT__ITALICFONT = EscherPropertyTypes.GEOTEXT__ITALICFONT.propNumber; - short GEOTEXT__UNDERLINEFONT = EscherPropertyTypes.GEOTEXT__UNDERLINEFONT.propNumber; - short GEOTEXT__SHADOWFONT = EscherPropertyTypes.GEOTEXT__SHADOWFONT.propNumber; - short GEOTEXT__SMALLCAPSFONT = EscherPropertyTypes.GEOTEXT__SMALLCAPSFONT.propNumber; - short GEOTEXT__STRIKETHROUGHFONT = EscherPropertyTypes.GEOTEXT__STRIKETHROUGHFONT.propNumber; - short BLIP__CROPFROMTOP = EscherPropertyTypes.BLIP__CROPFROMTOP.propNumber; - short BLIP__CROPFROMBOTTOM = EscherPropertyTypes.BLIP__CROPFROMBOTTOM.propNumber; - short BLIP__CROPFROMLEFT = EscherPropertyTypes.BLIP__CROPFROMLEFT.propNumber; - short BLIP__CROPFROMRIGHT = EscherPropertyTypes.BLIP__CROPFROMRIGHT.propNumber; - short BLIP__BLIPTODISPLAY = EscherPropertyTypes.BLIP__BLIPTODISPLAY.propNumber; - short BLIP__BLIPFILENAME = EscherPropertyTypes.BLIP__BLIPFILENAME.propNumber; - short BLIP__BLIPFLAGS = EscherPropertyTypes.BLIP__BLIPFLAGS.propNumber; - short BLIP__TRANSPARENTCOLOR = EscherPropertyTypes.BLIP__TRANSPARENTCOLOR.propNumber; - short BLIP__CONTRASTSETTING = EscherPropertyTypes.BLIP__CONTRASTSETTING.propNumber; - short BLIP__BRIGHTNESSSETTING = EscherPropertyTypes.BLIP__BRIGHTNESSSETTING.propNumber; - short BLIP__GAMMA = EscherPropertyTypes.BLIP__GAMMA.propNumber; - short BLIP__PICTUREID = EscherPropertyTypes.BLIP__PICTUREID.propNumber; - short BLIP__DOUBLEMOD = EscherPropertyTypes.BLIP__DOUBLEMOD.propNumber; - short BLIP__PICTUREFILLMOD = EscherPropertyTypes.BLIP__PICTUREFILLMOD.propNumber; - short BLIP__PICTURELINE = EscherPropertyTypes.BLIP__PICTURELINE.propNumber; - short BLIP__PRINTBLIP = EscherPropertyTypes.BLIP__PRINTBLIP.propNumber; - short BLIP__PRINTBLIPFILENAME = EscherPropertyTypes.BLIP__PRINTBLIPFILENAME.propNumber; - short BLIP__PRINTFLAGS = EscherPropertyTypes.BLIP__PRINTFLAGS.propNumber; - short BLIP__NOHITTESTPICTURE = EscherPropertyTypes.BLIP__NOHITTESTPICTURE.propNumber; - short BLIP__PICTUREGRAY = EscherPropertyTypes.BLIP__PICTUREGRAY.propNumber; - short BLIP__PICTUREBILEVEL = EscherPropertyTypes.BLIP__PICTUREBILEVEL.propNumber; - short BLIP__PICTUREACTIVE = EscherPropertyTypes.BLIP__PICTUREACTIVE.propNumber; - short GEOMETRY__LEFT = EscherPropertyTypes.GEOMETRY__LEFT.propNumber; - short GEOMETRY__TOP = EscherPropertyTypes.GEOMETRY__TOP.propNumber; - short GEOMETRY__RIGHT = EscherPropertyTypes.GEOMETRY__RIGHT.propNumber; - short GEOMETRY__BOTTOM = EscherPropertyTypes.GEOMETRY__BOTTOM.propNumber; - short GEOMETRY__SHAPEPATH = EscherPropertyTypes.GEOMETRY__SHAPEPATH.propNumber; - short GEOMETRY__VERTICES = EscherPropertyTypes.GEOMETRY__VERTICES.propNumber; - short GEOMETRY__SEGMENTINFO = EscherPropertyTypes.GEOMETRY__SEGMENTINFO.propNumber; - short GEOMETRY__ADJUSTVALUE = EscherPropertyTypes.GEOMETRY__ADJUSTVALUE.propNumber; - short GEOMETRY__ADJUST2VALUE = EscherPropertyTypes.GEOMETRY__ADJUST2VALUE.propNumber; - short GEOMETRY__ADJUST3VALUE = EscherPropertyTypes.GEOMETRY__ADJUST3VALUE.propNumber; - short GEOMETRY__ADJUST4VALUE = EscherPropertyTypes.GEOMETRY__ADJUST4VALUE.propNumber; - short GEOMETRY__ADJUST5VALUE = EscherPropertyTypes.GEOMETRY__ADJUST5VALUE.propNumber; - short GEOMETRY__ADJUST6VALUE = EscherPropertyTypes.GEOMETRY__ADJUST6VALUE.propNumber; - short GEOMETRY__ADJUST7VALUE = EscherPropertyTypes.GEOMETRY__ADJUST7VALUE.propNumber; - short GEOMETRY__ADJUST8VALUE = EscherPropertyTypes.GEOMETRY__ADJUST8VALUE.propNumber; - short GEOMETRY__ADJUST9VALUE = EscherPropertyTypes.GEOMETRY__ADJUST9VALUE.propNumber; - short GEOMETRY__ADJUST10VALUE = EscherPropertyTypes.GEOMETRY__ADJUST10VALUE.propNumber; - short GEOMETRY__PCONNECTIONSITES = EscherPropertyTypes.GEOMETRY__PCONNECTIONSITES.propNumber; - short GEOMETRY__PCONNECTIONSITESDIR = EscherPropertyTypes.GEOMETRY__PCONNECTIONSITESDIR.propNumber; - short GEOMETRY__XLIMO = EscherPropertyTypes.GEOMETRY__XLIMO.propNumber; - short GEOMETRY__YLIMO = EscherPropertyTypes.GEOMETRY__YLIMO.propNumber; - short GEOMETRY__PADJUSTHANDLES = EscherPropertyTypes.GEOMETRY__PADJUSTHANDLES.propNumber; - short GEOMETRY__PGUIDES = EscherPropertyTypes.GEOMETRY__PGUIDES.propNumber; - short GEOMETRY__PINSCRIBE = EscherPropertyTypes.GEOMETRY__PINSCRIBE.propNumber; - short GEOMETRY__CXK = EscherPropertyTypes.GEOMETRY__CXK.propNumber; - short GEOMETRY__PFRAGMENTS = EscherPropertyTypes.GEOMETRY__PFRAGMENTS.propNumber; - short GEOMETRY__SHADOWok = EscherPropertyTypes.GEOMETRY__SHADOWOK.propNumber; - short GEOMETRY__3DOK = EscherPropertyTypes.GEOMETRY__3DOK.propNumber; - short GEOMETRY__LINEOK = EscherPropertyTypes.GEOMETRY__LINEOK.propNumber; - short GEOMETRY__GEOTEXTOK = EscherPropertyTypes.GEOMETRY__GEOTEXTOK.propNumber; - short GEOMETRY__FILLSHADESHAPEOK = EscherPropertyTypes.GEOMETRY__FILLSHADESHAPEOK.propNumber; - short GEOMETRY__FILLOK = EscherPropertyTypes.GEOMETRY__FILLOK.propNumber; - short FILL__FILLTYPE = EscherPropertyTypes.FILL__FILLTYPE.propNumber; - short FILL__FILLCOLOR = EscherPropertyTypes.FILL__FILLCOLOR.propNumber; - short FILL__FILLOPACITY = EscherPropertyTypes.FILL__FILLOPACITY.propNumber; - short FILL__FILLBACKCOLOR = EscherPropertyTypes.FILL__FILLBACKCOLOR.propNumber; - short FILL__BACKOPACITY = EscherPropertyTypes.FILL__BACKOPACITY.propNumber; - short FILL__CRMOD = EscherPropertyTypes.FILL__CRMOD.propNumber; - short FILL__PATTERNTEXTURE = EscherPropertyTypes.FILL__PATTERNTEXTURE.propNumber; - short FILL__BLIPFILENAME = EscherPropertyTypes.FILL__BLIPFILENAME.propNumber; - short FILL__BLIPFLAGS = EscherPropertyTypes.FILL__BLIPFLAGS.propNumber; - short FILL__WIDTH = EscherPropertyTypes.FILL__WIDTH.propNumber; - short FILL__HEIGHT = EscherPropertyTypes.FILL__HEIGHT.propNumber; - short FILL__ANGLE = EscherPropertyTypes.FILL__ANGLE.propNumber; - short FILL__FOCUS = EscherPropertyTypes.FILL__FOCUS.propNumber; - short FILL__TOLEFT = EscherPropertyTypes.FILL__TOLEFT.propNumber; - short FILL__TOTOP = EscherPropertyTypes.FILL__TOTOP.propNumber; - short FILL__TORIGHT = EscherPropertyTypes.FILL__TORIGHT.propNumber; - short FILL__TOBOTTOM = EscherPropertyTypes.FILL__TOBOTTOM.propNumber; - short FILL__RECTLEFT = EscherPropertyTypes.FILL__RECTLEFT.propNumber; - short FILL__RECTTOP = EscherPropertyTypes.FILL__RECTTOP.propNumber; - short FILL__RECTRIGHT = EscherPropertyTypes.FILL__RECTRIGHT.propNumber; - short FILL__RECTBOTTOM = EscherPropertyTypes.FILL__RECTBOTTOM.propNumber; - short FILL__DZTYPE = EscherPropertyTypes.FILL__DZTYPE.propNumber; - short FILL__SHADEPRESET = EscherPropertyTypes.FILL__SHADEPRESET.propNumber; - short FILL__SHADECOLORS = EscherPropertyTypes.FILL__SHADECOLORS.propNumber; - short FILL__ORIGINX = EscherPropertyTypes.FILL__ORIGINX.propNumber; - short FILL__ORIGINY = EscherPropertyTypes.FILL__ORIGINY.propNumber; - short FILL__SHAPEORIGINX = EscherPropertyTypes.FILL__SHAPEORIGINX.propNumber; - short FILL__SHAPEORIGINY = EscherPropertyTypes.FILL__SHAPEORIGINY.propNumber; - short FILL__SHADETYPE = EscherPropertyTypes.FILL__SHADETYPE.propNumber; - short FILL__FILLED = EscherPropertyTypes.FILL__FILLED.propNumber; - short FILL__HITTESTFILL = EscherPropertyTypes.FILL__HITTESTFILL.propNumber; - short FILL__SHAPE = EscherPropertyTypes.FILL__SHAPE.propNumber; - short FILL__USERECT = EscherPropertyTypes.FILL__USERECT.propNumber; - short FILL__NOFILLHITTEST = EscherPropertyTypes.FILL__NOFILLHITTEST.propNumber; - short LINESTYLE__COLOR = EscherPropertyTypes.LINESTYLE__COLOR.propNumber; - short LINESTYLE__OPACITY = EscherPropertyTypes.LINESTYLE__OPACITY.propNumber; - short LINESTYLE__BACKCOLOR = EscherPropertyTypes.LINESTYLE__BACKCOLOR.propNumber; - short LINESTYLE__CRMOD = EscherPropertyTypes.LINESTYLE__CRMOD.propNumber; - short LINESTYLE__LINETYPE = EscherPropertyTypes.LINESTYLE__LINETYPE.propNumber; - short LINESTYLE__FILLBLIP = EscherPropertyTypes.LINESTYLE__FILLBLIP.propNumber; - short LINESTYLE__FILLBLIPNAME = EscherPropertyTypes.LINESTYLE__FILLBLIPNAME.propNumber; - short LINESTYLE__FILLBLIPFLAGS = EscherPropertyTypes.LINESTYLE__FILLBLIPFLAGS.propNumber; - short LINESTYLE__FILLWIDTH = EscherPropertyTypes.LINESTYLE__FILLWIDTH.propNumber; - short LINESTYLE__FILLHEIGHT = EscherPropertyTypes.LINESTYLE__FILLHEIGHT.propNumber; - short LINESTYLE__FILLDZTYPE = EscherPropertyTypes.LINESTYLE__FILLDZTYPE.propNumber; - short LINESTYLE__LINEWIDTH = EscherPropertyTypes.LINESTYLE__LINEWIDTH.propNumber; - short LINESTYLE__LINEMITERLIMIT = EscherPropertyTypes.LINESTYLE__LINEMITERLIMIT.propNumber; - short LINESTYLE__LINESTYLE = EscherPropertyTypes.LINESTYLE__LINESTYLE.propNumber; - short LINESTYLE__LINEDASHING = EscherPropertyTypes.LINESTYLE__LINEDASHING.propNumber; - short LINESTYLE__LINEDASHSTYLE = EscherPropertyTypes.LINESTYLE__LINEDASHSTYLE.propNumber; - short LINESTYLE__LINESTARTARROWHEAD = EscherPropertyTypes.LINESTYLE__LINESTARTARROWHEAD.propNumber; - short LINESTYLE__LINEENDARROWHEAD = EscherPropertyTypes.LINESTYLE__LINEENDARROWHEAD.propNumber; - short LINESTYLE__LINESTARTARROWWIDTH = EscherPropertyTypes.LINESTYLE__LINESTARTARROWWIDTH.propNumber; - short LINESTYLE__LINESTARTARROWLENGTH = EscherPropertyTypes.LINESTYLE__LINESTARTARROWLENGTH.propNumber; - short LINESTYLE__LINEENDARROWWIDTH = EscherPropertyTypes.LINESTYLE__LINEENDARROWWIDTH.propNumber; - short LINESTYLE__LINEENDARROWLENGTH = EscherPropertyTypes.LINESTYLE__LINEENDARROWLENGTH.propNumber; - short LINESTYLE__LINEJOINSTYLE = EscherPropertyTypes.LINESTYLE__LINEJOINSTYLE.propNumber; - short LINESTYLE__LINEENDCAPSTYLE = EscherPropertyTypes.LINESTYLE__LINEENDCAPSTYLE.propNumber; - short LINESTYLE__ARROWHEADSOK = EscherPropertyTypes.LINESTYLE__ARROWHEADSOK.propNumber; - short LINESTYLE__ANYLINE = EscherPropertyTypes.LINESTYLE__ANYLINE.propNumber; - short LINESTYLE__HITLINETEST = EscherPropertyTypes.LINESTYLE__HITLINETEST.propNumber; - short LINESTYLE__LINEFILLSHAPE = EscherPropertyTypes.LINESTYLE__LINEFILLSHAPE.propNumber; - short LINESTYLE__NOLINEDRAWDASH = EscherPropertyTypes.LINESTYLE__NOLINEDRAWDASH.propNumber; - short LINESTYLE__NOLINEDRAWDASH_LEFT = EscherPropertyTypes.LINESTYLE__NOLINEDRAWDASH_LEFT.propNumber; - short LINESTYLE__NOLINEDRAWDASH_TOP = EscherPropertyTypes.LINESTYLE__NOLINEDRAWDASH_TOP.propNumber; - short LINESTYLE__NOLINEDRAWDASH_BOTTOM = EscherPropertyTypes.LINESTYLE__NOLINEDRAWDASH_BOTTOM.propNumber; - short LINESTYLE__NOLINEDRAWDASH_RIGHT = EscherPropertyTypes.LINESTYLE__NOLINEDRAWDASH_RIGHT.propNumber; - short SHADOWSTYLE__TYPE = EscherPropertyTypes.SHADOWSTYLE__TYPE.propNumber; - short SHADOWSTYLE__COLOR = EscherPropertyTypes.SHADOWSTYLE__COLOR.propNumber; - short SHADOWSTYLE__HIGHLIGHT = EscherPropertyTypes.SHADOWSTYLE__HIGHLIGHT.propNumber; - short SHADOWSTYLE__CRMOD = EscherPropertyTypes.SHADOWSTYLE__CRMOD.propNumber; - short SHADOWSTYLE__OPACITY = EscherPropertyTypes.SHADOWSTYLE__OPACITY.propNumber; - short SHADOWSTYLE__OFFSETX = EscherPropertyTypes.SHADOWSTYLE__OFFSETX.propNumber; - short SHADOWSTYLE__OFFSETY = EscherPropertyTypes.SHADOWSTYLE__OFFSETY.propNumber; - short SHADOWSTYLE__SECONDOFFSETX = EscherPropertyTypes.SHADOWSTYLE__SECONDOFFSETX.propNumber; - short SHADOWSTYLE__SECONDOFFSETY = EscherPropertyTypes.SHADOWSTYLE__SECONDOFFSETY.propNumber; - short SHADOWSTYLE__SCALEXTOX = EscherPropertyTypes.SHADOWSTYLE__SCALEXTOX.propNumber; - short SHADOWSTYLE__SCALEYTOX = EscherPropertyTypes.SHADOWSTYLE__SCALEYTOX.propNumber; - short SHADOWSTYLE__SCALEXTOY = EscherPropertyTypes.SHADOWSTYLE__SCALEXTOY.propNumber; - short SHADOWSTYLE__SCALEYTOY = EscherPropertyTypes.SHADOWSTYLE__SCALEYTOY.propNumber; - short SHADOWSTYLE__PERSPECTIVEX = EscherPropertyTypes.SHADOWSTYLE__PERSPECTIVEX.propNumber; - short SHADOWSTYLE__PERSPECTIVEY = EscherPropertyTypes.SHADOWSTYLE__PERSPECTIVEY.propNumber; - short SHADOWSTYLE__WEIGHT = EscherPropertyTypes.SHADOWSTYLE__WEIGHT.propNumber; - short SHADOWSTYLE__ORIGINX = EscherPropertyTypes.SHADOWSTYLE__ORIGINX.propNumber; - short SHADOWSTYLE__ORIGINY = EscherPropertyTypes.SHADOWSTYLE__ORIGINY.propNumber; - short SHADOWSTYLE__SHADOW = EscherPropertyTypes.SHADOWSTYLE__SHADOW.propNumber; - short SHADOWSTYLE__SHADOWOBSURED = EscherPropertyTypes.SHADOWSTYLE__SHADOWOBSURED.propNumber; - short PERSPECTIVE__TYPE = EscherPropertyTypes.PERSPECTIVE__TYPE.propNumber; - short PERSPECTIVE__OFFSETX = EscherPropertyTypes.PERSPECTIVE__OFFSETX.propNumber; - short PERSPECTIVE__OFFSETY = EscherPropertyTypes.PERSPECTIVE__OFFSETY.propNumber; - short PERSPECTIVE__SCALEXTOX = EscherPropertyTypes.PERSPECTIVE__SCALEXTOX.propNumber; - short PERSPECTIVE__SCALEYTOX = EscherPropertyTypes.PERSPECTIVE__SCALEYTOX.propNumber; - short PERSPECTIVE__SCALEXTOY = EscherPropertyTypes.PERSPECTIVE__SCALEXTOY.propNumber; - short PERSPECTIVE__SCALEYTOY = EscherPropertyTypes.PERSPECTIVE__SCALEYTOY.propNumber; - short PERSPECTIVE__PERSPECTIVEX = EscherPropertyTypes.PERSPECTIVE__PERSPECTIVEX.propNumber; - short PERSPECTIVE__PERSPECTIVEY = EscherPropertyTypes.PERSPECTIVE__PERSPECTIVEY.propNumber; - short PERSPECTIVE__WEIGHT = EscherPropertyTypes.PERSPECTIVE__WEIGHT.propNumber; - short PERSPECTIVE__ORIGINX = EscherPropertyTypes.PERSPECTIVE__ORIGINX.propNumber; - short PERSPECTIVE__ORIGINY = EscherPropertyTypes.PERSPECTIVE__ORIGINY.propNumber; - short PERSPECTIVE__PERSPECTIVEON = EscherPropertyTypes.PERSPECTIVE__PERSPECTIVEON.propNumber; - short THREED__SPECULARAMOUNT = EscherPropertyTypes.THREED__SPECULARAMOUNT.propNumber; - short THREED__DIFFUSEAMOUNT = EscherPropertyTypes.THREED__DIFFUSEAMOUNT.propNumber; - short THREED__SHININESS = EscherPropertyTypes.THREED__SHININESS.propNumber; - short THREED__EDGETHICKNESS = EscherPropertyTypes.THREED__EDGETHICKNESS.propNumber; - short THREED__EXTRUDEFORWARD = EscherPropertyTypes.THREED__EXTRUDEFORWARD.propNumber; - short THREED__EXTRUDEBACKWARD = EscherPropertyTypes.THREED__EXTRUDEBACKWARD.propNumber; - short THREED__EXTRUDEPLANE = EscherPropertyTypes.THREED__EXTRUDEPLANE.propNumber; - short THREED__EXTRUSIONCOLOR = EscherPropertyTypes.THREED__EXTRUSIONCOLOR.propNumber; - short THREED__CRMOD = EscherPropertyTypes.THREED__CRMOD.propNumber; - short THREED__3DEFFECT = EscherPropertyTypes.THREED__3DEFFECT.propNumber; - short THREED__METALLIC = EscherPropertyTypes.THREED__METALLIC.propNumber; - short THREED__USEEXTRUSIONCOLOR = EscherPropertyTypes.THREED__USEEXTRUSIONCOLOR.propNumber; - short THREED__LIGHTFACE = EscherPropertyTypes.THREED__LIGHTFACE.propNumber; - short THREEDSTYLE__YROTATIONANGLE = EscherPropertyTypes.THREEDSTYLE__YROTATIONANGLE.propNumber; - short THREEDSTYLE__XROTATIONANGLE = EscherPropertyTypes.THREEDSTYLE__XROTATIONANGLE.propNumber; - short THREEDSTYLE__ROTATIONAXISX = EscherPropertyTypes.THREEDSTYLE__ROTATIONAXISX.propNumber; - short THREEDSTYLE__ROTATIONAXISY = EscherPropertyTypes.THREEDSTYLE__ROTATIONAXISY.propNumber; - short THREEDSTYLE__ROTATIONAXISZ = EscherPropertyTypes.THREEDSTYLE__ROTATIONAXISZ.propNumber; - short THREEDSTYLE__ROTATIONANGLE = EscherPropertyTypes.THREEDSTYLE__ROTATIONANGLE.propNumber; - short THREEDSTYLE__ROTATIONCENTERX = EscherPropertyTypes.THREEDSTYLE__ROTATIONCENTERX.propNumber; - short THREEDSTYLE__ROTATIONCENTERY = EscherPropertyTypes.THREEDSTYLE__ROTATIONCENTERY.propNumber; - short THREEDSTYLE__ROTATIONCENTERZ = EscherPropertyTypes.THREEDSTYLE__ROTATIONCENTERZ.propNumber; - short THREEDSTYLE__RENDERMODE = EscherPropertyTypes.THREEDSTYLE__RENDERMODE.propNumber; - short THREEDSTYLE__TOLERANCE = EscherPropertyTypes.THREEDSTYLE__TOLERANCE.propNumber; - short THREEDSTYLE__XVIEWPOINT = EscherPropertyTypes.THREEDSTYLE__XVIEWPOINT.propNumber; - short THREEDSTYLE__YVIEWPOINT = EscherPropertyTypes.THREEDSTYLE__YVIEWPOINT.propNumber; - short THREEDSTYLE__ZVIEWPOINT = EscherPropertyTypes.THREEDSTYLE__ZVIEWPOINT.propNumber; - short THREEDSTYLE__ORIGINX = EscherPropertyTypes.THREEDSTYLE__ORIGINX.propNumber; - short THREEDSTYLE__ORIGINY = EscherPropertyTypes.THREEDSTYLE__ORIGINY.propNumber; - short THREEDSTYLE__SKEWANGLE = EscherPropertyTypes.THREEDSTYLE__SKEWANGLE.propNumber; - short THREEDSTYLE__SKEWAMOUNT = EscherPropertyTypes.THREEDSTYLE__SKEWAMOUNT.propNumber; - short THREEDSTYLE__AMBIENTINTENSITY = EscherPropertyTypes.THREEDSTYLE__AMBIENTINTENSITY.propNumber; - short THREEDSTYLE__KEYX = EscherPropertyTypes.THREEDSTYLE__KEYX.propNumber; - short THREEDSTYLE__KEYY = EscherPropertyTypes.THREEDSTYLE__KEYY.propNumber; - short THREEDSTYLE__KEYZ = EscherPropertyTypes.THREEDSTYLE__KEYZ.propNumber; - short THREEDSTYLE__KEYINTENSITY = EscherPropertyTypes.THREEDSTYLE__KEYINTENSITY.propNumber; - short THREEDSTYLE__FILLX = EscherPropertyTypes.THREEDSTYLE__FILLX.propNumber; - short THREEDSTYLE__FILLY = EscherPropertyTypes.THREEDSTYLE__FILLY.propNumber; - short THREEDSTYLE__FILLZ = EscherPropertyTypes.THREEDSTYLE__FILLZ.propNumber; - short THREEDSTYLE__FILLINTENSITY = EscherPropertyTypes.THREEDSTYLE__FILLINTENSITY.propNumber; - short THREEDSTYLE__CONSTRAINROTATION = EscherPropertyTypes.THREEDSTYLE__CONSTRAINROTATION.propNumber; - short THREEDSTYLE__ROTATIONCENTERAUTO = EscherPropertyTypes.THREEDSTYLE__ROTATIONCENTERAUTO.propNumber; - short THREEDSTYLE__PARALLEL = EscherPropertyTypes.THREEDSTYLE__PARALLEL.propNumber; - short THREEDSTYLE__KEYHARSH = EscherPropertyTypes.THREEDSTYLE__KEYHARSH.propNumber; - short THREEDSTYLE__FILLHARSH = EscherPropertyTypes.THREEDSTYLE__FILLHARSH.propNumber; - short SHAPE__MASTER = EscherPropertyTypes.SHAPE__MASTER.propNumber; - short SHAPE__CONNECTORSTYLE = EscherPropertyTypes.SHAPE__CONNECTORSTYLE.propNumber; - short SHAPE__BLACKANDWHITESETTINGS = EscherPropertyTypes.SHAPE__BLACKANDWHITESETTINGS.propNumber; - short SHAPE__WMODEPUREBW = EscherPropertyTypes.SHAPE__WMODEPUREBW.propNumber; - short SHAPE__WMODEBW = EscherPropertyTypes.SHAPE__WMODEBW.propNumber; - short SHAPE__OLEICON = EscherPropertyTypes.SHAPE__OLEICON.propNumber; - short SHAPE__PREFERRELATIVERESIZE = EscherPropertyTypes.SHAPE__PREFERRELATIVERESIZE.propNumber; - short SHAPE__LOCKSHAPETYPE = EscherPropertyTypes.SHAPE__LOCKSHAPETYPE.propNumber; - short SHAPE__DELETEATTACHEDOBJECT = EscherPropertyTypes.SHAPE__DELETEATTACHEDOBJECT.propNumber; - short SHAPE__BACKGROUNDSHAPE = EscherPropertyTypes.SHAPE__BACKGROUNDSHAPE.propNumber; - short CALLOUT__CALLOUTTYPE = EscherPropertyTypes.CALLOUT__CALLOUTTYPE.propNumber; - short CALLOUT__XYCALLOUTGAP = EscherPropertyTypes.CALLOUT__XYCALLOUTGAP.propNumber; - short CALLOUT__CALLOUTANGLE = EscherPropertyTypes.CALLOUT__CALLOUTANGLE.propNumber; - short CALLOUT__CALLOUTDROPTYPE = EscherPropertyTypes.CALLOUT__CALLOUTDROPTYPE.propNumber; - short CALLOUT__CALLOUTDROPSPECIFIED = EscherPropertyTypes.CALLOUT__CALLOUTDROPSPECIFIED.propNumber; - short CALLOUT__CALLOUTLENGTHSPECIFIED = EscherPropertyTypes.CALLOUT__CALLOUTLENGTHSPECIFIED.propNumber; - short CALLOUT__ISCALLOUT = EscherPropertyTypes.CALLOUT__ISCALLOUT.propNumber; - short CALLOUT__CALLOUTACCENTBAR = EscherPropertyTypes.CALLOUT__CALLOUTACCENTBAR.propNumber; - short CALLOUT__CALLOUTTEXTBORDER = EscherPropertyTypes.CALLOUT__CALLOUTTEXTBORDER.propNumber; - short CALLOUT__CALLOUTMINUSX = EscherPropertyTypes.CALLOUT__CALLOUTMINUSX.propNumber; - short CALLOUT__CALLOUTMINUSY = EscherPropertyTypes.CALLOUT__CALLOUTMINUSY.propNumber; - short CALLOUT__DROPAUTO = EscherPropertyTypes.CALLOUT__DROPAUTO.propNumber; - short CALLOUT__LENGTHSPECIFIED = EscherPropertyTypes.CALLOUT__LENGTHSPECIFIED.propNumber; - short GROUPSHAPE__SHAPENAME = EscherPropertyTypes.GROUPSHAPE__SHAPENAME.propNumber; - short GROUPSHAPE__DESCRIPTION = EscherPropertyTypes.GROUPSHAPE__DESCRIPTION.propNumber; - short GROUPSHAPE__HYPERLINK = EscherPropertyTypes.GROUPSHAPE__HYPERLINK.propNumber; - short GROUPSHAPE__WRAPPOLYGONVERTICES = EscherPropertyTypes.GROUPSHAPE__WRAPPOLYGONVERTICES.propNumber; - short GROUPSHAPE__WRAPDISTLEFT = EscherPropertyTypes.GROUPSHAPE__WRAPDISTLEFT.propNumber; - short GROUPSHAPE__WRAPDISTTOP = EscherPropertyTypes.GROUPSHAPE__WRAPDISTTOP.propNumber; - short GROUPSHAPE__WRAPDISTRIGHT = EscherPropertyTypes.GROUPSHAPE__WRAPDISTRIGHT.propNumber; - short GROUPSHAPE__WRAPDISTBOTTOM = EscherPropertyTypes.GROUPSHAPE__WRAPDISTBOTTOM.propNumber; - short GROUPSHAPE__REGROUPID = EscherPropertyTypes.GROUPSHAPE__REGROUPID.propNumber; - short GROUPSHAPE__UNUSED906 = EscherPropertyTypes.GROUPSHAPE__UNUSED906.propNumber; - short GROUPSHAPE__TOOLTIP = EscherPropertyTypes.GROUPSHAPE__TOOLTIP.propNumber; - short GROUPSHAPE__SCRIPT = EscherPropertyTypes.GROUPSHAPE__SCRIPT.propNumber; - short GROUPSHAPE__POSH = EscherPropertyTypes.GROUPSHAPE__POSH.propNumber; - short GROUPSHAPE__POSRELH = EscherPropertyTypes.GROUPSHAPE__POSRELH.propNumber; - short GROUPSHAPE__POSV = EscherPropertyTypes.GROUPSHAPE__POSV.propNumber; - short GROUPSHAPE__POSRELV = EscherPropertyTypes.GROUPSHAPE__POSRELV.propNumber; - short GROUPSHAPE__HR_PCT = EscherPropertyTypes.GROUPSHAPE__HR_PCT.propNumber; - short GROUPSHAPE__HR_ALIGN = EscherPropertyTypes.GROUPSHAPE__HR_ALIGN.propNumber; - short GROUPSHAPE__HR_HEIGHT = EscherPropertyTypes.GROUPSHAPE__HR_HEIGHT.propNumber; - short GROUPSHAPE__HR_WIDTH = EscherPropertyTypes.GROUPSHAPE__HR_WIDTH.propNumber; - short GROUPSHAPE__SCRIPTEXT = EscherPropertyTypes.GROUPSHAPE__SCRIPTEXT.propNumber; - short GROUPSHAPE__SCRIPTLANG = EscherPropertyTypes.GROUPSHAPE__SCRIPTLANG.propNumber; - short GROUPSHAPE__BORDERTOPCOLOR = EscherPropertyTypes.GROUPSHAPE__BORDERTOPCOLOR.propNumber; - short GROUPSHAPE__BORDERLEFTCOLOR = EscherPropertyTypes.GROUPSHAPE__BORDERLEFTCOLOR.propNumber; - short GROUPSHAPE__BORDERBOTTOMCOLOR = EscherPropertyTypes.GROUPSHAPE__BORDERBOTTOMCOLOR.propNumber; - short GROUPSHAPE__BORDERRIGHTCOLOR = EscherPropertyTypes.GROUPSHAPE__BORDERRIGHTCOLOR.propNumber; - short GROUPSHAPE__TABLEPROPERTIES = EscherPropertyTypes.GROUPSHAPE__TABLEPROPERTIES.propNumber; - short GROUPSHAPE__TABLEROWPROPERTIES = EscherPropertyTypes.GROUPSHAPE__TABLEROWPROPERTIES.propNumber; - short GROUPSHAPE__WEBBOT = EscherPropertyTypes.GROUPSHAPE__WEBBOT.propNumber; - short GROUPSHAPE__METROBLOB = EscherPropertyTypes.GROUPSHAPE__METROBLOB.propNumber; - short GROUPSHAPE__ZORDER = EscherPropertyTypes.GROUPSHAPE__ZORDER.propNumber; - short GROUPSHAPE__EDITEDWRAP = EscherPropertyTypes.GROUPSHAPE__EDITEDWRAP.propNumber; - short GROUPSHAPE__BEHINDDOCUMENT = EscherPropertyTypes.GROUPSHAPE__BEHINDDOCUMENT.propNumber; - short GROUPSHAPE__ONDBLCLICKNOTIFY = EscherPropertyTypes.GROUPSHAPE__ONDBLCLICKNOTIFY.propNumber; - short GROUPSHAPE__ISBUTTON = EscherPropertyTypes.GROUPSHAPE__ISBUTTON.propNumber; - short GROUPSHAPE__1DADJUSTMENT = EscherPropertyTypes.GROUPSHAPE__1DADJUSTMENT.propNumber; - short GROUPSHAPE__HIDDEN = EscherPropertyTypes.GROUPSHAPE__HIDDEN.propNumber; - short GROUPSHAPE__FLAGS = EscherPropertyTypes.GROUPSHAPE__FLAGS.propNumber; - short GROUPSHAPE__PRINT = EscherPropertyTypes.GROUPSHAPE__FLAGS.propNumber; - - - static String getPropertyName(short propertyId) { - return EscherPropertyTypes.forPropertyID(propertyId).propName; - } - - static byte getPropertyType(short propertyId) { - return (byte)EscherPropertyTypes.forPropertyID(propertyId).holder.ordinal(); - } -} diff --git a/src/java/org/apache/poi/ddf/EscherRecord.java b/src/java/org/apache/poi/ddf/EscherRecord.java index cb1b1fea4b..85ebea3740 100644 --- a/src/java/org/apache/poi/ddf/EscherRecord.java +++ b/src/java/org/apache/poi/ddf/EscherRecord.java @@ -33,7 +33,6 @@ import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.GenericRecordXmlWriter; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; -import org.apache.poi.util.Removal; /** * The base abstract record from which all escher records are defined. Subclasses will need @@ -236,20 +235,6 @@ public abstract class EscherRecord implements Duplicatable, GenericRecord { throw new UnsupportedOperationException("This record does not support child records."); } - /** - * Escher records may need to be clonable in the future. - * - * @return the cloned object - * @deprecated use {@link #copy()} - */ - @Override - @SuppressWarnings("squid:S2975") - @Deprecated - @Removal(version = "5.0.0") - public final EscherRecord clone() { - return copy(); - } - /** * Returns the indexed child record. * diff --git a/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java b/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java deleted file mode 100644 index 620253ae11..0000000000 --- a/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java +++ /dev/null @@ -1,60 +0,0 @@ -/* ==================================================================== - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -==================================================================== */ - -package org.apache.poi.hpsf.wellknown; - -import org.apache.poi.hpsf.ClassID; -import org.apache.poi.hpsf.DocumentSummaryInformation; -import org.apache.poi.hpsf.SummaryInformation; -import org.apache.poi.util.Internal; -import org.apache.poi.util.Removal; - -/** - * This classed used to map section format IDs to {@link PropertyIDMap PropertyIDMaps}, - * but there's no way to use custom PropertyIDMaps.

- * - * It is only kept for its ClassIDs until removal. - * - * @deprecated in 4.0.0, there's no way to create custom PropertyIDMaps, therefore - * this class is obsolete - */ -@Internal -@Deprecated -@Removal(version="4.2.0") -public class SectionIDMap { - - /** - * The SummaryInformation's section's format ID. - * @deprecated use {@link SummaryInformation#FORMAT_ID} - */ - @Deprecated - public static final ClassID SUMMARY_INFORMATION_ID = SummaryInformation.FORMAT_ID; - - /** - * The DocumentSummaryInformation's first and second sections' format ID. - * @deprecated use {@link DocumentSummaryInformation#FORMAT_ID} - */ - @Deprecated - public static final ClassID[] DOCUMENT_SUMMARY_INFORMATION_ID = DocumentSummaryInformation.FORMAT_ID; - - /** - * A property without a known name is described by this string. - * @deprecated use {@link PropertyIDMap#UNDEFINED} - */ - @Deprecated - public static final String UNDEFINED = PropertyIDMap.UNDEFINED; -} diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java b/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java index ff26643558..4dd6a53c76 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java @@ -22,6 +22,7 @@ import java.util.Objects; import org.apache.poi.hssf.record.FontRecord; import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.ss.usermodel.Font; +import org.apache.poi.util.Removal; /** * Represents a Font used in a workbook. @@ -75,26 +76,17 @@ public final class HSSFFont implements Font { * @return String representing the name of the font to use * @see #FONT_ARIAL */ - public String getFontName() { return font.getFontName(); } - /** - * get the index within the HSSFWorkbook (sequence within the collection of Font objects) - * @return unique index number of the underlying record this Font represents (probably you don't care - * unless you're comparing which one is which) - */ - - public short getIndex() { return (short)index; } - - /** - * get the index within the HSSFWorkbook (sequence within the collection of Font objects) - * @return unique index number of the underlying record this Font represents (probably you don't care - * unless you're comparing which one is which) - */ + @Override + public int getIndex() { return index; } + @Deprecated + @Removal(version = "6.0.0") + @Override public int getIndexAsInt() { return index; diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java b/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java index dd146e03f3..34b95d7fa0 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java @@ -168,7 +168,7 @@ public final class HSSFRichTextString implements Comparable, * @param font The index of the font to use. */ public void applyFont(int startIndex, int endIndex, Font font) { - applyFont(startIndex, endIndex, font.getIndex()); + applyFont(startIndex, endIndex, (short)font.getIndex()); } /** diff --git a/src/java/org/apache/poi/ss/usermodel/Font.java b/src/java/org/apache/poi/ss/usermodel/Font.java index 4e95fb2751..60b8a91dc2 100644 --- a/src/java/org/apache/poi/ss/usermodel/Font.java +++ b/src/java/org/apache/poi/ss/usermodel/Font.java @@ -262,23 +262,25 @@ public interface Font { */ void setCharSet(int charset); - /** - * Get the index within the XSSFWorkbook (sequence within the collection of Font objects) - * - * @return unique index number of the underlying record this Font represents (probably you don't care - * unless you're comparing which one is which) - * @deprecated use getIndexAsInt() instead - */ - @Removal(version = "4.2") - short getIndex(); - /** * get the index within the XSSFWorkbook (sequence within the collection of Font objects) * * @return unique index number of the underlying record this Font represents (probably you don't care * unless you're comparing which one is which) + * @since 5.0.0 (used to return a short) + */ + int getIndex(); + + /** + * get the index within the XSSFWorkbook (sequence within the collection of Font objects) + * + * @deprecated use {@link #getIndex()} instead + * @return unique index number of the underlying record this Font represents (probably you don't care + * unless you're comparing which one is which) * @since 4.0.0 */ + @Deprecated + @Removal(version = "6.0.0") int getIndexAsInt(); void setBold(boolean bold); diff --git a/src/java/org/apache/poi/ss/util/ImageUtils.java b/src/java/org/apache/poi/ss/util/ImageUtils.java index fdd8ee8965..d1c3a5f982 100644 --- a/src/java/org/apache/poi/ss/util/ImageUtils.java +++ b/src/java/org/apache/poi/ss/util/ImageUtils.java @@ -40,7 +40,6 @@ import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; -import org.apache.poi.util.Removal; import org.apache.poi.util.Units; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -48,13 +47,6 @@ import org.w3c.dom.NodeList; public final class ImageUtils { private static final POILogger logger = POILogFactory.getLogger(ImageUtils.class); - /** - * @deprecated use {@link Units#PIXEL_DPI} - */ - @Deprecated - @Removal(version = "5.0.0") - public static final int PIXEL_DPI = 96; - private static final int WIDTH_UNITS = 1024; private static final int HEIGHT_UNITS = 256; diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java index be7be6cb39..ddd278eb8e 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java @@ -18,14 +18,15 @@ package org.apache.poi.xssf.usermodel; import java.util.Objects; +import org.apache.poi.common.usermodel.fonts.FontCharset; import org.apache.poi.ooxml.POIXMLException; import org.apache.poi.ss.usermodel.Font; -import org.apache.poi.ss.usermodel.FontCharset; import org.apache.poi.ss.usermodel.FontFamily; import org.apache.poi.ss.usermodel.FontScheme; import org.apache.poi.ss.usermodel.FontUnderline; import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.util.Internal; +import org.apache.poi.util.Removal; import org.apache.poi.xssf.model.StylesTable; import org.apache.poi.xssf.model.ThemesTable; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBooleanProperty; @@ -126,7 +127,8 @@ public class XSSFFont implements Font { */ public int getCharSet() { CTIntProperty charset = _ctFont.sizeOfCharsetArray() == 0 ? null : _ctFont.getCharsetArray(0); - return charset == null ? FontCharset.ANSI.getValue() : FontCharset.valueOf(charset.getVal()).getValue(); + return charset == null ? org.apache.poi.ss.usermodel.FontCharset.ANSI.getValue() : + org.apache.poi.ss.usermodel.FontCharset.valueOf(charset.getVal()).getValue(); } @@ -311,20 +313,21 @@ public class XSSFFont implements Font { * set character-set to use. * * @param charset - charset - * @see FontCharset + * @see org.apache.poi.ss.usermodel.FontCharset */ public void setCharSet(byte charset) { int cs = charset & 0xff; setCharSet(cs); } + /** * set character-set to use. * * @param charset - charset - * @see FontCharset + * @see org.apache.poi.ss.usermodel.FontCharset */ public void setCharSet(int charset) { - FontCharset fontCharset = FontCharset.valueOf(charset); + org.apache.poi.ss.usermodel.FontCharset fontCharset = org.apache.poi.ss.usermodel.FontCharset.valueOf(charset); if(fontCharset != null) { setCharSet(fontCharset); } else { @@ -337,7 +340,7 @@ public class XSSFFont implements Font { * * @param charSet */ - public void setCharSet(FontCharset charSet) { + public void setCharSet(org.apache.poi.ss.usermodel.FontCharset charSet) { CTIntProperty charsetProperty; if(_ctFont.sizeOfCharsetArray() == 0) { charsetProperty = _ctFont.addNewCharset(); @@ -349,6 +352,24 @@ public class XSSFFont implements Font { charsetProperty.setVal( charSet.getValue() ); } + /** + * set character-set to use. + * + * @param charSet + * @since 5.0.0 + */ + public void setCharSet(FontCharset charSet) { + CTIntProperty charsetProperty; + if(_ctFont.sizeOfCharsetArray() == 0) { + charsetProperty = _ctFont.addNewCharset(); + } else { + charsetProperty = _ctFont.getCharsetArray(0); + } + // We know that FontCharset only has valid entries in it, + // so we can just set the int value from it + charsetProperty.setVal( charSet.getNativeId() ); + } + /** * set the indexed color for the font * @@ -624,11 +645,12 @@ public class XSSFFont implements Font { } @Override - @Deprecated - public short getIndex() { - return (short)getIndexAsInt(); + public int getIndex() { + return _index; } + @Deprecated + @Removal(version = "6.0.0") @Override public int getIndexAsInt() { diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java index 8547b29511..bce40f0707 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java @@ -384,7 +384,7 @@ public final class TestXSSFFont extends BaseTestFont{ XSSFFont nf = wb.createFont(); assertEquals(2, wb.getNumberOfFonts()); - assertEquals(1, nf.getIndexAsInt()); + assertEquals(1, nf.getIndex()); assertEquals(nf, wb.getFontAt(1)); nf.setBold(false); @@ -422,7 +422,7 @@ public final class TestXSSFFont extends BaseTestFont{ assertNotNull(font); assertEquals( 1, - font.getIndexAsInt() + font.getIndex() ); assertEquals(nf, wb.findFont( diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java b/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java deleted file mode 100644 index 1375092ac4..0000000000 --- a/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java +++ /dev/null @@ -1,40 +0,0 @@ -/* ==================================================================== - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -==================================================================== */ - -package org.apache.poi.hslf.model; - - -import org.apache.poi.hslf.usermodel.HSLFGroupShape; -import org.apache.poi.sl.draw.SLGraphics; -import org.apache.poi.util.Removal; - -/** - * Translates Graphics2D calls into PowerPoint. - * @deprecated since 4.0.0 - use SLGraphics - */ -@Deprecated -@Removal(version="5.0.0") -public final class PPGraphics2D extends SLGraphics { - /** - * Construct Java Graphics object which translates graphic calls in ppt drawing layer. - * - * @param group The shape group to write the graphics calls into. - */ - public PPGraphics2D(HSLFGroupShape group){ - super(group); - } -} diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java index e445eeeaca..706e5ae261 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java @@ -25,7 +25,6 @@ import java.util.function.Supplier; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; -import org.apache.poi.util.Removal; /** * Definition of a special kind of property of some text, or its @@ -185,14 +184,6 @@ public abstract class BitMaskTextProp extends TextProp { super.setValue(newVal); } - @Override - @SuppressWarnings("squid:S2975") - @Deprecated - @Removal(version = "5.0.0") - public BitMaskTextProp clone() { - return copy(); - } - /** * @return an identical copy of this, i.e. also the subPropMatches are copied */ diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java index 0c340b067e..a8db55e521 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java @@ -26,7 +26,6 @@ import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.sl.usermodel.TabStop; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.Internal; -import org.apache.poi.util.Removal; import org.apache.poi.util.Units; @Internal @@ -86,14 +85,6 @@ public class HSLFTabStop implements TabStop, Duplicatable, GenericRecord { this.type = type; } - @Override - @SuppressWarnings("squid:S2975") - @Deprecated - @Removal(version = "5.0.0") - public HSLFTabStop clone() { - return copy(); - } - @Override public HSLFTabStop copy() { return new HSLFTabStop(this); diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java index 071ceeb188..247077404b 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java @@ -32,7 +32,6 @@ import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.LittleEndianInput; import org.apache.poi.util.LittleEndianOutput; import org.apache.poi.util.LittleEndianOutputStream; -import org.apache.poi.util.Removal; /** * Container for tabstop lists @@ -109,14 +108,6 @@ public class HSLFTabStopPropCollection extends TextProp { tabStops.add(ts); } - @Override - @SuppressWarnings("squid:S2975") - @Deprecated - @Removal(version = "5.0.0") - public HSLFTabStopPropCollection clone() { - return copy(); - } - @Override public HSLFTabStopPropCollection copy() { return new HSLFTabStopPropCollection(this); diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java index 26b30ea53c..bf4b10545b 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java @@ -32,7 +32,6 @@ import org.junit.runners.Suite; TestMovieShape.class, TestOleEmbedding.class, TestPPFont.class, - TestPPGraphics2D.class, TestSetBoldItalic.class, TestShapes.class, TestSheet.class, diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java deleted file mode 100644 index cd5c3f7976..0000000000 --- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java +++ /dev/null @@ -1,95 +0,0 @@ -/* ==================================================================== - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -==================================================================== */ - -package org.apache.poi.hslf.model; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.awt.*; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.util.List; - -import org.apache.poi.POIDataSamples; -import org.apache.poi.hslf.usermodel.*; -import org.junit.Before; -import org.junit.Test; - -/** - * Test drawing shapes via Graphics2D - * - * @author Yegor Kozlov - */ -public final class TestPPGraphics2D { - private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance(); - private HSLFSlideShow ppt; - - @Before - public void setUp() throws Exception { - ppt = new HSLFSlideShow(_slTests.openResourceAsStream("empty.ppt")); - } - - @Test - public void testGraphics() throws Exception { - // Starts off empty - assertTrue(ppt.getSlides().isEmpty()); - - // Add a slide - HSLFSlide slide = ppt.createSlide(); - assertEquals(1, ppt.getSlides().size()); - - // Add some stuff into it - HSLFGroupShape group = new HSLFGroupShape(); - Dimension pgsize = ppt.getPageSize(); - java.awt.Rectangle bounds = new java.awt.Rectangle(0, 0, (int)pgsize.getWidth(), (int)pgsize.getHeight()); - group.setAnchor(bounds); - slide.addShape(group); - - PPGraphics2D graphics = new PPGraphics2D(group); - graphics.setColor(Color.blue); - graphics.draw(new Rectangle(1296, 2544, 1344, 0)); - - graphics.setColor(Color.red); - graphics.setStroke(new BasicStroke((float)2.5)); - graphics.drawLine(500, 500, 1500, 2500); - - graphics.setColor(Color.green); - graphics.setPaint(Color.gray); - graphics.drawOval(4000, 1000, 1000, 1000); - - // Write the file out - ByteArrayOutputStream out = new ByteArrayOutputStream(); - ppt.write(out); - out.close(); - - // And read it back in - ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray()))); - assertEquals(1, ppt.getSlides().size()); - - slide = ppt.getSlides().get(0); - List shape = slide.getShapes(); - assertEquals(shape.size(), 1); //group shape - - assertTrue(shape.get(0) instanceof HSLFGroupShape); //group shape - - group = (HSLFGroupShape)shape.get(0); - shape = group.getShapes(); - assertEquals(shape.size(), 3); - } - -} diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java index 43d33d3d3f..caf976b4f9 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java @@ -312,7 +312,7 @@ public abstract class BaseTestCell { cs = c.getCellStyle(); assertNotNull("Formula Cell Style", cs); - assertEquals("Font Index Matches", f.getIndexAsInt(), cs.getFontIndex()); + assertEquals("Font Index Matches", f.getIndex(), cs.getFontIndex()); assertEquals("Top Border", BorderStyle.THIN, cs.getBorderTop()); assertEquals("Left Border", BorderStyle.THIN, cs.getBorderLeft()); assertEquals("Right Border", BorderStyle.THIN, cs.getBorderRight()); diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java index 92a566888f..5044bdcf34 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java @@ -68,17 +68,17 @@ public abstract class BaseTestFont { Font f1=wb.createFont(); f1.setBold(true); - short idx1 = f1.getIndex(); + int idx1 = f1.getIndex(); wb.createCellStyle().setFont(f1); Font f2=wb.createFont(); f2.setUnderline(Font.U_DOUBLE); - short idx2 = f2.getIndex(); + int idx2 = f2.getIndex(); wb.createCellStyle().setFont(f2); Font f3=wb.createFont(); f3.setFontHeightInPoints((short)23); - short idx3 = f3.getIndex(); + int idx3 = f3.getIndex(); wb.createCellStyle().setFont(f3); assertEquals(num0 + 3,wb.getNumberOfFonts()); @@ -107,7 +107,7 @@ public abstract class BaseTestFont { font.setStrikeout(true); font.setColor(IndexedColors.YELLOW.getIndex()); font.setFontName("Courier"); - int font1Idx = font.getIndexAsInt(); + int font1Idx = font.getIndex(); wb1.createCellStyle().setFont(font); assertEquals(num0 + 1, wb1.getNumberOfFonts()); @@ -131,7 +131,7 @@ public abstract class BaseTestFont { Font font2 = wb2.createFont(); font2.setItalic(true); font2.setFontHeightInPoints((short)15); - int font2Idx = font2.getIndexAsInt(); + int font2Idx = font2.getIndex(); wb2.createCellStyle().setFont(font2); assertEquals(num0 + 2, wb2.getNumberOfFonts()); @@ -183,7 +183,7 @@ public abstract class BaseTestFont { ); Font nf = wb.createFont(); - int nfIdx = nf.getIndexAsInt(); + int nfIdx = nf.getIndex(); assertEquals(num0 + 1, wb.getNumberOfFonts()); assertSame(nf, wb.getFontAt(nfIdx)); diff --git a/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java b/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java index 5523827cc5..d06bea9b3e 100644 --- a/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java +++ b/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java @@ -305,7 +305,7 @@ public abstract class BaseTestCellUtil { final int defaultFontIndex = 0; Font font = wb.createFont(); font.setItalic(true); - final int customFontIndex = font.getIndexAsInt(); + final int customFontIndex = font.getIndex(); // Assumptions assertNotEquals(defaultFontIndex, customFontIndex);