* Added comments

* Removed connection uris from java files.

RegistryParser/files/other/.gitignore

@@ -0,0 +1 @@
+connection.txt

RegistryParser/src/models/DataController.java

@@ -6,16 +6,21 @@
 import java.util.Calendar;
 import java.util.HashSet;
 
+/**
+ * Class to contain all the information about a data controller
+ * @author Mohammad Ali
+ *
+ */
 public class DataController {
 	private String registrationNumber, organisationName, companiesHouseNumber,
 			postcode, country, foiFlag, exemptFlag, tradingName, ukContact,
 			subjectAccess, format;
 	private Calendar startDate, endDate;
 	private ArrayList<String> address;
 
-	// new format
+	// new format - an object on its own
 	private NewFormat newFormat;
-	// old format
+	// old format - list of purpose objects
 	private ArrayList<Purpose> oldFormat;
 
 	public DataController() {

RegistryParser/src/parser/RegistryParser.java

@@ -2,6 +2,8 @@
 
 import java.io.BufferedWriter;
 import java.io.FileWriter;
+import java.io.BufferedReader;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -65,7 +67,8 @@ public class RegistryParser extends DefaultHandler {
 	public RegistryParser() throws IOException {
 		gson = new Gson();
 		out = new PrintWriter(new BufferedWriter(new FileWriter("files/other/Errors.txt")));
-		dbURI = new MongoClientURI("mongodb://admin:[email protected]:33629/data_controllers");
+		String uri = new BufferedReader(new FileReader("files/other/connection.txt")).readLine();
+		dbURI = new MongoClientURI(uri);
 		client = new MongoClient(dbURI);
 		// client = new MongoClient("localhost",27017);
 		// database = client.getDB("dataControllers");

WebApplication/app/controllers/Util.java

@@ -1,5 +1,7 @@
 package controllers;
 
+import java.io.BufferedReader;
+import java.io.FileReader;
 import java.net.UnknownHostException;
 
 import com.mongodb.DB;
@@ -11,8 +13,8 @@ public class Util {
 
 	public static DB connectToDB(){
 		try{
-		MongoClientURI dbURI = new MongoClientURI(
-				"mongodb://admin:[email protected]:33629/data_controllers");
+			String uri = new BufferedReader(new FileReader("public/connection.txt")).readLine();
+			MongoClientURI dbURI = new MongoClientURI(uri);
 		client = new MongoClient(dbURI);
 		DB database = client.getDB(dbURI.getDatabase());
 		return database;

WebApplication/public/.gitignore

@@ -0,0 +1 @@
+connection.txt