Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons

src/classes/TrackedDataSet.java

@@ -5,9 +5,9 @@ import java.awt.Color;
 public class TrackedDataSet {
 
 	//Property Integers
-	public final int CONSUMPTION = 0;
-	public final int PRODUCTION = 1;
-	public final int ACTIVATED_ELEMENTS = 2;
+	public static  final int CONSUMPTION = 0;
+	public static final int PRODUCTION = 1;
+	public static final int ACTIVATED_ELEMENTS = 2;
 
 	//Variables of the Data Set
 	private AbstractCpsObject cps;