فهرست منبع

Added Time support.

Gilian Joosen 11 سال پیش
والد
کامیت
1fb311992d
3فایلهای تغییر یافته به همراه31 افزوده شده و 13 حذف شده
  1. 4 4
      src/GUI.java
  2. 5 9
      src/agenda/ActTime.java
  3. 22 0
      src/agenda/Time.java

+ 4 - 4
src/GUI.java

@@ -1,9 +1,6 @@
 package src;
 package src;
 
 
-import src.agenda.Act;
-import src.agenda.Agenda;
-import src.agenda.Artist;
-import src.agenda.Stage;
+import src.agenda.*;
 
 
 import java.awt.Color;
 import java.awt.Color;
 import java.awt.EventQueue;
 import java.awt.EventQueue;
@@ -51,6 +48,9 @@ public class GUI {
         agenda.addAct(new Act(agenda.getStages().get(0), "Heavy metal", agenda.getArtists().get(0)));
         agenda.addAct(new Act(agenda.getStages().get(0), "Heavy metal", agenda.getArtists().get(0)));
         
         
         System.out.println(agenda);
         System.out.println(agenda);
+        
+        //test time
+        System.out.println(new ActTime(new Time(10, 30), new Time(11, 20)).getLength());
 	}
 	}
 
 
 	/**
 	/**

+ 5 - 9
src/agenda/ActTime.java

@@ -1,7 +1,5 @@
 package src.agenda;
 package src.agenda;
 
 
-import java.sql.Time;
-
 /**
 /**
  * Created by gjoosen on 06/02/15.
  * Created by gjoosen on 06/02/15.
  */
  */
@@ -13,12 +11,10 @@ public class ActTime {
         this.beginTime = beginTime;
         this.beginTime = beginTime;
         this.endTime = endTime;
         this.endTime = endTime;
     }
     }
-
-    public Time getBeginTime() {
-        return beginTime;
-    }
-
-    public Time getEndTime() {
-        return endTime;
+    
+    public int getLength(){
+        int difHours = this.endTime.getHours() - this.beginTime.getHours();
+        int difMinutes = this.endTime.getMinutes() - this.beginTime.getMinutes();
+        return difHours  * 60 + difMinutes;
     }
     }
 }
 }

+ 22 - 0
src/agenda/Time.java

@@ -0,0 +1,22 @@
+package src.agenda;
+
+/**
+ * Created by gjoosen on 07/02/15.
+ */
+public class Time {
+    
+    private int hours, minutes;
+    
+    public Time(int hours, int minutes){
+        this.hours = hours;
+        this.minutes = minutes;
+    }
+
+    public int getHours() {
+        return hours;
+    }
+
+    public int getMinutes() {
+        return minutes;
+    }
+}