java: classes in java.lang package do not need to be fully qualified

Change-Id: I7b18f62336c3a8ca4c538b30ce04c99f202a4756

4 files changed, 112 insertions, 112 deletions

diff --git a/filter/qa/complex/filter/detection/typeDetection/Helper.java b/filter/qa/complex/filter/detection/typeDetection/Helper.java
index 1c445901cdcd..81bd8bb64b3d 100644
--- a/filter/qa/complex/filter/detection/typeDetection/Helper.java
+++ b/filter/qa/complex/filter/detection/typeDetection/Helper.java
@@ -208,7 +208,7 @@ public class Helper  {
             }
 
         }catch (IOException e) {
-        }catch(java.lang.NullPointerException e) {
+        }catch(NullPointerException e) {
             return null;
         }
         return null;
@@ -343,7 +343,7 @@ public class Helper  {
         try{
             String fileURL = m_hFileURLs.get(fileAlias).toString();
             return utils.getFullURL(ensureEndingFileSep(m_sTestDocPath) + fileURL);
-        } catch (java.lang.NullPointerException e){
+        } catch (NullPointerException e){
             throw new FileAliasNotFoundException(fileAlias);
        }
 
@@ -358,7 +358,7 @@ public class Helper  {
                                         throws FileAliasNotFoundException{
         try{
             return m_hFileTypes.get(fileAlias).toString();
-        } catch (java.lang.NullPointerException e){
+        } catch (NullPointerException e){
             throw new FileAliasNotFoundException(fileAlias);
        }
     }
diff --git a/filter/source/config/tools/split/FCFGSplit.java b/filter/source/config/tools/split/FCFGSplit.java
index e1902ba48157..a9803fa2a992 100644
--- a/filter/source/config/tools/split/FCFGSplit.java
+++ b/filter/source/config/tools/split/FCFGSplit.java
@@ -41,10 +41,10 @@ public class FCFGSplit
     // private const
 
     /** specify the command line parameter to set the debug level for this app. */
-    private static final java.lang.String CMD_DEBUG = "debug" ;
+    private static final String CMD_DEBUG = "debug" ;
 
     /** specify the command line parameter to set a configuration file for this app. */
-    private static final java.lang.String CMD_CONFIG = "config";
+    private static final String CMD_CONFIG = "config";
 
     /** The following strings are used as property names of
      *  the configuration file we need here.
@@ -52,38 +52,38 @@ public class FCFGSplit
      *  @seealso    readCfg()
      */
 
-    private static final java.lang.String CFGKEY_XMLFILE                              = "xmlfile"                             ;
-    private static final java.lang.String CFGKEY_INFORMAT                             = "informat"                            ;
-    private static final java.lang.String CFGKEY_OUTFORMAT                            = "outformat"                           ;
-    private static final java.lang.String CFGKEY_INENCODING                           = "inencoding"                          ;
-    private static final java.lang.String CFGKEY_OUTENCODING                          = "outencoding"                         ;
-    private static final java.lang.String CFGKEY_OUTDIR                               = "outdir"                              ;
-    private static final java.lang.String CFGKEY_FRAGMENT_EXTENSION                   = "fragment_extension"                  ;
-    private static final java.lang.String CFGKEY_CREATE_COMBINE_FILTER_FLAG           = "create_combine_filter_flag"          ;
-    private static final java.lang.String CFGKEY_REMOVE_FILTER_FLAG_BROWSERPREFERRED  = "remove_filter_flag_browserpreferred" ;
-    private static final java.lang.String CFGKEY_REMOVE_FILTER_FLAG_PREFERRED         = "remove_filter_flag_preferred"        ;
-    private static final java.lang.String CFGKEY_REMOVE_FILTER_FLAG_3RDPARTY          = "remove_filter_flag_3rdparty"         ;
-    private static final java.lang.String CFGKEY_REMOVE_FILTER_UINAMES                = "remove_filter_uinames"               ;
-    private static final java.lang.String CFGKEY_REMOVE_GRAPHIC_FILTERS               = "remove_graphic_filters"              ;
-    private static final java.lang.String CFGKEY_SET_DEFAULT_DETECTOR                 = "set_default_detector"                ;
-
-    private static final java.lang.String CFGKEY_SUBDIR_TYPES                         = "subdir_types"                        ;
-    private static final java.lang.String CFGKEY_SUBDIR_FILTERS                       = "subdir_filters"                      ;
-    private static final java.lang.String CFGKEY_SUBDIR_DETECTSERVICES                = "subdir_detectservices"               ;
-    private static final java.lang.String CFGKEY_SUBDIR_FRAMELOADERS                  = "subdir_frameloaders"                 ;
-    private static final java.lang.String CFGKEY_SUBDIR_CONTENTHANDLERS               = "subdir_contenthandlers"              ;
-
-    private static final java.lang.String CFGKEY_SEPARATE_FILTERS_BY_MODULE           = "separate_filters_by_module"          ;
-
-    private static final java.lang.String CFGKEY_SUBDIR_MODULE_SWRITER                = "subdir_module_swriter"               ;
-    private static final java.lang.String CFGKEY_SUBDIR_MODULE_SWEB                   = "subdir_module_sweb"                  ;
-    private static final java.lang.String CFGKEY_SUBDIR_MODULE_SGLOBAL                = "subdir_module_sglobal"               ;
-    private static final java.lang.String CFGKEY_SUBDIR_MODULE_SCALC                  = "subdir_module_scalc"                 ;
-    private static final java.lang.String CFGKEY_SUBDIR_MODULE_SDRAW                  = "subdir_module_sdraw"                 ;
-    private static final java.lang.String CFGKEY_SUBDIR_MODULE_SIMPRESS               = "subdir_module_simpress"              ;
-    private static final java.lang.String CFGKEY_SUBDIR_MODULE_SMATH                  = "subdir_module_smath"                 ;
-    private static final java.lang.String CFGKEY_SUBDIR_MODULE_SCHART                 = "subdir_module_schart"                ;
-    private static final java.lang.String CFGKEY_SUBDIR_MODULE_OTHERS                 = "subdir_module_others"                ;
+    private static final String CFGKEY_XMLFILE                              = "xmlfile"                             ;
+    private static final String CFGKEY_INFORMAT                             = "informat"                            ;
+    private static final String CFGKEY_OUTFORMAT                            = "outformat"                           ;
+    private static final String CFGKEY_INENCODING                           = "inencoding"                          ;
+    private static final String CFGKEY_OUTENCODING                          = "outencoding"                         ;
+    private static final String CFGKEY_OUTDIR                               = "outdir"                              ;
+    private static final String CFGKEY_FRAGMENT_EXTENSION                   = "fragment_extension"                  ;
+    private static final String CFGKEY_CREATE_COMBINE_FILTER_FLAG           = "create_combine_filter_flag"          ;
+    private static final String CFGKEY_REMOVE_FILTER_FLAG_BROWSERPREFERRED  = "remove_filter_flag_browserpreferred" ;
+    private static final String CFGKEY_REMOVE_FILTER_FLAG_PREFERRED         = "remove_filter_flag_preferred"        ;
+    private static final String CFGKEY_REMOVE_FILTER_FLAG_3RDPARTY          = "remove_filter_flag_3rdparty"         ;
+    private static final String CFGKEY_REMOVE_FILTER_UINAMES                = "remove_filter_uinames"               ;
+    private static final String CFGKEY_REMOVE_GRAPHIC_FILTERS               = "remove_graphic_filters"              ;
+    private static final String CFGKEY_SET_DEFAULT_DETECTOR                 = "set_default_detector"                ;
+
+    private static final String CFGKEY_SUBDIR_TYPES                         = "subdir_types"                        ;
+    private static final String CFGKEY_SUBDIR_FILTERS                       = "subdir_filters"                      ;
+    private static final String CFGKEY_SUBDIR_DETECTSERVICES                = "subdir_detectservices"               ;
+    private static final String CFGKEY_SUBDIR_FRAMELOADERS                  = "subdir_frameloaders"                 ;
+    private static final String CFGKEY_SUBDIR_CONTENTHANDLERS               = "subdir_contenthandlers"              ;
+
+    private static final String CFGKEY_SEPARATE_FILTERS_BY_MODULE           = "separate_filters_by_module"          ;
+
+    private static final String CFGKEY_SUBDIR_MODULE_SWRITER                = "subdir_module_swriter"               ;
+    private static final String CFGKEY_SUBDIR_MODULE_SWEB                   = "subdir_module_sweb"                  ;
+    private static final String CFGKEY_SUBDIR_MODULE_SGLOBAL                = "subdir_module_sglobal"               ;
+    private static final String CFGKEY_SUBDIR_MODULE_SCALC                  = "subdir_module_scalc"                 ;
+    private static final String CFGKEY_SUBDIR_MODULE_SDRAW                  = "subdir_module_sdraw"                 ;
+    private static final String CFGKEY_SUBDIR_MODULE_SIMPRESS               = "subdir_module_simpress"              ;
+    private static final String CFGKEY_SUBDIR_MODULE_SMATH                  = "subdir_module_smath"                 ;
+    private static final String CFGKEY_SUBDIR_MODULE_SCHART                 = "subdir_module_schart"                ;
+    private static final String CFGKEY_SUBDIR_MODULE_OTHERS                 = "subdir_module_others"                ;
 
     /** The following strings are used as property default
      *  values if a configuration key does not exist.
@@ -94,44 +94,44 @@ public class FCFGSplit
      *  @seealso    readCfg()
      */
 
-    private static final java.lang.String DEFAULT_XMLFILE                             = ".//TypeDetection.xcu"                ;
-    private static final java.lang.String DEFAULT_INFORMAT                            = "6.0"                                 ;
-    private static final java.lang.String DEFAULT_OUTFORMAT                           = "6.Y"                                 ;
-    private static final java.lang.String DEFAULT_INENCODING                          = "UTF-8"                               ;
-    private static final java.lang.String DEFAULT_OUTENCODING                         = "UTF-8"                               ;
-    private static final java.lang.String DEFAULT_OUTDIR                              = ".//temp"                             ;
-    private static final java.lang.String DEFAULT_FRAGMENT_EXTENSION                  = ".xcu"                                ;
-    private static final java.lang.String DEFAULT_CREATE_COMBINE_FILTER_FLAG          = "false"                               ;
-    private static final java.lang.String DEFAULT_REMOVE_FILTER_FLAG_BROWSERPREFERRED = "false"                               ;
-    private static final java.lang.String DEFAULT_REMOVE_FILTER_FLAG_PREFERRED        = "false"                               ;
-    private static final java.lang.String DEFAULT_REMOVE_FILTER_FLAG_3RDPARTY         = "false"                               ;
-    private static final java.lang.String DEFAULT_REMOVE_FILTER_UINAMES               = "false"                               ;
-    private static final java.lang.String DEFAULT_REMOVE_GRAPHIC_FILTERS              = "false"                               ;
-    private static final java.lang.String DEFAULT_SET_DEFAULT_DETECTOR                = "false"                               ;
-
-    private static final java.lang.String DEFAULT_SUBDIR_TYPES                        = "Types"                               ;
-    private static final java.lang.String DEFAULT_SUBDIR_FILTERS                      = "Filters"                             ;
-    private static final java.lang.String DEFAULT_SUBDIR_DETECTSERVICES               = "DetectServices"                      ;
-    private static final java.lang.String DEFAULT_SUBDIR_FRAMELOADERS                 = "FrameLoaders"                        ;
-    private static final java.lang.String DEFAULT_SUBDIR_CONTENTHANDLERS              = "ContentHandlers"                     ;
-
-    private static final java.lang.String DEFAULT_SEPARATE_FILTERS_BY_MODULE          = "false"                               ;
-
-    private static final java.lang.String DEFAULT_SUBDIR_MODULE_SWRITER               = "SWriter"                             ;
-    private static final java.lang.String DEFAULT_SUBDIR_MODULE_SWEB                  = "SWeb"                                ;
-    private static final java.lang.String DEFAULT_SUBDIR_MODULE_SGLOBAL               = "SGlobal"                             ;
-    private static final java.lang.String DEFAULT_SUBDIR_MODULE_SCALC                 = "SCalc"                               ;
-    private static final java.lang.String DEFAULT_SUBDIR_MODULE_SDRAW                 = "SDraw"                               ;
-    private static final java.lang.String DEFAULT_SUBDIR_MODULE_SIMPRESS              = "SImpress"                            ;
-    private static final java.lang.String DEFAULT_SUBDIR_MODULE_SMATH                 = "SMath"                               ;
-    private static final java.lang.String DEFAULT_SUBDIR_MODULE_SCHART                = "SChart"                              ;
-    private static final java.lang.String DEFAULT_SUBDIR_MODULE_OTHERS                = "Others"                              ;
+    private static final String DEFAULT_XMLFILE                             = ".//TypeDetection.xcu"                ;
+    private static final String DEFAULT_INFORMAT                            = "6.0"                                 ;
+    private static final String DEFAULT_OUTFORMAT                           = "6.Y"                                 ;
+    private static final String DEFAULT_INENCODING                          = "UTF-8"                               ;
+    private static final String DEFAULT_OUTENCODING                         = "UTF-8"                               ;
+    private static final String DEFAULT_OUTDIR                              = ".//temp"                             ;
+    private static final String DEFAULT_FRAGMENT_EXTENSION                  = ".xcu"                                ;
+    private static final String DEFAULT_CREATE_COMBINE_FILTER_FLAG          = "false"                               ;
+    private static final String DEFAULT_REMOVE_FILTER_FLAG_BROWSERPREFERRED = "false"                               ;
+    private static final String DEFAULT_REMOVE_FILTER_FLAG_PREFERRED        = "false"                               ;
+    private static final String DEFAULT_REMOVE_FILTER_FLAG_3RDPARTY         = "false"                               ;
+    private static final String DEFAULT_REMOVE_FILTER_UINAMES               = "false"                               ;
+    private static final String DEFAULT_REMOVE_GRAPHIC_FILTERS              = "false"                               ;
+    private static final String DEFAULT_SET_DEFAULT_DETECTOR                = "false"                               ;
+
+    private static final String DEFAULT_SUBDIR_TYPES                        = "Types"                               ;
+    private static final String DEFAULT_SUBDIR_FILTERS                      = "Filters"                             ;
+    private static final String DEFAULT_SUBDIR_DETECTSERVICES               = "DetectServices"                      ;
+    private static final String DEFAULT_SUBDIR_FRAMELOADERS                 = "FrameLoaders"                        ;
+    private static final String DEFAULT_SUBDIR_CONTENTHANDLERS              = "ContentHandlers"                     ;
+
+    private static final String DEFAULT_SEPARATE_FILTERS_BY_MODULE          = "false"                               ;
+
+    private static final String DEFAULT_SUBDIR_MODULE_SWRITER               = "SWriter"                             ;
+    private static final String DEFAULT_SUBDIR_MODULE_SWEB                  = "SWeb"                                ;
+    private static final String DEFAULT_SUBDIR_MODULE_SGLOBAL               = "SGlobal"                             ;
+    private static final String DEFAULT_SUBDIR_MODULE_SCALC                 = "SCalc"                               ;
+    private static final String DEFAULT_SUBDIR_MODULE_SDRAW                 = "SDraw"                               ;
+    private static final String DEFAULT_SUBDIR_MODULE_SIMPRESS              = "SImpress"                            ;
+    private static final String DEFAULT_SUBDIR_MODULE_SMATH                 = "SMath"                               ;
+    private static final String DEFAULT_SUBDIR_MODULE_SCHART                = "SChart"                              ;
+    private static final String DEFAULT_SUBDIR_MODULE_OTHERS                = "Others"                              ;
 
 
     // private member
 
     /** contains the name of the reading xcu file. */
-    private static java.lang.String m_sXMLFile;
+    private static String m_sXMLFile;
 
     /** specify the xml file format, which must be interpreted at reading time. */
     private static int m_nInFormat;
@@ -141,41 +141,41 @@ public class FCFGSplit
     private static int m_nOutFormat;
 
     /** specify the file encoding for reading. */
-    private static java.lang.String m_sInEncoding;
+    private static String m_sInEncoding;
 
     /** specify the file encoding for writing fragments. */
-    private static java.lang.String m_sOutEncoding;
+    private static String m_sOutEncoding;
 
     /** specify the target directory, where all results of this
      *  process can be generated.
      *  Note: May it will be cleared! */
-    private static java.lang.String m_sOutDir;
+    private static String m_sOutDir;
 
     /** can be used to generate some output on the console. */
     private static Logger m_aDebug;
 
     /** contains the file extension for all generated xml fragments. */
-    private static java.lang.String m_sFragmentExtension;
+    private static String m_sFragmentExtension;
 
     /** specify the sub directory to generate type fragments.
      *  Its meaned relative to m_sOutDir. */
-    private static java.lang.String m_sSubDirTypes;
+    private static String m_sSubDirTypes;
 
     /** specify the sub directory to generate filter fragments.
      *  Its meaned relative to m_sOutDir. */
-    private static java.lang.String m_sSubDirFilters;
+    private static String m_sSubDirFilters;
 
     /** specify the sub directory to generate detect service fragments.
      *  Its meaned relative to m_sOutDir. */
-    private static java.lang.String m_sSubDirDetectServices;
+    private static String m_sSubDirDetectServices;
 
     /** specify the sub directory to generate frame loader fragments.
      *  Its meaned relative to m_sOutDir. */
-    private static java.lang.String m_sSubDirFrameLoaders;
+    private static String m_sSubDirFrameLoaders;
 
     /** specify the sub directory to generate content handler fragments.
      *  Its meaned relative to m_sOutDir. */
-    private static java.lang.String m_sSubDirContentHandlers;
+    private static String m_sSubDirContentHandlers;
 
     /** enable/disable generating of filter groups - separated by
      *  application modules. */
@@ -184,48 +184,48 @@ public class FCFGSplit
     /** specify the sub directory to generate filter groups
      *  for the module writer. Will be used only,
      *  if m_bSeparateFiltersByModule is set to TRUE.*/
-    private static java.lang.String m_sSubDirModuleSWriter;
+    private static String m_sSubDirModuleSWriter;
 
     /** specify the sub directory to generate filter groups
      *  for the module writer/web. Will be used only,
      *  if m_bSeparateFiltersByModule is set to TRUE.*/
-    private static java.lang.String m_sSubDirModuleSWeb;
+    private static String m_sSubDirModuleSWeb;
 
     /** specify the sub directory to generate filter groups
      *  for the module writer/global. Will be used only,
      *  if m_bSeparateFiltersByModule is set to TRUE.*/
-    private static java.lang.String m_sSubDirModuleSGlobal;
+    private static String m_sSubDirModuleSGlobal;
 
     /** specify the sub directory to generate filter groups
      *  for the module calc. Will be used only,
      *  if m_bSeparateFiltersByModule is set to TRUE.*/
-    private static java.lang.String m_sSubDirModuleSCalc;
+    private static String m_sSubDirModuleSCalc;
 
     /** specify the sub directory to generate filter groups
      *  for the module draw. Will be used only,
      *  if m_bSeparateFiltersByModule is set to TRUE.*/
-    private static java.lang.String m_sSubDirModuleSDraw;
+    private static String m_sSubDirModuleSDraw;
 
     /** specify the sub directory to generate filter groups
      *  for the module impress. Will be used only,
      *  if m_bSeparateFiltersByModule is set to TRUE.*/
-    private static java.lang.String m_sSubDirModuleSImpress;
+    private static String m_sSubDirModuleSImpress;
 
     /** specify the sub directory to generate filter groups
      *  for the module math. Will be used only,
      *  if m_bSeparateFiltersByModule is set to TRUE.*/
-    private static java.lang.String m_sSubDirModuleSMath;
+    private static String m_sSubDirModuleSMath;
 
     /** specify the sub directory to generate filter groups
      *  for the module chart. Will be used only,
      *  if m_bSeparateFiltersByModule is set to TRUE.*/
-    private static java.lang.String m_sSubDirModuleSChart;
+    private static String m_sSubDirModuleSChart;
 
     /** specify the sub directory to generate filter groups
      *  for unknown modules - e.g. the graphic filters.
      *  Will be used only, if m_bSeparateFiltersByModule
      *  is set to TRUE.*/
-    private static java.lang.String m_sSubDirModuleOthers;
+    private static String m_sSubDirModuleOthers;
 
     private static boolean m_bCreateCombineFilterFlag;
     private static boolean m_bRemoveFilterFlagBrowserPreferred;
@@ -247,7 +247,7 @@ public class FCFGSplit
      *  @param  lArgs
      *          contains the command line arguments.
      */
-    public static void main(java.lang.String[] lArgs)
+    public static void main(String[] lArgs)
     {
         long t_start = System.currentTimeMillis();
 
@@ -442,7 +442,7 @@ public class FCFGSplit
         // analyze some time stamps
         long t_end = System.currentTimeMillis();
 
-        java.lang.StringBuffer sTimes = new java.lang.StringBuffer(100);
+        StringBuffer sTimes = new StringBuffer(100);
         sTimes.append("Needed times:\n"                  );
         sTimes.append("t [all]\t\t=\t"                   );
         sTimes.append(t_end-t_start                      );
@@ -509,7 +509,7 @@ public class FCFGSplit
         m_bRemoveGraphicFilters             = new java.lang.Boolean(aCfg.getProperty(CFGKEY_REMOVE_GRAPHIC_FILTERS             , DEFAULT_REMOVE_GRAPHIC_FILTERS             )).booleanValue();
         m_bSetDefaultDetector               = new java.lang.Boolean(aCfg.getProperty(CFGKEY_SET_DEFAULT_DETECTOR               , DEFAULT_SET_DEFAULT_DETECTOR               )).booleanValue();
 
-        java.lang.String sFormat = aCfg.getProperty(CFGKEY_INFORMAT, DEFAULT_INFORMAT);
+        String sFormat = aCfg.getProperty(CFGKEY_INFORMAT, DEFAULT_INFORMAT);
         m_nInFormat = Cache.mapFormatString2Format(sFormat);
 
         sFormat = aCfg.getProperty(CFGKEY_OUTFORMAT, DEFAULT_OUTFORMAT);
@@ -522,7 +522,7 @@ public class FCFGSplit
      */
     private static void printCopyright()
     {
-        java.lang.StringBuffer sOut = new java.lang.StringBuffer(256);
+        StringBuffer sOut = new StringBuffer(256);
         sOut.append("FCFGSplit\n");
         sOut.append("Copyright: 2000 by Sun Microsystems, Inc.\n");
         sOut.append("All Rights Reserved.\n");
@@ -535,7 +535,7 @@ public class FCFGSplit
      */
     private static void printHelp()
     {
-        java.lang.StringBuffer sOut = new java.lang.StringBuffer(1000);
+        StringBuffer sOut = new StringBuffer(1000);
         sOut.append("_______________________________________________________________________________\n\n"   );
         sOut.append("usage: FCFGSplit "+CMD_CONFIG+"=<file name> "+CMD_DEBUG+"=<level>\n"                       );
         sOut.append("parameters:\n"                                                                         );
diff --git a/filter/source/config/tools/split/Splitter.java b/filter/source/config/tools/split/Splitter.java
index a347fd93edda..5be4bfab7b5a 100644
--- a/filter/source/config/tools/split/Splitter.java
+++ b/filter/source/config/tools/split/Splitter.java
@@ -84,7 +84,7 @@ public class Splitter
         java.util.ArrayList      lNames = m_aDataSet.m_aCache.getItemNames(Cache.E_TYPE);
         java.util.Enumeration it     = lNames.elements();
         while(it.hasMoreElements())
-            generateXMLFragment(Cache.E_TYPE, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirTypes);
+            generateXMLFragment(Cache.E_TYPE, (String)it.nextElement(), m_aDataSet.m_aFragmentDirTypes);
         nTypes -= lNames.size();
 
         // generate filter fragments for the writer module
@@ -95,7 +95,7 @@ public class Splitter
         lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps);
         it     = lNames.elements();
         while(it.hasMoreElements())
-            generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSWriter);
+            generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSWriter);
         nFilters -= lNames.size();
 
         // generate filter fragments for the writer/web module
@@ -104,7 +104,7 @@ public class Splitter
         lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps);
         it     = lNames.elements();
         while(it.hasMoreElements())
-            generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSWeb);
+            generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSWeb);
         nFilters -= lNames.size();
 
         // generate filter fragments for the writer/global module
@@ -113,7 +113,7 @@ public class Splitter
         lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps);
         it     = lNames.elements();
         while(it.hasMoreElements())
-            generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSGlobal);
+            generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSGlobal);
         nFilters -= lNames.size();
 
         // generate filter fragments for the calc module
@@ -122,7 +122,7 @@ public class Splitter
         lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps);
         it     = lNames.elements();
         while(it.hasMoreElements())
-            generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSCalc);
+            generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSCalc);
         nFilters -= lNames.size();
 
         // generate filter fragments for the draw module
@@ -131,7 +131,7 @@ public class Splitter
         lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps);
         it     = lNames.elements();
         while(it.hasMoreElements())
-            generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSDraw);
+            generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSDraw);
         nFilters -= lNames.size();
 
         // generate filter fragments for the impress module
@@ -140,7 +140,7 @@ public class Splitter
         lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps);
         it     = lNames.elements();
         while(it.hasMoreElements())
-            generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSImpress);
+            generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSImpress);
         nFilters -= lNames.size();
 
         // generate filter fragments for the chart module
@@ -149,7 +149,7 @@ public class Splitter
         lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps);
         it     = lNames.elements();
         while(it.hasMoreElements())
-            generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSChart);
+            generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSChart);
         nFilters -= lNames.size();
 
         // generate filter fragments for the math module
@@ -158,7 +158,7 @@ public class Splitter
         lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps);
         it     = lNames.elements();
         while(it.hasMoreElements())
-            generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSMath);
+            generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSMath);
         nFilters -= lNames.size();
 
         // generate fragments for 3rdParty or unspecified (may graphics) filters!
@@ -167,7 +167,7 @@ public class Splitter
         lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps);
         it     = lNames.elements();
         while(it.hasMoreElements())
-            generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleOthers);
+            generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleOthers);
         nFilters -= lNames.size();
 
         // generate all detect service fragments
@@ -175,7 +175,7 @@ public class Splitter
         lNames = m_aDataSet.m_aCache.getItemNames(Cache.E_DETECTSERVICE);
         it     = lNames.elements();
         while(it.hasMoreElements())
-            generateXMLFragment(Cache.E_DETECTSERVICE, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirDetectServices);
+            generateXMLFragment(Cache.E_DETECTSERVICE, (String)it.nextElement(), m_aDataSet.m_aFragmentDirDetectServices);
         nDetectServices -= lNames.size();
 
         // generate all frame loader fragments
@@ -183,7 +183,7 @@ public class Splitter
         lNames = m_aDataSet.m_aCache.getItemNames(Cache.E_FRAMELOADER);
         it     = lNames.elements();
         while(it.hasMoreElements())
-            generateXMLFragment(Cache.E_FRAMELOADER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirFrameLoaders);
+            generateXMLFragment(Cache.E_FRAMELOADER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirFrameLoaders);
         nFrameLoaders -= lNames.size();
 
         // generate all content handler fragments
@@ -191,7 +191,7 @@ public class Splitter
         lNames = m_aDataSet.m_aCache.getItemNames(Cache.E_CONTENTHANDLER);
         it     = lNames.elements();
         while(it.hasMoreElements())
-            generateXMLFragment(Cache.E_CONTENTHANDLER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirContentHandlers);
+            generateXMLFragment(Cache.E_CONTENTHANDLER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirContentHandlers);
         nContentHandlers -= lNames.size();
 
         // check if all cache items was handled
@@ -203,7 +203,7 @@ public class Splitter
             (nContentHandlers != 0)
            )
         {
-            java.lang.StringBuffer sStatistic = new java.lang.StringBuffer(256);
+            StringBuffer sStatistic = new StringBuffer(256);
             sStatistic.append("some cache items seems to be not transformed:\n");
             sStatistic.append(nTypes          +" unhandled types\n"          );
             sStatistic.append(nFilters        +" unhandled filters\n"        );
@@ -233,12 +233,12 @@ public class Splitter
      *          successfully.
      */
     private void generateXMLFragment(int              eItemType,
-                                     java.lang.String sItemName,
+                                     String sItemName,
                                      java.io.File     aOutDir  )
         throws java.lang.Exception
     {
-        java.lang.String sFileName = FileHelper.convertName2FileName(sItemName);
-        java.lang.String sXML      = m_aDataSet.m_aCache.getItemAsXML(eItemType, sItemName, m_aDataSet.m_nFormat);
+        String sFileName = FileHelper.convertName2FileName(sItemName);
+        String sXML      = m_aDataSet.m_aCache.getItemAsXML(eItemType, sItemName, m_aDataSet.m_nFormat);
         java.io.File     aFile     = new java.io.File(aOutDir, sFileName+m_aDataSet.m_sFragmentExtension);
 
         if (aFile.exists())
diff --git a/filter/source/config/tools/split/SplitterData.java b/filter/source/config/tools/split/SplitterData.java
index fd73bbbba44d..7160c125d770 100644
--- a/filter/source/config/tools/split/SplitterData.java
+++ b/filter/source/config/tools/split/SplitterData.java
@@ -44,7 +44,7 @@ public class SplitterData
     public int m_nFormat;
 
     /** specify the encoding for the output xml files. */
-    public java.lang.String m_sEncoding;
+    public String m_sEncoding;
 
     /** directory to generate some generic views. */
     public java.io.File m_aOutDir;
@@ -74,5 +74,5 @@ public class SplitterData
     public java.io.File m_aFragmentDirModuleOthers;
 
     /** file extension for generated xml fragments. */
-    public java.lang.String m_sFragmentExtension;
+    public String m_sFragmentExtension;
 }