From 43a07e130bb71b2113b6d24d6f3db55f9e26525a Mon Sep 17 00:00:00 2001
From: andreas <andreas.hainke@foteviken.de>
Date: Fri, 31 Oct 2014 13:47:15 +0100
Subject: [PATCH] Anpassungen am Objekt

---
 HeatUp/src/de/heatup/objects/Gegner.java   |  2 +-
 HeatUp/src/de/heatup/objects/Objekt.java   | 10 ++++----
 HeatUp/src/de/heatup/ui/GameInterface.java | 30 +++++++++++-----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/HeatUp/src/de/heatup/objects/Gegner.java b/HeatUp/src/de/heatup/objects/Gegner.java
index e38e07e..d02cfbd 100644
--- a/HeatUp/src/de/heatup/objects/Gegner.java
+++ b/HeatUp/src/de/heatup/objects/Gegner.java
@@ -24,7 +24,7 @@ public class Gegner {
 		} else {
 			fname="../resources/images/25x25_black.png";
 		}
-		opponentImage = ImageIO.read(new File("./resources/images/25x25_black.png"));
+		opponentImage = ImageIO.read(new File("src/de/heatup/resources/images/25x25_black.png"));
 		opponentLabel = new JLabel(new ImageIcon(opponentImage));
 		this.gegnerLogik();
 	}
diff --git a/HeatUp/src/de/heatup/objects/Objekt.java b/HeatUp/src/de/heatup/objects/Objekt.java
index 2afe2bd..5fc28b5 100644
--- a/HeatUp/src/de/heatup/objects/Objekt.java
+++ b/HeatUp/src/de/heatup/objects/Objekt.java
@@ -42,7 +42,7 @@ public class Objekt {
 	
 	private void setObjectImage() throws IOException {
 		String filename = getImageFilename(objectIdentifier);
-		System.out.println(filename);
+		System.out.println("Filename: " + filename);
 		objectImage = ImageIO.read(new File(filename));
 		objectLabel = new JLabel(new ImageIcon(objectImage));
 	}
@@ -52,18 +52,18 @@ public class Objekt {
 		switch (objectIdentifier) {
 		case '1':
 			//leiterbahn  
-			objectFilename="../resources/images/25x25_black.png";
+			objectFilename="src/de/heatup/resources/images/25x25_black.png";
 			break;
 		case '2':
 			//2:harware
-			objectFilename="../resources/images/25x25_red.png";
+			objectFilename="src/de/heatup/resources/images/25x25_red.png";
 			break;
 		case '3':
 			//3:wand
-			objectFilename="../resources/images/25x25_blue.png";
+			objectFilename="src/de/heatup/resources/images/25x25_blue.png";
 			break;
 		default:
-			objectFilename="images/25x25_orange.png";
+			objectFilename="src/de/heatup/resources/images/25x25_orange.png";
 			break;
 		}
 		System.out.println(objectFilename);
diff --git a/HeatUp/src/de/heatup/ui/GameInterface.java b/HeatUp/src/de/heatup/ui/GameInterface.java
index 77cb1d4..80537ae 100644
--- a/HeatUp/src/de/heatup/ui/GameInterface.java
+++ b/HeatUp/src/de/heatup/ui/GameInterface.java
@@ -90,16 +90,16 @@ public class GameInterface extends JFrame {
 		Gegner g2 = new Gegner();
 		Gegner g3 = new Gegner();
 
-		Objekt o1 = new Objekt("images/objekt_dot144.png");
-		o1.getLabel().setVisible(true);
+		//Objekt o1 = new Objekt('0');
+		//o1.getLabel().setVisible(true);
 
 		
-		Objekt s1 = new Objekt("../resources/images/25x25_black.png");
-		Objekt s2 = new Objekt("../resources/images/25x25_black.png");
-		Objekt s3 = new Objekt("../resources/images/25x25_black.png");
-		Objekt s4 = new Objekt("../resources/images/25x25_black.png");
-		Objekt s5 = new Objekt("../resources/images/25x25_black.png");
-		Objekt s6 = new Objekt("../resources/images/25x25_black.png");
+		Objekt s1 = new Objekt('0');
+		Objekt s2 = new Objekt('0');
+		Objekt s3 = new Objekt('0');
+		Objekt s4 = new Objekt('0');
+		Objekt s5 = new Objekt('0');
+		Objekt s6 = new Objekt('0');
 
 		
 		/*
@@ -109,14 +109,14 @@ public class GameInterface extends JFrame {
 		gameWindow.gamePanel.add(g2.getLabel());
 		gameWindow.gamePanel.add(g3.getLabel());
 
-		gameWindow.gamePanel.add(o1.getLabel());
+		//gameWindow.gamePanel.add(o1.getLabel());
 		
 		g1.getLabel().setBounds(300, 100, 20, 20);
 		g2.getLabel().setBounds(300, 200, 20, 20);
 		g3.getLabel().setBounds(300, 300, 20, 20);
 		
-		Objekt bg = new Objekt("images/bg_gray.png");
-		bg.setPosition(0, 0);
+		//Objekt bg = new Objekt("images/bg_gray.png");
+		//bg.setPosition(0, 0);
 
 		gameWindow.gamePanel.add(s1.getLabel());
 		gameWindow.gamePanel.add(s2.getLabel());
@@ -124,12 +124,12 @@ public class GameInterface extends JFrame {
 		gameWindow.gamePanel.add(s4.getLabel());
 		gameWindow.gamePanel.add(s5.getLabel());
 		gameWindow.gamePanel.add(s6.getLabel());
-		gameWindow.gamePanel.add(bg.getLabel());
+		//gameWindow.gamePanel.add(bg.getLabel());
 	
-		bg.getLabel().repaint();
+		//bg.getLabel().repaint();
 		
-		gameWindow.gamePanel.setComponentZOrder(o1.getLabel(), 0);
-		gameWindow.gamePanel.setComponentZOrder(bg.getLabel(), 5);
+		//gameWindow.gamePanel.setComponentZOrder(o1.getLabel(), 0);
+		//gameWindow.gamePanel.setComponentZOrder(bg.getLabel(), 5);
 		gameWindow.gamePanel.setComponentZOrder(g1.getLabel(), 1);
 		gameWindow.gamePanel.setComponentZOrder(g2.getLabel(), 1);
 		gameWindow.gamePanel.setComponentZOrder(g3.getLabel(), 1);