progressbar text change

GalKarp · Sep 6, 2014 · de4b380 · de4b380
1 parent 29a6fe1
commit de4b380
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/Java-Missle/src/missile/DestructedLanucher.java b/Java-Missle/src/missile/DestructedLanucher.java
@@ -43,7 +43,7 @@ public void run() {
 				for(int time = 0 ; time <= super.getDelayBeforeLaunch() ; time++){
 				    Thread.sleep(War.TIME_INTERVAL);
 				    for (WarEventListener l : allListeners) {
-					l.UpdatedMissileProgressToModelEvent(time, target.getLauncherId() , "destructor");
+					l.UpdatedMissileProgressToModelEvent(time, target.getLauncherId() , "destructor",(destructor.getType()+" #" + destructor.getDestructorId()),0,super.getDelayBeforeLaunch());
 				    }
 				}
 				for (WarEventListener l : allListeners) {

diff --git a/Java-Missle/src/missile/Missile.java b/Java-Missle/src/missile/Missile.java
@@ -130,7 +130,7 @@ public void run() {
 			for(int time = 0 ; time <= flyTime ; time++){
 			    Thread.sleep(War.TIME_INTERVAL);
 			    for (WarEventListener l : allListeners) {
-				l.UpdatedMissileProgressToModelEvent(time, missileId , "missile");
+				l.UpdatedMissileProgressToModelEvent(time, missileId , "missile",destination,damage,flyTime);
 			    }
 			}
 			for (WarEventListener l : allListeners) {

diff --git a/Java-Missle/src/war/controller/AbstractWarView.java b/Java-Missle/src/war/controller/AbstractWarView.java
@@ -12,9 +12,10 @@ public interface AbstractWarView {
 	void addMissileToUI(String missileId, String destination, int damage,
 			int flyTime);
 	void destroyMissileProgress(String missileId, String type);
-	void updateMissileProgress(int time, String missileId, String type);
 	void addDestroyerProgress(String destructor_id, String target_id,
 		int destruct_time);
 	void removeLauncherFromView(String launcherId);
+	void updateMissileProgress(int time, String missileId, String type,
+			String destination, int damage, int flyTime);
 
 }
diff --git a/Java-Missle/src/war/controller/WarController.java b/Java-Missle/src/war/controller/WarController.java
@@ -124,15 +124,6 @@ public void addMissileToProgress(String name, String dest,
 
 	}
 
-
-	@Override
-	public void UpdatedMissileProgressToModelEvent(int time , String missileId , String type) {
-	    // TODO Auto-generated method stub
-	    warView.updateMissileProgress(time , missileId , type);
-	}
-
-
-
 	@Override
 	public void destroyLauncherInUI(String destroyerId,
 			String launcherIdToDestroy) {
@@ -171,6 +162,17 @@ public void RemovedLauncherFromUI(String launcherId) {
 
 
 
+	@Override
+	public void UpdatedMissileProgressToModelEvent(int time, String missileId,
+			String type, String destination, int damage, int flyTime) {
+		warView.updateMissileProgress(time , missileId , type,destination,damage,flyTime);
+
+	}
+
+
+
+
+
 
 
 

diff --git a/Java-Missle/src/war/controller/WarEventListener.java b/Java-Missle/src/war/controller/WarEventListener.java
@@ -11,8 +11,8 @@ void addedMissileToModelEvent(String missileId, String destination,
 		int damage, int flyTime);
 	void addedLauncherToDestroy(String destructor_id, String target_id, int destruct_time);
 	void DestroyMissileProgressBar(String missileId, String string);
-	void UpdatedMissileProgressToModelEvent(int time, String missileId,
-		String string);
 	void RemovedLauncherFromUI(String launcherId);
+	void UpdatedMissileProgressToModelEvent(int time, String missileId,
+			String string, String destination, int damage, int flyTime);
 
 }