From 5973ee2ff9d8f9c807e47712012ecb14fd87b839 Mon Sep 17 00:00:00 2001
From: zalavari <zalavari@sch.bme.hu>
Date: Tue, 1 May 2018 12:29:01 +0200
Subject: [PATCH] unnecessary code lines removed
---
src/killer_sokoban/Hole.java | 1 -
src/killer_sokoban/Moveable.java | 1 -
src/killer_sokoban/SwitchField.java | 2 --
src/killer_sokoban/TargetField.java | 29 +----------------------------
src/killer_sokoban/View.java | 15 +--------------
src/killer_sokoban/Wall.java | 2 --
6 files changed, 2 insertions(+), 48 deletions(-)
diff --git a/src/killer_sokoban/Hole.java b/src/killer_sokoban/Hole.java
index 107fd82..981ab69 100644
--- a/src/killer_sokoban/Hole.java
+++ b/src/killer_sokoban/Hole.java
@@ -1,6 +1,5 @@
package killer_sokoban;
-import java.util.ArrayList;
public class Hole extends SimpleField {
diff --git a/src/killer_sokoban/Moveable.java b/src/killer_sokoban/Moveable.java
index 65e1e3e..be7c9ec 100644
--- a/src/killer_sokoban/Moveable.java
+++ b/src/killer_sokoban/Moveable.java
@@ -1,6 +1,5 @@
package killer_sokoban;
-import java.util.ArrayList;
public abstract class Moveable {
diff --git a/src/killer_sokoban/SwitchField.java b/src/killer_sokoban/SwitchField.java
index 03ef598..4b6dc72 100644
--- a/src/killer_sokoban/SwitchField.java
+++ b/src/killer_sokoban/SwitchField.java
@@ -1,7 +1,5 @@
package killer_sokoban;
-import java.util.ArrayList;
-
public class SwitchField extends SimpleField {
private SwitchableHole sHole;
diff --git a/src/killer_sokoban/TargetField.java b/src/killer_sokoban/TargetField.java
index 448b36c..5fe84d1 100644
--- a/src/killer_sokoban/TargetField.java
+++ b/src/killer_sokoban/TargetField.java
@@ -1,7 +1,5 @@
package killer_sokoban;
-import java.util.ArrayList;
-
public class TargetField extends SimpleField {
/**Ez a függvény azt jelzi a mező számára, hogy szeretnének rálépni.
@@ -13,29 +11,6 @@ public class TargetField extends SimpleField {
@Override
public boolean accept(Direction toward, Worker w, Moveable m) {
-// boolean ret=true; //Alapvetően elfogadnánk....
-// if (myMoveable != null) //...kivétel ha van rajta valaki...
-// {
-// Moveable myEx = myMoveable;
-//
-// ret=m.meetWith(toward, w, myMoveable); //...aki nem hajlandó elmenni
-//
-// if (ret) { //Ellépés adminisztrációja
-// myEx.stepOffTarget(w);
-// }
-// }
-//
-// //Elfogadás adminisztrációja
-// if (ret)
-// {
-// m.move(this); //Fontos a sorrend, mert ez a függvény eldobatja magát m mezőjével.
-// myMoveable=m;
-// myMoveable.stepOnTarget(w);
-// determineBlocked(toward);
-// }
-
-
-
Moveable myEx = myMoveable; //can be null!
boolean ret=super.accept(toward, w, m);
if (ret)
@@ -43,9 +18,7 @@ public class TargetField extends SimpleField {
if (myEx!=null) myEx.stepOffTarget(w);
myMoveable.stepOnTarget(w);
}
-
-
-
+
return ret;
}
diff --git a/src/killer_sokoban/View.java b/src/killer_sokoban/View.java
index 26061d1..6e0df24 100644
--- a/src/killer_sokoban/View.java
+++ b/src/killer_sokoban/View.java
@@ -1,12 +1,9 @@
package killer_sokoban;
-
-
import javafx.scene.canvas.Canvas;
import javafx.scene.canvas.GraphicsContext;
import javafx.scene.image.Image;
import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
public class View {
@@ -32,8 +29,7 @@ public class View {
}
public void setCanvas(Canvas c)
{
- this.gc=c.getGraphicsContext2D();
-
+ this.gc=c.getGraphicsContext2D();
}
public void update()
@@ -45,7 +41,6 @@ public class View {
for (x=0;x<column;x++)
for (y=0;y<line;y++)
Main.drawRequiredFor(y,x);
-
}
public void drawAbstract() {
@@ -59,38 +54,30 @@ public class View {
}
public void drawTargetField() {
- gc.setFill(Color.YELLOW);
gc.drawImage(targetFieldImg, x*tileSize, y*tileSize);
}
public void drawHole() {
- gc.setFill(Color.BLACK);
gc.drawImage(holeImg, x*tileSize, y*tileSize);
}
public void drawSwitchField() {
- gc.setFill(Color.PLUM);
gc.drawImage(switchFieldImg, x*tileSize, y*tileSize);
}
public void drawWall() {
- gc.setFill(Color.GREY);
gc.drawImage(wallImg, x*tileSize, y*tileSize);
}
public void drawOil() {
- gc.setFill(Color.SLATEGREY);
gc.drawImage(oilImg, x*tileSize, y*tileSize);
}
public void drawHoney() {
- gc.setFill(Color.GOLD);
gc.drawImage(honeyImg, x*tileSize, y*tileSize);
}
public void drawWorker(Worker w) {
String name=Main.getMoveableName(w);
Image wImg=new Image("file:GIMPimages/"+name+".png");
- gc.setFill(Color.GREEN);
gc.drawImage(wImg, x*tileSize, y*tileSize);
}
public void drawCrate() {
- gc.setFill(Color.ORANGE);
gc.drawImage(crateImg, x*tileSize, y*tileSize);
}
diff --git a/src/killer_sokoban/Wall.java b/src/killer_sokoban/Wall.java
index 070e3dd..9ba94e2 100644
--- a/src/killer_sokoban/Wall.java
+++ b/src/killer_sokoban/Wall.java
@@ -1,6 +1,5 @@
package killer_sokoban;
-import java.util.ArrayList;
public class Wall extends AbstractField {
@@ -12,7 +11,6 @@ public class Wall extends AbstractField {
*/
@Override
public boolean accept(Direction toward, Worker w, Moveable m) {
-
return false;
}
--
GitLab