Fix for issue 1

Author: matt

.classpath

@@ -11,6 +11,6 @@
 	<classpathentry kind="lib" path="C:/workspace/CLIMediaRenderer/httpcore-4.2.1.jar" sourcepath="C:/Users/Matt/Desktop/httpcomponents-core-4.2.1-src/httpcomponents-core-4.2.1"/>
 	<classpathentry kind="lib" path="C:/workspace/CLIMediaRenderer/httpclient-4.2.1.jar"/>
 	<classpathentry kind="lib" path="C:/workspace/CLIMediaRenderer/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="C:/workspace/CLIMediaRenderer/javampd-4.1.jar"/>
+	<classpathentry kind="lib" path="C:/workspace/CLIMediaRenderer/JMPDComm.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

build.xml

@@ -8,7 +8,7 @@
                 <attribute name="Main-Class" value="org.eclipse.jdt.internal.jarinjarloader.JarRsrcLoader"/>
                 <attribute name="Rsrc-Main-Class" value="org.matt1.climediarenderer.MediaRenderer"/>
                 <attribute name="Class-Path" value="."/>
-                <attribute name="Rsrc-Class-Path" value="./ cling-core-2.0-20111017.171724-1.jar teleal-common-1.0.6.jar cling-support-2.0-20111017.171832-1.jar seamless-util-1.0-20111017.170503-1.jar seamless-xml-1.0-20111129.053837-2.jar seamless-http-1.0-20111017.170623-1.jar httpcore-4.2.1.jar httpclient-4.2.1.jar commons-logging-1.1.1.jar javampd-4.1.jar"/>
+                <attribute name="Rsrc-Class-Path" value="./ cling-core-2.0-20111017.171724-1.jar teleal-common-1.0.6.jar cling-support-2.0-20111017.171832-1.jar seamless-util-1.0-20111017.170503-1.jar seamless-xml-1.0-20111129.053837-2.jar seamless-http-1.0-20111017.170623-1.jar httpcore-4.2.1.jar httpclient-4.2.1.jar commons-logging-1.1.1.jar JMPDComm.jar"/>
             </manifest>
             <zipfileset src="jar-in-jar-loader.zip"/>
             <fileset dir="C:/workspace/CLIMediaRenderer/bin"/>
@@ -21,7 +21,7 @@
             <zipfileset dir="C:\workspace\CLIMediaRenderer" includes="httpcore-4.2.1.jar"/>
             <zipfileset dir="C:\workspace\CLIMediaRenderer" includes="httpclient-4.2.1.jar"/>
             <zipfileset dir="C:\workspace\CLIMediaRenderer" includes="commons-logging-1.1.1.jar"/>
-            <zipfileset dir="C:\workspace\CLIMediaRenderer" includes="javampd-4.1.jar"/>
+            <zipfileset dir="C:\workspace\CLIMediaRenderer" includes="JMPDComm.jar"/>
         </jar>
     </target>
 </project>

cliMediaRenderer.jar

@@ -20,13 +20,17 @@ public static void main(final String[] args) throws Exception {
 
     	configureLogging();
 
-    	CliMediaRenderer mediaRenderer = new CliMediaRenderer(PropertyHelper.getName());
-
-    	UpnpServiceImpl upnp = new UpnpServiceImpl(new ApacheServiceConfiguration());
-    	
-    	upnp.getRegistry().addDevice(
-                mediaRenderer.getDevice()
-        );
+    	try {
+	    	CliMediaRenderer mediaRenderer = new CliMediaRenderer(PropertyHelper.getInstance().getName());
+	
+	    	UpnpServiceImpl upnp = new UpnpServiceImpl(new ApacheServiceConfiguration());
+	    	
+	    	upnp.getRegistry().addDevice(
+	                mediaRenderer.getDevice()
+	        );
+    	} catch (Exception e) {
+    		Logger.getLogger(MediaRenderer.class.getName()).severe("Unexpected error starting up: " + e.getMessage());
+    	}
 
     }
 

javampd-4.1.jar

@@ -55,14 +55,16 @@ public static void main(String[] args) throws PlayerException, InterruptedExcept
 	 */
 	public MPlayer(String mediaPath) throws PlayerException {
 		try {
-			mPlayer = Runtime.getRuntime().exec(PropertyHelper.getMPlayerPath() + " -slave -quiet -idle "); 
+			mPlayer = Runtime.getRuntime().exec(PropertyHelper.getInstance().getMPlayerPath() + " -slave -quiet -idle "); 
 			mPlayerStream = new PrintStream(mPlayer.getOutputStream());
 			this.mediaPath = mediaPath;
 			Runtime.getRuntime().addShutdownHook(cleanupThread);
 			log.info("New MPlayer player ready.");
 		} catch (IOException e) {
 			log.warning("Unable to create MPlayer instance.");
 			throw new PlayerException("Unable to instantiate player.");
+		} catch (Exception e) {
+			log.severe(e.getMessage());
 		}
 	}
 

src/org/matt1/climediarenderer/MediaRenderer.java

@@ -16,16 +16,19 @@ public class PlayerFactory {
 	 * @throws PlayerException 
 	 */
 	public static BasicPlayer getPlayer(String mediaPath) throws PlayerException {
-		
-		String type = PropertyHelper.getMediaPlayer().toLowerCase();
+		String type;
+		try {
+			type = PropertyHelper.getInstance().getMediaPlayer().toLowerCase();
+		} catch (Exception e) {
+			throw new PlayerException("Unable to load media player type from config: " + e.getMessage());
+		}
 
 		if (type.equals("mplayer")) {
 			return new MPlayer(mediaPath);
 		} else {
 			throw new PlayerException("Unknown media player type");
 		}
 
-		
 
 	}
 

src/org/matt1/climediarenderer/player/MPlayer.java

@@ -79,20 +79,24 @@ public class CliMediaRenderer {
     /** Longer lock for slower hardware/JRE */
     protected static final int TIMEOUT = 2000;
 
+    /** PropertyHelper instance */
+    protected PropertyHelper properties;
+    
     /**
      * Creates a new device using the default device details
      * 
      * @throws IllegalArgumentException
      * @throws ValidationException
      * @throws IOException 
      */
-    public CliMediaRenderer() throws IllegalArgumentException, ValidationException, IOException {
-        
+    public CliMediaRenderer() throws IllegalArgumentException, ValidationException, IOException, Exception {
+    	
     	this(new DeviceDetails(
                 "CliMediaRenderer",
                 new ManufacturerDetails(MANUFACTURER_NAME, MANUFACTURER_SITE),
                 new ModelDetails(MODEL_NAME, MODEL_DESCRIPTION, MODEL_VERSION, MODEL_SITE)
         ));
+    	   
     }
 
     /**
@@ -104,28 +108,44 @@ public CliMediaRenderer() throws IllegalArgumentException, ValidationException,
      * @throws IOException 
      */
     public CliMediaRenderer(String name) throws IllegalArgumentException, 
-    	ValidationException, IOException {
+    	ValidationException, IOException, Exception {
     	this(new DeviceDetails(
                 name,
                 new ManufacturerDetails(MANUFACTURER_NAME, MANUFACTURER_SITE),
                 new ModelDetails(MODEL_NAME, MODEL_DESCRIPTION, MODEL_VERSION, MODEL_SITE)
         ));
     }
 
+    /**
+     * Try loading the properties from the configuration file.
+     * 
+     * @throws Exception
+     */
+    private void loadProperties() throws Exception {
+    	
+    	// Load properties
+    	try {
+			properties = PropertyHelper.getInstance();
+		} catch (Exception e) {
+			log.severe("Unable to load the config file! " + e.getMessage());
+			System.exit(1);
+		}	
+    }
+    
     /**
      * Try loading the icon specified in the properties file
      */
     private Icon loadIcon() {
-    	File iconFile = new File(PropertyHelper.getIconPath());
+    	File iconFile = new File(properties.getIconPath());
     	Icon icon = null;
     	try {
 	    	if (iconFile.exists() && iconFile.canRead()) {
 	    		icon = new Icon("image/png", 48, 48, 8, iconFile);
 	    	} else {
-	    		log.warning("Custom icon " + PropertyHelper.getIconPath() + " could not be read.");
+	    		log.warning("Custom icon " + properties.getIconPath() + " could not be read.");
 	    	}
     	} catch (IOException e) {
-    		log.warning("IO Exception trying to load icon file at " + PropertyHelper.getIconPath());
+    		log.warning("IO Exception trying to load icon file at " + properties.getIconPath());
     	}
     	return icon;
     }
@@ -139,8 +159,10 @@ private Icon loadIcon() {
      */
     @SuppressWarnings("unchecked")
 	public CliMediaRenderer(DeviceDetails deviceDetails) throws IllegalArgumentException, 
-		ValidationException, IOException {
+		ValidationException, IOException, Exception {
 
+    	loadProperties();
+    	
         LocalService<CliMRConnectionManagerService> connectionManagerService = serviceBinder.read(CliMRConnectionManagerService.class);
         connectionServiceManager =
                 new DefaultServiceManager<CliMRConnectionManagerService>(connectionManagerService) {

src/org/matt1/climediarenderer/player/PlayerFactory.java

@@ -12,64 +12,77 @@
  */
 public class PropertyHelper {
 
-	private static Properties properties = new Properties();
-	static {
-		try {
-			properties.load(new FileInputStream("cliMediaRenderer.properties"));
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+	private Properties properties;
+	private static PropertyHelper propertyHelper;
+
+	
+	public static PropertyHelper getInstance() throws Exception {
+		
+		if (propertyHelper == null) {
+		
+			propertyHelper = new PropertyHelper();
+			
+			try {
+				propertyHelper.properties.load(new FileInputStream("cliMediaRenderer.properties"));
+			} catch (FileNotFoundException e) {
+				throw new Exception("File not found: ./cliMediaRenderer.properties", e);
+			} catch (IOException e) {
+				throw new Exception("Cannot open file: ./cliMediaRenderer.properties", e);
+			}
 		}
+		return propertyHelper;
+	}
+	
+	private PropertyHelper() {
+		properties = new Properties();
+		
 	}
 
 	/**
 	 * Gets the playerType property for use by the player factory
 	 * @return
 	 */
-	public static String getMediaPlayer() {
+	public String getMediaPlayer() {
 		return (String) properties.get("playerType");
 	}
 
 	/**
 	 * Gets the path to MPlayer
 	 * @return
 	 */
-	public static String getMPlayerPath() {
+	public String getMPlayerPath() {
 		return (String) properties.get("mplayerPath");
 	}
 
 	/**
 	 * Gets the name of the player
 	 * @return
 	 */
-	public static String getName() {
+	public String getName() {
 		return (String) properties.getProperty("name");
 	}
 
 	/**
 	 * Gets the path to the icon file
 	 * @return
 	 */
-	public static String getIconPath() {
+	public String getIconPath() {
 		return (String) properties.getProperty("icon");
 	}
 
 	/**
 	 * Gets the hostname of the MPD client
 	 * @return
 	 */
-	public static String getMPDHost() {
+	public String getMPDHost() {
 		return (String) properties.getProperty("mpdHost");
 	}
 
 	/**
 	 * Gets the port of the MPD client
 	 * @return
 	 */
-	public static int getMPDPort() {
+	public int getMPDPort() {
 		return Integer.valueOf(properties.getProperty("mpdPort"));
 	}
 }