Merge pull request #33 from rage/refactor-3

Refactor comet service + removed extra repository

Author: jamo

maven-wrapper/pom.xml

@@ -40,17 +40,6 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
-        <repository>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </releases>
-            <id>org</id>
-            <name>tmccli</name>
-            <url>http://tmc-cli.jvn.lu/maven2/</url>
-            <layout>default</layout>
-         </repository>
     </repositories>
 
     <dependencies>

tmc-plugin/src/fi/helsinki/cs/tmc/model/PushEventListener.java

@@ -23,7 +23,7 @@
  */
 public class PushEventListener {
     private static final Logger log = Logger.getLogger(PushEventListener.class.getName());
-    private static final long CONNECTION_CHECK_INTERVAL = 120*1000;
+    private static final long CONNECTION_CHECK_INTERVAL = 120 * 1000;
 
     public static class ReviewAvailableEvent implements TmcEvent {
         public final String exerciseName;
@@ -115,33 +115,25 @@ private synchronized void initClientIfPossible() {
         if (cometUrl == null) {
             return;
         }
-
-        ClientTransport transport;
-        try {
-            transport = createWebSocketTransport(cometUrl);
-        } catch (Exception ex) {
-            log.log(Level.WARNING, "Failed to initialize web socket transport.", ex);
-            return;
-        }
-
+        ClientTransport transport = createWebSocketTransport(cometUrl);
         client = new BayeuxClient(cometUrl, transport);
         client.getChannel(Channel.META_HANDSHAKE).addListener(handshakeListener);
         client.getChannel(Channel.META_DISCONNECT).addListener(disconnectListener);
 
         client.addExtension(getAuthenticationExtension(getAuthFields()));
         client.handshake();
     }
-    
-    private ClientTransport createWebSocketTransport(String cometUrl) throws Exception {
+
+    private ClientTransport createWebSocketTransport(String cometUrl) {
         Map<String, Object> transportOpts = new HashMap<String, Object>();
         WebSocketTransport.Factory factory = new WebSocketTransport.Factory();
         return factory.newClientTransport(cometUrl, transportOpts);
     }
 
     private boolean hasEnoughSettings() {
-        return !"".equals(settings.getUsername()) &&
-                !"".equals(settings.getPassword()) &&
-                !"".equals(settings.getServerAddress());
+        return !"".equals(settings.getUsername())
+                && !"".equals(settings.getPassword())
+                && !"".equals(settings.getServerAddress());
     }
 
     public ClientSession.Extension getAuthenticationExtension(final Map<String, Object> fields) {