From 7ee889d8438125d87c47ec3e613d4f3f86e4bcac Mon Sep 17 00:00:00 2001 From: 0nlineSam Date: Sun, 27 Oct 2024 14:29:07 +0100 Subject: [PATCH] Fixed error highlighted by Checkstyle --- boulder-dash/.idea/checkstyle-idea.xml | 1 + .../BoulderDash/helpers/LevelSaveHelper.class | Bin 8794 -> 8859 bytes .../BoulderDash/models/DiamondModel.class | Bin 2044 -> 2004 bytes .../models/DisplayableElementModel.class | Bin 4812 -> 4830 bytes .../BoulderDash/models/LevelModel.class | Bin 13487 -> 13446 bytes .../BoulderDash/models/RockfordModel.class | Bin 4429 -> 4389 bytes .../views/AssetsLevelEditorComponent.class | Bin 2757 -> 2757 bytes .../BoulderDash/views/GameGroundView.class | Bin 1332 -> 1394 bytes .../enssat/BoulderDash/views/GroundView.class | Bin 2398 -> 2521 bytes .../BoulderDash/views/WinLoseView.class | Bin 1249 -> 1249 bytes .../BoulderDash/models/DiamondModel.java | 4 +-- .../models/DisplayableElementModel.java | 6 ++-- .../enssat/BoulderDash/models/LevelModel.java | 25 ++++++------- .../BoulderDash/models/RockfordModel.java | 11 +++--- .../views/AssetsLevelEditorComponent.java | 6 ++-- .../BoulderDash/views/GameGroundView.java | 2 +- .../enssat/BoulderDash/views/GroundView.java | 6 +++- .../enssat/BoulderDash/views/WinLoseView.java | 9 ++--- .../ueb01_checkstyle_config-Homework.xml | 33 ++++++++++++++++++ 19 files changed, 68 insertions(+), 35 deletions(-) create mode 100644 boulder-dash/ueb01_checkstyle_config-Homework.xml diff --git a/boulder-dash/.idea/checkstyle-idea.xml b/boulder-dash/.idea/checkstyle-idea.xml index 805be345..6f4e9ba3 100644 --- a/boulder-dash/.idea/checkstyle-idea.xml +++ b/boulder-dash/.idea/checkstyle-idea.xml @@ -9,6 +9,7 @@ (bundled) (bundled) + $PROJECT_DIR$/ueb01_checkstyle_config-Homework.xml $PROJECT_DIR$/ueb01_checkstyle_config.xml diff --git a/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/helpers/LevelSaveHelper.class b/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/helpers/LevelSaveHelper.class index 6d19c1e32ff0156dacbb3a2d39ff9805914e9608..e8ae6c4fe292cd61bf24c3349862c1c66aa048f9 100644 GIT binary patch delta 2173 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 diff --git a/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/models/DiamondModel.class b/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/models/DiamondModel.class index d46f2da36e6dd22fa8156d8f33286abf60f721b1..dc6b354da2fc2bfe6cb1e81e4b75a28a42f47a93 100644 GIT binary patch delta 809 zcmYjPO-~b16g_Wd%9P=imJ*dvVnIOK5vW3`A|RrrSX91Rf#OH0?I5#gAuYJ=#y?=j zjdAA&x3#n+ni#hlm+oA+^gkGa-ZwVtB=6mibLXCOZ{D%{t6Teg^6mqG8EjXyJS%IE zaE_xFeGDyT!Q4yi7R^1Q#2^QPtIdR-=NLeMf$tWLr{>OnDQV^n1~xB1o#TQ49i?5v z$cfAl$1vKcJiA{k8il=BF_Sk0aFOE@Mi^XMB2$W*nfy+{8kT%5VT`GWa9qX}D=9^k zs|;OMS?R5S;VX!Io5QGBaV41FDIR0+~K&3 z1?!XCJ+Q=}=4`H<6Dtf#cE>C*xD)Y>^m=+RmQF0K#FMkuiG0RmCsY5D)pli!`8$z7 z8yJ$bHVOC8iPisOYtAt-MH{kF8r`+>C##S`m zU?(m-rV$ykRHZ^Hs+e}rcIX{7L_HU20wel+gi}YDsUaj!`aI6pBuXgJ-$JY7rq9!{ zEqmyzW3GU8X7<2aOscl1v;HTGh3>W)J@6-w7uYv?A n5ue|?ScRrk!RV-R6<)HZ$hLZytLPA0XEgH{HK=ZpFX72=n<9$J delta 796 zcmYjPT~8B16g{)svTd2#iU~GS(<&k`6_7%Ut@r`hYW)DD6(|a&(p6AswUjp#LgF7F zl`<5Q~uQA4Wk@m7?&YEWs72hBZ-vU z)csg;(qwjd&D1Fs_s+f^Vlrio&eA#rXv#Ug zn^ZzzNY}6#x>G9u-8HpyjiZGKzgz3?!9qRxq&iE82|IN_Kz_Bhth?P6oDiy>5>>R9 zYoE+fZHARIFj|!c*GASKF4}yq6$DDlH(7vu_`svn3o^rH+ zN-0vGuDS=bHp4?g4QNFJF)L+8e?{HYrh4(~bll?+FY*;#Q gkR&JS_?qs>4a3towF8fenvv`qqtkdqy@tns0GC#S`v3p{ diff --git a/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/models/DisplayableElementModel.class b/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/models/DisplayableElementModel.class index 9bcbeed08b3a94a136ecb41488d9428a7d0ec517..62ac63de2d34817f1c1144993a47a8ce780ce93a 100644 GIT binary patch delta 371 zcmW-bNlQXe6vzM9_w)^^PYsneCdAtqv2HqXPcd9t~d zVXGE>fM^rZwlC1KeRXtm?(hDGd+wY0W$LfL&o2O?xPR0qZ9#i>Jef+T;<<@TJ}uyg z=aWOD-N{@cIhai=n5mR(W5RJLU=yNcBr~kym<%=GJk@cAa|LBPBDkQi`XR2#&_eR9 zK!D1sp9-o{>DRuk+5;rWywao|BPfTS&_Ow)v)x1rX_nc52lWuJpa}*3nFUj<`e6Cv zAt_K5Oe^SvP|z!Lu83LsF%sc9&I(R?F%Lhts4d$5+C0J~YdYVraDzKE`~!dyP9OjP delta 363 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 literal 13487 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 diff --git a/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/views/AssetsLevelEditorComponent.class b/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/views/AssetsLevelEditorComponent.class index 847fc4f7a674bc4f6a1bef6e73418315de696f1e..572c042be154e032eb6f9b1d6964c582617be11d 100644 GIT binary patch delta 48 ycmX>qdQ@~n7Kb<&gA9W#10zEX0|NsSLoE;sFbFa*Y;NSRWa5?pN=ySwOa}nWN(UMM delta 48 ycmX>qdQ@~n7Kb8yFdYEISO*#a diff --git a/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/views/GameGroundView.class b/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/views/GameGroundView.class index f29eeb87eb84a095a8f0c632ebbf911211e88690..b4c3b5f18f01be8082b232882e73d85c6888f8b6 100644 GIT binary patch delta 92 zcmdnO^@)q?)W2Q(7#J8F8SFN4sWZxQF)%R*@GuB62r)A7rl*$pq?V=T_~xgi<}fm7 vPd>vaIr%lS(B=}xPfU~T7|kXpv&1rPpL~!dh2M(78mN_#!3Jm;6N4=Plc5(c delta 65 zcmeywwS|l8)W2Q(7#J8F8EiIksWWnMGH@^m@GuB62u;plvD{qA_=#!q5|${&EtCJV Tr0@fU8JHLt8LWUhm>8@9OY;v1 diff --git a/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/views/GroundView.class b/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/views/GroundView.class index b6f4411e854cc3a01148c5265a2b08b34fefd7f2..f14c5fe0ceb8d2a6cef9185f01c6a612707f5ead 100644 GIT binary patch delta 972 zcmZuvJxo(k6#nk}DUbFMYUu-i>JPD0(n^ScP0$d722lc$U=%^Xf~^HDKMFQ6(bU1X zlQ$?PE|@r&n1I0=9oSqP9PH$xBfFb~7{B{&sf)wC=iGD8`OeRGeuTc)?f>%U(!#FJye6>;vN;AFzu|`G14ciVY}L##cg?ev--(rm0C@N|<30I_^+!L|_NCVh5Jk zMr<3dX*HOV+6lMOiX9h27(Ms>&+EgO8D&9Rrc|bC+J;IcC8(cd2(8dgqs&lrn5i-%kw|9OrDSp! ze!@a*NmQ5yNq06D7G`B5HezRCXM=O!9n%DPx$nE*&pqEg=er-{pJJ=u{d~O$U=ObQ zFkrf{0@!e>bDhx$JVadh0a_3UY^sj5R(mt^PritD4}Agp;RyIsh4O4Me{-xbXhHCw7hNQ8U!^LGU|) zlNx`ySX6A8tSemk*=ZB5{N-$HacfB4$6OdqyFEJE&gj5BZ0=Fv8V0o)vU1VrbXfVw zjaSr_CfFR<%64h2LND6The6ui^!HPtqZlB?9XQA6B@CgAUAV>U9omQVA7d|`VjrGk z7_WHZEe_y4{SU~5)J7@w8g$_-5p1j=+7x#dZlG&tBUow%Nv^3u9p_mn6k%N8PH9`m zMNGp)L6*Fft@NLi54^P@5%nm55%`>h(p2dO>Zmm})UdUZBx35^8w_V-nFSmgTN;su z87EBkKQMwCTyDS|CJWUvk*a8Qk7#qOyN2U`1LhGY+of42nmiLBCpGILN)70Pv?if# lKA(T?R%G8&2-TsBko@y*Y|P*a&+;T@ah2B-xJJ)F`8PZMdIA6d diff --git a/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/views/WinLoseView.class b/boulder-dash/classes/production/Boulder Dash/fr/enssat/BoulderDash/views/WinLoseView.class index a7cc8c9a3677ab1a620b6bd541629ed6d2f75329..3ce0c933071118de379eb416ca9108572c840fc9 100644 GIT binary patch delta 17 YcmaFJ`H*wNau!wt20aGD$!l0l0XEeIJOBUy delta 17 YcmaFJ`H*wNau!y720aFY$!l0l0XD}4IsgCw diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/DiamondModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/DiamondModel.java index ba1dbab5..b23a8312 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/DiamondModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/DiamondModel.java @@ -15,6 +15,8 @@ import fr.enssat.BoulderDash.models.DisplayableElementModel; * @since 2015-06-19 */ public class DiamondModel extends DisplayableElementModel { + private static final int SIZ_X_OF_SPRITE = 16; + private static final int SIZ_Y_OF_SPRITE = 16; private static String spriteName; private static boolean isDestructible; private static boolean canMove; @@ -25,8 +27,6 @@ public class DiamondModel extends DisplayableElementModel { private long previousTime; private int currentFrame; - private final int SIZ_X_OF_SPRITE = 16; - private final int SIZ_Y_OF_SPRITE = 16; private long speed; private ArrayList framesDiamond; diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/DisplayableElementModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/DisplayableElementModel.java index dd0bf8c1..556cb66e 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/DisplayableElementModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/DisplayableElementModel.java @@ -210,15 +210,15 @@ public abstract class DisplayableElementModel { * @return Sprite object */ public BufferedImage loadSprite(String spriteName) { - BufferedImage sprite = null; + BufferedImage loadedSprite = null; try { - sprite = ImageIO.read(new File("res/drawable/field/" + spriteName + ".gif")); + loadedSprite = ImageIO.read(new File("res/drawable/field/" + spriteName + ".gif")); } catch (IOException e) { e.printStackTrace(); } - this.sprite = sprite; + sprite = loadedSprite; return sprite; } diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/LevelModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/LevelModel.java index cbb5415a..2c685075 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/LevelModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/LevelModel.java @@ -31,6 +31,11 @@ import java.util.Observable; * @since 2015-06-19 */ public class LevelModel extends Observable implements Runnable { + /** + * Animation speed + */ + private static final int DELAY = 25; + private DisplayableElementModel[][] groundGrid; private String levelName; private AudioLoadHelper audioLoadHelper; @@ -54,11 +59,6 @@ public class LevelModel extends Observable implements Runnable { */ private Thread spriteAnimator; - /** - * Animation speed - */ - private final int DELAY = 25; - /** * Class constructor * @@ -196,9 +196,9 @@ public class LevelModel extends Observable implements Runnable { private void playCollisionSound(int posX, int posY) { String collisionSound = null; - if (this.getRockford().isCollisionDone() == false) { + if (!this.getRockford().isCollisionDone()) { // Out of bounds? - if (this.isOutOfBounds(posX, posY) == true) { + if (this.isOutOfBounds(posX, posY)) { collisionSound = "touch"; } else { DisplayableElementModel nextElement = this.groundGrid[posX][posY]; @@ -246,7 +246,7 @@ public class LevelModel extends Observable implements Runnable { this.playCollisionSound(posX, posY); // Check that we are not out of bound... - if (this.isOutOfBounds(posX, posY) == false) { + if (!this.isOutOfBounds(posX, posY)) { // Create a new empty model in the old pos of Rockford this.groundGrid[oldX][oldY] = new EmptyModel(); @@ -273,13 +273,8 @@ public class LevelModel extends Observable implements Runnable { * @param blockValue New value */ public void triggerBlockChange(String blockValue) { - // No block value? - if(blockValue == null || blockValue.isEmpty()) { - return; - } - - // Cancel if Rockford is already in model - if((blockValue.equals("Rockford") || blockValue.equals("rockford")) && this.isRockfordInModel()) { + // No block value? or Cancel if Rockford is already in model + if((blockValue == null || blockValue.isEmpty()) || ((blockValue.equals("Rockford") || blockValue.equals("rockford")) && this.isRockfordInModel())) { return; } diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/RockfordModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/RockfordModel.java index e958ebf4..f87a0cb7 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/RockfordModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/RockfordModel.java @@ -15,6 +15,11 @@ import fr.enssat.BoulderDash.models.DisplayableElementModel; * @since 2015-06-19 */ public class RockfordModel extends DisplayableElementModel { + /** + * Defines the size of the sprite + * */ + private static final int SIZ_X_OF_SPRITE = 16; + private static final int SIZ_Y_OF_SPRITE = 16; private static String spriteName; private static boolean isDestructible; private static boolean canMove; @@ -32,12 +37,6 @@ public class RockfordModel extends DisplayableElementModel { private static ArrayList framesRunningRight; private static ArrayList framesRunningUpOrDown; - /** - * Defines the size of the sprite - */ - private final int SIZ_X_OF_SPRITE = 16; - private final int SIZ_Y_OF_SPRITE = 16; - /** * Defines the current speed of the object */ diff --git a/boulder-dash/src/fr/enssat/BoulderDash/views/AssetsLevelEditorComponent.java b/boulder-dash/src/fr/enssat/BoulderDash/views/AssetsLevelEditorComponent.java index 25645d47..07fccff3 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/views/AssetsLevelEditorComponent.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/views/AssetsLevelEditorComponent.java @@ -18,15 +18,15 @@ import fr.enssat.BoulderDash.views.LevelEditorView; * @since 2015-06-22 */ public class AssetsLevelEditorComponent extends JPanel implements ActionListener { - private LevelEditorView levelEditorView; - /** * Available choices */ - static List choiceList = Arrays.asList( + private static List choiceList = Arrays.asList( "Boulder", "Diamond", "Dirt", "Brick Wall", "Expanding Wall", "Magic Wall", "Steel Wall", "Rockford" ); + private LevelEditorView levelEditorView; + /** * Class constructor * diff --git a/boulder-dash/src/fr/enssat/BoulderDash/views/GameGroundView.java b/boulder-dash/src/fr/enssat/BoulderDash/views/GameGroundView.java index 640e7fd2..a9d46367 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/views/GameGroundView.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/views/GameGroundView.java @@ -31,7 +31,7 @@ public class GameGroundView extends GroundView { this.gameController = gameController; - this.addKeyListener(new GameKeyController(this.levelModel, this.gameController.getAudioLoadHelper())); + this.addKeyListener(new GameKeyController(super.getLevelModel(), this.gameController.getAudioLoadHelper())); this.setBorder(BorderFactory.createLineBorder(Color.black)); this.setFocusable(true); diff --git a/boulder-dash/src/fr/enssat/BoulderDash/views/GroundView.java b/boulder-dash/src/fr/enssat/BoulderDash/views/GroundView.java index 359bbcb4..fbc4c0d4 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/views/GroundView.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/views/GroundView.java @@ -22,7 +22,7 @@ import java.util.Observer; * */ public abstract class GroundView extends JPanel implements Observer { - protected LevelModel levelModel; + private LevelModel levelModel; /** * Class constructor @@ -34,6 +34,10 @@ public abstract class GroundView extends JPanel implements Observer { this.levelModel.addObserver(this); } + protected LevelModel getLevelModel() { + return levelModel; + } + /** * Draws the map * diff --git a/boulder-dash/src/fr/enssat/BoulderDash/views/WinLoseView.java b/boulder-dash/src/fr/enssat/BoulderDash/views/WinLoseView.java index b0c85837..c0ac71d1 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/views/WinLoseView.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/views/WinLoseView.java @@ -39,10 +39,11 @@ public class WinLoseView extends JFrame{ private void createLayout() { JTextArea help = new JTextArea(); help.setEditable(false); - if(winOrLose.equals("win")) - help.setText("YOU WIN THE GAME :-)"); - else - help.setText("YOU LOSE THE GAME :-( TRY AGAIN!"); + if(winOrLose.equals("win")) { + help.setText("YOU WIN THE GAME :-)"); + } else { + help.setText("YOU LOSE THE GAME :-( TRY AGAIN!"); + } this.add(help); } diff --git a/boulder-dash/ueb01_checkstyle_config-Homework.xml b/boulder-dash/ueb01_checkstyle_config-Homework.xml new file mode 100644 index 00000000..a24aaf1a --- /dev/null +++ b/boulder-dash/ueb01_checkstyle_config-Homework.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +