More work for timings

Author: bensku

src/main/java/ch/njol/skript/timings/Timing.java

@@ -21,9 +21,40 @@
 
 package ch.njol.skript.timings;
 
-/**
- *
- */
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
 public class Timing {
 
+	public class Capture {
+		
+		Timing parent;
+		
+		protected Capture(Timing parent) {
+			this.parent = parent;
+		}
+		
+		public void start() {
+			
+		}
+	}
+	
+	private List<Capture> captures = new ArrayList<Capture>();
+	
+	/**
+	 * Creates a new timing. Only used for {@link Timings}
+	 */
+	protected Timing() {
+		captures = new ArrayList<Capture>();
+	}
+	
+	/**
+	 * Creates a capture for timing.
+	 * @return
+	 */
+	public Capture capture() {
+		return new Capture(this);
+	}
 }

src/main/java/ch/njol/skript/timings/Timings.java

@@ -31,29 +31,20 @@
  */
 public class Timings {
 
-	static class TimingObject extends HashMap<String,Timing> {}
+	private static Map<String,Timing> timings = new HashMap<String,Timing>();
 
-	private static Map<Object,TimingObject> timings = new HashMap<Object,TimingObject>();
-	
-	public static Timing of(Object obj, String name) {
-		TimingObject map;
+	public static Timing of(String name) {
+		Timing timing;
 		synchronized (timings) {
-			if (timings.containsKey(obj)) {
-				map = timings.get(obj);
+			if (timings.containsKey(name)) {
+				timing = timings.get(name);
 			} else {
-				map = new TimingObject();
-				timings.put(obj, map);
+				timing = new Timing();
+				timings.put(name, timing);
 			}
 		}
 
-		synchronized (map) {
-			if (map.containsKey(name)) {
-				return map.get(name);
-			} else {
-				Timing timing = new Timing();
-				map.put(name, timing);
-				return timing;
-			}
-		}
+		assert timing != null;
+		return timing;
 	}
 }