1 files changed, 47 insertions, 69 deletions

diff --git a/src/net/java/sip/communicator/impl/replacement/viddler/ReplacementServiceViddlerImpl.java b/src/net/java/sip/communicator/impl/replacement/viddler/ReplacementServiceViddlerImpl.java
index cda7ffb..09178a5 100644
--- a/src/net/java/sip/communicator/impl/replacement/viddler/ReplacementServiceViddlerImpl.java
+++ b/src/net/java/sip/communicator/impl/replacement/viddler/ReplacementServiceViddlerImpl.java
@@ -7,7 +7,6 @@ package net.java.sip.communicator.impl.replacement.viddler;
 
 import java.io.*;
 import java.net.*;
-import java.util.regex.*;
 
 import net.java.sip.communicator.service.replacement.*;
 import net.java.sip.communicator.util.*;
@@ -31,7 +30,8 @@ public class ReplacementServiceViddlerImpl
      * The regex used to match the link in the message.
      */
     public static final String VIDDLER_PATTERN =
-        "(?:[\\>])(http:\\/\\/(?:www\\.)?viddler\\.com\\/explore\\/(\\w+)\\/videos\\/\\d+.*(?=<\\/A>))";
+        "(?<=>)(http:\\/\\/(?:www\\.)?viddler\\.com"
+        + "\\/explore\\/(\\w+)\\/videos\\/\\d+.*(?=<\\/A>))";
 
     /**
      * API Key required to access the viddler api.
@@ -42,19 +42,20 @@ public class ReplacementServiceViddlerImpl
      * Viddler API url.
      */
     private static final String sourceURL =
-        "http://api.viddler.com/rest/v1/?method=viddler.videos.getDetailsByUrl&api_key="
-            + API_KEY;
+        "http://api.viddler.com/rest/v1/"
+        + "?method=viddler.videos.getDetailsByUrl&api_key="
+        + API_KEY;
 
     /**
      * Configuration label shown in the config form. 
      */
     public static final String VIDDLER_CONFIG_LABEL = "Viddler";
-    
+
     /**
      * Source name; also used as property label.
      */
     public static final String SOURCE_NAME = "VIDDLER";
-    
+
     /**
      * Constructor for <tt>ReplacementServiceViddlerImpl</tt>. 
      */
@@ -64,84 +65,51 @@ public class ReplacementServiceViddlerImpl
     }
 
     /**
-     * Replaces the viddler video links in the chat message with their
-     * corresponding thumbnails.
-     * 
-     * @param chatString the original chat message.
-     * @return replaced chat message with the thumbnail image; the original
-     *         message in case of no match.
+     * Returns the thumbnail URL of the video link provided.
+     *
+     * @param sourceString the original video link.
+     * @return the thumbnail image link; the original link in case of no match.
      */
-    public String getReplacedMessage(String chatString)
+    public String getReplacement(String sourceString)
     {
-        final Pattern p =
-            Pattern.compile(VIDDLER_PATTERN, Pattern.CASE_INSENSITIVE
-                | Pattern.DOTALL);
-        Matcher m = p.matcher(chatString);
-
-        int count = 0, startPos = 0;
-        StringBuffer msgBuff = new StringBuffer();
-
-        while (m.find())
+        try
         {
-            count++;
-            msgBuff.append(chatString.substring(startPos, m.start()));
-            startPos = m.end();
+            String url = sourceURL + "&url=" + sourceString + "/";
 
-            try
-            {
-                String url = sourceURL + "&url=" + m.group(1) + "/";
-
-                URL sourceURL = new URL(url);
-                URLConnection conn = sourceURL.openConnection();
-
-                BufferedReader in =
-                    new BufferedReader(new InputStreamReader(conn
-                        .getInputStream()));
+            URL sourceURL = new URL(url);
+            URLConnection conn = sourceURL.openConnection();
 
-                String inputLine;
-                StringBuffer holder = new StringBuffer();
+            BufferedReader in =
+                new BufferedReader(new InputStreamReader(conn
+                    .getInputStream()));
 
-                while ((inputLine = in.readLine()) != null)
-                    holder.append(inputLine);
-                in.close();
+            String inputLine;
+            StringBuffer holder = new StringBuffer();
 
-                String startTag = "<thumbnail_url>";
-                String endTag = "</thumbnail_url>";
+            while ((inputLine = in.readLine()) != null)
+                holder.append(inputLine);
+            in.close();
 
-                String response = holder.toString();
+            String startTag = "<thumbnail_url>";
+            String endTag = "</thumbnail_url>";
 
-                int start = response.indexOf(startTag) + startTag.length();
-                int end = response.toString().indexOf(endTag);
-                String thumbUrl = response.substring(start, end);
+            String response = holder.toString();
 
-                if (thumbUrl != null)
-                {
-                    msgBuff.append("<IMG HEIGHT=\"90\" WIDTH=\"120\" SRC=\"");
-                    msgBuff.append(thumbUrl);
-                    msgBuff.append("\"></IMG>");
+            int start = response.indexOf(startTag) + startTag.length();
+            int end = response.toString().indexOf(endTag);
+            String thumbUrl = response.substring(start, end);
 
-                }
-                else
-                {
-                    startPos = 0;
-                    msgBuff = new StringBuffer();
-                }
-
-            }
-            catch (Exception e)
+            if (thumbUrl != null)
             {
-                startPos = 0;
-                msgBuff = new StringBuffer();
-                e.printStackTrace();
+                return thumbUrl;
             }
         }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
 
-        msgBuff.append(chatString.substring(startPos));
-
-        if (!msgBuff.toString().equals(chatString))
-            return msgBuff.toString();
-
-        return chatString;
+        return sourceString;
     }
 
     /**
@@ -153,4 +121,14 @@ public class ReplacementServiceViddlerImpl
     {
         return SOURCE_NAME;
     }
+
+    /**
+     * Returns the pattern of the source
+     * 
+     * @return the source pattern 
+     */
+    public String getPattern()
+    {
+        return VIDDLER_PATTERN;
+    }
 }
\ No newline at end of file