diff --git a/cicaprojekt/Drawer.java b/cicaprojekt/Drawer.java index 950e989..abf86df 100644 --- a/cicaprojekt/Drawer.java +++ b/cicaprojekt/Drawer.java @@ -1,10 +1,27 @@ package cicaprojekt; +import java.awt.image.BufferedImage; +import java.io.File; import java.io.IOException; -public interface Drawer { +import javax.imageio.ImageIO; + +public abstract class Drawer { + private BufferedImage image; + + public Drawer(String path) throws IOException { + image = ImageIO.read(new File(path)); + } + + public void changeImage(String path) throws IOException { + image = ImageIO.read(new File(path)); + } - public void draw() throws IOException; - public int getTileX(); - public int getTileY(); + public BufferedImage getImage() { + return image; + } + + public abstract void draw() throws IOException; + public abstract int getTileX(); + public abstract int getTileY(); } diff --git a/cicaprojekt/FieldDrawer.java b/cicaprojekt/FieldDrawer.java index c00b26e..1c63b8e 100644 --- a/cicaprojekt/FieldDrawer.java +++ b/cicaprojekt/FieldDrawer.java @@ -2,14 +2,12 @@ package cicaprojekt; import java.io.IOException; -public class FieldDrawer extends ImagePanel implements Drawer { - +public class FieldDrawer extends Drawer { Field field; public FieldDrawer(Field f) throws IOException { super("Field.png"); field = f; - setVisible(false); } @Override @@ -21,7 +19,6 @@ public class FieldDrawer extends ImagePanel implements Drawer { else changeImage("Field.png"); - setVisible(true); } @Override diff --git a/cicaprojekt/GapDrawer.java b/cicaprojekt/GapDrawer.java index 9676fd0..aafbed5 100644 --- a/cicaprojekt/GapDrawer.java +++ b/cicaprojekt/GapDrawer.java @@ -2,19 +2,17 @@ package cicaprojekt; import java.io.IOException; -public class GapDrawer extends ImagePanel implements Drawer{ - +public class GapDrawer extends Drawer{ private Gap gap; public GapDrawer(Gap g) throws IOException { super("Gap.png"); gap = g; - setVisible(false); } @Override public void draw() { - setVisible(true); + //TODO kezdeni ezzel valamit. } @Override diff --git a/cicaprojekt/GateDrawer.java b/cicaprojekt/GateDrawer.java index cb45d0e..33ac692 100644 --- a/cicaprojekt/GateDrawer.java +++ b/cicaprojekt/GateDrawer.java @@ -2,14 +2,12 @@ package cicaprojekt; import java.io.IOException; -public class GateDrawer extends ImagePanel implements Drawer{ - +public class GateDrawer extends Drawer{ Gate gate; public GateDrawer(Gate g) throws IOException { super("ClosedGate.png"); gate = g; - setVisible(false); } @Override @@ -17,9 +15,7 @@ public class GateDrawer extends ImagePanel implements Drawer{ if(gate.isOpen()) changeImage("Field.png"); //TODO picture for open gate. else - changeImage("ClosedGate.png"); - - setVisible(true); + changeImage("ClosedGate.png"); } @Override diff --git a/cicaprojekt/ImagePanel.java b/cicaprojekt/ImagePanel.java deleted file mode 100644 index 243a779..0000000 --- a/cicaprojekt/ImagePanel.java +++ /dev/null @@ -1,29 +0,0 @@ -package cicaprojekt; - -import java.awt.Graphics; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; - -import javax.imageio.ImageIO; -import javax.swing.JPanel; - -public class ImagePanel extends JPanel{ - - private BufferedImage image; - - public ImagePanel(String path) throws IOException { - image = ImageIO.read(new File(path)); - } - - @Override - protected void paintComponent(Graphics g) { - super.paintComponent(g); - g.drawImage(image, 0, 0, null); // see javadoc for more info on the parameters - } - - public void changeImage(String path) throws IOException { - image = ImageIO.read(new File(path)); - repaint(); - } -} \ No newline at end of file diff --git a/cicaprojekt/PlayerBaseDrawer.java b/cicaprojekt/PlayerBaseDrawer.java index 6a616b0..bd864f1 100644 --- a/cicaprojekt/PlayerBaseDrawer.java +++ b/cicaprojekt/PlayerBaseDrawer.java @@ -2,13 +2,12 @@ package cicaprojekt; import java.io.IOException; -public class PlayerBaseDrawer extends ImagePanel implements Drawer { +public class PlayerBaseDrawer extends Drawer { PlayerBase playerbase; public PlayerBaseDrawer(PlayerBase pb) throws IOException { super("Replicator.png"); playerbase = pb; - setVisible(false); } @Override @@ -33,7 +32,6 @@ public class PlayerBaseDrawer extends ImagePanel implements Drawer { } } - setVisible(true); } @Override diff --git a/cicaprojekt/PlayerDrawer.java b/cicaprojekt/PlayerDrawer.java index e88da0a..c7ef64f 100644 --- a/cicaprojekt/PlayerDrawer.java +++ b/cicaprojekt/PlayerDrawer.java @@ -2,13 +2,12 @@ package cicaprojekt; import java.io.IOException; -public class PlayerDrawer extends ImagePanel implements Drawer { +public class PlayerDrawer extends Drawer { Player player; public PlayerDrawer(Player p) throws IOException { super("ONeill.png"); player = p; - setVisible(false); } @Override @@ -49,9 +48,7 @@ public class PlayerDrawer extends ImagePanel implements Drawer { break; } break; - } - - setVisible(true); + } } @Override diff --git a/cicaprojekt/ScaleDrawer.java b/cicaprojekt/ScaleDrawer.java index a11edf1..826898a 100644 --- a/cicaprojekt/ScaleDrawer.java +++ b/cicaprojekt/ScaleDrawer.java @@ -2,14 +2,12 @@ package cicaprojekt; import java.io.IOException; -public class ScaleDrawer extends ImagePanel implements Drawer { - +public class ScaleDrawer extends Drawer { Scale scale; public ScaleDrawer(Scale s) throws IOException { super("Scale.png"); scale = s; - setVisible(false); } @Override @@ -19,7 +17,6 @@ public class ScaleDrawer extends ImagePanel implements Drawer { else changeImage("Scale.png"); - setVisible(true); } @Override diff --git a/cicaprojekt/WallDrawer.java b/cicaprojekt/WallDrawer.java index cf4a8bd..2447ad5 100644 --- a/cicaprojekt/WallDrawer.java +++ b/cicaprojekt/WallDrawer.java @@ -2,14 +2,12 @@ package cicaprojekt; import java.io.IOException; -public class WallDrawer extends ImagePanel implements Drawer { - +public class WallDrawer extends Drawer { Wall wall; public WallDrawer(Wall w) throws IOException { super("Wall.png"); wall = w; - setVisible(false); } @Override @@ -34,9 +32,7 @@ public class WallDrawer extends ImagePanel implements Drawer { changeImage("Wall.png"); break; } - } - - setVisible(true); + } } @Override