From 0dd4233ec3e91ba93577ec61177c882ca34e7cf2 Mon Sep 17 00:00:00 2001 From: La VloZ Date: Sun, 26 Jan 2014 17:51:11 +0100 Subject: [PATCH] I have deleted some warnings :) --- src/com/github/puzzles/core/AbstractRectangularPuzzle.java | 2 +- .../core/NoEmptyCaseAdjacentSlidingPuzzleExecption.java | 5 +++++ .../puzzles/core/PersonalisedDifficultyException.java | 5 +++++ .../core/RectangularPuzzleIndexOutOfBoundsException.java | 5 +++++ src/com/github/puzzles/core/SlidingPuzzle.java | 14 +++++++------- src/com/github/puzzles/gui/AboutMeDialog.java | 9 ++++++--- src/com/github/puzzles/gui/FlippingPuzzlePanel.java | 5 +++++ src/com/github/puzzles/gui/SlidingPuzzlePanel.java | 5 +++++ test/com/github/puzzles/test/Main.java | 6 +++--- test/com/github/puzzles/test/MatricesTest.java | 8 ++------ test/com/github/puzzles/test/SlidingTest.java | 6 +----- 11 files changed, 45 insertions(+), 25 deletions(-) diff --git a/src/com/github/puzzles/core/AbstractRectangularPuzzle.java b/src/com/github/puzzles/core/AbstractRectangularPuzzle.java index 2ae8ba2..c1321eb 100644 --- a/src/com/github/puzzles/core/AbstractRectangularPuzzle.java +++ b/src/com/github/puzzles/core/AbstractRectangularPuzzle.java @@ -6,7 +6,6 @@ package com.github.puzzles.core; import java.util.Arrays; import com.github.puzzles.util.Matrices; -import java.util.Random; public abstract class AbstractRectangularPuzzle extends AbstractPuzzle { @@ -88,6 +87,7 @@ public abstract class AbstractRectangularPuzzle extends AbstractPuzzle { * @see java.lang.Object#equals(java.lang.Object) */ @Override + @SuppressWarnings("rawtypes") public boolean equals(Object obj) { if (this == obj) { return true; diff --git a/src/com/github/puzzles/core/NoEmptyCaseAdjacentSlidingPuzzleExecption.java b/src/com/github/puzzles/core/NoEmptyCaseAdjacentSlidingPuzzleExecption.java index c1ab876..9f72de4 100644 --- a/src/com/github/puzzles/core/NoEmptyCaseAdjacentSlidingPuzzleExecption.java +++ b/src/com/github/puzzles/core/NoEmptyCaseAdjacentSlidingPuzzleExecption.java @@ -12,4 +12,9 @@ package com.github.puzzles.core; */ public class NoEmptyCaseAdjacentSlidingPuzzleExecption extends RuntimeException { + /** + * + */ + private static final long serialVersionUID = -9215866099344609257L; + } diff --git a/src/com/github/puzzles/core/PersonalisedDifficultyException.java b/src/com/github/puzzles/core/PersonalisedDifficultyException.java index 3347972..08767c2 100644 --- a/src/com/github/puzzles/core/PersonalisedDifficultyException.java +++ b/src/com/github/puzzles/core/PersonalisedDifficultyException.java @@ -2,4 +2,9 @@ package com.github.puzzles.core; public class PersonalisedDifficultyException extends RuntimeException { + /** + * + */ + private static final long serialVersionUID = 984870086601632505L; + } diff --git a/src/com/github/puzzles/core/RectangularPuzzleIndexOutOfBoundsException.java b/src/com/github/puzzles/core/RectangularPuzzleIndexOutOfBoundsException.java index 98dcb66..7bb567a 100644 --- a/src/com/github/puzzles/core/RectangularPuzzleIndexOutOfBoundsException.java +++ b/src/com/github/puzzles/core/RectangularPuzzleIndexOutOfBoundsException.java @@ -13,4 +13,9 @@ package com.github.puzzles.core; public class RectangularPuzzleIndexOutOfBoundsException extends RuntimeException { + /** + * + */ + private static final long serialVersionUID = -3574940876834216117L; + } diff --git a/src/com/github/puzzles/core/SlidingPuzzle.java b/src/com/github/puzzles/core/SlidingPuzzle.java index 5dfac3a..b1f8ed1 100644 --- a/src/com/github/puzzles/core/SlidingPuzzle.java +++ b/src/com/github/puzzles/core/SlidingPuzzle.java @@ -28,29 +28,29 @@ public class SlidingPuzzle extends AbstractRectangularPuzzle implements } private static Integer[][] makeCorrectPuzzleHelper(int width, int height) { - Integer[][] integersMatrix = new Integer[width][height]; + Integer[][] puzzle = new Integer[width][height]; for (int i = 0, k = 1; i < width; i++) { for (int j = 0; j < height; j++, k++) { - integersMatrix[i][j] = k; + puzzle[i][j] = k; } } - integersMatrix[width - 1][height - 1] = 0; + puzzle[width - 1][height - 1] = 0; - return integersMatrix; + return puzzle; } private static Integer[][] makePuzzleHelper(int width, int height) { - Integer[][] integersMatrix = makeCorrectPuzzleHelper(width, height); + Integer[][] puzzle = makeCorrectPuzzleHelper(width, height); Random randoms = new Random(); for (int i = 0; i < MAX_SWAP; i++) { - Matrices.swap(integersMatrix, randoms.nextInt(width), + Matrices.swap(puzzle, randoms.nextInt(width), randoms.nextInt(width), randoms.nextInt(height), randoms.nextInt(height)); } - return integersMatrix; + return puzzle; } private static Integer[][] makePuzzleFromDifficultyHelper( diff --git a/src/com/github/puzzles/gui/AboutMeDialog.java b/src/com/github/puzzles/gui/AboutMeDialog.java index 0a7b0c4..6ec82f5 100644 --- a/src/com/github/puzzles/gui/AboutMeDialog.java +++ b/src/com/github/puzzles/gui/AboutMeDialog.java @@ -3,15 +3,18 @@ package com.github.puzzles.gui; import java.awt.BorderLayout; import java.awt.FlowLayout; -import javax.swing.JButton; import javax.swing.JDialog; -import javax.swing.JPanel; -import javax.swing.border.EmptyBorder; import javax.swing.JLabel; +import javax.swing.JPanel; import javax.swing.SwingConstants; +import javax.swing.border.EmptyBorder; public class AboutMeDialog extends JDialog { + /** + * + */ + private static final long serialVersionUID = -3200331392530781095L; private final JPanel contentPanel = new JPanel(); /** diff --git a/src/com/github/puzzles/gui/FlippingPuzzlePanel.java b/src/com/github/puzzles/gui/FlippingPuzzlePanel.java index c43becd..76eaa9a 100644 --- a/src/com/github/puzzles/gui/FlippingPuzzlePanel.java +++ b/src/com/github/puzzles/gui/FlippingPuzzlePanel.java @@ -5,6 +5,11 @@ import javax.swing.JPanel; public class FlippingPuzzlePanel extends JPanel { /** + * + */ + private static final long serialVersionUID = 4872124821136999470L; + + /** * Create the panel. */ public FlippingPuzzlePanel() { diff --git a/src/com/github/puzzles/gui/SlidingPuzzlePanel.java b/src/com/github/puzzles/gui/SlidingPuzzlePanel.java index ec082e0..1dcab6e 100644 --- a/src/com/github/puzzles/gui/SlidingPuzzlePanel.java +++ b/src/com/github/puzzles/gui/SlidingPuzzlePanel.java @@ -5,6 +5,11 @@ import javax.swing.JPanel; public class SlidingPuzzlePanel extends JPanel { /** + * + */ + private static final long serialVersionUID = -2769199725994710949L; + + /** * Create the panel. */ public SlidingPuzzlePanel() { diff --git a/test/com/github/puzzles/test/Main.java b/test/com/github/puzzles/test/Main.java index 93784da..8367c5c 100644 --- a/test/com/github/puzzles/test/Main.java +++ b/test/com/github/puzzles/test/Main.java @@ -1,8 +1,8 @@ package com.github.puzzles.test; -import java.awt.Point; - -import com.github.puzzles.core.*; +import com.github.puzzles.core.AbstractRectangularPuzzle; +import com.github.puzzles.core.Difficulty; +import com.github.puzzles.core.FlippingPuzzle; public class Main { diff --git a/test/com/github/puzzles/test/MatricesTest.java b/test/com/github/puzzles/test/MatricesTest.java index b800b48..671d3d9 100644 --- a/test/com/github/puzzles/test/MatricesTest.java +++ b/test/com/github/puzzles/test/MatricesTest.java @@ -1,15 +1,11 @@ package com.github.puzzles.test; -import static org.junit.Assert.*; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; import org.junit.Test; -import com.github.puzzles.core.Difficulty; -import com.github.puzzles.core.FlippingPuzzle; -import com.github.puzzles.core.SlidingPuzzle; import com.github.puzzles.util.Matrices; -import java.util.Arrays; -import static org.hamcrest.CoreMatchers.is; public class MatricesTest { diff --git a/test/com/github/puzzles/test/SlidingTest.java b/test/com/github/puzzles/test/SlidingTest.java index 25c8982..e0ebfd5 100644 --- a/test/com/github/puzzles/test/SlidingTest.java +++ b/test/com/github/puzzles/test/SlidingTest.java @@ -6,17 +6,13 @@ package com.github.puzzles.test; -import com.github.puzzles.core.SlidingPuzzle; - -import static org.hamcrest.CoreMatchers.is; - import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; +import com.github.puzzles.core.SlidingPuzzle; /** * -- 2.11.4.GIT