Added multichat operation set definition and Gibberish protocol implementation. Related issues: Issue #241 , Issue #244, Issue #250

Added line number to the logs

src/net/java/sip/communicator/util/ScLogFormatter.java

@@ -54,7 +54,7 @@ public synchronized String format(LogRecord record)
         sb.append(": ");
 
         //caller method
-        inferCaller(record);
+        int lineNumber = inferCaller(record);
         String loggerName = record.getLoggerName();
 
         if(loggerName == null)
@@ -72,7 +72,12 @@ public synchronized String format(LogRecord record)
         {
             sb.append(".");
             sb.append(record.getSourceMethodName());
-            sb.append("()");
+
+            //include the line number if we have it.
+            if(lineNumber != -1)
+                sb.append("().").append(Integer.toString(lineNumber));
+            else
+                sb.append("()");
         }
         sb.append(" ");
         sb.append(record.getMessage());
@@ -99,12 +104,17 @@ public synchronized String format(LogRecord record)
      * log statement.
      *
      * @param record the logrecord where class and method name should be stored.
+     *
+     * @return the line number that the call was made from in the caller.
      */
-    private void inferCaller(LogRecord record)
+    private int inferCaller(LogRecord record)
     {
         // Get the stack trace.
         StackTraceElement stack[] = (new Throwable()).getStackTrace();
 
+        //the line number that the caller made the call from
+        int lineNumber = -1;
+
         // First, search back to a method in the SIP Communicator Logger class.
         int ix = 0;
         while (ix < stack.length)
@@ -121,6 +131,7 @@ private void inferCaller(LogRecord record)
         while (ix < stack.length)
         {
             StackTraceElement frame = stack[ix];
+            lineNumber=stack[ix].getLineNumber();
             String cname = frame.getClassName();
             if (!cname.equals("net.java.sip.communicator.util.Logger"))
             {
@@ -131,5 +142,7 @@ private void inferCaller(LogRecord record)
             }
             ix++;
         }
+
+        return lineNumber;
     }
 }