diff -r d6dafc5d983f -r 1627c337e51e javauis/m2g_qt/javasrc/com/nokia/microedition/m2g/M2GSVGImage.java
--- a/javauis/m2g_qt/javasrc/com/nokia/microedition/m2g/M2GSVGImage.java	Fri Oct 15 12:29:39 2010 +0300
+++ b/javauis/m2g_qt/javasrc/com/nokia/microedition/m2g/M2GSVGImage.java	Fri Oct 29 11:49:32 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -39,18 +39,7 @@
     //--------------------------------------------------
     // STATIC CONSTANTS
     //--------------------------------------------------
-    /* Optimization: static finals changed to local variables
-    private static final String NULL_TYPE_ESTR =
-      "The type is null.";
-    private static final String ILLEGAL_VALUS_ESTR =
-      "The x or y values are negative.";
-    private static final String EVENT_TYPE_NOT_SUPPORTED_ESTR =
-      "The event type is not supported.";
-    private static final String INVALID_ELEMENT_ESTR =
-      "Invalid element.";
-    public static final String URI_IS_NULL_ESTR =
-      "The URI is null.";
-    */
+
 
     //--------------------------------------------------
     //  VARIABLES
@@ -198,7 +187,7 @@
             _focusOn(
                 ((M2GSVGElement)element).getNativeSVGProxyHandle(),
                 ((M2GSVGElement)element).getDocument().getHandle(),
-                ((M2GSVGElement)element).getHandle() );
+                ((M2GSVGElement)element).getHandle());
         }
         tempNode = element;
         while (tempNode != null)
@@ -339,7 +328,7 @@
         {
             throw new NullPointerException();
         }
-				
+
 
         String strData = new String(StreamUtils.readBytesFromStream(stream, -1));
 
@@ -351,7 +340,7 @@
 
         // Creates and setups svg image
         M2GSVGImage image = new M2GSVGImage();
-        
+
         M2GDocument document = M2GDocument.buildDocument(
                                    image,
                                    baseUrl,
@@ -359,9 +348,9 @@
                                    strData,
                                    handler);
         // Checks document validity
-				
+
         image.setDocument(document);
-        
+
         if (handler != null)
         {
             // Gets size of external resources
@@ -383,11 +372,11 @@
                 }
             }
         }
-        
+
         // initialise the viewport
         _initViewport(document.getNativeSVGProxyHandle(),
                       document.getHandle());
-        
+
 
         return image;
     }
@@ -454,19 +443,19 @@
     // NATIVE METHODS
     //--------------------------------------------------
     private native static int _dispatchMouseEvent(
-        int aSvgProxyHandle,int aDocumentHandle, 
+        int aSvgProxyHandle,int aDocumentHandle,
         int aX, int aY);
 
     private native static void _focusOn(
-        int aSvgProxyHandle,int aDocumentHandle, 
+        int aSvgProxyHandle,int aDocumentHandle,
         int aSvgElementHandle);
 
     private native static void _focusOut(
-        int aSvgProxyHandle,int aDocumentHandle, 
+        int aSvgProxyHandle,int aDocumentHandle,
         int aSvgElementHandle);
 
     native static int _getExternalListSize(
-         int aSvgProxyHandle, int aDocumentHandle);
+        int aSvgProxyHandle, int aDocumentHandle);
 
     native static String _getExternalListItem(
         int aSvgProxyHandle, int aDocumentHandle,