worked out missing messages, extended delete genre support to non-empty genres, worked out dark color schemeHEADmaster

2 files changed, 23 insertions, 19 deletions

diff --git a/cmpcj/src/de/schwarzrot/control/support/SelectedMedia.java b/cmpcj/src/de/schwarzrot/control/support/SelectedMedia.java
index efde378..1ab15de 100644
--- a/cmpcj/src/de/schwarzrot/control/support/SelectedMedia.java
+++ b/cmpcj/src/de/schwarzrot/control/support/SelectedMedia.java
@@ -1,25 +1,25 @@
 /**
  * ======================== legal notice ======================
  * 
- * File:      SelectedMedia.java
- * Created:   13. June 2012, 04:57
- * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
- * Project:   cmpc - a java frontend (client) part of compound media player
- *                   uses external players to play the media
+ * File: SelectedMedia.java Created: 13. June 2012, 04:57 Author: <a
+ * href="mailto:geronimo013@gmx.de">Geronimo</a> Project: cmpc - a java frontend
+ * (client) part of compound media player uses external players to play the
+ * media
  * 
  * CMP - compound media player
  * 
- * is a client/server mediaplayer intended to play any media from any workstation
- * without the need to export or mount shares. cmps is an easy to use backend
- * with a (ready to use) HTML-interface. Additionally the backend supports
- * authentication via HTTP-digest authorization.
- * cmpc is a client with vdr-like osd-menues.
+ * is a client/server mediaplayer intended to play any media from any
+ * workstation without the need to export or mount shares. cmps is an easy to
+ * use backend with a (ready to use) HTML-interface. Additionally the backend
+ * supports authentication via HTTP-digest authorization. cmpc is a client with
+ * vdr-like osd-menues.
  * 
- * Copyright (c) 2012 Reinhard Mantey, some rights reserved!
- * published under Creative Commons by-sa
- * For details see http://creativecommons.org/licenses/by-sa/3.0/
+ * Copyright (c) 2012 Reinhard Mantey, some rights reserved! published under
+ * Creative Commons by-sa For details see
+ * http://creativecommons.org/licenses/by-sa/3.0/
  * 
- * The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
+ * The cmp project's homepage is at
+ * http://projects.vdr-developer.org/projects/cmp
  * 
  * --------------------------------------------------------------
  */
@@ -75,7 +75,10 @@ public class SelectedMedia implements ListSelectionListener {
 
             if (sm.isSelectionEmpty())
                 return;
-            pcs.firePropertyChange(MEDIA_PROPERTY, this.media, this.media = mediaList.get(sm.getLeadSelectionIndex()));
+            int i = sm.getLeadSelectionIndex();
+
+            if (i > 0)
+                pcs.firePropertyChange(MEDIA_PROPERTY, this.media, this.media = mediaList.get(i));
         }
     }
 
diff --git a/cmpcj/src/de/schwarzrot/control/support/TreeCellEditor.java b/cmpcj/src/de/schwarzrot/control/support/TreeCellEditor.java
index b436207..6935249 100644
--- a/cmpcj/src/de/schwarzrot/control/support/TreeCellEditor.java
+++ b/cmpcj/src/de/schwarzrot/control/support/TreeCellEditor.java
@@ -8,12 +8,13 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellEditor;
 import javax.swing.tree.DefaultTreeCellRenderer;
-import de.schwarzrot.media.domain.AbstractMediaNode;
 import de.schwarzrot.media.domain.Genre;
+import de.schwarzrot.media.service.AbstractMediaChangeCommand;
+import de.schwarzrot.media.service.ChangeMediaCommand;
 
 
 public class TreeCellEditor extends DefaultTreeCellEditor implements CellEditorListener {
-    public TreeCellEditor(JTree tree, List<AbstractMediaNode> changes) {
+    public TreeCellEditor(JTree tree, List<AbstractMediaChangeCommand> changes) {
         super(tree, (DefaultTreeCellRenderer) tree.getCellRenderer());
         this.changes = changes;
         addCellEditorListener(this);
@@ -33,7 +34,7 @@ public class TreeCellEditor extends DefaultTreeCellEditor implements CellEditorL
 
         genre.setName((String) editedValue);
         if (!changes.contains(genre))
-            changes.add(genre);
+            changes.add(new ChangeMediaCommand(genre));
     }
 
 
@@ -48,5 +49,5 @@ public class TreeCellEditor extends DefaultTreeCellEditor implements CellEditorL
 
     private Object editedValue;
     private DefaultMutableTreeNode editedNode;
-    private List<AbstractMediaNode> changes;
+    private List<AbstractMediaChangeCommand> changes;
 }