diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java index 79ef400fe..8a23933f6 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java @@ -792,8 +792,7 @@ public class AnimationState { } /** Returns the track entry for the animation currently playing on the track, or null if no animation is currently playing. */ - @Null - public TrackEntry getCurrent (int trackIndex) { + public @Null TrackEntry getCurrent (int trackIndex) { if (trackIndex < 0) throw new IllegalArgumentException("trackIndex must be >= 0."); if (trackIndex >= tracks.size) return null; return tracks.get(trackIndex); @@ -1031,8 +1030,7 @@ public class AnimationState { *

* A track entry returned from {@link AnimationState#setAnimation(int, Animation, boolean)} is already the current animation * for the track, so the track entry listener {@link AnimationStateListener#start(TrackEntry)} will not be called. */ - @Null - public AnimationStateListener getListener () { + public @Null AnimationStateListener getListener () { return listener; } @@ -1087,8 +1085,7 @@ public class AnimationState { } /** The animation queued to start after this animation, or null. next makes up a linked list. */ - @Null - public TrackEntry getNext () { + public @Null TrackEntry getNext () { return next; } @@ -1147,15 +1144,13 @@ public class AnimationState { /** The track entry for the previous animation when mixing from the previous animation to this animation, or null if no * mixing is currently occuring. When mixing from multiple animations, mixingFrom makes up a linked list. */ - @Null - public TrackEntry getMixingFrom () { + public @Null TrackEntry getMixingFrom () { return mixingFrom; } /** The track entry for the next animation when mixing from this animation to the next animation, or null if no mixing is * currently occuring. When mixing to multiple animations, mixingTo makes up a linked list. */ - @Null - public TrackEntry getMixingTo () { + public @Null TrackEntry getMixingTo () { return mixingTo; } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Bone.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Bone.java index 490423a35..a0f3317ca 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Bone.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Bone.java @@ -225,8 +225,7 @@ public class Bone implements Updatable { } /** The parent bone, or null if this is the root bone. */ - @Null - public Bone getParent () { + public @Null Bone getParent () { return parent; } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/BoneData.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/BoneData.java index 2d73b457e..94bb5a0b6 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/BoneData.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/BoneData.java @@ -79,8 +79,7 @@ public class BoneData { return name; } - @Null - public BoneData getParent () { + public @Null BoneData getParent () { return parent; } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java index 301af5bd1..b6b111045 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java @@ -484,8 +484,7 @@ public class Skeleton { /** Finds a bone by comparing each bone's name. It is more efficient to cache the results of this method than to call it * repeatedly. */ - @Null - public Bone findBone (String boneName) { + public @Null Bone findBone (String boneName) { if (boneName == null) throw new IllegalArgumentException("boneName cannot be null."); Object[] bones = this.bones.items; for (int i = 0, n = this.bones.size; i < n; i++) { @@ -502,8 +501,7 @@ public class Skeleton { /** Finds a slot by comparing each slot's name. It is more efficient to cache the results of this method than to call it * repeatedly. */ - @Null - public Slot findSlot (String slotName) { + public @Null Slot findSlot (String slotName) { if (slotName == null) throw new IllegalArgumentException("slotName cannot be null."); Object[] slots = this.slots.items; for (int i = 0, n = this.slots.size; i < n; i++) { @@ -524,8 +522,7 @@ public class Skeleton { } /** The skeleton's current skin. */ - @Null - public Skin getSkin () { + public @Null Skin getSkin () { return skin; } @@ -573,8 +570,7 @@ public class Skeleton { * name. *

* See {@link #getAttachment(int, String)}. */ - @Null - public Attachment getAttachment (String slotName, String attachmentName) { + public @Null Attachment getAttachment (String slotName, String attachmentName) { SlotData slot = data.findSlot(slotName); if (slot == null) throw new IllegalArgumentException("Slot not found: " + slotName); return getAttachment(slot.getIndex(), attachmentName); @@ -584,8 +580,7 @@ public class Skeleton { * attachment name. First the skin is checked and if the attachment was not found, the default skin is checked. *

* See Runtime skins in the Spine Runtimes Guide. */ - @Null - public Attachment getAttachment (int slotIndex, String attachmentName) { + public @Null Attachment getAttachment (int slotIndex, String attachmentName) { if (attachmentName == null) throw new IllegalArgumentException("attachmentName cannot be null."); if (skin != null) { Attachment attachment = skin.getAttachment(slotIndex, attachmentName); @@ -618,8 +613,7 @@ public class Skeleton { /** Finds an IK constraint by comparing each IK constraint's name. It is more efficient to cache the results of this method * than to call it repeatedly. */ - @Null - public IkConstraint findIkConstraint (String constraintName) { + public @Null IkConstraint findIkConstraint (String constraintName) { if (constraintName == null) throw new IllegalArgumentException("constraintName cannot be null."); Object[] ikConstraints = this.ikConstraints.items; for (int i = 0, n = this.ikConstraints.size; i < n; i++) { @@ -636,8 +630,7 @@ public class Skeleton { /** Finds a transform constraint by comparing each transform constraint's name. It is more efficient to cache the results of * this method than to call it repeatedly. */ - @Null - public TransformConstraint findTransformConstraint (String constraintName) { + public @Null TransformConstraint findTransformConstraint (String constraintName) { if (constraintName == null) throw new IllegalArgumentException("constraintName cannot be null."); Object[] transformConstraints = this.transformConstraints.items; for (int i = 0, n = this.transformConstraints.size; i < n; i++) { @@ -654,8 +647,7 @@ public class Skeleton { /** Finds a path constraint by comparing each path constraint's name. It is more efficient to cache the results of this method * than to call it repeatedly. */ - @Null - public PathConstraint findPathConstraint (String constraintName) { + public @Null PathConstraint findPathConstraint (String constraintName) { if (constraintName == null) throw new IllegalArgumentException("constraintName cannot be null."); Object[] pathConstraints = this.pathConstraints.items; for (int i = 0, n = this.pathConstraints.size; i < n; i++) { diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java index bb67841bc..b2959d7c3 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java @@ -312,8 +312,7 @@ public class SkeletonBinary extends SkeletonLoader { return skeletonData; } - @Null - private Skin readSkin (SkeletonInput input, SkeletonData skeletonData, boolean defaultSkin, boolean nonessential) + private @Null Skin readSkin (SkeletonInput input, SkeletonData skeletonData, boolean defaultSkin, boolean nonessential) throws IOException { Skin skin; @@ -920,8 +919,7 @@ public class SkeletonBinary extends SkeletonLoader { super(file.read(512)); } - @Null - public String readStringRef () throws IOException { + public @Null String readStringRef () throws IOException { int index = readInt(true); return index == 0 ? null : strings[index - 1]; } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBounds.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBounds.java index f15729812..7b56406cd 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBounds.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBounds.java @@ -143,8 +143,7 @@ public class SkeletonBounds { /** Returns the first bounding box attachment that contains the point, or null. When doing many checks, it is usually more * efficient to only call this method if {@link #aabbContainsPoint(float, float)} returns true. */ - @Null - public BoundingBoxAttachment containsPoint (float x, float y) { + public @Null BoundingBoxAttachment containsPoint (float x, float y) { Object[] polygons = this.polygons.items; for (int i = 0, n = this.polygons.size; i < n; i++) if (containsPoint((FloatArray)polygons[i], x, y)) return boundingBoxes.get(i); @@ -174,8 +173,7 @@ public class SkeletonBounds { /** Returns the first bounding box attachment that contains any part of the line segment, or null. When doing many checks, it * is usually more efficient to only call this method if {@link #aabbIntersectsSegment(float, float, float, float)} returns * true. */ - @Null - public BoundingBoxAttachment intersectsSegment (float x1, float y1, float x2, float y2) { + public @Null BoundingBoxAttachment intersectsSegment (float x1, float y1, float x2, float y2) { Object[] polygons = this.polygons.items; for (int i = 0, n = this.polygons.size; i < n; i++) if (intersectsSegment((FloatArray)polygons[i], x1, y1, x2, y2)) return boundingBoxes.get(i); @@ -248,8 +246,7 @@ public class SkeletonBounds { } /** Returns the polygon for the specified bounding box, or null. */ - @Null - public FloatArray getPolygon (BoundingBoxAttachment boundingBox) { + public @Null FloatArray getPolygon (BoundingBoxAttachment boundingBox) { if (boundingBox == null) throw new IllegalArgumentException("boundingBox cannot be null."); int index = boundingBoxes.indexOf(boundingBox, true); return index == -1 ? null : polygons.get(index); diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonData.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonData.java index 4ef6ab341..8319d57be 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonData.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonData.java @@ -67,8 +67,7 @@ public class SkeletonData { /** Finds a bone by comparing each bone's name. It is more efficient to cache the results of this method than to call it * multiple times. */ - @Null - public BoneData findBone (String boneName) { + public @Null BoneData findBone (String boneName) { if (boneName == null) throw new IllegalArgumentException("boneName cannot be null."); Object[] bones = this.bones.items; for (int i = 0, n = this.bones.size; i < n; i++) { @@ -87,8 +86,7 @@ public class SkeletonData { /** Finds a slot by comparing each slot's name. It is more efficient to cache the results of this method than to call it * multiple times. */ - @Null - public SlotData findSlot (String slotName) { + public @Null SlotData findSlot (String slotName) { if (slotName == null) throw new IllegalArgumentException("slotName cannot be null."); Object[] slots = this.slots.items; for (int i = 0, n = this.slots.size; i < n; i++) { @@ -103,8 +101,7 @@ public class SkeletonData { /** The skeleton's default skin. By default this skin contains all attachments that were not in a skin in Spine. *

* See {@link Skeleton#getAttachment(int, String)}. */ - @Null - public Skin getDefaultSkin () { + public @Null Skin getDefaultSkin () { return defaultSkin; } @@ -114,8 +111,7 @@ public class SkeletonData { /** Finds a skin by comparing each skin's name. It is more efficient to cache the results of this method than to call it * multiple times. */ - @Null - public Skin findSkin (String skinName) { + public @Null Skin findSkin (String skinName) { if (skinName == null) throw new IllegalArgumentException("skinName cannot be null."); for (Skin skin : skins) if (skin.name.equals(skinName)) return skin; @@ -131,8 +127,7 @@ public class SkeletonData { /** Finds an event by comparing each events's name. It is more efficient to cache the results of this method than to call it * multiple times. */ - @Null - public EventData findEvent (String eventDataName) { + public @Null EventData findEvent (String eventDataName) { if (eventDataName == null) throw new IllegalArgumentException("eventDataName cannot be null."); for (EventData eventData : events) if (eventData.name.equals(eventDataName)) return eventData; @@ -153,8 +148,7 @@ public class SkeletonData { /** Finds an animation by comparing each animation's name. It is more efficient to cache the results of this method than to * call it multiple times. */ - @Null - public Animation findAnimation (String animationName) { + public @Null Animation findAnimation (String animationName) { if (animationName == null) throw new IllegalArgumentException("animationName cannot be null."); Object[] animations = this.animations.items; for (int i = 0, n = this.animations.size; i < n; i++) { @@ -173,8 +167,7 @@ public class SkeletonData { /** Finds an IK constraint by comparing each IK constraint's name. It is more efficient to cache the results of this method * than to call it multiple times. */ - @Null - public IkConstraintData findIkConstraint (String constraintName) { + public @Null IkConstraintData findIkConstraint (String constraintName) { if (constraintName == null) throw new IllegalArgumentException("constraintName cannot be null."); Object[] ikConstraints = this.ikConstraints.items; for (int i = 0, n = this.ikConstraints.size; i < n; i++) { @@ -193,8 +186,7 @@ public class SkeletonData { /** Finds a transform constraint by comparing each transform constraint's name. It is more efficient to cache the results of * this method than to call it multiple times. */ - @Null - public TransformConstraintData findTransformConstraint (String constraintName) { + public @Null TransformConstraintData findTransformConstraint (String constraintName) { if (constraintName == null) throw new IllegalArgumentException("constraintName cannot be null."); Object[] transformConstraints = this.transformConstraints.items; for (int i = 0, n = this.transformConstraints.size; i < n; i++) { @@ -213,8 +205,7 @@ public class SkeletonData { /** Finds a path constraint by comparing each path constraint's name. It is more efficient to cache the results of this method * than to call it multiple times. */ - @Null - public PathConstraintData findPathConstraint (String constraintName) { + public @Null PathConstraintData findPathConstraint (String constraintName) { if (constraintName == null) throw new IllegalArgumentException("constraintName cannot be null."); Object[] pathConstraints = this.pathConstraints.items; for (int i = 0, n = this.pathConstraints.size; i < n; i++) { @@ -227,8 +218,7 @@ public class SkeletonData { // --- /** The skeleton's name, which by default is the name of the skeleton data file, if possible. */ - @Null - public String getName () { + public @Null String getName () { return name; } @@ -273,8 +263,7 @@ public class SkeletonData { } /** The Spine version used to export the skeleton data, or null. */ - @Null - public String getVersion () { + public @Null String getVersion () { return version; } @@ -283,8 +272,7 @@ public class SkeletonData { } /** The skeleton data hash. This value will change if any of the skeleton data has changed. */ - @Null - public String getHash () { + public @Null String getHash () { return hash; } @@ -293,8 +281,7 @@ public class SkeletonData { } /** The path to the images directory as defined in Spine. Available only when nonessential data was exported. */ - @Null - public String getImagesPath () { + public @Null String getImagesPath () { return imagesPath; } @@ -303,8 +290,7 @@ public class SkeletonData { } /** The path to the audio directory as defined in Spine. Available only when nonessential data was exported. */ - @Null - public String getAudioPath () { + public @Null String getAudioPath () { return audioPath; } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRenderer.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRenderer.java index 862ddd20c..231f5489c 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRenderer.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRenderer.java @@ -448,8 +448,7 @@ public class SkeletonRenderer { this.premultipliedAlpha = premultipliedAlpha; } - @Null - public VertexEffect getVertexEffect () { + public @Null VertexEffect getVertexEffect () { return vertexEffect; } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skin.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skin.java index d52feaa16..7b65396d9 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skin.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skin.java @@ -94,8 +94,7 @@ public class Skin { } /** Returns the attachment for the specified slot index and name, or null. */ - @Null - public Attachment getAttachment (int slotIndex, String name) { + public @Null Attachment getAttachment (int slotIndex, String name) { lookup.set(slotIndex, name); SkinEntry entry = attachments.get(lookup); return entry != null ? entry.attachment : null; diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Slot.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Slot.java index 622d771e8..a71a9fa2d 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Slot.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Slot.java @@ -95,14 +95,12 @@ public class Slot { /** The dark color used to tint the slot's attachment for two color tinting, or null if two color tinting is not used. The dark * color's alpha is not used. */ - @Null - public Color getDarkColor () { + public @Null Color getDarkColor () { return darkColor; } /** The current attachment for the slot, or null if the slot has no attachment. */ - @Null - public Attachment getAttachment () { + public @Null Attachment getAttachment () { return attachment; } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SlotData.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SlotData.java index 8497f6849..f002cf454 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SlotData.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SlotData.java @@ -74,8 +74,7 @@ public class SlotData { /** The dark color used to tint the slot's attachment for two color tinting, or null if two color tinting is not used. The dark * color's alpha is not used. */ - @Null - public Color getDarkColor () { + public @Null Color getDarkColor () { return darkColor; } @@ -88,8 +87,7 @@ public class SlotData { } /** The name of the attachment that is visible for this slot in the setup pose, or null if no attachment is visible. */ - @Null - public String getAttachmentName () { + public @Null String getAttachmentName () { return attachmentName; } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/AttachmentLoader.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/AttachmentLoader.java index 74e2fdf0f..53d59fcba 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/AttachmentLoader.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/AttachmentLoader.java @@ -39,26 +39,20 @@ import com.esotericsoftware.spine.Skin; * Runtimes Guide. */ public interface AttachmentLoader { /** @return May be null to not load the attachment. */ - @Null - public RegionAttachment newRegionAttachment (Skin skin, String name, String path); + public @Null RegionAttachment newRegionAttachment (Skin skin, String name, String path); /** @return May be null to not load the attachment. */ - @Null - public MeshAttachment newMeshAttachment (Skin skin, String name, String path); + public @Null MeshAttachment newMeshAttachment (Skin skin, String name, String path); /** @return May be null to not load the attachment. */ - @Null - public BoundingBoxAttachment newBoundingBoxAttachment (Skin skin, String name); + public @Null BoundingBoxAttachment newBoundingBoxAttachment (Skin skin, String name); /** @return May be null to not load the attachment. */ - @Null - public ClippingAttachment newClippingAttachment (Skin skin, String name); + public @Null ClippingAttachment newClippingAttachment (Skin skin, String name); /** @return May be null to not load the attachment. */ - @Null - public PathAttachment newPathAttachment (Skin skin, String name); + public @Null PathAttachment newPathAttachment (Skin skin, String name); /** @return May be null to not load the attachment. */ - @Null - public PointAttachment newPointAttachment (Skin skin, String name); + public @Null PointAttachment newPointAttachment (Skin skin, String name); } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/VertexAttachment.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/VertexAttachment.java index 835edd629..608ec44a1 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/VertexAttachment.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/VertexAttachment.java @@ -123,8 +123,7 @@ abstract public class VertexAttachment extends Attachment { /** Deform keys for the deform attachment are also applied to this attachment. * @return May be null if no deform keys should be applied. */ - @Null - public VertexAttachment getDeformAttachment () { + public @Null VertexAttachment getDeformAttachment () { return deformAttachment; } @@ -136,8 +135,7 @@ abstract public class VertexAttachment extends Attachment { /** The bones which affect the {@link #getVertices()}. The array entries are, for each vertex, the number of bones affecting * the vertex followed by that many bone indices, which is the index of the bone in {@link Skeleton#getBones()}. Will be null * if this attachment has no weights. */ - @Null - public int[] getBones () { + public @Null int[] getBones () { return bones; }