From 363eca663ca48bc71d11634151218f967b1456ba Mon Sep 17 00:00:00 2001 From: Peter Tissen Date: Mon, 25 May 2015 17:00:56 +0200 Subject: [PATCH 1/2] Fix some javadoc 8 errors This fixes the errors in the opsu src that the new html linter in the Java 8 javadoc tool catches and classifies as error (unless the linter is explicitly disabled) --- src/itdelatrisu/opsu/MenuButton.java | 2 +- src/itdelatrisu/opsu/beatmap/BeatmapSet.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/itdelatrisu/opsu/MenuButton.java b/src/itdelatrisu/opsu/MenuButton.java index de04a0e3..60700cde 100644 --- a/src/itdelatrisu/opsu/MenuButton.java +++ b/src/itdelatrisu/opsu/MenuButton.java @@ -146,7 +146,7 @@ public class MenuButton { * Sets text to draw in the middle of the button. * @param text the text to draw * @param font the font to use when drawing - * @color the color to draw the text + * @param color the color to draw the text */ public void setText(String text, Font font, Color color) { this.text = text; diff --git a/src/itdelatrisu/opsu/beatmap/BeatmapSet.java b/src/itdelatrisu/opsu/beatmap/BeatmapSet.java index 256a41dd..8ba0693b 100644 --- a/src/itdelatrisu/opsu/beatmap/BeatmapSet.java +++ b/src/itdelatrisu/opsu/beatmap/BeatmapSet.java @@ -139,7 +139,7 @@ public class BeatmapSet { /** * Checks whether the beatmap set matches a given condition. * @param type the condition type (ar, cs, od, hp, bpm, length) - * @param operator the operator (=/==, >, >=, <, <=) + * @param operator the operator {@literal (=/==, >, >=, <, <=)} * @param value the value * @return true if the condition is met */ From 6e7f5e17dcbbdcf399bec4cb65be19ce97f772a1 Mon Sep 17 00:00:00 2001 From: Peter Tissen Date: Mon, 25 May 2015 17:02:54 +0200 Subject: [PATCH 2/2] Fix some javadoc 8 errors in libs This fixes the errors in the libraries that opsu uses that the new html linter in the Java 8 javadoc tool catches and classifies as error. Whether or not this should be merged or whether this should be fixed upstream first is for someone else to decide :P --- src/org/newdawn/slick/GameContainer.java | 4 ++-- src/org/newdawn/slick/Image.java | 4 ++-- src/org/newdawn/slick/Music.java | 2 +- src/org/newdawn/slick/openal/OpenALStreamPlayer.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/org/newdawn/slick/GameContainer.java b/src/org/newdawn/slick/GameContainer.java index 3c6cff2d..01c7604f 100644 --- a/src/org/newdawn/slick/GameContainer.java +++ b/src/org/newdawn/slick/GameContainer.java @@ -555,8 +555,8 @@ public abstract class GameContainer implements GUIContext { * bottom. * * @param ref The reference to the image to be loaded - * @param x The x-coordinate of the cursor hotspot (left -> right) - * @param y The y-coordinate of the cursor hotspot (bottom -> top) + * @param x The x-coordinate of the cursor hotspot (left {@literal ->} right) + * @param y The y-coordinate of the cursor hotspot (bottom {@literal ->} top) * @param width The x width of the cursor * @param height The y height of the cursor * @param cursorDelays image delays between changing frames in animation diff --git a/src/org/newdawn/slick/Image.java b/src/org/newdawn/slick/Image.java index 05027b9b..1737a808 100644 --- a/src/org/newdawn/slick/Image.java +++ b/src/org/newdawn/slick/Image.java @@ -935,7 +935,7 @@ public class Image implements Renderable { /** * Set the angle to rotate this image to. The angle will be normalized to - * be 0 <= angle < 360. The image will be rotated around its center. + * be {@literal 0 <= angle < 360}. The image will be rotated around its center. * * @param angle The angle to be set */ @@ -973,7 +973,7 @@ public class Image implements Renderable { /** * Add the angle provided to the current rotation. The angle will be normalized to - * be 0 <= angle < 360. The image will be rotated around its center. + * be {@literal 0 <= angle < 360}. The image will be rotated around its center. * * @param angle The angle to add. */ diff --git a/src/org/newdawn/slick/Music.java b/src/org/newdawn/slick/Music.java index e15b7ee5..36dd3ca5 100644 --- a/src/org/newdawn/slick/Music.java +++ b/src/org/newdawn/slick/Music.java @@ -42,7 +42,7 @@ import org.newdawn.slick.util.Log; * play at any given time and a channel is reserved so music will always play. * * @author kevin - * @author Nathan Sweet + * @author Nathan Sweet {@literal } */ @SuppressWarnings({"rawtypes", "unchecked"}) public class Music { diff --git a/src/org/newdawn/slick/openal/OpenALStreamPlayer.java b/src/org/newdawn/slick/openal/OpenALStreamPlayer.java index 8fbe3694..2e737886 100644 --- a/src/org/newdawn/slick/openal/OpenALStreamPlayer.java +++ b/src/org/newdawn/slick/openal/OpenALStreamPlayer.java @@ -46,7 +46,7 @@ import org.newdawn.slick.util.ResourceLoader; * as required. * * @author Kevin Glass - * @author Nathan Sweet + * @author Nathan Sweet {@literal } * @author Rockstar play and setPosition cleanup */ public class OpenALStreamPlayer {