adjusted 'before' project of demo video

CedricReichenbach · Mar 5, 2013 · b875483 · b875483
1 parent 36baa7d
commit b875483
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 139 deletions.
diff --git a/DemoVideo/~$Script.rtf b/DemoVideo/~$Script.rtf
diff --git a/DemoVideo/~WRL0005.tmp b/DemoVideo/~WRL0005.tmp
diff --git a/DemoVideo_before/.classpath b/DemoVideo_before/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="ch.unibe.scg.doodle.buildpath.DD_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/DemoVideo_before/src/demo/DemoMain.java b/DemoVideo_before/src/demo/DemoMain.java
@@ -2,8 +2,6 @@
 
 import java.io.IOException;
 
-import ch.unibe.scg.doodle.Doo;
-
 import demo.model.Directory;
 import demo.util.DemoUtil;
 
@@ -22,7 +20,6 @@ public static void main(String[] args) throws IOException {
 			directory.addContact(DemoUtil.randomContact());
 		}
 
-		Doo.dle(directory);
-		// System.out.println(directory);
+		System.out.println(directory);
 	}
 }
diff --git a/DemoVideo_before/src/demo/model/Address.java b/DemoVideo_before/src/demo/model/Address.java
@@ -1,12 +1,11 @@
 package demo.model;
 
-
 public class Address {
 	private String street;
 	private int zipCode;
 	private String city;
 	private String country;
-	
+
 	public Address(String street, int zipCode, String city, String country) {
 		super();
 		this.street = street;
@@ -30,4 +29,19 @@ public String getCity() {
 	public String getCountry() {
 		return country;
 	}
+
+	// @Override
+	// public void doodleOn(DoodleCanvas c) {
+	// c.draw(street);
+	// c.newLine();
+	// c.draw(zipCode);
+	// c.draw(city);
+	// c.newColumn();
+	// c.draw(country);
+	// }
+	//
+	// @Override
+	// public void summarizeOn(DoodleCanvas c) {
+	// c.draw(city);
+	// }
 }
diff --git a/DemoVideo_before/src/demo/model/Contact.java b/DemoVideo_before/src/demo/model/Contact.java
@@ -2,10 +2,7 @@
 
 import java.awt.Image;
 
-import ch.unibe.scg.doodle.api.DoodleCanvas;
-import ch.unibe.scg.doodle.api.Doodleable;
-
-public class Contact implements Doodleable {
+public class Contact {
 	private String name;
 	private Address address;
 	private PhoneNumber phoneNumber;
@@ -40,20 +37,4 @@ public String toString() {
 		return "\n(" + name + ", " + address + ", " + phoneNumber + ")";
 	}
 
-	@Override
-	public void doodleOn(DoodleCanvas c) {
-		c.draw(picture);
-		c.newColumn();
-		c.draw(name);
-		c.newLine();
-		c.draw(phoneNumber);
-		c.newColumn();
-		c.draw(address);
-	}
-
-	@Override
-	public void summarizeOn(DoodleCanvas c) {
-		c.draw(name);
-	}
-
 }
diff --git a/DemoVideo_before/src/demo/model/Directory.java b/DemoVideo_before/src/demo/model/Directory.java
@@ -3,10 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import ch.unibe.scg.doodle.api.DoodleCanvas;
-import ch.unibe.scg.doodle.api.Doodleable;
-
-public class Directory implements Doodleable {
+public class Directory {
 	private Collection<Contact> contacts;
 
 	public Directory() {
@@ -23,25 +20,6 @@ public int numberOfContacts() {
 
 	public String toString() {
 		return contacts.toString();
-		// String result = "";
-		// result += "Directory: (";
-		// for (Contact contact : contacts) {
-		// result += contact+", ";
-		// }
-		// result += ")";
-	}
-
-	@Override
-	public void doodleOn(DoodleCanvas c) {
-		for (Contact contact : contacts) {
-			c.draw(contact);
-			c.newLine();
-		}
-	}
-
-	@Override
-	public void summarizeOn(DoodleCanvas c) {
-		c.draw("Directory with " + numberOfContacts() + " contacts");
 	}
 
 }
diff --git a/DemoVideo_before/src/demo/model/PhoneNumber.java b/DemoVideo_before/src/demo/model/PhoneNumber.java
@@ -18,4 +18,15 @@ public String getRest() {
 		return rest;
 	}
 
+	// @Override
+	// public void doodleOn(DoodleCanvas c) {
+	// c.draw(areaCode);
+	// c.draw(rest);
+	// }
+	//
+	// @Override
+	// public void summarizeOn(DoodleCanvas c) {
+	// doodleOn(c);
+	// }
+
 }