summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeronimo <geronimo013@gmx.de>2012-08-15 08:49:41 +0200
committergeronimo <geronimo013@gmx.de>2012-08-15 08:49:41 +0200
commit317c25c4fd88b2f7611f249b2ae73cf2aa80d051 (patch)
treec79a05a55d173afb5e5c93a4d592e95f42f8706f
parentaf80bd2426282b7491d9ba0ebfb201abb42e3ca4 (diff)
downloadcmp-317c25c4fd88b2f7611f249b2ae73cf2aa80d051.tar.gz
cmp-317c25c4fd88b2f7611f249b2ae73cf2aa80d051.tar.bz2
added support for creating new server entries
-rw-r--r--cmpcj/src/de/schwarzrot/control/config/ConfigDialog.java48
-rw-r--r--cmpcj/src/de/schwarzrot/control/table/ServerDefinitionTableFormat.java35
2 files changed, 54 insertions, 29 deletions
diff --git a/cmpcj/src/de/schwarzrot/control/config/ConfigDialog.java b/cmpcj/src/de/schwarzrot/control/config/ConfigDialog.java
index 2acb026..4bc71c7 100644
--- a/cmpcj/src/de/schwarzrot/control/config/ConfigDialog.java
+++ b/cmpcj/src/de/schwarzrot/control/config/ConfigDialog.java
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
*
- * File: ConfigDialog.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: ConfigDialog.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
*
* --------------------------------------------------------------
*/
@@ -27,11 +27,15 @@ package de.schwarzrot.control.config;
import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
import java.util.List;
+import javax.swing.AbstractAction;
import javax.swing.JComponent;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
import javax.swing.JTable;
+import javax.swing.KeyStroke;
import ca.odell.glazedlists.BasicEventList;
import ca.odell.glazedlists.EventList;
import ca.odell.glazedlists.GlazedLists;
@@ -96,6 +100,11 @@ public class ConfigDialog extends AbstractDialog {
}
+ protected void createServerDefinition() {
+ serverDefinitions.add(new MediaServer());
+ }
+
+
protected JComponent createServerTable() {
serverDefinitions = GlazedLists.eventList(config.getKnownServers());
ServerDefinitionTableFormat stf = new ServerDefinitionTableFormat();
@@ -112,6 +121,17 @@ public class ConfigDialog extends AbstractDialog {
serverTable.getColumnModel().getColumn(i).setMaxWidth(cw);
}
}
+ serverTable.getActionMap().put("createServerDefinition", new AbstractAction() {
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ createServerDefinition();
+ }
+ });
+ serverTable.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, 0), "createServerDefinition");
+
return serverTableScrollPane;
}
diff --git a/cmpcj/src/de/schwarzrot/control/table/ServerDefinitionTableFormat.java b/cmpcj/src/de/schwarzrot/control/table/ServerDefinitionTableFormat.java
index 2e4c630..e13fc3c 100644
--- a/cmpcj/src/de/schwarzrot/control/table/ServerDefinitionTableFormat.java
+++ b/cmpcj/src/de/schwarzrot/control/table/ServerDefinitionTableFormat.java
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
*
- * File: ServerDefinitionTableFormat.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: ServerDefinitionTableFormat.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
*
* --------------------------------------------------------------
*/
@@ -101,7 +101,12 @@ public class ServerDefinitionTableFormat implements WritableTableFormat<MediaSer
public MediaServer setColumnValue(MediaServer sd, Object value, int column) {
switch (column) {
case 0:
- sd.setHostName(value.toString());
+ String hn = value.toString();
+
+ if (!hn.contains(" "))
+ sd.setHostName(value.toString());
+ else
+ System.err.println("hostname may not contain any blanks! Please correct the value [" + hn + "]");
break;
case 1: