From bd3b4e58b22a9ec87fd4e7e30f5476825ed6a401 Mon Sep 17 00:00:00 2001
From: DarkGuardsman <rseifert.phone@gmail.com>
Date: Mon, 2 Sep 2013 16:26:19 -0400
Subject: [PATCH] Place IColorCoded interface in ColorCode.class

---
 src/dark/interfaces/ColorCode.java   | 11 ++++++++++-
 src/dark/interfaces/IColorCoded.java | 10 ----------
 2 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 src/dark/interfaces/IColorCoded.java

diff --git a/src/dark/interfaces/ColorCode.java b/src/dark/interfaces/ColorCode.java
index 2cd63f329..6b36c2109 100644
--- a/src/dark/interfaces/ColorCode.java
+++ b/src/dark/interfaces/ColorCode.java
@@ -32,7 +32,7 @@ public enum ColorCode
     }
 
     /** gets a ColorCode from any of the following
-     * 
+     *
      * @param obj - Integer,String,LiquidData,ColorCode
      * @return Color NONE if it can't find it */
     public static ColorCode get(Object obj)
@@ -58,4 +58,13 @@ public enum ColorCode
         return NONE;
     }
 
+    public static interface IColorCoded
+    {
+        /** Returns the ColorCode of the object */
+        public ColorCode getColor();
+
+        /** Sets the ColorCode of the Object */
+        public void setColor(Object obj);
+    }
+
 }
diff --git a/src/dark/interfaces/IColorCoded.java b/src/dark/interfaces/IColorCoded.java
deleted file mode 100644
index 603ffaba2..000000000
--- a/src/dark/interfaces/IColorCoded.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package dark.interfaces;
-
-public interface IColorCoded
-{
-    /** Returns the ColorCode of the object */
-    public ColorCode getColor();
-
-    /** Sets the ColorCode of the Object */
-    public void setColor(Object obj);
-}