Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

declare one variable per line

master
melvin 2012-09-28 16:19:28 +08:00
parent d49f1a3104
commit 366e1fa0fe
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/magic/GraphicsUtilities.java
View File

@ -97,7 +97,8 @@ public class GraphicsUtilities {
final int type = (img.getTransparency() == Transparency.OPAQUE) ? final int type = (img.getTransparency() == Transparency.OPAQUE) ?
BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB; BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB;
BufferedImage ret = img; BufferedImage ret = img;
int w, h; int w;
int h;
if (higherQuality && (img.getWidth() > targetWidth && img.getHeight() > targetHeight)) { if (higherQuality && (img.getWidth() > targetWidth && img.getHeight() > targetHeight)) {
// Use multi-step technique: start with original size, then // Use multi-step technique: start with original size, then
// scale down in multiple passes with drawImage() // scale down in multiple passes with drawImage()

3
src/magic/model/MagicGameReport.java
View File

@ -73,7 +73,8 @@ public class MagicGameReport implements Thread.UncaughtExceptionHandler {
} }
private static void buildScore(final MagicGame game,final StringBuilder report) { private static void buildScore(final MagicGame game,final StringBuilder report) {
int totalScore=0,count=0; int totalScore=0;
int count=0;
for (final MagicAction action : game.getActions()) { for (final MagicAction action : game.getActions()) {
final int score=action.getScore(game.getScorePlayer()); final int score=action.getScore(game.getScorePlayer());
totalScore+=score; totalScore+=score;

13
src/magic/ui/PreferencesDialog.java
View File

@ -72,10 +72,15 @@ public class PreferencesDialog extends JDialog implements ActionListener {
final GeneralConfig config=GeneralConfig.getInstance(); final GeneralConfig config=GeneralConfig.getInstance();
int Y=20; int Y=20;
final int X=28, W=70, H=25; final int X=28;
final int X2=100, W2=255; final int W=70;
final int X3=25, H3=20, W3=350; final int H=25;
final int X2=100;
final int W2=255;
final int X3=25;
final int H3=20;
final int W3=350;
final JLabel themeLabel=new JLabel("Theme"); final JLabel themeLabel=new JLabel("Theme");
themeLabel.setBounds(X,Y,W,H); themeLabel.setBounds(X,Y,W,H);
themeLabel.setIcon(IconImages.PICTURE); themeLabel.setIcon(IconImages.PICTURE);