Some cleanups

dict-ws/tdt4250.dict3.gogo/src/tdt4250/dict3/gogo/DictCommands.java

@@ -8,6 +8,7 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.annotations.Component;
 
 import tdt4250.dict3.api.Dict;
@@ -30,62 +31,60 @@ import tdt4250.dict3.util.SortedSetWords;
 	)
 public class DictCommands {
 
-	public void listDicts() throws InvalidSyntaxException {
+	public void listDicts() {
 		System.out.println("Dictionaries: ");
 		// iterate through all Dict service objects
 		BundleContext bc = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
+		try {
 			for (ServiceReference<Dict> serviceReference : bc.getServiceReferences(Dict.class, null)) {
 				Dict dict = bc.getService(serviceReference);
 				System.out.print(dict.getDictName() + " ");
 			}
 			System.out.println();
+		} catch (InvalidSyntaxException e) {
+		}
 	}
 	
-	public void dictLookup(String s) throws InvalidSyntaxException {
+	public void dictLookup(String s) {
 		BundleContext bc = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
+		try {
 			// iterate through all Dict service objects
 			for (ServiceReference<Dict> serviceReference : bc.getServiceReferences(Dict.class, null)) {
 				Dict dict = bc.getService(serviceReference);
 				DictSearchResult search = dict.search(s);
 				System.out.println(dict.getDictName() + ": " + search.getMessage());
 			}
+		} catch (InvalidSyntaxException e) {
+		}
 	}
 	
 	public void addDict(String name, String urlStringOrWord, String... ss) {
 		MutableWords words = null;
-		URL url = null;
 		try {
-			url = new URL(urlStringOrWord);
-		} catch (MalformedURLException e) {
-		}
-		if (url != null) {
+			URL url = new URL(urlStringOrWord);
 			try {
 				words = new ResourceWords(url.openStream());
 			} catch (IOException e) {
 				System.err.println("Couldn't read from " + url);
+				return;
 			}
-		} else {
+		} catch (MalformedURLException e) {
 			words = new SortedSetWords();
 			words.addWord(urlStringOrWord);
 		}
-		if (words != null) {
 		for (String s : ss) {
 			words.addWord(s);
 		}
-			boolean exists = false;
-			try {
-				exists = removeDict(name, false) > 0;
-			} catch (InvalidSyntaxException e) {
-			}
+		boolean exists = removeDict(name, false) > 0;
 		BundleContext bc = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
 		bc.registerService(Dict.class, new CommandDict(name, words), null);
 		System.out.println("\"" + name + "\" dictionary " + (exists ? "replaced" : "added"));
 	}
-	}
 	
-	private int removeDict(String name, boolean showMessage) throws InvalidSyntaxException {
+	private int removeDict(String name, boolean showMessage) {
 		int count = 0;
 		BundleContext bc = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
+		try {
 			// iterate through all Dict service objects
 			for (ServiceReference<Dict> serviceReference : bc.getServiceReferences(Dict.class, null)) {
 				Dict dict = bc.getService(serviceReference);
@@ -100,10 +99,12 @@ public class DictCommands {
 			if (count == 0 && showMessage) {
 				System.out.println("\"" + name + "\" dictionary not found");			
 			}
+		} catch (InvalidSyntaxException e) {
+		}
 		return count;
 	}
 
-	public void removeDict(String name) throws InvalidSyntaxException {
+	public void removeDict(String name) {
 		removeDict(name, true);
 	}
 }