Made the configuration include the trigger

I have made the trigger configurable as well

Author: webpigeon

src/main/java/uk/co/unitycoders/pircbotx/Bot.java

@@ -42,7 +42,10 @@ public class Bot
 {
 	public static void main(String[] args) throws Exception
 	{
-		CommandProcessor processor = new CommandProcessor('&');
+                // Bot Configuration
+                Configuration config = ConfigurationManager.loadJsonConfig();
+                
+                CommandProcessor processor = new CommandProcessor(config.trigger);
 
 		ProfileManager profiles = new ProfileManager(DBConnection.getProfileModel());
 		DateTimeCommand dtCmd = new DateTimeCommand();
@@ -72,9 +75,6 @@ public static void main(String[] args) throws Exception
 		bot.setAutoReconnect(true);
 		bot.setAutoReconnectChannels(true);
 
-                // Bot Configuration
-                Configuration config = ConfigurationManager.loadJsonConfig();
-                
 		try
 		{
 			bot.setName(config.nick);

src/main/java/uk/co/unitycoders/pircbotx/Configuration.java

@@ -30,4 +30,5 @@ public class Configuration {
     public int port;
     public Boolean ssl;
     public String[] channels;
+    public char trigger;
 }

src/main/java/uk/co/unitycoders/pircbotx/ConfigurationManager.java

@@ -41,6 +41,7 @@ public class ConfigurationManager {
     public static final String DEFAULT_PORT = "6697";
     public static final String DEFAULT_SSL = "true";
     public static final String DEFAULT_CHANS = "#unity-coders";
+    public static final String DEFAULT_TRIGGER = "&";
 
     private static Reader getFileReader(String file) throws IOException {
         return new FileReader(file);
@@ -57,6 +58,7 @@ public static Configuration loadConfig() throws IOException {
         config.port = Integer.parseInt(properties.getProperty("port", DEFAULT_PORT));
         config.nick = properties.getProperty("nick", DEFAULT_BOT_NAME);
         config.ssl = Boolean.parseBoolean(properties.getProperty("ssl", DEFAULT_SSL));
+        config.trigger = properties.getProperty("trigger", DEFAULT_TRIGGER).charAt(0);
 
         //work out what channels to connect to
         String channelStr = properties.getProperty("channels",DEFAULT_CHANS);

src/main/resources/uc_pircbotx.json.example

@@ -1,8 +1,9 @@
 {
-    "nick": "uc_pircbotx",
+    "nick": "uc_pircbotx2",
     "host": "irc.freenode.net",
     "port": 6697,
     "ssl": true,
+    "trigger": "&",
     "channels": [
         "#unity-coders",
         "#unity-coders-bots"

src/main/resources/uc_pircbotx.properties.example

@@ -8,5 +8,6 @@ host = irc.freenode.net
 port = 6697
 ssl = true
 
-# Channel settings
+# Bot settings
+trigger = &
 channels = #unity-coders,#unity-coders-bots