From 301f77acdd559f0a5acb5d6750e025c4bd195b82 Mon Sep 17 00:00:00 2001 From: geronimo Date: Thu, 16 Aug 2012 09:47:55 +0200 Subject: fixed revoke of config dialog, and genre editing, improved visual consistency --- .../de/schwarzrot/media/domain/MediaServer.java | 41 +++++++++++++-------- .../schwarzrot/media/domain/PlayerDefinition.java | 43 ++++++++++++++-------- 2 files changed, 53 insertions(+), 31 deletions(-) (limited to 'cmpcj/src/de/schwarzrot/media/domain') diff --git a/cmpcj/src/de/schwarzrot/media/domain/MediaServer.java b/cmpcj/src/de/schwarzrot/media/domain/MediaServer.java index a8968c4..5ee0371 100644 --- a/cmpcj/src/de/schwarzrot/media/domain/MediaServer.java +++ b/cmpcj/src/de/schwarzrot/media/domain/MediaServer.java @@ -1,32 +1,43 @@ /** * ======================== legal notice ====================== * - * File: MediaServer.java - * Created: 13. June 2012, 04:57 - * Author: Geronimo - * Project: cmpc - a java frontend (client) part of compound media player - * uses external players to play the media + * File: MediaServer.java Created: 13. June 2012, 04:57 Author: Geronimo 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 * * -------------------------------------------------------------- */ package de.schwarzrot.media.domain; -public class MediaServer { +public class MediaServer implements Cloneable { + @Override + public Object clone() { + MediaServer rv = new MediaServer(); + + rv.hostName = hostName; + rv.port = port; + + return rv; + } + + public String getHostName() { return hostName; } diff --git a/cmpcj/src/de/schwarzrot/media/domain/PlayerDefinition.java b/cmpcj/src/de/schwarzrot/media/domain/PlayerDefinition.java index 05b9bbc..85f4f3c 100644 --- a/cmpcj/src/de/schwarzrot/media/domain/PlayerDefinition.java +++ b/cmpcj/src/de/schwarzrot/media/domain/PlayerDefinition.java @@ -1,25 +1,25 @@ /** * ======================== legal notice ====================== * - * File: PlayerDefinition.java - * Created: 13. June 2012, 04:57 - * Author: Geronimo - * Project: cmpc - a java frontend (client) part of compound media player - * uses external players to play the media + * File: PlayerDefinition.java Created: 13. June 2012, 04:57 Author: Geronimo 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 * * -------------------------------------------------------------- */ @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.List; -public class PlayerDefinition { +public class PlayerDefinition implements Cloneable { public PlayerDefinition() { parameters = new ArrayList(); } @@ -41,6 +41,17 @@ public class PlayerDefinition { } + @Override + public Object clone() { + PlayerDefinition pd = new PlayerDefinition(); + + pd.mediaType = mediaType; + pd.setCommandLine(getCommandLine()); + + return pd; + } + + public String getCommandLine() { if (commandLine == null) assembleCommandLine(); @@ -87,7 +98,7 @@ public class PlayerDefinition { protected void assembleCommandLine() { - if (executable == null || parameters == null || parameters.size() < 1) + if (executable == null || parameters == null) return; StringBuilder sb = new StringBuilder(executable); -- cgit v1.2.3