From 0d8dc746fce805f62dc90d9f721a0c866bb23e3c Mon Sep 17 00:00:00 2001 From: Sylvain Vedrenne Date: Fri, 28 Dec 2012 19:39:05 +0100 Subject: [PATCH] Fixed lots of warnings --- .../net/jankenpoi/sudokuki/generator/SudokuGenerator.java | 2 +- .../net/jankenpoi/sudokuki/generator/suexg/SuexgJava.java | 10 +++++----- .../net/jankenpoi/sudokuki/model/GridChangedEvent.java | 2 +- src/classes/net/jankenpoi/sudokuki/model/GridModel.java | 6 +++--- .../net/jankenpoi/sudokuki/preferences/UserPreferences.java | 2 +- .../net/jankenpoi/sudokuki/solver/BruteForceGridSolver.java | 2 +- .../net/jankenpoi/sudokuki/ui/swing/AboutAction.java | 4 +--- src/classes/net/jankenpoi/sudokuki/ui/swing/CheatMenu.java | 4 ++-- .../net/jankenpoi/sudokuki/ui/swing/CheckUpdateDialog.java | 13 +++++-------- .../jankenpoi/sudokuki/ui/swing/ClearAllMovesAction.java | 3 +-- .../net/jankenpoi/sudokuki/ui/swing/CustomGridAction.java | 3 +-- src/classes/net/jankenpoi/sudokuki/ui/swing/EditMenu.java | 8 ++++---- .../jankenpoi/sudokuki/ui/swing/EraseAllMemosAction.java | 3 +-- src/classes/net/jankenpoi/sudokuki/ui/swing/FileMenu.java | 6 +++--- .../jankenpoi/sudokuki/ui/swing/GridGenerationDialog.java | 4 ++-- src/classes/net/jankenpoi/sudokuki/ui/swing/HelpMenu.java | 9 ++++----- src/classes/net/jankenpoi/sudokuki/ui/swing/LevelMenu.java | 4 ++-- src/classes/net/jankenpoi/sudokuki/ui/swing/MenuBar.java | 2 +- .../net/jankenpoi/sudokuki/ui/swing/OpenGridAction.java | 2 +- .../jankenpoi/sudokuki/ui/swing/PlayCustomGridAction.java | 3 +-- .../net/jankenpoi/sudokuki/ui/swing/ResolveAction.java | 2 +- .../net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java | 13 ++++++------- .../net/jankenpoi/sudokuki/ui/swing/SaveAsAction.java | 2 +- .../net/jankenpoi/sudokuki/ui/swing/SelectMemosPanel.java | 8 ++++---- .../net/jankenpoi/sudokuki/ui/swing/SetAllMemosAction.java | 3 +-- .../net/jankenpoi/sudokuki/ui/swing/SetMemosHereAction.java | 3 +-- src/classes/net/jankenpoi/sudokuki/view/GridView.java | 2 +- 27 files changed, 56 insertions(+), 69 deletions(-) diff --git a/src/classes/net/jankenpoi/sudokuki/generator/SudokuGenerator.java b/src/classes/net/jankenpoi/sudokuki/generator/SudokuGenerator.java index abb1ec0..cd27409 100644 --- a/src/classes/net/jankenpoi/sudokuki/generator/SudokuGenerator.java +++ b/src/classes/net/jankenpoi/sudokuki/generator/SudokuGenerator.java @@ -12,7 +12,7 @@ public abstract class SudokuGenerator { System.out.println(); if (i % 27 == 0) System.out.println(); - System.out.print("" + (tab[i] == 0 ? "-" : tab[i])); + System.out.print("" + (tab[i] == 0 ? "-" : Integer.valueOf(tab[i]))); } System.out.println(); } diff --git a/src/classes/net/jankenpoi/sudokuki/generator/suexg/SuexgJava.java b/src/classes/net/jankenpoi/sudokuki/generator/suexg/SuexgJava.java index 62d9bf5..31163ae 100644 --- a/src/classes/net/jankenpoi/sudokuki/generator/suexg/SuexgJava.java +++ b/src/classes/net/jankenpoi/sudokuki/generator/suexg/SuexgJava.java @@ -216,7 +216,7 @@ class SuexgJava extends SuexgGenerator { // mr1: if (gotoMR1) { gotoMR1 = false; - i1 = (int) (MWC() >> 8) & 127; + i1 = (MWC() >> 8) & 127; if (i1 > 80) { gotoMR1 = true; continue; // these 2 instructions stand for: goto mr1; @@ -232,7 +232,7 @@ class SuexgJava extends SuexgGenerator { // mr3: if (gotoMR3) { gotoMR3 = false; - s = (int) (MWC() >> 9) & 15; + s = (MWC() >> 9) & 15; if (s > 8) { gotoMR3 = true; continue; // these 2 instructions stand for: goto mr3; @@ -268,7 +268,7 @@ class SuexgJava extends SuexgGenerator { x = i; while (x >= i) { // mr4: - x = (int) (MWC() >> 8) & 127; + x = (MWC() >> 8) & 127; } x++; P[i] = P[x]; @@ -393,7 +393,7 @@ class SuexgJava extends SuexgGenerator { w++; W[w] = c; } - ; + if (V[c] < min) { w = 1; W[w] = c; @@ -408,7 +408,7 @@ class SuexgJava extends SuexgGenerator { if (gotoMR) { gotoMR = false; - c2 = (int) (MWC() & Two[w]); + c2 = (MWC() & Two[w]); if (c2 >= w) { gotoMR = true; continue; // simulates: goto mr; diff --git a/src/classes/net/jankenpoi/sudokuki/model/GridChangedEvent.java b/src/classes/net/jankenpoi/sudokuki/model/GridChangedEvent.java index 276238d..36846c0 100644 --- a/src/classes/net/jankenpoi/sudokuki/model/GridChangedEvent.java +++ b/src/classes/net/jankenpoi/sudokuki/model/GridChangedEvent.java @@ -38,7 +38,7 @@ public class GridChangedEvent extends EventObject { } public short getInfos() { - return (short)infos; + return infos; } } diff --git a/src/classes/net/jankenpoi/sudokuki/model/GridModel.java b/src/classes/net/jankenpoi/sudokuki/model/GridModel.java index f230ded..4f88983 100644 --- a/src/classes/net/jankenpoi/sudokuki/model/GridModel.java +++ b/src/classes/net/jankenpoi/sudokuki/model/GridModel.java @@ -85,8 +85,8 @@ public class GridModel implements Cloneable { } private void newGrid() { - final int minRating = UserPreferences.getInstance().getInteger("minRating", 0); - final int maxRating = UserPreferences.getInstance().getInteger("maxRating", Integer.MAX_VALUE); + final int minRating = UserPreferences.getInstance().getInteger("minRating", Integer.valueOf(0)).intValue(); + final int maxRating = UserPreferences.getInstance().getInteger("maxRating", Integer.valueOf(Integer.MAX_VALUE)).intValue(); SudokuGrid grid = SudokuGeneratorFactory.getGenerator().generateGrid(minRating, maxRating); for (int i = 0; i < cellInfos.length; i++) { @@ -111,7 +111,7 @@ public class GridModel implements Cloneable { .println("GridModel.GridModel() length:" + strValues.length()); System.out.println("GridModel.GridModel() strValues:" + strValues); for (int i = 0; i < strValues.length(); i++) { - short value = Short.valueOf(strValues.substring(i, i + 1)); + short value = Short.valueOf(strValues.substring(i, i + 1)).shortValue(); System.out.print(value); cellInfos[i] = value; if (1 <= value && value <= 9) { diff --git a/src/classes/net/jankenpoi/sudokuki/preferences/UserPreferences.java b/src/classes/net/jankenpoi/sudokuki/preferences/UserPreferences.java index 71736dd..ca2fa1a 100644 --- a/src/classes/net/jankenpoi/sudokuki/preferences/UserPreferences.java +++ b/src/classes/net/jankenpoi/sudokuki/preferences/UserPreferences.java @@ -9,7 +9,7 @@ public class UserPreferences { static { INSTANCE.set("minRating", Integer.valueOf(0)); INSTANCE.set("maxRating", Integer.valueOf(5700)); - INSTANCE.set("kanjiMode", Boolean.FALSE); + INSTANCE.set("numbersMode", Integer.valueOf(0)); } private final HashMap map = new HashMap(); diff --git a/src/classes/net/jankenpoi/sudokuki/solver/BruteForceGridSolver.java b/src/classes/net/jankenpoi/sudokuki/solver/BruteForceGridSolver.java index e591314..0fc4d43 100755 --- a/src/classes/net/jankenpoi/sudokuki/solver/BruteForceGridSolver.java +++ b/src/classes/net/jankenpoi/sudokuki/solver/BruteForceGridSolver.java @@ -28,7 +28,7 @@ public class BruteForceGridSolver implements GridSolver { private boolean cancelRequested() { synchronized (cancelled) { - return cancelled; + return cancelled.booleanValue(); } } diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/AboutAction.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/AboutAction.java index a150e7b..3d48de5 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/AboutAction.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/AboutAction.java @@ -20,7 +20,6 @@ package net.jankenpoi.sudokuki.ui.swing; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; -import javax.swing.Icon; import javax.swing.JFrame; @SuppressWarnings("serial") @@ -28,8 +27,7 @@ public class AboutAction extends AbstractAction { private JFrame parent; - public AboutAction(JFrame parent, SwingGrid grid, String string, Icon iconHelpAbout, - String desc, Integer mnemonic) { + public AboutAction(JFrame parent) { this.parent = parent; } diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/CheatMenu.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/CheatMenu.java index 235344a..3152656 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/CheatMenu.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/CheatMenu.java @@ -60,12 +60,12 @@ public class CheatMenu extends JMenu implements L10nComponent { private final Action actionResolve; public CheatMenu(ActionsRepository actions, JFrame parent, GridView view) { - actionSetMemosHere = new SetMemosHereAction(parent, _("Memos"), + actionSetMemosHere = new SetMemosHereAction(_("Memos"), StockIcons.ICON_SET_MEMOS_HERE, _("Set memos"), new Integer( KeyEvent.VK_T), view); actions.put("SetMemosHere", actionSetMemosHere); - actionSetAllMemos = new SetAllMemosAction(parent, _("All memos"), + actionSetAllMemos = new SetAllMemosAction(_("All memos"), StockIcons.ICON_SET_ALL_MEMOS, _("Set memos in all cells"), new Integer( KeyEvent.VK_X), view); actions.put("SetAllMemos", actionSetAllMemos); diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/CheckUpdateDialog.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/CheckUpdateDialog.java index d94dc9c..adb3d98 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/CheckUpdateDialog.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/CheckUpdateDialog.java @@ -28,6 +28,7 @@ import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; +import java.net.UnknownHostException; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; @@ -80,14 +81,8 @@ public class CheckUpdateDialog extends JDialog { result = 1; } } catch (InterruptedException e) { - System.out - .println("CheckUpdateDialog.worker.new SwingWorker() {...}.done() Interrupted !!!!"); } catch (ExecutionException e) { - System.out - .println("CheckUpdateDialog.worker.new SwingWorker() {...}.done() ExecutionException !!!!"); } catch (CancellationException e) { - System.out - .println("CheckUpdateDialog.worker.new SwingWorker() {...}.done() CancellationException !!!!"); result = -2; } finally { CheckUpdateDialog.this.dispose(); @@ -113,11 +108,13 @@ public class CheckUpdateDialog extends JDialog { line = dis.readLine(); } catch (MalformedURLException mue) { mue.printStackTrace(); + } catch (UnknownHostException uhe) { } catch (IOException ioe) { - ioe.printStackTrace(); } finally { try { - dis.close(); + if (dis != null) { + dis.close(); + } } catch (IOException e) { e.printStackTrace(); } diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/ClearAllMovesAction.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/ClearAllMovesAction.java index d293766..f416ba7 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/ClearAllMovesAction.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/ClearAllMovesAction.java @@ -21,7 +21,6 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Icon; -import javax.swing.JFrame; import net.jankenpoi.sudokuki.view.GridView; @@ -30,7 +29,7 @@ public class ClearAllMovesAction extends AbstractAction { private GridView view; - public ClearAllMovesAction(JFrame parent, String text, Icon icon, + public ClearAllMovesAction(String text, Icon icon, String desc, Integer mnemonic, GridView view) { super(text, icon); diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/CustomGridAction.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/CustomGridAction.java index ee73a54..8216e60 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/CustomGridAction.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/CustomGridAction.java @@ -21,7 +21,6 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Icon; -import javax.swing.JFrame; import net.jankenpoi.sudokuki.view.GridView; @@ -30,7 +29,7 @@ public class CustomGridAction extends AbstractAction { private GridView view; - public CustomGridAction(JFrame parent, String text, Icon icon, + public CustomGridAction(String text, Icon icon, String desc, Integer mnemonic, GridView view) { super(text, icon); diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/EditMenu.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/EditMenu.java index f756492..0c3211d 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/EditMenu.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/EditMenu.java @@ -67,22 +67,22 @@ public class EditMenu extends JMenu implements L10nComponent { getAccessibleContext().setAccessibleDescription( "Edit menu"); - actionClearAllMoves = new ClearAllMovesAction(parent, "Clear all moves", + actionClearAllMoves = new ClearAllMovesAction("Clear all moves", StockIcons.ICON_CLEAR, "Clear all my moves", new Integer( KeyEvent.VK_X), view); actions.put("ClearAllMoves", actionClearAllMoves); - actionEraseAllMemos = new EraseAllMemosAction(parent, "Erase all memos", + actionEraseAllMemos = new EraseAllMemosAction("Erase all memos", StockIcons.ICON_CLEAR_ALL_MEMOS, "Erase all memos...", new Integer( KeyEvent.VK_X), view); actions.put("EraseAllMemos", actionEraseAllMemos); - actionCustomGrid = new CustomGridAction(parent, "Custom grid", + actionCustomGrid = new CustomGridAction("Custom grid", StockIcons.ICON_EDIT, "Compose a custom grid...", new Integer( KeyEvent.VK_G), view); actions.put("CustomGrid", actionCustomGrid); - actionPlayCustomGrid = new PlayCustomGridAction(parent, "Play custom grid", + actionPlayCustomGrid = new PlayCustomGridAction("Play custom grid", StockIcons.ICON_PLAY, "Play with current grid...", new Integer( KeyEvent.VK_H), view); actions.put("PlayCustomGrid", actionPlayCustomGrid); diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/EraseAllMemosAction.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/EraseAllMemosAction.java index 9b2e3ca..7f5a84b 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/EraseAllMemosAction.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/EraseAllMemosAction.java @@ -21,7 +21,6 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Icon; -import javax.swing.JFrame; import net.jankenpoi.sudokuki.view.GridView; @@ -30,7 +29,7 @@ public class EraseAllMemosAction extends AbstractAction { private GridView view; - public EraseAllMemosAction(JFrame parent, String text, Icon icon, + public EraseAllMemosAction(String text, Icon icon, String desc, Integer mnemonic, GridView view) { super(text, icon); diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/FileMenu.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/FileMenu.java index ca63ea5..4f84a20 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/FileMenu.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/FileMenu.java @@ -94,14 +94,14 @@ public class FileMenu extends JMenu implements L10nComponent { actionNew = new NewGridAction(parent, view, actions); actions.put("NewGrid", actionNew); - actionOpen = new OpenGridAction(parent, view, actions); + actionOpen = new OpenGridAction(parent, view); actions.put("OpenGrid", actionOpen); - actionSaveAs = new SaveAsAction(parent, view, actions); + actionSaveAs = new SaveAsAction(parent, view); actions.put("SaveAs", actionSaveAs); actionPrint = new PrintAction(grid); actions.put("Print", actionPrint); actionPrintMulti = new PrintMultiAction(parent, view); - actions.put("PrintMulti", actionPrintMulti);; + actions.put("PrintMulti", actionPrintMulti); addItems(); setL10nMessages(null, _("DETECTED_LANGUAGE")); localeListener = new LocaleListenerImpl(this); diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/GridGenerationDialog.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/GridGenerationDialog.java index d5e704d..2d91388 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/GridGenerationDialog.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/GridGenerationDialog.java @@ -134,9 +134,9 @@ public class GridGenerationDialog extends JDialog { dispose(); } - private int generateGrid() { + private Integer generateGrid() { view.getController().notifyNewGridRequested(); - return 0; + return Integer.valueOf(0); } } diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/HelpMenu.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/HelpMenu.java index 5cc4749..d38df7e 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/HelpMenu.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/HelpMenu.java @@ -30,7 +30,6 @@ import javax.swing.JMenuItem; import net.jankenpoi.i18n.I18n; import net.jankenpoi.i18n.LocaleListener; import net.jankenpoi.sudokuki.ui.L10nComponent; -import net.jankenpoi.sudokuki.view.GridView; @SuppressWarnings("serial") public class HelpMenu extends JMenu implements L10nComponent { @@ -71,7 +70,7 @@ public class HelpMenu extends JMenu implements L10nComponent { actionAbout.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_P)); } - HelpMenu(ActionsRepository actions, JFrame frame, SwingGrid grid, GridView view) { + HelpMenu(ActionsRepository actions, JFrame frame) { this.parent = frame; setMnemonic(KeyEvent.VK_H); getAccessibleContext().setAccessibleDescription( @@ -85,15 +84,15 @@ public class HelpMenu extends JMenu implements L10nComponent { actionTranslate = new TranslateAction(parent); actions.put("Translate", actionTranslate); - actionAbout = new AboutAction(parent, grid, "", null, "", Integer.valueOf(0)); + actionAbout = new AboutAction(parent); actions.put("About", actionAbout); - addItems(view); + addItems(); setL10nMessages(null, _("DETECTED_LANGUAGE")); localeListener = new LocaleListenerImpl(this); I18n.addLocaleListener(localeListener); } - private void addItems(GridView view) { + private void addItems() { itemCheckUpdate.setAction(actionCheckUpdate); add(itemCheckUpdate); diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/LevelMenu.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/LevelMenu.java index b01706a..069df64 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/LevelMenu.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/LevelMenu.java @@ -133,8 +133,8 @@ public class LevelMenu extends JMenu implements L10nComponent { } private void setLevelRatingBounds(final int minRating, final int maxRating) { - UserPreferences.getInstance().set("minRating", minRating); - UserPreferences.getInstance().set("maxRating", maxRating); + UserPreferences.getInstance().set("minRating", Integer.valueOf(minRating)); + UserPreferences.getInstance().set("maxRating", Integer.valueOf(maxRating)); } } diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/MenuBar.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/MenuBar.java index 01026d3..4d8c219 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/MenuBar.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/MenuBar.java @@ -35,7 +35,7 @@ public class MenuBar extends JMenuBar { add(new FileMenu(parent, actions, grid, view)); editMenu = new EditMenu(actions, parent, view); add(editMenu); - add(new HelpMenu(actions, parent, grid, view)); + add(new HelpMenu(actions, parent)); } final CheatMenu getCheatMenu() { diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/OpenGridAction.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/OpenGridAction.java index 5dd1c1c..93411b2 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/OpenGridAction.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/OpenGridAction.java @@ -41,7 +41,7 @@ public class OpenGridAction extends AbstractAction { private final JFrame frame; - OpenGridAction(JFrame frame, GridView view, ActionsRepository actions) { + OpenGridAction(JFrame frame, GridView view) { this.frame = frame; this.view = view; } diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/PlayCustomGridAction.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/PlayCustomGridAction.java index 0fcee81..1065162 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/PlayCustomGridAction.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/PlayCustomGridAction.java @@ -21,7 +21,6 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Icon; -import javax.swing.JFrame; import net.jankenpoi.sudokuki.view.GridView; @@ -30,7 +29,7 @@ public class PlayCustomGridAction extends AbstractAction { private GridView view; - public PlayCustomGridAction(JFrame parent, String text, Icon icon, + public PlayCustomGridAction(String text, Icon icon, String desc, Integer mnemonic, GridView view) { super(text, icon); diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveAction.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveAction.java index 17d790e..2f4316b 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveAction.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveAction.java @@ -45,7 +45,7 @@ public class ResolveAction extends AbstractAction { @Override public void actionPerformed(ActionEvent e) { - ResolveGridDialog dlg = new ResolveGridDialog(frame, view, this); + ResolveGridDialog dlg = new ResolveGridDialog(frame, view); dlg.setVisible(true); int result = dlg.getResult(); if (result == 0) { diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java index 34d1626..9ad3995 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java @@ -54,8 +54,7 @@ public class ResolveGridDialog extends JDialog { private final BruteForceGridSolver bruteSolver; private final GridModel gridToSolve; - public ResolveGridDialog(JFrame parent, final GridView view, - final ResolveAction resolveAction) { + public ResolveGridDialog(JFrame parent, final GridView view) { super(parent, true); this.parent = parent; @@ -85,7 +84,7 @@ public class ResolveGridDialog extends JDialog { /* Executed in the EDT, triggered when the SwingWorker has completed */ protected void done() { try { - status = get(); + status = get().intValue(); } catch (InterruptedException e) { e.printStackTrace(); return; @@ -154,14 +153,14 @@ public class ResolveGridDialog extends JDialog { return status; } - private int resolveGrid() { + private Integer resolveGrid() { GridSolution solution = bruteSolver.resolve(); if (solution == null) { /** * RESOLUTION PROCESS CANCELLED BEFORE COMPLETION */ - return 1; + return Integer.valueOf(1); } if (solution.isSolved()) { GridModel solGrid = solution.getSolutionGrid(); @@ -175,12 +174,12 @@ public class ResolveGridDialog extends JDialog { /** * RESOLUTION SUCCESSFULL */ - return 0; + return Integer.valueOf(0); } else { /** * RESOLUTION PROCESS WAS UNABLE TO SOLVE THIS GRID */ - return 2; + return Integer.valueOf(2); } } diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/SaveAsAction.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/SaveAsAction.java index 80de37e..cc00e9a 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/SaveAsAction.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/SaveAsAction.java @@ -22,7 +22,7 @@ public class SaveAsAction extends AbstractAction { private final GridView view; private final JFrame frame; - SaveAsAction(JFrame frame, GridView view, ActionsRepository actions) { + SaveAsAction(JFrame frame, GridView view) { this.frame = frame; this.view = view; } diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/SelectMemosPanel.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/SelectMemosPanel.java index b2072a8..1db1a5b 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/SelectMemosPanel.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/SelectMemosPanel.java @@ -139,7 +139,7 @@ public class SelectMemosPanel extends JPanel { Iterator it = memos.iterator(); while (it.hasNext()) { - JToggleButton button = ckb[it.next()-1]; + JToggleButton button = ckb[it.next().intValue()-1]; button.setSelected(true); button.setFont(BOLD_FONT); } @@ -177,10 +177,10 @@ public class SelectMemosPanel extends JPanel { private void buttonClicked(int button) { byte value = (byte)(button + 1); if (ckb[button].isSelected()) { - memos.add(value); + memos.add(Byte.valueOf(value)); ckb[button].setFont(BOLD_FONT); } else { - memos.remove(value); + memos.remove(Byte.valueOf(value)); ckb[button].setFont(NORMAL_FONT); } } @@ -191,7 +191,7 @@ public class SelectMemosPanel extends JPanel { Iterator it = memos.iterator(); int i = 0; while (it.hasNext()) { - memosArray[i] = it.next(); + memosArray[i] = it.next().byteValue(); i++; } return memosArray; diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/SetAllMemosAction.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/SetAllMemosAction.java index 40edabe..390057a 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/SetAllMemosAction.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/SetAllMemosAction.java @@ -21,7 +21,6 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Icon; -import javax.swing.JFrame; import net.jankenpoi.sudokuki.view.GridView; @@ -30,7 +29,7 @@ public class SetAllMemosAction extends AbstractAction { private GridView view; - public SetAllMemosAction(JFrame parent, String text, Icon icon, + public SetAllMemosAction(String text, Icon icon, String desc, Integer mnemonic, GridView view) { super(text, icon); diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/SetMemosHereAction.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/SetMemosHereAction.java index f688e63..449c132 100644 --- a/src/classes/net/jankenpoi/sudokuki/ui/swing/SetMemosHereAction.java +++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/SetMemosHereAction.java @@ -21,7 +21,6 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Icon; -import javax.swing.JFrame; import net.jankenpoi.sudokuki.view.GridView; @@ -30,7 +29,7 @@ public class SetMemosHereAction extends AbstractAction { private GridView view; - public SetMemosHereAction(JFrame parent, String text, Icon icon, + public SetMemosHereAction(String text, Icon icon, String desc, Integer mnemonic, GridView view) { super(text, icon); diff --git a/src/classes/net/jankenpoi/sudokuki/view/GridView.java b/src/classes/net/jankenpoi/sudokuki/view/GridView.java index 447333a..fcc628f 100644 --- a/src/classes/net/jankenpoi/sudokuki/view/GridView.java +++ b/src/classes/net/jankenpoi/sudokuki/view/GridView.java @@ -55,7 +55,7 @@ public abstract class GridView implements GridListener { public boolean isCellValueSet(int li, int co) { for (byte v = 1; v<=9; v++) { - if (isCellValueSet(li, co, v)) { + if (isCellValueSet(li, co, Byte.valueOf(v))) { return true; } } -- 2.11.0