From edcc7606ba3f03bc23b1126da8938fbf344da800 Mon Sep 17 00:00:00 2001 From: andreas Date: Fri, 31 Oct 2014 11:58:04 +0100 Subject: [PATCH] Objekt angepasst --- HeatUp/.classpath | 2 +- HeatUp/src/de/heatup/objects/Objekt.java | 8 ++++++-- HeatUp/src/de/heatup/ui/GameInterface.java | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/HeatUp/.classpath b/HeatUp/.classpath index d4c97fc..9b07da8 100644 --- a/HeatUp/.classpath +++ b/HeatUp/.classpath @@ -1,6 +1,6 @@ - + diff --git a/HeatUp/src/de/heatup/objects/Objekt.java b/HeatUp/src/de/heatup/objects/Objekt.java index becc345..d44f2c8 100644 --- a/HeatUp/src/de/heatup/objects/Objekt.java +++ b/HeatUp/src/de/heatup/objects/Objekt.java @@ -6,6 +6,10 @@ import java.io.IOException; import java.lang.reflect.Array; import java.util.Arrays; +import javax.imageio.ImageIO; +import javax.swing.ImageIcon; +import javax.swing.JLabel; + public class Objekt { private static int numberOfInstances; @@ -22,13 +26,13 @@ public class Objekt { * */ - Objekt(String filename) throws IOException { + public Objekt(String filename) throws IOException { numberOfInstances++; objectImage = ImageIO.read(new File(filename)); objectLabel = new JLabel(new ImageIcon(objectImage)); } - Objekt(char objectIdentifier) throws IOException { + public Objekt(char objectIdentifier) throws IOException { numberOfInstances++; String filename = getImageFilename(objectIdentifier); System.out.println(filename); diff --git a/HeatUp/src/de/heatup/ui/GameInterface.java b/HeatUp/src/de/heatup/ui/GameInterface.java index 2296d99..ad598a3 100644 --- a/HeatUp/src/de/heatup/ui/GameInterface.java +++ b/HeatUp/src/de/heatup/ui/GameInterface.java @@ -11,6 +11,9 @@ import javax.swing.BorderFactory; import javax.swing.JFrame; import javax.swing.JPanel; +import de.heatup.objects.Gegner; +import de.heatup.objects.Objekt; +