More error handling and cleanup.

Author: Layoric

src/ServiceStackEclipse/plugin.xml

@@ -21,14 +21,14 @@
    <extension
          point="org.eclipse.ui.commands">
       <command
-            id="net.servicestack.eclipse.commands.sampleCommand"
+            id="net.servicestack.eclipse.commands.updateReferenceCommand"
             name="Update ServiceStack Reference">
       </command>
    </extension>
    <extension
          point="org.eclipse.ui.bindings">
       <key
-            commandId="net.servicestack.eclipse.commands.sampleCommand"
+            commandId="net.servicestack.eclipse.commands.updateReferenceCommand"
             contextId="org.eclipse.ui.contexts.window"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="M1+6">
@@ -39,9 +39,9 @@
       <menuContribution
             locationURI="popup:org.eclipse.jdt.ui.PackageExplorer">
          	<command
-                commandId="net.servicestack.eclipse.commands.sampleCommand"
+                commandId="net.servicestack.eclipse.commands.updateReferenceCommand"
                 icon="icons/logo-16.png"
-                id="net.servicestack.eclipse.menus.sampleCommand"
+                id="net.servicestack.eclipse.menus.updateReferenceMenu"
                 mnemonic="M">
                 <visibleWhen>
 				   <with
@@ -59,7 +59,7 @@
    <extension point="org.eclipse.ui.handlers">
       <handler
             class="net.servicestack.eclipse.handlers.UpdateReferenceHandler"
-            commandId="net.servicestack.eclipse.commands.sampleCommand">
+            commandId="net.servicestack.eclipse.commands.updateReferenceCommand">
             <visibleWhen>
 				   <with
 				     variable="selection">

src/ServiceStackEclipse/src/net/servicestack/eclipse/handlers/UpdateReferenceHandler.java

@@ -37,7 +37,6 @@
 import org.eclipse.jface.dialogs.MessageDialog;
 
 /**
- * Our sample handler extends AbstractHandler, an IHandler base class.
  * @see org.eclipse.core.commands.IHandler
  * @see org.eclipse.core.commands.AbstractHandler
  */
@@ -80,9 +79,25 @@ protected IStatus run(IProgressMonitor monitor) {
 					showErrorDialogOnUIThread(shell,"Unable to read ServiceStack reference from project.");
 					return Status.CANCEL_STATUS;
 				}
-				
 				INativeTypesHandler nativeTypesHandler = new JavaNativeTypesHandler();
-				Map<String,String> options = nativeTypesHandler.parseComments(fileContents);
+				if(!nativeTypesHandler.isFileAServiceStackReference(fileContents)) {
+					showErrorDialogOnUIThread(shell,"Unable to read ServiceStack reference file Options. Have you deleted the Options header?");
+					return Status.CANCEL_STATUS;
+				}
+				
+				
+				Map<String,String> options = null;
+				try {
+					options = nativeTypesHandler.parseComments(fileContents);
+				} 
+				catch(IllegalArgumentException e) {
+					showErrorDialogOnUIThread(shell,"Unable to read BaseUrl option from ServiceStack reference file. Check BaseUrl in the Options header.");
+					return Status.CANCEL_STATUS;
+				}
+				catch(Exception e) {
+					showErrorDialogOnUIThread(shell,"Unable to read reference options. Check Options comment.");
+					return Status.CANCEL_STATUS;
+				}
 				String baseUrl = options.get("BaseUrl");
 				options.remove("BaseUrl");
 				String updatedCode = "";

src/ServiceStackEclipse/src/net/servicestack/eclipse/nativetypes/JavaNativeTypesHandler.java

@@ -34,6 +34,9 @@ public Map<String, String> parseComments(String codeOutput) {
             }
         }
 
+        if(baseUrl == null) {
+        	throw new IllegalArgumentException("Missing BaseURL value");
+        }
         if(!baseUrl.endsWith("/")) {
             baseUrl += "/";
         }