From 0d31d8c79ba7cbb86e66198fe9394935e535cf7c Mon Sep 17 00:00:00 2001 From: ericnerdo Date: Sat, 7 May 2016 20:12:49 +0200 Subject: [PATCH] Revert "Drawers refactored. Imageloading is now in the Drawers instead of" This reverts commit 3268268dc2d24e0d07473c53a75a7a71b27ce653. --- cicaprojekt/FieldDrawer.java | 21 ++------------------- cicaprojekt/GapDrawer.java | 16 ++-------------- cicaprojekt/GateDrawer.java | 21 ++------------------- cicaprojekt/ImagePanel.java | 29 +++++++++++++++++++++++++++++ cicaprojekt/ScaleDrawer.java | 21 ++------------------- cicaprojekt/WallDrawer.java | 21 ++------------------- 6 files changed, 39 insertions(+), 90 deletions(-) create mode 100644 cicaprojekt/ImagePanel.java diff --git a/cicaprojekt/FieldDrawer.java b/cicaprojekt/FieldDrawer.java index c7d54b4..7d86b68 100644 --- a/cicaprojekt/FieldDrawer.java +++ b/cicaprojekt/FieldDrawer.java @@ -1,19 +1,13 @@ 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 FieldDrawer extends ImagePanel implements Drawer { -public class FieldDrawer extends JPanel implements Drawer { - private BufferedImage image; Field field; public FieldDrawer(Field f) throws IOException { - image = ImageIO.read(new File("Field.png")); + super("Field.png"); field = f; setVisible(false); } @@ -39,16 +33,5 @@ public class FieldDrawer extends JPanel implements Drawer { public int getY() { return field.getY(); } - - @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(); - } } diff --git a/cicaprojekt/GapDrawer.java b/cicaprojekt/GapDrawer.java index 486a628..b5248a5 100644 --- a/cicaprojekt/GapDrawer.java +++ b/cicaprojekt/GapDrawer.java @@ -1,19 +1,13 @@ 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 GapDrawer extends ImagePanel implements Drawer{ -public class GapDrawer extends JPanel implements Drawer{ - private BufferedImage image; private Gap gap; public GapDrawer(Gap g) throws IOException { - image = ImageIO.read(new File("Gap.png")); + super("Gap.png"); gap = g; setVisible(false); } @@ -33,10 +27,4 @@ public class GapDrawer extends JPanel implements Drawer{ return gap.getY(); } - - @Override - protected void paintComponent(Graphics g) { - super.paintComponent(g); - g.drawImage(image, 0, 0, null); // see javadoc for more info on the parameters - } } diff --git a/cicaprojekt/GateDrawer.java b/cicaprojekt/GateDrawer.java index f01a171..a841e26 100644 --- a/cicaprojekt/GateDrawer.java +++ b/cicaprojekt/GateDrawer.java @@ -1,19 +1,13 @@ 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 GateDrawer extends ImagePanel implements Drawer{ -public class GateDrawer extends JPanel implements Drawer{ - private BufferedImage image; Gate gate; public GateDrawer(Gate g) throws IOException { - image = ImageIO.read(new File("ClosedGate.png")); + super("ClosedGate.png"); gate = g; setVisible(false); } @@ -38,15 +32,4 @@ public class GateDrawer extends JPanel implements Drawer{ return gate.getY(); } - @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(); - } - } diff --git a/cicaprojekt/ImagePanel.java b/cicaprojekt/ImagePanel.java new file mode 100644 index 0000000..243a779 --- /dev/null +++ b/cicaprojekt/ImagePanel.java @@ -0,0 +1,29 @@ +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/ScaleDrawer.java b/cicaprojekt/ScaleDrawer.java index ac18510..d0d5244 100644 --- a/cicaprojekt/ScaleDrawer.java +++ b/cicaprojekt/ScaleDrawer.java @@ -1,19 +1,13 @@ 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 ScaleDrawer extends ImagePanel implements Drawer { -public class ScaleDrawer extends JPanel implements Drawer { - private BufferedImage image; Scale scale; public ScaleDrawer(Scale s) throws IOException { - image = ImageIO.read(new File("Scale.png")); + super("Scale.png"); scale = s; setVisible(false); } @@ -38,15 +32,4 @@ public class ScaleDrawer extends JPanel implements Drawer { return scale.getY(); } - @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(); - } - } diff --git a/cicaprojekt/WallDrawer.java b/cicaprojekt/WallDrawer.java index 9864ed7..4e8ad7a 100644 --- a/cicaprojekt/WallDrawer.java +++ b/cicaprojekt/WallDrawer.java @@ -1,19 +1,13 @@ 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 WallDrawer extends ImagePanel implements Drawer { -public class WallDrawer extends JPanel implements Drawer { - private BufferedImage image; Wall wall; public WallDrawer(Wall w) throws IOException { - image = ImageIO.read(new File("Wall.png")); + super("Wall.png"); wall = w; setVisible(false); } @@ -51,16 +45,5 @@ public class WallDrawer extends JPanel implements Drawer { public int getY() { return wall.getY(); } - - @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(); - } - }