#90 [WIP] on redesigning the channel processing gui components and backing model. Simplifies channel state by introducing a new Metadata class that tracks all metadata for all decoders.

src/alias/Alias.java

@@ -117,9 +117,9 @@ public class Alias
 		mColor = color;
 	}
 
-	public Color getMapColor()
+	public Color getDisplayColor()
 	{
-		return new Color( mColor );
+		return new Color( getColor() );
 	}
 	
 	@XmlAttribute

src/alias/AliasNameEditor.java

@@ -148,7 +148,7 @@ public class AliasNameEditor extends Editor<Alias>
                 Color newColor = JColorChooser.showDialog(
                     AliasNameEditor.this,
                     "Choose color for this alias",
-                    (hasItem() ? getItem().getMapColor() : null));
+                    (hasItem() ? getItem().getDisplayColor() : null));
 
                 if(newColor != null)
                 {
@@ -264,7 +264,7 @@ public class AliasNameEditor extends Editor<Alias>
 
             mGroupCombo.setSelectedItem(alias.getGroup());
 
-            Color color = alias.getMapColor();
+            Color color = alias.getDisplayColor();
 
             mButtonColor.setBackground(color);
             mButtonColor.setForeground(color);

src/alias/PatchGroupAlias.java

@@ -47,6 +47,17 @@ public class PatchGroupAlias extends Alias
     {
     }
 
+    @Override
+    public int getColor()
+    {
+        if(mPatchGroupAlias != null)
+        {
+            return mPatchGroupAlias.getColor();
+        }
+
+        return super.getColor();
+    }
+
     /**
      * Sets an alias for this patch group ID
      */