Changeset 11682 in josm

Timestamp:

2017-03-05T01:25:59+01:00 (8 years ago)

Author:

Don-vip

Message:

update to japi-compliance-checker 2.1

Location:

trunk/tools/japicc

Files:

• japi-compliance-checker.pl (modified) (196 diffs)
• modules (added)
• modules/Internals (added)
• modules/Internals/APIDump.pm (added)
• modules/Internals/Basic.pm (added)
• modules/Internals/Css (added)
• modules/Internals/Css/Report.css (added)
• modules/Internals/Css/Tabs.css (added)
• modules/Internals/Descriptor.pm (added)
• modules/Internals/Filter.pm (added)
• modules/Internals/Input.pm (added)
• modules/Internals/Js (added)
• modules/Internals/Js/Sections.js (added)
• modules/Internals/Js/Tabs.js (added)
• modules/Internals/Logging.pm (added)
• modules/Internals/Mangling.pm (added)
• modules/Internals/Path.pm (added)
• modules/Internals/RegTests.pm (added)
• modules/Internals/SysFiles.pm (added)
• modules/Internals/TypeAttr.pm (added)
• modules/Internals/Utils.pm (added)
• modules/RulesBin.xml (added)
• modules/RulesSrc.xml (added)

trunk/tools/japicc/japi-compliance-checker.pl

@@ -1 +1 @@
 #!/usr/bin/perl
 ###########################################################################
-# Java API Compliance Checker (JAPICC) 1.8
+# Java API Compliance Checker (JAPICC) 2.1
 # A tool for checking backward compatibility of a Java library API
 #
 # Written by Andrey Ponomarenko
 #
-# Copyright (C) 2011 Institute for System Programming, RAS
-# Copyright (C) 2011-2016 Andrey Ponomarenko's ABI Laboratory
+# Copyright (C) 2011-2017 Andrey Ponomarenko's ABI Laboratory
 #
 # PLATFORMS
@@ -40 +39 @@
 use File::Path qw(mkpath rmtree);
 use File::Temp qw(tempdir);
-use File::Copy qw(copy);
-use File::Spec::Functions qw(abs2rel);
+use File::Basename qw(dirname);
 use Cwd qw(abs_path cwd);
 use Data::Dumper;
-use Digest::MD5 qw(md5_hex);
-use Config;
-
-my $TOOL_VERSION = "1.8";
-my $API_DUMP_VERSION = "2.0";
-my $API_DUMP_MAJOR = majorVersion($API_DUMP_VERSION);
-
-my ($Help, $ShowVersion, %Descriptor, $TargetLibraryName, $CheckSeparately,
-$TestSystem, $DumpAPI, $ClassListPath, $ClientPath, $StrictCompat,
-$DumpVersion, $BinaryOnly, $TargetTitle, %TargetVersion, $SourceOnly,
-$ShortMode, $KeepInternal, $OutputReportPath, $BinaryReportPath,
-$SourceReportPath, $Debug, $Quick, $SortDump, $SkipDeprecated, $SkipClassesList,
-$ShowAccess, $AffectLimit, $JdkPath, $SkipInternalPackages, $HideTemplates,
-$HidePackages, $ShowPackages, $Minimal, $AnnotationsListPath,
-$SkipPackagesList, $OutputDumpPath, $AllAffected, $Compact,
-$SkipAnnotationsListPath, $ExternCss, $ExternJs, $SkipInternalTypes,
-$AddedAnnotations, $RemovedAnnotations, $CountMethods, %DepDump, $OldStyle);
-
-my $CmdName = get_filename($0);
-my $OSgroup = get_OSgroup();
-my $ORIG_DIR = cwd();
-my $TMP_DIR = tempdir(CLEANUP=>1);
-my $ARG_MAX = get_ARG_MAX();
-my $REPRODUCIBLE = 1;
-my $MD5_LEN = 8;
-
-my %OS_Archive = (
-    "windows"=>"zip",
-    "default"=>"tar.gz"
-);
-
-my %ERROR_CODE = (
-    # Compatible verdict
-    "Compatible"=>0,
-    "Success"=>0,
-    # Incompatible verdict
-    "Incompatible"=>1,
-    # Undifferentiated error code
-    "Error"=>2,
-    # System command is not found
-    "Not_Found"=>3,
-    # Cannot access input files
-    "Access_Error"=>4,
-    # Invalid input API dump
-    "Invalid_Dump"=>7,
-    # Incompatible version of API dump
-    "Dump_Version"=>8,
-    # Cannot find a module
-    "Module_Error"=>9
-);
+
+my $TOOL_VERSION = "2.1";
+my $API_DUMP_VERSION = "2.1";
+my $API_DUMP_VERSION_MIN = "2.0";
+
+# Internal modules
+my $MODULES_DIR = getModules();
+push(@INC, dirname($MODULES_DIR));
+
+# Basic modules
+my %LoadedModules = ();
+loadModule("Basic");
+loadModule("Input");
+loadModule("Path");
+loadModule("Logging");
+loadModule("Utils");
+loadModule("TypeAttr");
+loadModule("Filter");
+loadModule("SysFiles");
+loadModule("Descriptor");
+loadModule("Mangling");
+
+# Rules DB
+my %RULES_PATH = (
+"Binary" => $MODULES_DIR."/RulesBin.xml",
+"Source" => $MODULES_DIR."/RulesSrc.xml");
+
+my $CmdName = getFilename($0);
 
 my %HomePage = (
     "Dev"=>"https://github.com/lvc/japi-compliance-checker",
-    "Wiki"=>"http://ispras.linuxbase.org/index.php/Java_API_Compliance_Checker"
+    "Doc"=>"https://lvc.github.io/japi-compliance-checker/"
 );
 
 my $ShortUsage = "Java API Compliance Checker (JAPICC) $TOOL_VERSION
 A tool for checking backward compatibility of a Java library API
-Copyright (C) 2016 Andrey Ponomarenko's ABI Laboratory
+Copyright (C) 2017 Andrey Ponomarenko's ABI Laboratory
 License: GNU LGPL or GNU GPL
 
@@ -116 +92 @@
 }
 
-GetOptions("h|help!" => \$Help,
-  "v|version!" => \$ShowVersion,
-  "dumpversion!" => \$DumpVersion,
+GetOptions("h|help!" => \$In::Opt{"Help"},
+  "v|version!" => \$In::Opt{"ShowVersion"},
+  "dumpversion!" => \$In::Opt{"DumpVersion"},
 # general options
-  "l|lib|library=s" => \$TargetLibraryName,
-  "d1|old|o=s" => \$Descriptor{1}{"Path"},
-  "d2|new|n=s" => \$Descriptor{2}{"Path"},
+  "l|lib|library=s" => \$In::Opt{"TargetLib"},
+  "d1|old|o=s" => \$In::Desc{1}{"Path"},
+  "d2|new|n=s" => \$In::Desc{2}{"Path"},
 # extra options
-  "client|app=s" => \$ClientPath,
-  "binary|bin!" => \$BinaryOnly,
-  "source|src!" => \$SourceOnly,
-  "v1|version1|vnum=s" => \$TargetVersion{1},
-  "v2|version2=s" => \$TargetVersion{2},
-  "s|strict!" => \$StrictCompat,
-  "keep-internal!" => \$KeepInternal,
-  "skip-internal-packages|skip-internal=s" => \$SkipInternalPackages,
-  "skip-internal-types=s" => \$SkipInternalTypes,
-  "dump|dump-api=s" => \$DumpAPI,
-  "classes-list=s" => \$ClassListPath,
-  "annotations-list=s" => \$AnnotationsListPath,
-  "skip-annotations-list=s" => \$SkipAnnotationsListPath,
-  "skip-deprecated!" => \$SkipDeprecated,
-  "skip-classes=s" => \$SkipClassesList,
-  "skip-packages=s" => \$SkipPackagesList,
-  "short" => \$ShortMode,
-  "dump-path=s" => \$OutputDumpPath,
-  "report-path=s" => \$OutputReportPath,
-  "bin-report-path=s" => \$BinaryReportPath,
-  "src-report-path=s" => \$SourceReportPath,
-  "quick!" => \$Quick,
-  "sort!" => \$SortDump,
-  "show-access!" => \$ShowAccess,
-  "limit-affected=s" => \$AffectLimit,
-  "hide-templates!" => \$HideTemplates,
-  "show-packages!" => \$ShowPackages,
-  "compact!" => \$Compact,
-  "added-annotations!" => \$AddedAnnotations,
-  "removed-annotations!" => \$RemovedAnnotations,
-  "count-methods=s" => \$CountMethods,
-  "dep1=s" => \$DepDump{1},
-  "dep2=s" => \$DepDump{2},
-  "old-style!" => \$OldStyle,
+  "client|app=s" => \$In::Opt{"ClientPath"},
+  "binary|bin!" => \$In::Opt{"BinaryOnly"},
+  "source|src!" => \$In::Opt{"SourceOnly"},
+  "v1|version1|vnum=s" => \$In::Desc{1}{"TargetVersion"},
+  "v2|version2=s" => \$In::Desc{2}{"TargetVersion"},
+  "s|strict!" => \$In::Opt{"StrictCompat"},
+  "keep-internal!" => \$In::Opt{"KeepInternal"},
+  "skip-internal-packages|skip-internal=s" => \$In::Opt{"SkipInternalPackages"},
+  "skip-internal-types=s" => \$In::Opt{"SkipInternalTypes"},
+  "dump|dump-api=s" => \$In::Opt{"DumpAPI"},
+  "classes-list=s" => \$In::Opt{"ClassListPath"},
+  "annotations-list=s" => \$In::Opt{"AnnotationsListPath"},
+  "skip-annotations-list=s" => \$In::Opt{"SkipAnnotationsListPath"},
+  "skip-deprecated!" => \$In::Opt{"SkipDeprecated"},
+  "skip-classes=s" => \$In::Opt{"SkipClassesList"},
+  "skip-packages=s" => \$In::Opt{"SkipPackagesList"},
+  "short" => \$In::Opt{"ShortMode"},
+  "dump-path=s" => \$In::Opt{"OutputDumpPath"},
+  "report-path=s" => \$In::Opt{"OutputReportPath"},
+  "bin-report-path=s" => \$In::Opt{"BinaryReportPath"},
+  "src-report-path=s" => \$In::Opt{"SourceReportPath"},
+  "quick!" => \$In::Opt{"Quick"},
+  "sort!" => \$In::Opt{"SortDump"},
+  "show-access!" => \$In::Opt{"ShowAccess"},
+  "limit-affected=s" => \$In::Opt{"AffectLimit"},
+  "hide-templates!" => \$In::Opt{"HideTemplates"},
+  "show-packages!" => \$In::Opt{"ShowPackages"},
+  "compact!" => \$In::Opt{"Compact"},
+  "added-annotations!" => \$In::Opt{"AddedAnnotations"},
+  "removed-annotations!" => \$In::Opt{"RemovedAnnotations"},
+  "count-methods=s" => \$In::Opt{"CountMethods"},
+  "dep1=s" => \$In::Desc{1}{"DepDump"},
+  "dep2=s" => \$In::Desc{2}{"DepDump"},
+  "old-style!" => \$In::Opt{"OldStyle"},
 # other options
-  "test!" => \$TestSystem,
-  "debug!" => \$Debug,
-  "title=s" => \$TargetTitle,
-  "jdk-path=s" => \$JdkPath,
-  "external-css=s" => \$ExternCss,
-  "external-js=s" => \$ExternJs,
+  "test!" => \$In::Opt{"TestTool"},
+  "debug!" => \$In::Opt{"Debug"},
+  "title=s" => \$In::Opt{"TargetTitle"},
+  "jdk-path=s" => \$In::Opt{"JdkPath"},
+  "external-css=s" => \$In::Opt{"ExternCss"},
+  "external-js=s" => \$In::Opt{"ExternJs"},
 # deprecated
-  "minimal!" => \$Minimal,
-  "hide-packages!" => \$HidePackages,
+  "minimal!" => \$In::Opt{"Minimal"},
+  "hide-packages!" => \$In::Opt{"HidePackages"},
 # private
-  "all-affected!" => \$AllAffected
-) or ERR_MESSAGE();
+  "all-affected!" => \$In::Opt{"AllAffected"}
+) or errMsg();
 
 if(@ARGV)
@@ -176 +152 @@
     if($#ARGV==1)
     { # japi-compliance-checker OLD.jar NEW.jar
-        $Descriptor{1}{"Path"} = $ARGV[0];
-        $Descriptor{2}{"Path"} = $ARGV[1];
+        $In::Desc{1}{"Path"} = $ARGV[0];
+        $In::Desc{2}{"Path"} = $ARGV[1];
     }
     else {
-        ERR_MESSAGE();
-    }
-}
-
-sub ERR_MESSAGE()
+        errMsg();
+    }
+}
+
+sub errMsg()
 {
     printMsg("INFO", "\n".$ShortUsage);
-    exit($ERROR_CODE{"Error"});
-}
-
-my $AR_EXT = getAR_EXT($OSgroup);
-
-my $HelpMessage="
+    exit(getErrorCode("Error"));
+}
+
+my $HelpMessage = "
 NAME:
   Java API Compliance Checker ($CmdName)
@@ -199 +173 @@
 DESCRIPTION:
   Java API Compliance Checker (JAPICC) is a tool for checking backward
-  binary/source compatibility of a Java library API. The tool checks classes
+  binary/source compatibility of a Java library API. The tool checks class
   declarations of old and new versions and analyzes changes that may break
-  compatibility: removed class members, added abstract methods, etc. Breakage
-  of the binary compatibility may result in crashing or incorrect behavior of
-  existing clients built with an old version of a library if they run with a
-  new one. Breakage of the source compatibility may result in recompilation
+  compatibility: removed class members, added abstract methods, etc.
+  
+  Break of the binary compatibility may result in crash or incorrect behavior
+  of existing clients built with an old library version if they run with a
+  new one. Break of the source compatibility may result in recompilation
   errors with a new library version.
 
-  JAPICC is intended for library developers and operating system maintainers
-  who are interested in ensuring backward compatibility (i.e. allow old clients
-  to run or to be recompiled with a new version of a library).
+  The tool is intended for developers of software libraries and maintainers
+  of operating systems who are interested in ensuring backward compatibility,
+  i.e. allow old clients to run or to be recompiled with newer library
+  versions.
 
   This tool is free software: you can redistribute it and/or modify it
@@ -217 +193 @@
   $CmdName [options]
 
-EXAMPLE:
+EXAMPLE 1:
   $CmdName OLD.jar NEW.jar
-    OR
+
+EXAMPLE 2:
   $CmdName -lib NAME -old OLD.xml -new NEW.xml
   OLD.xml and NEW.xml are XML-descriptors:
@@ -244 +221 @@
 
 GENERAL OPTIONS:
-  -l|-lib|-library NAME
+  -l|-library NAME
       Library name (without version).
 
-  -d1|-old|-o PATH
-      Descriptor of 1st (old) library version.
+  -old|-d1 PATH
+      Descriptor of the 1st (old) library version.
       It may be one of the following:
       
-         1. Java ARchive (*.jar)
+         1. Java archive (*.jar)
          2. XML-descriptor (VERSION.xml file):
 
@@ -268 +245 @@
          3. API dump generated by -dump option
 
-      If you are using 1, 4-6 descriptor types then you should
+      If you are using *.jar as a descriptor then you should
       specify version numbers with -v1 and -v2 options too.
-
-      If you are using *.jar as a descriptor then the tool will try to
-      get implementation version from MANIFEST.MF file.
-
-  -d2|-new|-n PATH
-      Descriptor of 2nd (new) library version.
+      If version numbers are not specified then the tool will
+      try to detect them automatically.
+
+  -new|-d2 PATH
+      Descriptor of the 2nd (new) library version.
 
 EXTRA OPTIONS:
   -client|-app PATH
-      This option allows to specify the client Java ARchive that should be
+      This option allows to specify the client Java archive that should be
       checked for portability to the new library version.
-      
+
   -binary|-bin
       Show \"Binary\" compatibility problems only.
       Generate report to \"bin_compat_report.html\".
-      
+
   -source|-src
       Show \"Source\" compatibility problems only.
       Generate report to \"src_compat_report.html\".
-      
+
   -v1|-version1 NUM
       Specify 1st API version outside the descriptor. This option is needed
@@ -323 +299 @@
       Dump library API to gzipped TXT format file. You can transfer it
       anywhere and pass instead of the descriptor. Also it may be used
-      for debugging the tool. Compatible dump versions: $API_DUMP_MAJOR.0<=V<=$API_DUMP_VERSION
+      for debugging the tool.
       
   -classes-list PATH
@@ -352 +328 @@
   
   -dump-path PATH
-      Specify a *.api.$AR_EXT or *.api file path where to generate an API dump.
+      Specify a *.dump file path where to generate an API dump.
       Default: 
-          abi_dumps/LIB_NAME/LIB_NAME_VERSION.api.$AR_EXT
+          api_dumps/LIB_NAME/VERSION/API.dump
 
   -report-path PATH
@@ -455 +431 @@
     non-zero - Incompatible or the tool has run with errors.
 
-MORE INFORMATION:
-    ".$HomePage{"Wiki"}."
-    ".$HomePage{"Dev"}."\n\n";
-
-sub HELP_MESSAGE()
-{ # -help
+MORE INFO:
+    ".$HomePage{"Doc"}."
+    ".$HomePage{"Dev"};
+
+sub helpMsg() {
     printMsg("INFO", $HelpMessage."\n");
 }
 
-my %TypeProblems_Kind=(
-    "Binary"=>{
-        "NonAbstract_Class_Added_Abstract_Method"=>"High",
-        "Abstract_Class_Added_Abstract_Method"=>"Safe",
-        "Abstract_Class_Added_Abstract_Method_Invoked_By_Others"=>"Medium",
-        "Class_Removed_Abstract_Method"=>"High",
-        "Interface_Added_Abstract_Method"=>"Safe",
-        "Interface_Added_Abstract_Method_Invoked_By_Others"=>"Medium",
-        "Interface_Removed_Abstract_Method"=>"High",
-        "Removed_Class"=>"High",
-        "Removed_Interface"=>"High",
-        "Class_Method_Became_Abstract"=>"High",
-        "Class_Method_Became_NonAbstract"=>"Low",
-        "Interface_Method_Became_NonDefault"=>"High",
-        "Interface_Method_Became_Default"=>"Safe",
-        "Added_Super_Class"=>"Low",
-        "Abstract_Class_Added_Super_Abstract_Class"=>"Safe",
-        "Abstract_Class_Added_Super_Abstract_Class_Invoked_By_Others"=>"Medium",
-        "Removed_Super_Class"=>"Medium",
-        "Changed_Super_Class"=>"Medium",
-        "Abstract_Class_Added_Super_Interface"=>"Safe",
-        "Abstract_Class_Added_Super_Interface_Invoked_By_Others"=>"Medium",
-        "Abstract_Class_Added_Super_Interface_With_Implemented_Methods"=>"Safe",
-        "Class_Removed_Super_Interface"=>"High",
-        "Interface_Added_Super_Interface"=>"Safe",
-        "Interface_Added_Super_Interface_Used_By_Others"=>"Medium",
-        "Interface_Added_Super_Constant_Interface"=>"Low",
-        "Interface_Added_Super_Interface_With_Implemented_Methods"=>"Safe",
-        "Interface_Removed_Super_Interface"=>"High",
-        "Interface_Removed_Super_Constant_Interface"=>"Safe",
-        "Class_Became_Interface"=>"High",
-        "Interface_Became_Class"=>"High",
-        "Class_Became_Final"=>"High",
-        "Class_Became_Abstract"=>"High",
-        "Class_Added_Field"=>"Safe",
-        "Interface_Added_Field"=>"Safe",
-        "Removed_NonConstant_Field"=>"High",
-        "Removed_Constant_Field"=>"Low",
-        "Renamed_Field"=>"High",
-        "Renamed_Constant_Field"=>"Low",
-        "Changed_Field_Type"=>"High",
-        "Changed_Field_Access"=>"High",
-        "Changed_Final_Field_Value"=>"Medium",
-        "Changed_Final_Version_Field_Value"=>"Low",
-        "Field_Became_Final"=>"Medium",
-        "Field_Became_NonFinal"=>"Low",
-        "NonConstant_Field_Became_Static"=>"High",
-        "NonConstant_Field_Became_NonStatic"=>"High",
-        "Class_Overridden_Method"=>"Low",
-        "Class_Method_Moved_Up_Hierarchy"=>"Low"
-    },
-    "Source"=>{
-        "NonAbstract_Class_Added_Abstract_Method"=>"High",
-        "Abstract_Class_Added_Abstract_Method"=>"High",
-        "Abstract_Class_Added_Abstract_Method_Invoked_By_Others"=>"High",
-        "Interface_Added_Abstract_Method"=>"High",
-        "Interface_Added_Abstract_Method_Invoked_By_Others"=>"High",
-        "Class_Removed_Abstract_Method"=>"High",
-        "Interface_Removed_Abstract_Method"=>"High",
-        "Removed_Class"=>"High",
-        "Removed_Interface"=>"High",
-        "Class_Method_Became_Abstract"=>"High",
-        "Class_Method_Became_NonAbstract"=>"Safe",
-        "Interface_Method_Became_NonDefault"=>"High",
-        "Interface_Method_Became_Default"=>"Safe",
-        "Added_Super_Class"=>"Low",
-        "Abstract_Class_Added_Super_Abstract_Class"=>"High",
-        "Abstract_Class_Added_Super_Abstract_Class_Invoked_By_Others"=>"High",
-        "Removed_Super_Class"=>"Medium",
-        "Changed_Super_Class"=>"Medium",
-        "Abstract_Class_Added_Super_Interface"=>"High",
-        "Abstract_Class_Added_Super_Interface_Invoked_By_Others"=>"High",
-        "Abstract_Class_Added_Super_Interface_With_Implemented_Methods"=>"Safe",
-        "Class_Removed_Super_Interface"=>"High",
-        "Interface_Added_Super_Interface"=>"High",
-        "Interface_Added_Super_Interface_Used_By_Others"=>"High",
-        "Interface_Added_Super_Constant_Interface"=>"Low",
-        "Interface_Added_Super_Interface_With_Implemented_Methods"=>"Safe",
-        "Interface_Removed_Super_Interface"=>"High",
-        "Interface_Removed_Super_Constant_Interface"=>"High",
-        "Class_Became_Interface"=>"High",
-        "Interface_Became_Class"=>"High",
-        "Class_Became_Final"=>"High",
-        "Class_Became_Abstract"=>"High",
-        "Class_Added_Field"=>"Safe",
-        "Interface_Added_Field"=>"Safe",
-        "Removed_NonConstant_Field"=>"High",
-        "Removed_Constant_Field"=>"High",
-        "Renamed_Field"=>"High",
-        "Renamed_Constant_Field"=>"High",
-        "Changed_Field_Type"=>"High",
-        "Changed_Field_Access"=>"High",
-        "Field_Became_Final"=>"Medium",
-        "Constant_Field_Became_NonStatic"=>"High",
-        "NonConstant_Field_Became_NonStatic"=>"High",
-        "Removed_Annotation"=>"High"
-    }
-);
-
-my %MethodProblems_Kind=(
-    "Binary"=>{
-        "Added_Method"=>"Safe",
-        "Removed_Method"=>"High",
-        "Method_Became_Static"=>"High",
-        "Method_Became_NonStatic"=>"High",
-        "NonStatic_Method_Became_Final"=>"Medium",
-        "Changed_Method_Access"=>"High",
-        "Method_Became_Synchronized"=>"Low",
-        "Method_Became_NonSynchronized"=>"Low",
-        "Method_Became_Abstract"=>"High",
-        "Method_Became_NonAbstract"=>"Low",
-        "Method_Became_NonDefault"=>"High",
-        "Method_Became_Default"=>"Safe",
-        "NonAbstract_Method_Added_Checked_Exception"=>"Low",
-        "NonAbstract_Method_Removed_Checked_Exception"=>"Low",
-        "Added_Unchecked_Exception"=>"Low",
-        "Removed_Unchecked_Exception"=>"Low",
-        "Variable_Arity_To_Array"=>"Low",# not implemented yet
-        "Changed_Method_Return_From_Void"=>"High"
-    },
-    "Source"=>{
-        "Added_Method"=>"Safe",
-        "Removed_Method"=>"High",
-        "Method_Became_Static"=>"Low",
-        "Method_Became_NonStatic"=>"High",
-        "Static_Method_Became_Final"=>"Medium",
-        "NonStatic_Method_Became_Final"=>"Medium",
-        "Changed_Method_Access"=>"High",
-        "Method_Became_Abstract"=>"High",
-        "Method_Became_NonAbstract"=>"Safe",
-        "Method_Became_NonDefault"=>"High",
-        "Method_Became_Default"=>"Safe",
-        "Abstract_Method_Added_Checked_Exception"=>"Medium",
-        "NonAbstract_Method_Added_Checked_Exception"=>"Medium",
-        "Abstract_Method_Removed_Checked_Exception"=>"Medium",
-        "NonAbstract_Method_Removed_Checked_Exception"=>"Medium"
-    }
-);
-
+#Aliases
+my (%MethodInfo, %TypeInfo, %TName_Tid) = ();
+
+#Separate checked and unchecked exceptions
 my %KnownRuntimeExceptions= map {$_=>1} (
-# To separate checked- and unchecked- exceptions
     "java.lang.AnnotationTypeMismatchException",
     "java.lang.ArithmeticException",
@@ -656 +495 @@
 );
 
-my %Slash_Type=(
-    "default"=>"/",
-    "windows"=>"\\"
-);
-
-my $SLASH = $Slash_Type{$OSgroup}?$Slash_Type{$OSgroup}:$Slash_Type{"default"};
-
-my %OS_AddPath=(
-# this data needed if tool can't detect it automatically
-"macos"=>{
-    "bin"=>{"/Developer/usr/bin"=>1}},
-"beos"=>{
-    "bin"=>{"/boot/common/bin"=>1,"/boot/system/bin"=>1,"/boot/develop/abi"=>1}}
-);
-
-#Global variables
-my %RESULT;
-my $ExtractCounter = 0;
-my %Cache;
-my $TOP_REF = "<a class='top_ref' href='#Top'>to the top</a>";
-my %DEBUG_PATH;
-
-#Types
-my %TypeInfo;
-my $TYPE_ID = 0;
-my %CheckedTypes;
-my %TName_Tid;
-my %Class_Constructed;
-
-#Classes
-my %ClassList_User;
-my %UsedMethods_Client;
-my %UsedFields_Client;
-my %UsedClasses_Client;
-my %LibArchives;
-my %Class_Methods;
-my %Class_AbstractMethods;
-my %Class_Fields;
-my %MethodUsed;
-my %ClassMethod_AddedUsed;
-# my %FieldUsed;
-
 #java.lang.Object
 my %JavaObjectMethod = (
@@ -714 +511 @@
 );
 
-#Annotations
-my %AnnotationList_User;
-my %SkipAnnotationList_User;
+#Global variables
+my %Cache;
+my %RESULT;
+my $TOP_REF = "<a class='top_ref' href='#Top'>to the top</a>";
+
+#Types
+my %CheckedTypes;
+
+#Classes
+my %LibArchives;
+my %Class_Methods;
+my %Class_AbstractMethods;
+my %Class_Fields;
+my %ClassMethod_AddedUsed;
+my %Class_Constructed;
 
 #Methods
 my %CheckedMethods;
-my %tr_name;
+my %MethodUsed;
 
 #Merging
-my %MethodInfo;
-my $Version;
 my %AddedMethod_Abstract;
 my %RemovedMethod_Abstract;
 my %ChangedReturnFromVoid;
-my %SkipClasses;
-my %SkipPackages;
-my %KeepPackages;
-my %SkippedPackage;
+my %CompatRules;
+my %IncompleteRules;
 
 #Report
@@ -737 +542 @@
 
 #Recursion locks
-my @RecurSymlink;
 my @RecurTypes;
-
-#System
-my %SystemPaths;
-my %DefaultBinPaths;
 
 #Problem descriptions
@@ -760 +560 @@
 my $Content_Counter = 0;
 
-#Modes
-my $JoinReport = 1;
-my $DoubleReport = 0;
-
-sub get_CmdPath($)
+sub getModules()
+{
+    my $TOOL_DIR = dirname($0);
+    if(not $TOOL_DIR)
+    { # patch for MS Windows
+        $TOOL_DIR = ".";
+    }
+    my @SEARCH_DIRS = (
+        # tool's directory
+        abs_path($TOOL_DIR),
+        # relative path to modules
+        abs_path($TOOL_DIR)."/../share/japi-compliance-checker",
+        # install path
+        'MODULES_INSTALL_PATH'
+    );
+    foreach my $DIR (@SEARCH_DIRS)
+    {
+        if($DIR!~/\A(\/|\w+:[\/\\])/)
+        { # relative path
+            $DIR = abs_path($TOOL_DIR)."/".$DIR;
+        }
+        if(-d $DIR."/modules") {
+            return $DIR."/modules";
+        }
+    }
+    
+    print STDERR "ERROR: can't find modules (Did you installed the tool by 'make install' command?)\n";
+    exit(9); # Module_Error
+}
+
+sub loadModule($)
 {
     my $Name = $_[0];
-    return "" if(not $Name);
-    if(defined $Cache{"get_CmdPath"}{$Name}) {
-        return $Cache{"get_CmdPath"}{$Name};
-    }
-    my $Path = search_Cmd($Name);
-    if(not $Path and $OSgroup eq "windows")
-    { # search for *.exe file
-        $Path=search_Cmd($Name.".exe");
-    }
-    if (not $Path) {
-        $Path=search_Cmd_Path($Name);
-    }
-    if($Path=~/\s/) {
-        $Path = "\"".$Path."\"";
-    }
-    return ($Cache{"get_CmdPath"}{$Name} = $Path);
-}
-
-sub search_Cmd($)
-{
-    my $Name = $_[0];
-    return "" if(not $Name);
-    if(defined $Cache{"search_Cmd"}{$Name}) {
-        return $Cache{"search_Cmd"}{$Name};
-    }
-    if(defined $JdkPath)
-    {
-        if(-x $JdkPath."/".$Name) {
-            return ($Cache{"search_Cmd"}{$Name} = $JdkPath."/".$Name);
-        }
-        
-        if(-x $JdkPath."/bin/".$Name) {
-            return ($Cache{"search_Cmd"}{$Name} = $JdkPath."/bin/".$Name);
-        }
-    }
-    if(my $DefaultPath = get_CmdPath_Default($Name)) {
-        return ($Cache{"search_Cmd"}{$Name} = $DefaultPath);
-    }
-    return ($Cache{"search_Cmd"}{$Name} = "");
-}
-
-sub search_Cmd_Path($)
-{
-    my $Name = $_[0];
-    return "" if(not $Name);
-    
-    if(defined $Cache{"search_Cmd_Path"}{$Name}) {
-        return $Cache{"search_Cmd_Path"}{$Name};
-    }
-    
-    if(defined $SystemPaths{"bin"})
-    {
-        foreach my $Path (sort {length($a)<=>length($b)} keys(%{$SystemPaths{"bin"}}))
-        {
-            if(-f $Path."/".$Name or -f $Path."/".$Name.".exe") {
-                return ($Cache{"search_Cmd_Path"}{$Name} = joinPath($Path,$Name));
-            }
-        }
-    }
-
-    return ($Cache{"search_Cmd_Path"}{$Name} = "");
-}
-
-sub get_CmdPath_Default($)
-{ # search in PATH
-    return "" if(not $_[0]);
-    if(defined $Cache{"get_CmdPath_Default"}{$_[0]}) {
-        return $Cache{"get_CmdPath_Default"}{$_[0]};
-    }
-    return ($Cache{"get_CmdPath_Default"}{$_[0]} = get_CmdPath_Default_I($_[0]));
-}
-
-sub get_CmdPath_Default_I($)
-{ # search in PATH
-    my $Name = $_[0];
-    if($Name=~/find/)
-    { # special case: search for "find" utility
-        if(`find \"$TMP_DIR\" -maxdepth 0 2>\"$TMP_DIR/null\"`) {
-            return "find";
-        }
-    }
-    if(get_version($Name)) {
-        return $Name;
-    }
-    if($OSgroup eq "windows")
-    {
-        if(`$Name /? 2>\"$TMP_DIR/null\"`) {
-            return $Name;
-        }
-    }
-    if($Name!~/which/)
-    {
-        if(my $WhichCmd = get_CmdPath("which"))
-        {
-            if(`$WhichCmd $Name 2>\"$TMP_DIR/null\"`) {
-                return $Name;
-            }
-        }
-    }
-    foreach my $Path (sort {length($a)<=>length($b)} keys(%DefaultBinPaths))
-    {
-        if(-f $Path."/".$Name) {
-            return joinPath($Path,$Name);
-        }
-    }
-    return "";
-}
-
-sub showPos($)
-{
-    my $Number = $_[0];
-    if(not $Number) {
-        $Number = 1;
-    }
-    else {
-        $Number = int($Number)+1;
-    }
-    if($Number>3) {
-        return $Number."th";
-    }
-    elsif($Number==1) {
-        return "1st";
-    }
-    elsif($Number==2) {
-        return "2nd";
-    }
-    elsif($Number==3) {
-        return "3rd";
-    }
-    else {
-        return $Number;
-    }
-}
-
-sub getAR_EXT($)
-{
-    my $Target = $_[0];
-    if(my $Ext = $OS_Archive{$Target}) {
-        return $Ext;
-    }
-    return $OS_Archive{"default"};
-}
-
-sub readDescriptor($$)
-{
-    my ($LibVersion, $Content) = @_;
-    return if(not $LibVersion);
-    my $DName = $DumpAPI?"descriptor":"descriptor \"d$LibVersion\"";
-    if(not $Content) {
-        exitStatus("Error", "$DName is empty");
-    }
-    if($Content!~/\</) {
-        exitStatus("Error", "descriptor should be one of the following:\n  Java ARchive, XML descriptor, gzipped API dump or directory with Java ARchives.");
-    }
-    $Content=~s/\/\*(.|\n)+?\*\///g;
-    $Content=~s/<\!--(.|\n)+?-->//g;
-    $Descriptor{$LibVersion}{"Version"} = parseTag(\$Content, "version");
-    $Descriptor{$LibVersion}{"Version"} = $TargetVersion{$LibVersion} if($TargetVersion{$LibVersion});
-    if($Descriptor{$LibVersion}{"Version"} eq "") {
-        exitStatus("Error", "version in the $DName is not specified (<version> section)");
-    }
-    
-    my $DArchives = parseTag(\$Content, "archives");
-    if(not $DArchives){
-        exitStatus("Error", "Java ARchives in the $DName are not specified (<archive> section)");
-    }
-    else
-    {# append the descriptor Java ARchives list
-        if($Descriptor{$LibVersion}{"Archives"}) {
-            $Descriptor{$LibVersion}{"Archives"} .= "\n".$DArchives;
-        }
-        else {
-            $Descriptor{$LibVersion}{"Archives"} = $DArchives;
-        }
-        foreach my $Path (split(/\s*\n\s*/, $DArchives))
-        {
-            if(not -e $Path) {
-                exitStatus("Access_Error", "can't access \'$Path\'");
-            }
-        }
-    }
-    foreach my $Package (split(/\s*\n\s*/, parseTag(\$Content, "skip_packages"))) {
-        $SkipPackages{$LibVersion}{$Package} = 1;
-    }
-    foreach my $Package (split(/\s*\n\s*/, parseTag(\$Content, "packages"))) {
-        $KeepPackages{$LibVersion}{$Package} = 1;
-    }
-}
-
-sub parseTag($$)
-{
-    my ($CodeRef, $Tag) = @_;
-    return "" if(not $CodeRef or not ${$CodeRef} or not $Tag);
-    if(${$CodeRef}=~s/\<\Q$Tag\E\>((.|\n)+?)\<\/\Q$Tag\E\>//)
-    {
-        my $Content = $1;
-        $Content=~s/(\A\s+|\s+\Z)//g;
-        return $Content;
-    }
-    else {
-        return "";
-    }
-}
-
-sub ignore_path($$)
-{
-    my ($Path, $Prefix) = @_;
-    return 1 if(not $Path or not -e $Path
-    or not $Prefix or not -e $Prefix);
-    return 1 if($Path=~/\~\Z/);# skipping system backup files
-    # skipping hidden .svn, .git, .bzr, .hg and CVS directories
-    return 1 if(cut_path_prefix($Path, $Prefix)=~/(\A|[\/\\]+)(\.(svn|git|bzr|hg)|CVS)([\/\\]+|\Z)/);
-    return 0;
-}
-
-sub cut_path_prefix($$)
-{
-    my ($Path, $Prefix) = @_;
-    $Prefix=~s/[\/\\]+\Z//;
-    $Path=~s/\A\Q$Prefix\E([\/\\]+|\Z)//;
-    return $Path;
-}
-
-sub get_filename($)
-{ # much faster than basename() from File::Basename module
-    if(defined $Cache{"get_filename"}{$_[0]}) {
-        return $Cache{"get_filename"}{$_[0]};
-    }
-    if($_[0] and $_[0]=~/([^\/\\]+)[\/\\]*\Z/) {
-        return ($Cache{"get_filename"}{$_[0]}=$1);
-    }
-    return ($Cache{"get_filename"}{$_[0]}="");
-}
-
-sub get_dirname($)
-{ # much faster than dirname() from File::Basename module
-    if(defined $Cache{"get_dirname"}{$_[0]}) {
-        return $Cache{"get_dirname"}{$_[0]};
-    }
-    if($_[0] and $_[0]=~/\A(.*?)[\/\\]+[^\/\\]*[\/\\]*\Z/) {
-        return ($Cache{"get_dirname"}{$_[0]}=$1);
-    }
-    return ($Cache{"get_dirname"}{$_[0]}="");
-}
-
-sub separate_path($) {
-    return (get_dirname($_[0]), get_filename($_[0]));
-}
-
-sub joinPath($$)
-{
-    return join($SLASH, @_);
-}
-
-sub get_abs_path($)
-{ # abs_path() should NOT be called for absolute inputs
-  # because it can change them
-    my $Path = $_[0];
-    if(not is_abs($Path)) {
-        $Path = abs_path($Path);
-    }
-    return $Path;
-}
-
-sub is_abs($) {
-    return ($_[0]=~/\A(\/|\w+:[\/\\])/);
-}
-
-sub cmd_find($$$$)
-{
-    my ($Path, $Type, $Name, $MaxDepth) = @_;
-    return () if(not $Path or not -e $Path);
-    if($OSgroup eq "windows")
-    {
-        my $DirCmd = get_CmdPath("dir");
-        if(not $DirCmd) {
-            exitStatus("Not_Found", "can't find \"dir\" command");
-        }
-        $Path=~s/[\\]+\Z//;
-        $Path = get_abs_path($Path);
-        my $Cmd = $DirCmd." \"$Path\" /B /O";
-        if($MaxDepth!=1) {
-            $Cmd .= " /S";
-        }
-        if($Type eq "d") {
-            $Cmd .= " /AD";
-        }
-        my @Files = ();
-        if($Name)
-        { # FIXME: how to search file names in MS shell?
-            $Name=~s/\*/.*/g if($Name!~/\]/);
-            foreach my $File (split(/\n/, `$Cmd`))
-            {
-                if($File=~/$Name\Z/i) {
-                    push(@Files, $File);    
-                }
-            }
-        }
-        else {
-            @Files = split(/\n/, `$Cmd 2>\"$TMP_DIR/null\"`);
-        }
-        my @AbsPaths = ();
-        foreach my $File (@Files)
-        {
-            if(not is_abs($File)) {
-                $File = joinPath($Path, $File);
-            }
-            if($Type eq "f" and not -f $File)
-            { # skip dirs
-                next;
-            }
-            push(@AbsPaths, $File);
-        }
-        if($Type eq "d") {
-            push(@AbsPaths, $Path);
-        }
-        return @AbsPaths;
-    }
-    else
-    {
-        my $FindCmd = get_CmdPath("find");
-        if(not $FindCmd) {
-            exitStatus("Not_Found", "can't find a \"find\" command");
-        }
-        $Path = get_abs_path($Path);
-        if(-d $Path and -l $Path
-        and $Path!~/\/\Z/)
-        { # for directories that are symlinks
-            $Path.="/";
-        }
-        my $Cmd = $FindCmd." \"$Path\"";
-        if($MaxDepth) {
-            $Cmd .= " -maxdepth $MaxDepth";
-        }
-        if($Type) {
-            $Cmd .= " -type $Type";
-        }
-        if($Name)
-        {
-            if($Name=~/\]/) {
-                $Cmd .= " -regex \"$Name\"";
-            }
-            else {
-                $Cmd .= " -name \"$Name\"";
-            }
-        }
-        return split(/\n/, `$Cmd 2>\"$TMP_DIR/null\"`);
-    }
-}
-
-sub path_format($$)
-{ # forward slash to pass into MinGW GCC
-    my ($Path, $Fmt) = @_;
-    if($Fmt eq "windows")
-    {
-        $Path=~s/\//\\/g;
-        $Path=lc($Path);
-    }
-    else {
-        $Path=~s/\\/\//g;
-    }
-    return $Path;
-}
-
-sub unpackDump($)
-{
-    my $Path = $_[0];
-    return "" if(not $Path or not -e $Path);
-    
-    if(isDumpFile($Path)) {
-        return $Path;
-    }
-    
-    $Path = get_abs_path($Path);
-    $Path = path_format($Path, $OSgroup);
-    my ($Dir, $FileName) = separate_path($Path);
-    my $UnpackDir = $TMP_DIR."/unpack";
-    if(-d $UnpackDir) {
-        rmtree($UnpackDir);
-    }
-    mkpath($UnpackDir);
-    if($FileName=~s/\Q.zip\E\Z//g)
-    { # *.zip
-        my $UnzipCmd = get_CmdPath("unzip");
-        if(not $UnzipCmd) {
-            exitStatus("Not_Found", "can't find \"unzip\" command");
-        }
-        chdir($UnpackDir);
-        system("$UnzipCmd \"$Path\" >contents.txt");
-        if($?) {
-            exitStatus("Error", "can't extract \'$Path\'");
-        }
-        chdir($ORIG_DIR);
-        my @Contents = ();
-        foreach (split("\n", readFile("$UnpackDir/contents.txt")))
-        {
-            if(/inflating:\s*([^\s]+)/) {
-                push(@Contents, $1);
-            }
-        }
-        if(not @Contents) {
-            exitStatus("Error", "can't extract \'$Path\'");
-        }
-        return joinPath($UnpackDir, $Contents[0]);
-    }
-    elsif($FileName=~s/\Q.tar.gz\E\Z//g)
-    { # *.tar.gz
-        if($OSgroup eq "windows")
-        { # -xvzf option is not implemented in tar.exe (2003)
-          # use "gzip.exe -k -d -f" + "tar.exe -xvf" instead
-            my $TarCmd = get_CmdPath("tar");
-            if(not $TarCmd) {
-                exitStatus("Not_Found", "can't find \"tar\" command");
-            }
-            my $GzipCmd = get_CmdPath("gzip");
-            if(not $GzipCmd) {
-                exitStatus("Not_Found", "can't find \"gzip\" command");
-            }
-            chdir($UnpackDir);
-            qx/$GzipCmd -k -d -f "$Path"/; # keep input files (-k)
-            if($?) {
-                exitStatus("Error", "can't extract \'$Path\'");
-            }
-            my @Contents = qx/$TarCmd -xvf "$Dir\\$FileName.tar"/;
-            if($? or not @Contents) {
-                exitStatus("Error", "can't extract \'$Path\'");
-            }
-            chdir($ORIG_DIR);
-            unlink($Dir."/".$FileName.".tar");
-            chomp $Contents[0];
-            return joinPath($UnpackDir, $Contents[0]);
-        }
-        else
-        { # Linux, Unix, OS X
-            my $TarCmd = get_CmdPath("tar");
-            if(not $TarCmd) {
-                exitStatus("Not_Found", "can't find \"tar\" command");
-            }
-            chdir($UnpackDir);
-            my @Contents = qx/$TarCmd -xvzf "$Path" 2>&1/;
-            if($? or not @Contents) {
-                exitStatus("Error", "can't extract \'$Path\'");
-            }
-            chdir($ORIG_DIR);
-            $Contents[0]=~s/^x //; # OS X
-            chomp $Contents[0];
-            return joinPath($UnpackDir, $Contents[0]);
-        }
-    }
+    if(defined $LoadedModules{$Name}) {
+        return;
+    }
+    my $Path = $MODULES_DIR."/Internals/$Name.pm";
+    if(not -f $Path)
+    {
+        print STDERR "can't access \'$Path\'\n";
+        exit(2);
+    }
+    require $Path;
+    $LoadedModules{$Name} = 1;
+}
+
+sub readModule($$)
+{
+    my ($Module, $Name) = @_;
+    my $Path = $MODULES_DIR."/Internals/$Module/".$Name;
+    if(not -f $Path) {
+        exitStatus("Module_Error", "can't access \'$Path\'");
+    }
+    return readFile($Path);
 }
 
@@ -1225 +623 @@
     {
         next if(not $ClassName);
-        my $Type1_Id = $TName_Tid{1}{$ClassName};
-        my %Type1 = get_Type($Type1_Id, 1);
-        
-        if($Type1{"Type"}!~/class|interface/) {
+        my $Type1 = getType($TName_Tid{1}{$ClassName}, 1);
+        
+        if($Type1->{"Type"}!~/class|interface/) {
             next;
         }
         
-        if(defined $Type1{"Access"}
-        and $Type1{"Access"}=~/private/) {
+        if(defined $Type1->{"Access"}
+        and $Type1->{"Access"}=~/private/) {
             next;
         }
         
-        if(not classFilter(\%Type1, 1, 0)) {
+        if(not classFilter($Type1, 1, 0)) {
             next;
         }
@@ -1253 +650 @@
                 $CheckedMethods{$Method} = 1;
                 
-                if($Type1{"Type"} eq "class")
+                if($Type1->{"Type"} eq "class")
                 {
                     %{$CompatProblems{$Method}{"Removed_Class"}{"this"}} = (
                         "Type_Name"=>$ClassName,
-                        "Target"=>$ClassName  );
+                        "Target"=>$ClassName);
                 }
                 else
@@ -1263 +660 @@
                     %{$CompatProblems{$Method}{"Removed_Interface"}{"this"}} = (
                         "Type_Name"=>$ClassName,
-                        "Target"=>$ClassName  );
+                        "Target"=>$ClassName);
                 }
                 
@@ -1273 +670 @@
     foreach my $Class_Id (keys(%{$TypeInfo{1}}))
     {
-        my %Class1 = get_Type($Class_Id, 1);
-        
-        if($Class1{"Type"}!~/class|interface/) {
+        my $Class1 = getType($Class_Id, 1);
+        
+        if($Class1->{"Type"}!~/class|interface/) {
             next;
         }
         
-        if(defined $Class1{"Access"}
-        and $Class1{"Access"}=~/private/) {
+        if(defined $Class1->{"Access"}
+        and $Class1->{"Access"}=~/private/) {
             next;
         }
         
-        if(not classFilter(\%Class1, 1, 1)) {
+        if(not classFilter($Class1, 1, 1)) {
             next;
         }
         
-        my $ClassName = $Class1{"Name"};
+        my $ClassName = $Class1->{"Name"};
         
         if(my $Class2_Id = $TName_Tid{2}{$ClassName})
@@ -1294 +691 @@
             if(not defined $Class_Methods{1}{$ClassName})
             {
-                my %Class2 = get_Type($Class2_Id, 2);
+                my $Class2 = getType($Class2_Id, 2);
                 
-                foreach my $Field (keys(%{$Class1{"Fields"}}))
+                foreach my $Field (keys(%{$Class1->{"Fields"}}))
                 {
-                    my $FieldInfo = $Class1{"Fields"}{$Field};
+                    my $FieldInfo = $Class1->{"Fields"}{$Field};
                     
                     my $FAccess = $FieldInfo->{"Access"};
@@ -1309 +706 @@
                         $CheckedTypes{$ClassName} = 1;
                         
-                        if(not defined $Class2{"Fields"}{$Field})
+                        if(not defined $Class2->{"Fields"}{$Field})
                         {
                             %{$CompatProblems{".client_method"}{"Removed_NonConstant_Field"}{$Field}}=(
                                 "Target"=>$Field,
                                 "Type_Name"=>$ClassName,
-                                "Type_Type"=>$Class1{"Type"},
-                                "Field_Type"=>get_TypeName($FieldInfo->{"Type"}, 1)  );
+                                "Type_Type"=>$Class1->{"Type"},
+                                "Field_Type"=>getTypeName($FieldInfo->{"Type"}, 1));
                         }
                     }
@@ -1323 +720 @@
         else
         { # removed
-            if(defined $Class1{"Annotation"})
+            if(defined $Class1->{"Annotation"})
             {
                 %{$CompatProblems{".client_method"}{"Removed_Annotation"}{"this"}} = (
                     "Type_Name"=>$ClassName,
-                    "Target"=>$ClassName  );
+                    "Target"=>$ClassName);
             }
             
@@ -1335 +732 @@
                 if(not defined $ReportedRemoved{$ClassName})
                 {
-                    foreach my $Field (keys(%{$Class1{"Fields"}}))
+                    foreach my $Field (keys(%{$Class1->{"Fields"}}))
                     {
-                        my $FieldInfo = $Class1{"Fields"}{$Field};
+                        my $FieldInfo = $Class1->{"Fields"}{$Field};
                         
                         my $FAccess = $FieldInfo->{"Access"};
@@ -1348 +745 @@
                             $CheckedTypes{$ClassName} = 1;
                             
-                            if($Class1{"Type"} eq "class")
+                            if($Class1->{"Type"} eq "class")
                             {
                                 %{$CompatProblems{".client_method"}{"Removed_Class"}{"this"}} = (
                                     "Type_Name"=>$ClassName,
-                                    "Target"=>$ClassName  );
+                                    "Target"=>$ClassName);
                             }
                             else
@@ -1358 +755 @@
                                 %{$CompatProblems{".client_method"}{"Removed_Interface"}{"this"}} = (
                                     "Type_Name"=>$ClassName,
-                                    "Target"=>$ClassName  );
+                                    "Target"=>$ClassName);
                             }
                         }
@@ -1405 +802 @@
 sub pushType($$)
 {
-    my %TypeDescriptor=(
+    my %TypeDescriptor = (
         "Tid1"  => $_[0],
-        "Tid2"  => $_[1]  );
+        "Tid2"  => $_[1]);
     push(@RecurTypes, \%TypeDescriptor);
 }
 
-sub get_SFormat($)
+sub getSFormat($)
 {
     my $Name = $_[0];
@@ -1418 +815 @@
 }
 
-sub get_PFormat($)
-{
-    my $Name = $_[0];
-    $Name=~s/\//./g;
-    return $Name;
-}
-
-sub get_ConstantValue($$)
+sub getConstantValue($$)
 {
     my ($Value, $ValueType) = @_;
-    return "" if(not $Value);
+    
+    if(not defined $Value) {
+        return undef;
+    }
+    
     if($Value eq "\@EMPTY_STRING\@") {
         return "\"\"";
@@ -1435 +829 @@
         return "\"".$Value."\"";
     }
-    else {
-        return $Value;
-    }
+    
+    return $Value;
 }
 
@@ -1466 +859 @@
     }
     
-    my %Type1 = get_Type($Type1_Id, 1);
-    my %Type2 = get_Type($Type2_Id, 2);
     if(isRecurType($Type1_Id, $Type2_Id))
     { # do not follow to recursive declarations
         return {};
     }
+    
+    my %Type1 = %{getType($Type1_Id, 1)};
+    my %Type2 = %{getType($Type2_Id, 2)};
+    
     return {} if(not $Type1{"Name"} or not $Type2{"Name"});
     return {} if(not $Type1{"Archive"} or not $Type2{"Archive"});
@@ -1502 +897 @@
     {
         %{$SubProblems{"Class_Became_Interface"}{""}}=(
-            "Type_Name"=>$Type1{"Name"}  );
+            "Type_Name"=>$Type1{"Name"});
         
         return ($Cache{"mergeTypes"}{$Type1_Id}{$Type2_Id} = \%SubProblems);
@@ -1510 +905 @@
     {
         %{$SubProblems{"Interface_Became_Class"}{""}}=(
-            "Type_Name"=>$Type1{"Name"}  );
+            "Type_Name"=>$Type1{"Name"});
         
         return ($Cache{"mergeTypes"}{$Type1_Id}{$Type2_Id} = \%SubProblems);
@@ -1519 +914 @@
         %{$SubProblems{"Class_Became_Final"}{""}}=(
             "Type_Name"=>$Type1{"Name"},
-            "Target"=>$Type1{"Name"}  );
+            "Target"=>$Type1{"Name"});
     }
     if(not $Type1{"Abstract"}
@@ -1525 +920 @@
     {
         %{$SubProblems{"Class_Became_Abstract"}{""}}=(
-            "Type_Name"=>$Type1{"Name"}  );
+            "Type_Name"=>$Type1{"Name"});
     }
     
@@ -1538 +933 @@
                 if(my @InvokedBy = sort keys(%{$MethodUsed{2}{$AddedMethod}}))
                 {
-                    %{$SubProblems{"Abstract_Class_Added_Abstract_Method_Invoked_By_Others"}{get_SFormat($AddedMethod)}} = (
+                    %{$SubProblems{"Abstract_Class_Added_Abstract_Method_Invoked_By_Others"}{getSFormat($AddedMethod)}} = (
                         "Type_Name"=>$Type1{"Name"},
                         "Type_Type"=>$Type1{"Type"},
                         "Target"=>$AddedMethod,
-                        "InvokedBy"=>$InvokedBy[0]  );
+                        "Invoked_By"=>$InvokedBy[0]);
                 }
                 else
                 {
-                    %{$SubProblems{"Abstract_Class_Added_Abstract_Method"}{get_SFormat($AddedMethod)}} = (
+                    %{$SubProblems{"Abstract_Class_Added_Abstract_Method"}{getSFormat($AddedMethod)}} = (
                         "Type_Name"=>$Type1{"Name"},
                         "Type_Type"=>$Type1{"Type"},
-                        "Target"=>$AddedMethod  );
+                        "Target"=>$AddedMethod);
                 }
             }
             else
             {
-                %{$SubProblems{"NonAbstract_Class_Added_Abstract_Method"}{get_SFormat($AddedMethod)}} = (
+                %{$SubProblems{"NonAbstract_Class_Added_Abstract_Method"}{getSFormat($AddedMethod)}} = (
                     "Type_Name"=>$Type1{"Name"},
                     "Type_Type"=>$Type1{"Type"},
-                    "Target"=>$AddedMethod  );
+                    "Target"=>$AddedMethod);
             }
         }
@@ -1564 +959 @@
             if(my @InvokedBy = sort keys(%{$MethodUsed{2}{$AddedMethod}}))
             {
-                %{$SubProblems{"Interface_Added_Abstract_Method_Invoked_By_Others"}{get_SFormat($AddedMethod)}} = (
+                %{$SubProblems{"Interface_Added_Abstract_Method_Invoked_By_Others"}{getSFormat($AddedMethod)}} = (
                     "Type_Name"=>$Type1{"Name"},
                     "Type_Type"=>$Type1{"Type"},
                     "Target"=>$AddedMethod,
-                    "InvokedBy"=>$InvokedBy[0]  );
+                    "Invoked_By"=>$InvokedBy[0]);
             }
             else
             {
-                %{$SubProblems{"Interface_Added_Abstract_Method"}{get_SFormat($AddedMethod)}} = (
+                %{$SubProblems{"Interface_Added_Abstract_Method"}{getSFormat($AddedMethod)}} = (
                     "Type_Name"=>$Type1{"Name"},
                     "Type_Type"=>$Type1{"Type"},
-                    "Target"=>$AddedMethod  );
+                    "Target"=>$AddedMethod);
             }
         }
@@ -1583 +978 @@
         if($Type1{"Type"} eq "class")
         {
-            %{$SubProblems{"Class_Removed_Abstract_Method"}{get_SFormat($RemovedMethod)}} = (
+            %{$SubProblems{"Class_Removed_Abstract_Method"}{getSFormat($RemovedMethod)}} = (
                 "Type_Name"=>$Type1{"Name"},
                 "Type_Type"=>$Type1{"Type"},
-                "Target"=>$RemovedMethod  );
+                "Target"=>$RemovedMethod);
         }
         else
         {
-            %{$SubProblems{"Interface_Removed_Abstract_Method"}{get_SFormat($RemovedMethod)}} = (
+            %{$SubProblems{"Interface_Removed_Abstract_Method"}{getSFormat($RemovedMethod)}} = (
                 "Type_Name"=>$Type1{"Name"},
                 "Type_Type"=>$Type1{"Type"},
-                "Target"=>$RemovedMethod  );
+                "Target"=>$RemovedMethod);
         }
     }
@@ -1599 +994 @@
     and $Type2{"Type"} eq "class")
     {
-        my %SuperClass1 = get_Type($Type1{"SuperClass"}, 1);
-        my %SuperClass2 = get_Type($Type2{"SuperClass"}, 2);
-        if($SuperClass2{"Name"} ne $SuperClass1{"Name"})
-        {
-            if($SuperClass1{"Name"} eq "java.lang.Object"
-            or not $SuperClass1{"Name"})
+        my $SuperClass1 = getType($Type1{"SuperClass"}, 1);
+        my $SuperClass2 = getType($Type2{"SuperClass"}, 2);
+        
+        my $SuperClassName1 = $SuperClass1->{"Name"};
+        my $SuperClassName2 = $SuperClass2->{"Name"};
+        
+        if($SuperClassName2 ne $SuperClassName1)
+        {
+            if($SuperClassName1 eq "java.lang.Object"
+            or not $SuperClassName1)
             {
               # Java 6: java.lang.Object
               # Java 7: none
-                if($SuperClass2{"Name"} ne "java.lang.Object")
+                if($SuperClassName2 ne "java.lang.Object")
                 {
-                    if($SuperClass2{"Abstract"}
+                    if($SuperClass2->{"Abstract"}
                     and $Type1{"Abstract"} and $Type2{"Abstract"}
-                    and keys(%{$Class_AbstractMethods{2}{$SuperClass2{"Name"}}}))
+                    and keys(%{$Class_AbstractMethods{2}{$SuperClassName2}}))
                     {
                         if(my ($Invoked, $InvokedBy) = getInvoked($Type1{"Name"}))
@@ -1618 +1017 @@
                             %{$SubProblems{"Abstract_Class_Added_Super_Abstract_Class_Invoked_By_Others"}{""}} = (
                                 "Type_Name"=>$Type1{"Name"},
-                                "Target"=>$SuperClass2{"Name"},
+                                "Target"=>$SuperClassName2,
                                 "Invoked"=>$Invoked,
-                                "InvokedBy"=>$InvokedBy  );
+                                "Invoked_By"=>$InvokedBy);
                         }
                         else
@@ -1626 +1025 @@
                             %{$SubProblems{"Abstract_Class_Added_Super_Abstract_Class"}{""}} = (
                                 "Type_Name"=>$Type1{"Name"},
-                                "Target"=>$SuperClass2{"Name"}  );
+                                "Target"=>$SuperClassName2);
                         }
                     }
@@ -1633 +1032 @@
                         %{$SubProblems{"Added_Super_Class"}{""}} = (
                             "Type_Name"=>$Type1{"Name"},
-                            "Target"=>$SuperClass2{"Name"}  );
-                    }
-                }
-            }
-            elsif($SuperClass2{"Name"} eq "java.lang.Object"
-            or not $SuperClass2{"Name"})
+                            "Target"=>$SuperClassName2);
+                    }
+                }
+            }
+            elsif($SuperClassName2 eq "java.lang.Object"
+            or not $SuperClassName2)
             {
               # Java 6: java.lang.Object
               # Java 7: none
-                if($SuperClass1{"Name"} ne "java.lang.Object")
+                if($SuperClassName1 ne "java.lang.Object")
                 {
                     %{$SubProblems{"Removed_Super_Class"}{""}} = (
                         "Type_Name"=>$Type1{"Name"},
-                        "Target"=>$SuperClass1{"Name"}  );
+                        "Target"=>$SuperClassName1);
                 }
             }
@@ -1653 +1052 @@
                 %{$SubProblems{"Changed_Super_Class"}{""}} = (
                     "Type_Name"=>$Type1{"Name"},
-                    "Target"=>$SuperClass1{"Name"},
-                    "Old_Value"=>$SuperClass1{"Name"},
-                    "New_Value"=>$SuperClass2{"Name"}  );
-            }
-        }
-    }
-    my %SuperInterfaces_Old = map {get_TypeName($_, 1) => 1} keys(%{$Type1{"SuperInterface"}});
-    my %SuperInterfaces_New = map {get_TypeName($_, 2) => 1} keys(%{$Type2{"SuperInterface"}});
+                    "Target"=>$SuperClassName1,
+                    "Old_Value"=>$SuperClassName1,
+                    "New_Value"=>$SuperClassName2);
+            }
+        }
+    }
+    my %SuperInterfaces_Old = map {getTypeName($_, 1) => 1} keys(%{$Type1{"SuperInterface"}});
+    my %SuperInterfaces_New = map {getTypeName($_, 2) => 1} keys(%{$Type2{"SuperInterface"}});
     foreach my $SuperInterface (keys(%SuperInterfaces_New))
     {
@@ -1675 +1074 @@
                     if($HaveMethods and checkDefaultImpl(2, $SuperInterface, $Type2{"Name"}))
                     {
-                        %{$SubProblems{"Interface_Added_Super_Interface_With_Implemented_Methods"}{get_SFormat($SuperInterface)}} = (
+                        %{$SubProblems{"Interface_Added_Super_Interface_With_Implemented_Methods"}{getSFormat($SuperInterface)}} = (
                             "Type_Name"=>$Type1{"Name"},
-                            "Target"=>$SuperInterface  );
+                            "Target"=>$SuperInterface);
                     }
                     else
@@ -1683 +1082 @@
                         if(my ($Invoked, $InvokedBy) = getInvoked($Type1{"Name"}))
                         {
-                            %{$SubProblems{"Interface_Added_Super_Interface_Used_By_Others"}{get_SFormat($SuperInterface)}} = (
+                            %{$SubProblems{"Interface_Added_Super_Interface_Used_By_Others"}{getSFormat($SuperInterface)}} = (
                                 "Type_Name"=>$Type1{"Name"},
                                 "Target"=>$SuperInterface,
                                 "Invoked"=>$Invoked,
-                                "InvokedBy"=>$InvokedBy  );
+                                "Invoked_By"=>$InvokedBy);
                         }
                         else
                         {
-                            %{$SubProblems{"Interface_Added_Super_Interface"}{get_SFormat($SuperInterface)}} = (
+                            %{$SubProblems{"Interface_Added_Super_Interface"}{getSFormat($SuperInterface)}} = (
                                 "Type_Name"=>$Type1{"Name"},
-                                "Target"=>$SuperInterface  );
+                                "Target"=>$SuperInterface);
                         }
                     }
@@ -1699 +1098 @@
                 elsif($HaveFields)
                 {
-                    %{$SubProblems{"Interface_Added_Super_Constant_Interface"}{get_SFormat($SuperInterface)}} = (
+                    %{$SubProblems{"Interface_Added_Super_Constant_Interface"}{getSFormat($SuperInterface)}} = (
                         "Type_Name"=>$Type2{"Name"},
-                        "Target"=>$SuperInterface  );
+                        "Target"=>$SuperInterface);
                 }
                 else
@@ -1714 +1113 @@
                     if($HaveMethods and checkDefaultImpl(2, $SuperInterface, $Type2{"Name"}))
                     {
-                        %{$SubProblems{"Abstract_Class_Added_Super_Interface_With_Implemented_Methods"}{get_SFormat($SuperInterface)}} = (
+                        %{$SubProblems{"Abstract_Class_Added_Super_Interface_With_Implemented_Methods"}{getSFormat($SuperInterface)}} = (
                             "Type_Name"=>$Type1{"Name"},
-                            "Target"=>$SuperInterface  );
+                            "Target"=>$SuperInterface);
                     }
                     else
@@ -1722 +1121 @@
                         if(my ($Invoked, $InvokedBy) = getInvoked($Type1{"Name"}))
                         {
-                            %{$SubProblems{"Abstract_Class_Added_Super_Interface_Invoked_By_Others"}{get_SFormat($SuperInterface)}} = (
+                            %{$SubProblems{"Abstract_Class_Added_Super_Interface_Invoked_By_Others"}{getSFormat($SuperInterface)}} = (
                                 "Type_Name"=>$Type1{"Name"},
                                 "Target"=>$SuperInterface,
                                 "Invoked"=>$Invoked,
-                                "InvokedBy"=>$InvokedBy  );
+                                "Invoked_By"=>$InvokedBy);
                         }
                         else
                         {
-                            %{$SubProblems{"Abstract_Class_Added_Super_Interface"}{get_SFormat($SuperInterface)}} = (
+                            %{$SubProblems{"Abstract_Class_Added_Super_Interface"}{getSFormat($SuperInterface)}} = (
                                 "Type_Name"=>$Type1{"Name"},
-                                "Target"=>$SuperInterface  );
+                                "Target"=>$SuperInterface);
                         }
                     }
@@ -1751 +1150 @@
                 or $SuperInterface=~/\Ajava\./)
                 {
-                    %{$SubProblems{"Interface_Removed_Super_Interface"}{get_SFormat($SuperInterface)}} = (
+                    %{$SubProblems{"Interface_Removed_Super_Interface"}{getSFormat($SuperInterface)}} = (
                         "Type_Name"=>$Type1{"Name"},
                         "Type_Type"=>"interface",
-                        "Target"=>$SuperInterface  );
+                        "Target"=>$SuperInterface);
                 }
                 elsif($HaveFields)
                 {
-                    %{$SubProblems{"Interface_Removed_Super_Constant_Interface"}{get_SFormat($SuperInterface)}} = (
+                    %{$SubProblems{"Interface_Removed_Super_Constant_Interface"}{getSFormat($SuperInterface)}} = (
                         "Type_Name"=>$Type1{"Name"},
-                        "Target"=>$SuperInterface  );
+                        "Target"=>$SuperInterface);
                 }
                 else {
@@ -1768 +1167 @@
             else
             {
-                %{$SubProblems{"Class_Removed_Super_Interface"}{get_SFormat($SuperInterface)}} = (
+                %{$SubProblems{"Class_Removed_Super_Interface"}{getSFormat($SuperInterface)}} = (
                     "Type_Name"=>$Type1{"Name"},
                     "Type_Type"=>"class",
-                    "Target"=>$SuperInterface  );
+                    "Target"=>$SuperInterface);
             }
         }
@@ -1785 +1184 @@
         my $Field_Pos1 = $Type1{"Fields"}{$Field_Name}{"Pos"};
         my $FieldType1_Id = $Type1{"Fields"}{$Field_Name}{"Type"};
-        my %FieldType1 = get_Type($FieldType1_Id, 1);
+        my $FieldType1_Name = getTypeName($FieldType1_Id, 1);
         
         if(not $Type2{"Fields"}{$Field_Name})
@@ -1791 +1190 @@
             my $StraightPair_Name = findFieldPair($Field_Pos1, \%Type2);
             if($StraightPair_Name ne "lost" and not $Type1{"Fields"}{$StraightPair_Name}
-            and $FieldType1{"Name"} eq get_TypeName($Type2{"Fields"}{$StraightPair_Name}{"Type"}, 2))
-            {
-                if(my $Constant = get_ConstantValue($Type1{"Fields"}{$Field_Name}{"Value"}, $FieldType1{"Name"}))
+            and $FieldType1_Name eq getTypeName($Type2{"Fields"}{$StraightPair_Name}{"Type"}, 2))
+            {
+                if(my $Constant = getConstantValue($Type1{"Fields"}{$Field_Name}{"Value"}, $FieldType1_Name))
                 {
                     %{$SubProblems{"Renamed_Constant_Field"}{$Field_Name}}=(
@@ -1800 +1199 @@
                         "Old_Value"=>$Field_Name,
                         "New_Value"=>$StraightPair_Name,
-                        "Field_Type"=>$FieldType1{"Name"},
-                        "Field_Value"=>$Constant  );
+                        "Field_Type"=>$FieldType1_Name,
+                        "Field_Value"=>$Constant);
                 }
                 else
@@ -1810 +1209 @@
                         "Old_Value"=>$Field_Name,
                         "New_Value"=>$StraightPair_Name,
-                        "Field_Type"=>$FieldType1{"Name"}  );
+                        "Field_Type"=>$FieldType1_Name);
                 }
             }
             else
             {
-                if(my $Constant = get_ConstantValue($Type1{"Fields"}{$Field_Name}{"Value"}, $FieldType1{"Name"}))
+                if(my $Constant = getConstantValue($Type1{"Fields"}{$Field_Name}{"Value"}, $FieldType1_Name))
                 { # has a compile-time constant value
                     %{$SubProblems{"Removed_Constant_Field"}{$Field_Name}}=(
@@ -1821 +1220 @@
                         "Type_Name"=>$Type1{"Name"},
                         "Field_Value"=>$Constant,
-                        "Field_Type"=>$FieldType1{"Name"},
-                        "Type_Type"=>$Type1{"Type"}  );
+                        "Field_Type"=>$FieldType1_Name,
+                        "Type_Type"=>$Type1{"Type"});
                 }
                 else
@@ -1830 +1229 @@
                         "Type_Name"=>$Type1{"Name"},
                         "Type_Type"=>$Type1{"Type"},
-                        "Field_Type"=>$FieldType1{"Name"}  );
+                        "Field_Type"=>$FieldType1_Name);
                 }
             }
             next;
         }
+        
         my $FieldType2_Id = $Type2{"Fields"}{$Field_Name}{"Type"};
-        my %FieldType2 = get_Type($FieldType2_Id, 2);
+        my $FieldType2_Name = getTypeName($FieldType2_Id, 2);
         
         if(not $Type1{"Fields"}{$Field_Name}{"Static"}
@@ -1845 +1245 @@
                 %{$SubProblems{"NonConstant_Field_Became_Static"}{$Field_Name}}=(
                     "Target"=>$Field_Name,
-                    "Field_Type"=>$FieldType1{"Name"},
-                    "Type_Name"=>$Type1{"Name"}  );
+                    "Field_Type"=>$FieldType1_Name,
+                    "Type_Name"=>$Type1{"Name"});
             }
         }
@@ -1856 +1256 @@
                 %{$SubProblems{"Constant_Field_Became_NonStatic"}{$Field_Name}}=(
                     "Target"=>$Field_Name,
-                    "Field_Type"=>$FieldType1{"Name"},
-                    "Type_Name"=>$Type1{"Name"}  );
+                    "Field_Type"=>$FieldType1_Name,
+                    "Type_Name"=>$Type1{"Name"});
             }
             else
@@ -1863 +1263 @@
                 %{$SubProblems{"NonConstant_Field_Became_NonStatic"}{$Field_Name}}=(
                     "Target"=>$Field_Name,
-                    "Field_Type"=>$FieldType1{"Name"},
-                    "Type_Name"=>$Type1{"Name"}  );
+                    "Field_Type"=>$FieldType1_Name,
+                    "Type_Name"=>$Type1{"Name"});
             }
         }
@@ -1872 +1272 @@
             %{$SubProblems{"Field_Became_Final"}{$Field_Name}}=(
                 "Target"=>$Field_Name,
-                "Field_Type"=>$FieldType1{"Name"},
-                "Type_Name"=>$Type1{"Name"}  );
+                "Field_Type"=>$FieldType1_Name,
+                "Type_Name"=>$Type1{"Name"});
         }
         elsif($Type1{"Fields"}{$Field_Name}{"Final"}
@@ -1880 +1280 @@
             %{$SubProblems{"Field_Became_NonFinal"}{$Field_Name}}=(
                 "Target"=>$Field_Name,
-                "Field_Type"=>$FieldType1{"Name"},
-                "Type_Name"=>$Type1{"Name"}  );
+                "Field_Type"=>$FieldType1_Name,
+                "Type_Name"=>$Type1{"Name"});
         }
         my $Access2 = $Type2{"Fields"}{$Field_Name}{"Access"};
@@ -1887 +1287 @@
         or $Access1 eq "protected" and $Access2=~/private/)
         {
-            %{$SubProblems{"Changed_Field_Access"}{$Field_Name}}=(
-                "Target"=>$Field_Name,
-                "Type_Name"=>$Type1{"Name"},
-                "Old_Value"=>$Access1,
-                "New_Value"=>$Access2  );
-        }
-        
-        my $Value1 = get_ConstantValue($Type1{"Fields"}{$Field_Name}{"Value"}, $FieldType1{"Name"});
-        my $Value2 = get_ConstantValue($Type2{"Fields"}{$Field_Name}{"Value"}, $FieldType2{"Name"});
+            if($Access2 eq "package-private")
+            {
+                %{$SubProblems{"Changed_Field_Access_To_Package_Private"}{$Field_Name}}=(
+                    "Target"=>$Field_Name,
+                    "Type_Name"=>$Type1{"Name"},
+                    "Old_Value"=>$Access1,
+                    "New_Value"=>$Access2);
+            }
+            else
+            {
+                %{$SubProblems{"Changed_Field_Access"}{$Field_Name}}=(
+                    "Target"=>$Field_Name,
+                    "Type_Name"=>$Type1{"Name"},
+                    "Old_Value"=>$Access1,
+                    "New_Value"=>$Access2);
+            }
+        }
+        
+        my $Value1 = getConstantValue($Type1{"Fields"}{$Field_Name}{"Value"}, $FieldType1_Name);
+        my $Value2 = getConstantValue($Type2{"Fields"}{$Field_Name}{"Value"}, $FieldType2_Name);
         
         if($Value1 ne $Value2)
@@ -1908 +1319 @@
                         %{$SubProblems{"Changed_Final_Version_Field_Value"}{$Field_Name}}=(
                             "Target"=>$Field_Name,
-                            "Field_Type"=>$FieldType1{"Name"},
+                            "Field_Type"=>$FieldType1_Name,
                             "Type_Name"=>$Type1{"Name"},
                             "Old_Value"=>$Value1,
-                            "New_Value"=>$Value2  );
+                            "New_Value"=>$Value2);
                     }
                     else
@@ -1917 +1328 @@
                         %{$SubProblems{"Changed_Final_Field_Value"}{$Field_Name}}=(
                             "Target"=>$Field_Name,
-                            "Field_Type"=>$FieldType1{"Name"},
+                            "Field_Type"=>$FieldType1_Name,
                             "Type_Name"=>$Type1{"Name"},
                             "Old_Value"=>$Value1,
-                            "New_Value"=>$Value2  );
+                            "New_Value"=>$Value2);
                     }
                 }
@@ -1948 +1359 @@
                 foreach my $Sub_SubLocation (sort {length($a)<=>length($b)} sort keys(%{$Sub_SubProblems->{$Sub_SubProblemType}}))
                 {
-                    if(not defined $AllAffected)
+                    if(not defined $In::Opt{"AllAffected"})
                     {
                         if(defined $DupProblems{$Sub_SubProblems->{$Sub_SubProblemType}{$Sub_SubLocation}}) {
@@ -1958 +1369 @@
                     $SubProblems{$Sub_SubProblemType}{$NewLocation} = $Sub_SubProblems->{$Sub_SubProblemType}{$Sub_SubLocation};
                     
-                    if(not defined $AllAffected)
+                    if(not defined $In::Opt{"AllAffected"})
                     {
                         $DupProblems{$Sub_SubProblems->{$Sub_SubProblemType}{$Sub_SubLocation}} = 1;
@@ -1975 +1386 @@
         my $FieldPos2 = $Type2{"Fields"}{$Field_Name}{"Pos"};
         my $FieldType2_Id = $Type2{"Fields"}{$Field_Name}{"Type"};
-        my %FieldType2 = get_Type($FieldType2_Id, 2);
+        my $FieldType2_Name = getTypeName($FieldType2_Id, 2);
         
         if(not $Type1{"Fields"}{$Field_Name})
@@ -1981 +1392 @@
             my $StraightPair_Name = findFieldPair($FieldPos2, \%Type1);
             if($StraightPair_Name ne "lost" and not $Type2{"Fields"}{$StraightPair_Name}
-            and get_TypeName($Type1{"Fields"}{$StraightPair_Name}{"Type"}, 1) eq $FieldType2{"Name"})
+            and getTypeName($Type1{"Fields"}{$StraightPair_Name}{"Type"}, 1) eq $FieldType2_Name)
             {
                 # Already reported as "Renamed_Field" or "Renamed_Constant_Field"
@@ -1991 +1402 @@
                     %{$SubProblems{"Interface_Added_Field"}{$Field_Name}}=(
                         "Target"=>$Field_Name,
-                        "Type_Name"=>$Type1{"Name"}  );
+                        "Type_Name"=>$Type1{"Name"});
                 }
                 else
@@ -1997 +1408 @@
                     %{$SubProblems{"Class_Added_Field"}{$Field_Name}}=(
                         "Target"=>$Field_Name,
-                        "Type_Name"=>$Type1{"Name"}  );
+                        "Type_Name"=>$Type1{"Name"});
                 }
             }
@@ -2010 +1421 @@
 { # Check if all abstract methods of the super class have
   # default implementations in the class
-    my ($LibVersion, $SuperClassName, $ClassName) = @_;
-    
-    foreach my $Method (keys(%{$Class_AbstractMethods{$LibVersion}{$SuperClassName}}))
-    {
-        if(my $Overridden = findMethod_Class($Method, $ClassName, $LibVersion))
-        {
-            if($MethodInfo{$LibVersion}{$Overridden}{"Abstract"}) {
+    my ($LVer, $SuperClassName, $ClassName) = @_;
+    
+    foreach my $Method (keys(%{$Class_AbstractMethods{$LVer}{$SuperClassName}}))
+    {
+        if(my $Overridden = findMethod_Class($Method, $ClassName, $LVer))
+        {
+            if($MethodInfo{$LVer}{$Overridden}{"Abstract"}) {
                 return 0;
             }
@@ -2028 +1439 @@
 }
 
-sub unmangle($)
-{
-    my $Name = $_[0];
-    $Name=~s!/!.!g;
-    $Name=~s!:\(!(!g;
-    $Name=~s!\).+\Z!)!g;
-    if($Name=~/\A(.+)\((.+)\)/)
-    {
-        my ($ShortName, $MangledParams) = ($1, $2);
-        my @UnmangledParams = ();
-        my ($IsArray, $Shift, $Pos, $CurParam) = (0, 0, 0, "");
-        while($Pos<length($MangledParams))
-        {
-            my $Symbol = substr($MangledParams, $Pos, 1);
-            if($Symbol eq "[")
-            { # array
-                $IsArray = 1;
-                $Pos+=1;
-            }
-            elsif($Symbol eq "L")
-            { # class
-                if(substr($MangledParams, $Pos+1)=~/\A(.+?);/) {
-                    $CurParam = $1;
-                    $Shift = length($CurParam)+2;
-                }
-                if($IsArray) {
-                    $CurParam .= "[]";
-                }
-                $Pos+=$Shift;
-                push(@UnmangledParams, $CurParam);
-                ($IsArray, $Shift, $CurParam) = (0, 0, "")
-            }
-            else
-            {
-                if($Symbol eq "C") {
-                    $CurParam = "char";
-                }
-                elsif($Symbol eq "B") {
-                    $CurParam = "byte";
-                }
-                elsif($Symbol eq "S") {
-                    $CurParam = "short";
-                }
-                elsif($Symbol eq "S") {
-                    $CurParam = "short";
-                }
-                elsif($Symbol eq "I") {
-                    $CurParam = "int";
-                }
-                elsif($Symbol eq "F") {
-                    $CurParam = "float";
-                }
-                elsif($Symbol eq "J") {
-                    $CurParam = "long";
-                }
-                elsif($Symbol eq "D") {
-                    $CurParam = "double";
-                }
-                else {
-                    printMsg("INFO", "WARNING: unmangling error");
-                }
-                if($IsArray) {
-                    $CurParam .= "[]";
-                }
-                $Pos+=1;
-                push(@UnmangledParams, $CurParam);
-                ($IsArray, $Shift, $CurParam) = (0, 0, "")
-            }
-        }
-        return $ShortName."(".join(", ", @UnmangledParams).")";
-    }
-    else {
-        return $Name;
-    }
-}
-
-sub get_TypeName($$)
-{
-    my ($TypeId, $LibVersion) = @_;
-    return $TypeInfo{$LibVersion}{$TypeId}{"Name"};
-}
-
-sub get_ShortName($$)
-{
-    my ($TypeId, $LibVersion) = @_;
-    my $TypeName = $TypeInfo{$LibVersion}{$TypeId}{"Name"};
-    $TypeName=~s/\A.*\.//g;
-    return $TypeName;
-}
-
-sub get_TypeType($$)
-{
-    my ($TypeId, $LibVersion) = @_;
-    return $TypeInfo{$LibVersion}{$TypeId}{"Type"};
-}
-
-sub get_TypeHeader($$)
-{
-    my ($TypeId, $LibVersion) = @_;
-    return $TypeInfo{$LibVersion}{$TypeId}{"Header"};
-}
-
-sub get_BaseType($$)
-{
-    my ($TypeId, $LibVersion) = @_;
-    return "" if(not $TypeId);
-    if(defined $Cache{"get_BaseType"}{$TypeId}{$LibVersion}) {
-        return %{$Cache{"get_BaseType"}{$TypeId}{$LibVersion}};
-    }
-    return "" if(not $TypeInfo{$LibVersion}{$TypeId});
-    my %Type = %{$TypeInfo{$LibVersion}{$TypeId}};
-    return %Type if(not $Type{"BaseType"});
-    %Type = get_BaseType($Type{"BaseType"}, $LibVersion);
-    $Cache{"get_BaseType"}{$TypeId}{$LibVersion} = \%Type;
-    return %Type;
-}
-
-sub get_OneStep_BaseType($$)
-{
-    my ($TypeId, $LibVersion) = @_;
-    return "" if(not $TypeId);
-    return "" if(not $TypeInfo{$LibVersion}{$TypeId});
-    my %Type = %{$TypeInfo{$LibVersion}{$TypeId}};
-    return %Type if(not $Type{"BaseType"});
-    return get_Type($Type{"BaseType"}, $LibVersion);
-}
-
-sub get_Type($$)
-{
-    my ($TypeId, $LibVersion) = @_;
-    return "" if(not $TypeId);
-    return "" if(not $TypeInfo{$LibVersion}{$TypeId});
-    return %{$TypeInfo{$LibVersion}{$TypeId}};
-}
-
-sub classFilter($$$)
-{
-    my ($Class, $LibVersion, $ClassContext) = @_;
-    
-    if(defined $Class->{"Dep"}) {
-        return 0;
-    }
-    
-    my $CName = $Class->{"Name"};
-    my $Package = $Class->{"Package"};
-    
-    if(defined $ClassListPath
-    and not defined $ClassList_User{$CName})
-    { # user defined classes
-        return 0;
-    }
-    
-    if(defined $SkipClassesList
-    and defined $SkipClasses{$CName})
-    { # user defined classes
-        return 0;
-    }
-    
-    if(skipPackage($Package, $LibVersion))
-    { # internal packages
-        return 0;
-    }
-    
-    if(skipType($CName))
-    { # internal types
-        return 0;
-    }
-    
-    if($ClassContext)
-    {
-        my @Ann = ();
-        
-        if(defined $Class->{"Annotations"}) {
-            @Ann = keys(%{$Class->{"Annotations"}});
-        }
-        
-        if(not annotationFilter(\@Ann, $LibVersion)) {
-            return 0;
-        }
-        
-        if($ClientPath)
-        {
-            if(not defined $UsedClasses_Client{$CName}) {
-                return 0;
-            }
-        }
-    }
-    
-    return 1;
-}
-
-sub annotationFilter($$)
-{
-    my ($Ann, $LibVersion) = @_;
-    
-    if(not defined $CountMethods)
-    {
-        if(defined $AddedAnnotations and $LibVersion==1) {
-            return 1;
-        }
-        
-        if(defined $RemovedAnnotations and $LibVersion==2) {
-            return 1;
-        }
-    }
-    
-    if($SkipAnnotationsListPath)
-    {
-        foreach my $Aid (@{$Ann})
-        {
-            my $AName = $TypeInfo{$LibVersion}{$Aid}{"Name"};
-            
-            if(defined $SkipAnnotationList_User{$AName}) {
-                return 0;
-            }
-        }
-    }
-    
-    if($AnnotationsListPath)
-    {
-        my $Annotated = 0;
-        
-        foreach my $Aid (@{$Ann})
-        {
-            my $AName = $TypeInfo{$LibVersion}{$Aid}{"Name"};
-            
-            if(defined $AnnotationList_User{$AName})
-            {
-                $Annotated = 1;
-                last;
-            }
-        }
-        
-        if(not $Annotated) {
-            return 0;
-        }
-    }
-    
-    return 1;
-}
-
-sub methodFilter($$)
-{
-    my ($Method, $LibVersion) = @_;
-    
-    if(defined $MethodInfo{$LibVersion}{$Method}{"Dep"}) {
-        return 0;
-    }
-    
-    if($MethodInfo{$LibVersion}{$Method}{"Access"}=~/private/)
-    { # non-public
-        return 0;
-    }
-    
-    my $ClassId = $MethodInfo{$LibVersion}{$Method}{"Class"};
-    my %Class = get_Type($ClassId, $LibVersion);
-    
-    if($Class{"Access"}=~/private/)
-    { # skip private classes
-        return 0;
-    }
-    
-    my $Package = $MethodInfo{$LibVersion}{$Method}{"Package"};
-    
-    my @Ann = ();
-    
-    if(defined $Class{"Annotations"}) {
-        @Ann = (@Ann, keys(%{$Class{"Annotations"}}));
-    }
-    
-    if(defined $MethodInfo{$LibVersion}{$Method}{"Annotations"}) {
-        @Ann = (@Ann, keys(%{$MethodInfo{$LibVersion}{$Method}{"Annotations"}}));
-    }
-    
-    if(not annotationFilter(\@Ann, $LibVersion)) {
-        return 0;
-    }
-    
-    if($ClientPath)
-    { # user defined application
-        if(not defined $UsedMethods_Client{$Method}
-        and not defined $UsedClasses_Client{$Class{"Name"}}) {
-            return 0;
-        }
-    }
-    
-    if(skipPackage($Package, $LibVersion))
-    { # internal packages
-        return 0;
-    }
-    
-    if(not classFilter(\%Class, $LibVersion, 0)) {
-        return 0;
-    }
-    
-    if(defined $SkipDeprecated)
-    {
-        if($Class{"Deprecated"})
-        { # deprecated class
-            return 0;
-        }
-        if($MethodInfo{$LibVersion}{$Method}{"Deprecated"})
-        { # deprecated method
-            return 0;
-        }
-    }
-    
-    return 1;
-}
-
-sub skipType($)
-{
-    my $TName = $_[0];
-    
-    if(defined $SkipInternalTypes)
-    {
-        if($TName=~/($SkipInternalTypes)/) {
-            return 1;
-        }
-    }
-    
-    return 0;
-}
-
-sub skipPackage($$)
-{
-    my ($Package, $LibVersion) = @_;
-    return 0 if(not $Package);
-    
-    if(defined $SkipInternalPackages)
-    {
-        if($Package=~/($SkipInternalPackages)/) {
-            return 1;
-        }
-    }
-    
-    if(defined $SkipPackages{$LibVersion})
-    {
-        foreach my $SkipPackage (keys(%{$SkipPackages{$LibVersion}}))
-        {
-            if($Package=~/\A\Q$SkipPackage\E(\.|\Z)/)
-            { # user skipped packages
-                return 1;
-            }
-        }
-    }
-    
-    if(not defined $KeepInternal)
-    {
-        my $Note = (not keys %SkippedPackage)?" (use --keep-internal option to check them)":"";
-        
-        if($Package=~/(\A|\.)(internal|impl|examples)(\.|\Z)/)
-        { # internal packages
-            if(not $SkippedPackage{$LibVersion}{$2})
-            {
-                $SkippedPackage{$LibVersion}{$2} = 1;
-                printMsg("WARNING", "skip \"$2\" packages".$Note);
-            }
-            return 1;
-        }
-    }
-    
-    if(defined $KeepPackages{$LibVersion}
-    and my @Keeped = keys(%{$KeepPackages{$LibVersion}}))
-    {
-        my $UserKeeped = 0;
-        foreach my $KeepPackage (@Keeped)
-        {
-            if($Package=~/\A\Q$KeepPackage\E(\.|\Z)/)
-            { # user keeped packages
-                $UserKeeped = 1;
-                last;
-            }
-        }
-        if(not $UserKeeped) {
-            return 1;
-        }
-    }
-    
-    return 0;
-}
-
-sub get_MSuffix($)
+sub getMSuffix($)
 {
     my $Method = $_[0];
@@ -2419 +1448 @@
 }
 
-sub get_MShort($)
+sub getMShort($)
 {
     my $Method = $_[0];
@@ -2436 +1465 @@
     {
         my @Search = ();
-        if(get_TypeType($ClassId, $ClassVersion) eq "class")
+        if(getTypeType($ClassId, $ClassVersion) eq "class")
         {
             if(my $SuperClassId = $TypeInfo{$ClassVersion}{$ClassId}{"SuperClass"}) {
@@ -2457 +1486 @@
             }
             
-            my $SuperName = get_TypeName($SuperId, $ClassVersion);
+            my $SuperName = getTypeName($SuperId, $ClassVersion);
             
             if(my $MethodInClass = findMethod_Class($Method, $SuperName, $ClassVersion)) {
@@ -2468 +1497 @@
     }
     
-    my $TargetSuffix = get_MSuffix($Method);
-    my $TargetShortName = get_MShort($Method);
+    my $TargetSuffix = getMSuffix($Method);
+    my $TargetShortName = getMShort($Method);
     
     # search in java.lang.Object
     foreach my $C (keys(%JavaObjectMethod))
     {
-        if($TargetSuffix eq get_MSuffix($C))
-        {
-            if($TargetShortName eq get_MShort($C)) {
+        if($TargetSuffix eq getMSuffix($C))
+        {
+            if($TargetShortName eq getMShort($C)) {
                 return $C;
             }
@@ -2488 +1517 @@
 {
     my ($Method, $ClassName, $ClassVersion) = @_;
-    my $TargetSuffix = get_MSuffix($Method);
-    my $TargetShortName = get_MShort($Method);
+    my $TargetSuffix = getMSuffix($Method);
+    my $TargetShortName = getMShort($Method);
     
     if(not defined $Class_Methods{$ClassVersion}{$ClassName}) {
@@ -2498 +1527 @@
     { # search for method with the same parameters suffix
         next if($MethodInfo{$ClassVersion}{$Candidate}{"Constructor"});
-        if($TargetSuffix eq get_MSuffix($Candidate))
-        {
-            if($TargetShortName eq get_MShort($Candidate)) {
+        if($TargetSuffix eq getMSuffix($Candidate))
+        {
+            if($TargetShortName eq getMShort($Candidate)) {
                 return $Candidate;
             }
@@ -2509 +1538 @@
 }
 
-sub prepareMethods($)
-{
-    my $LibVersion = $_[0];
-    foreach my $Method (keys(%{$MethodInfo{$LibVersion}}))
-    {
-        if($MethodInfo{$LibVersion}{$Method}{"Access"}!~/private/)
-        {
-            if($MethodInfo{$LibVersion}{$Method}{"Constructor"}) {
-                registerUsage($MethodInfo{$LibVersion}{$Method}{"Class"}, $LibVersion);
+sub prepareData($)
+{
+    my $LVer = $_[0];
+    
+    if(my $MUsed = $In::API{$LVer}{"MethodUsed"})
+    {
+        foreach my $M_Id (keys(%{$MUsed}))
+        {
+            my $Name = $MUsed->{$M_Id}{"Name"};
+            $MethodUsed{$LVer}{$Name} = $MUsed->{$M_Id}{"Used"};
+        }
+    }
+    
+    foreach my $TypeId (keys(%{$TypeInfo{$LVer}}))
+    {
+        my $TypeAttr = $TypeInfo{$LVer}{$TypeId};
+        my $TName = $TypeAttr->{"Name"};
+        
+        $TName_Tid{$LVer}{$TName} = $TypeId;
+        
+        if(not $TypeAttr->{"Dep"})
+        {
+            if(my $Archive = $TypeAttr->{"Archive"}) {
+                $LibArchives{$LVer}{$Archive} = 1;
+            }
+        }
+        
+        foreach my $FieldName (keys(%{$TypeAttr->{"Fields"}}))
+        {
+            if($TypeAttr->{"Fields"}{$FieldName}{"Access"}=~/public|protected/) {
+                $Class_Fields{$LVer}{$TName}{$FieldName} = $TypeAttr->{"Fields"}{$FieldName}{"Type"};
+            }
+        }
+    }
+    
+    foreach my $Method (keys(%{$MethodInfo{$LVer}}))
+    {
+        my $Name = $MethodInfo{$LVer}{$Method}{"Name"};
+        $MethodInfo{$LVer}{$Name} = delete($MethodInfo{$LVer}{$Method});
+    }
+    
+    foreach my $Method (keys(%{$MethodInfo{$LVer}}))
+    {
+        my $MAttr = $MethodInfo{$LVer}{$Method};
+        
+        $MAttr->{"Signature"} = getSignature($Method, $LVer, "Full");
+        
+        if(my $ClassId = $MAttr->{"Class"}
+        and $MAttr->{"Access"}=~/public|protected/)
+        {
+            my $CName = getTypeName($ClassId, $LVer);
+            $Class_Methods{$LVer}{$CName}{$Method} = 1;
+            if($MAttr->{"Abstract"}) {
+                $Class_AbstractMethods{$LVer}{$CName}{$Method} = 1;
+            }
+        }
+        
+        if($MAttr->{"Access"}!~/private/)
+        {
+            if($MAttr->{"Constructor"}) {
+                registerUsage($MAttr->{"Class"}, $LVer);
             }
             else {
-                registerUsage($MethodInfo{$LibVersion}{$Method}{"Return"}, $LibVersion);
+                registerUsage($MAttr->{"Return"}, $LVer);
             }
         }
@@ -2542 +1623 @@
         
         my $ClassId1 = $MethodInfo{1}{$Method}{"Class"};
-        my %Class1 = get_Type($ClassId1, 1);
-        
-        $CheckedTypes{$Class1{"Name"}} = 1;
+        my $Class1_Name = getTypeName($ClassId1, 1);
+        my $Class1_Type = getTypeType($ClassId1, 1);
+        
+        $CheckedTypes{$Class1_Name} = 1;
         $CheckedMethods{$Method} = 1;
         
-        my %Class2 = get_Type($MethodInfo{2}{$Method}{"Class"}, 2);
         if(not $MethodInfo{1}{$Method}{"Static"}
-        and $Class1{"Type"} eq "class" and not $Class_Constructed{1}{$ClassId1})
+        and $Class1_Type eq "class" and not $Class_Constructed{1}{$ClassId1})
         { # class cannot be constructed or inherited by clients
           # non-static method cannot be called
             next;
         }
+        
         # checking attributes
         if(not $MethodInfo{1}{$Method}{"Static"}
@@ -2563 +1645 @@
             %{$CompatProblems{$Method}{"Method_Became_NonStatic"}{""}} = ();
         }
+        
         if(not $MethodInfo{1}{$Method}{"Synchronized"}
         and $MethodInfo{2}{$Method}{"Synchronized"}) {
@@ -2571 +1654 @@
             %{$CompatProblems{$Method}{"Method_Became_NonSynchronized"}{""}} = ();
         }
+        
         if(not $MethodInfo{1}{$Method}{"Final"}
         and $MethodInfo{2}{$Method}{"Final"})
@@ -2581 +1665 @@
             }
         }
+        
         my $Access1 = $MethodInfo{1}{$Method}{"Access"};
         my $Access2 = $MethodInfo{2}{$Method}{"Access"};
+        
         if($Access1 eq "public" and $Access2=~/protected|private/
         or $Access1 eq "protected" and $Access2=~/private/)
@@ -2588 +1674 @@
             %{$CompatProblems{$Method}{"Changed_Method_Access"}{""}} = (
                 "Old_Value"=>$Access1,
-                "New_Value"=>$Access2  );
-        }
-        if($Class1{"Type"} eq "class"
-        and $Class2{"Type"} eq "class")
+                "New_Value"=>$Access2);
+        }
+        
+        my $Class2_Type = getTypeType($MethodInfo{2}{$Method}{"Class"}, 2);
+        
+        if($Class1_Type eq "class"
+        and $Class2_Type eq "class")
         {
             if(not $MethodInfo{1}{$Method}{"Abstract"}
@@ -2597 +1686 @@
             {
                 %{$CompatProblems{$Method}{"Method_Became_Abstract"}{""}} = ();
-                %{$CompatProblems{$Method}{"Class_Method_Became_Abstract"}{"this.".get_SFormat($Method)}} = (
-                    "Type_Name"=>$Class1{"Name"},
-                    "Target"=>$Method  );
+                %{$CompatProblems{$Method}{"Class_Method_Became_Abstract"}{"this.".getSFormat($Method)}} = (
+                    "Type_Name"=>$Class1_Name,
+                    "Target"=>$Method);
             }
             elsif($MethodInfo{1}{$Method}{"Abstract"}
@@ -2605 +1694 @@
             {
                 %{$CompatProblems{$Method}{"Method_Became_NonAbstract"}{""}} = ();
-                %{$CompatProblems{$Method}{"Class_Method_Became_NonAbstract"}{"this.".get_SFormat($Method)}} = (
-                    "Type_Name"=>$Class1{"Name"},
-                    "Target"=>$Method  );
-            }
-        }
-        elsif($Class1{"Type"} eq "interface"
-        and $Class2{"Type"} eq "interface")
+                %{$CompatProblems{$Method}{"Class_Method_Became_NonAbstract"}{"this.".getSFormat($Method)}} = (
+                    "Type_Name"=>$Class1_Name,
+                    "Target"=>$Method);
+            }
+        }
+        elsif($Class1_Type eq "interface"
+        and $Class2_Type eq "interface")
         {
             if(not $MethodInfo{1}{$Method}{"Abstract"}
@@ -2617 +1706 @@
             {
                 %{$CompatProblems{$Method}{"Method_Became_NonDefault"}{""}} = ();
-                %{$CompatProblems{$Method}{"Interface_Method_Became_NonDefault"}{"this.".get_SFormat($Method)}} = (
-                    "Type_Name"=>$Class1{"Name"},
-                    "Target"=>$Method  );
+                %{$CompatProblems{$Method}{"Interface_Method_Became_NonDefault"}{"this.".getSFormat($Method)}} = (
+                    "Type_Name"=>$Class1_Name,
+                    "Target"=>$Method);
             }
             elsif($MethodInfo{1}{$Method}{"Abstract"}
@@ -2625 +1714 @@
             {
                 %{$CompatProblems{$Method}{"Method_Became_Default"}{""}} = ();
-                %{$CompatProblems{$Method}{"Interface_Method_Became_Default"}{"this.".get_SFormat($Method)}} = (
-                    "Type_Name"=>$Class1{"Name"},
-                    "Target"=>$Method  );
-            }
-        }
-        
-        my %Exceptions_Old = map {get_TypeName($_, 1) => $_} keys(%{$MethodInfo{1}{$Method}{"Exceptions"}});
-        my %Exceptions_New = map {get_TypeName($_, 2) => $_} keys(%{$MethodInfo{2}{$Method}{"Exceptions"}});
+                %{$CompatProblems{$Method}{"Interface_Method_Became_Default"}{"this.".getSFormat($Method)}} = (
+                    "Type_Name"=>$Class1_Name,
+                    "Target"=>$Method);
+            }
+        }
+        
+        my %Exceptions_Old = map {getTypeName($_, 1) => $_} keys(%{$MethodInfo{1}{$Method}{"Exceptions"}});
+        my %Exceptions_New = map {getTypeName($_, 2) => $_} keys(%{$MethodInfo{2}{$Method}{"Exceptions"}});
         foreach my $Exception (keys(%Exceptions_Old))
         {
             if(not $Exceptions_New{$Exception})
             {
-                my %ExceptionType = get_Type($Exceptions_Old{$Exception}, 1);
-                my $SuperClass = $ExceptionType{"SuperClass"};
+                my $EType = getType($Exceptions_Old{$Exception}, 1);
+                my $SuperClass = $EType->{"SuperClass"};
+                
                 if($KnownRuntimeExceptions{$Exception}
-                or defined $SuperClass and get_TypeName($SuperClass, 1) eq "java.lang.RuntimeException")
+                or defined $SuperClass and getTypeName($SuperClass, 1) eq "java.lang.RuntimeException")
                 {
                     if(not $MethodInfo{1}{$Method}{"Abstract"}
                     and not $MethodInfo{2}{$Method}{"Abstract"})
                     {
-                        %{$CompatProblems{$Method}{"Removed_Unchecked_Exception"}{"this.".get_SFormat($Exception)}} = (
-                            "Type_Name"=>$Class1{"Name"},
-                            "Target"=>$Exception  );
+                        %{$CompatProblems{$Method}{"Removed_Unchecked_Exception"}{"this.".getSFormat($Exception)}} = (
+                            "Type_Name"=>$Class1_Name,
+                            "Target"=>$Exception);
                     }
                 }
@@ -2655 +1745 @@
                     and $MethodInfo{2}{$Method}{"Abstract"})
                     {
-                        %{$CompatProblems{$Method}{"Abstract_Method_Removed_Checked_Exception"}{"this.".get_SFormat($Exception)}} = (
-                            "Type_Name"=>$Class1{"Name"},
-                            "Target"=>$Exception  );
+                        %{$CompatProblems{$Method}{"Abstract_Method_Removed_Checked_Exception"}{"this.".getSFormat($Exception)}} = (
+                            "Type_Name"=>$Class1_Name,
+                            "Target"=>$Exception);
                     }
                     else
                     {
-                        %{$CompatProblems{$Method}{"NonAbstract_Method_Removed_Checked_Exception"}{"this.".get_SFormat($Exception)}} = (
-                            "Type_Name"=>$Class1{"Name"},
-                            "Target"=>$Exception  );
-                    }
-                }
-            }
-        }
+                        %{$CompatProblems{$Method}{"NonAbstract_Method_Removed_Checked_Exception"}{"this.".getSFormat($Exception)}} = (
+                            "Type_Name"=>$Class1_Name,
+                            "Target"=>$Exception);
+                    }
+                }
+            }
+        }
+        
         foreach my $Exception (keys(%Exceptions_New))
         {
             if(not $Exceptions_Old{$Exception})
             {
-                my %ExceptionType = get_Type($Exceptions_New{$Exception}, 2);
-                my $SuperClass = $ExceptionType{"SuperClass"};
+                my $EType = getType($Exceptions_New{$Exception}, 2);
+                my $SuperClass = $EType->{"SuperClass"};
+                
                 if($KnownRuntimeExceptions{$Exception}
-                or defined $SuperClass and get_TypeName($SuperClass, 2) eq "java.lang.RuntimeException")
+                or defined $SuperClass and getTypeName($SuperClass, 2) eq "java.lang.RuntimeException")
                 {
                     if(not $MethodInfo{1}{$Method}{"Abstract"}
                     and not $MethodInfo{2}{$Method}{"Abstract"})
                     {
-                        %{$CompatProblems{$Method}{"Added_Unchecked_Exception"}{"this.".get_SFormat($Exception)}} = (
-                            "Type_Name"=>$Class1{"Name"},
-                            "Target"=>$Exception  );
+                        %{$CompatProblems{$Method}{"Added_Unchecked_Exception"}{"this.".getSFormat($Exception)}} = (
+                            "Type_Name"=>$Class1_Name,
+                            "Target"=>$Exception);
                     }
                 }
@@ -2690 +1782 @@
                     and $MethodInfo{2}{$Method}{"Abstract"})
                     {
-                        %{$CompatProblems{$Method}{"Abstract_Method_Added_Checked_Exception"}{"this.".get_SFormat($Exception)}} = (
-                            "Type_Name"=>$Class1{"Name"},
-                            "Target"=>$Exception  );
+                        %{$CompatProblems{$Method}{"Abstract_Method_Added_Checked_Exception"}{"this.".getSFormat($Exception)}} = (
+                            "Type_Name"=>$Class1_Name,
+                            "Target"=>$Exception);
                     }
                     else
                     {
-                        %{$CompatProblems{$Method}{"NonAbstract_Method_Added_Checked_Exception"}{"this.".get_SFormat($Exception)}} = (
-                            "Type_Name"=>$Class1{"Name"},
-                            "Target"=>$Exception  );
+                        %{$CompatProblems{$Method}{"NonAbstract_Method_Added_Checked_Exception"}{"this.".getSFormat($Exception)}} = (
+                            "Type_Name"=>$Class1_Name,
+                            "Target"=>$Exception);
                     }
                 }
@@ -2779 +1871 @@
     my ($Type1_Id, $Type2_Id, $Prefix) = @_;
     my %LocalProblems = ();
-    my %Type1 = get_Type($Type1_Id, 1);
-    my %Type2 = get_Type($Type2_Id, 2);
-    my %Type1_Base = ($Type1{"Type"} eq "array")?get_OneStep_BaseType($Type1_Id, 1):get_BaseType($Type1_Id, 1);
-    my %Type2_Base = ($Type2{"Type"} eq "array")?get_OneStep_BaseType($Type2_Id, 2):get_BaseType($Type2_Id, 2);
-    return () if(not $Type1{"Name"} or not $Type2{"Name"});
-    return () if(not $Type1_Base{"Name"} or not $Type2_Base{"Name"});
-    if($Type1_Base{"Name"} ne $Type2_Base{"Name"} and $Type1{"Name"} eq $Type2{"Name"})
+    
+    my $Type1 = getType($Type1_Id, 1);
+    my $Type2 = getType($Type2_Id, 2);
+    
+    my $Type1_Name = $Type1->{"Name"};
+    my $Type2_Name = $Type2->{"Name"};
+    
+    my $Type1_Base = undef;
+    my $Type2_Base = undef;
+    
+    if($Type1->{"Type"} eq "array") {
+        $Type1_Base = getOneStepBaseType($Type1_Id, 1);
+    }
+    else {
+        $Type1_Base = getBaseType($Type1_Id, 1);
+    }
+    
+    if($Type2->{"Type"} eq "array") {
+        $Type2_Base = getOneStepBaseType($Type2_Id, 2);
+    }
+    else {
+        $Type2_Base = getBaseType($Type2_Id, 2);
+    }
+    
+    return () if(not $Type1_Name or not $Type2_Name);
+    return () if(not $Type1_Base->{"Name"} or not $Type2_Base->{"Name"});
+    if($Type1_Base->{"Name"} ne $Type2_Base->{"Name"} and $Type1_Name eq $Type2_Name)
     {# base type change
         %{$LocalProblems{"Changed_".$Prefix."_BaseType"}}=(
-            "Old_Value"=>$Type1_Base{"Name"},
-            "New_Value"=>$Type2_Base{"Name"} );
-    }
-    elsif($Type1{"Name"} ne $Type2{"Name"})
+            "Old_Value"=>$Type1_Base->{"Name"},
+            "New_Value"=>$Type2_Base->{"Name"});
+    }
+    elsif($Type1_Name ne $Type2_Name)
     {# type change
         %{$LocalProblems{"Changed_".$Prefix."_Type"}}=(
-            "Old_Value"=>$Type1{"Name"},
-            "New_Value"=>$Type2{"Name"} );
+            "Old_Value"=>$Type1_Name,
+            "New_Value"=>$Type2_Name);
     }
     return %LocalProblems;
 }
 
-sub htmlSpecChars($)
+sub specChars($)
 {
     my $Str = $_[0];
@@ -2820 +1932 @@
 }
 
-sub black_Name($$)
+sub blackName($)
+{
+    my $N = $_[0];
+    return "<span class='iname_b'>".$N."</span>";
+}
+
+sub highLight_ItalicColor($$)
 {
     my ($M, $V) = @_;
-    return "<span class='iname_b'>".highLight_Signature($M, $V)."</span>";
-}
-
-sub black_Name_S($)
-{
-    my $Name = $_[0];
-    $Name=~s!\A(\w+)!<span class='iname_b'>$1</span>&#160;!g;
-    return $Name;
-}
-
-sub highLight_Signature($$)
-{
-    my ($M, $V) = @_;
-    return get_Signature($M, $V, "Class|HTML|Italic");
-}
-
-sub highLight_Signature_Italic_Color($$)
-{
-    my ($M, $V) = @_;
-    return get_Signature($M, $V, "Full|HTML|Italic|Color");
-}
-
-sub get_Signature($$$)
-{
-    my ($Method, $LibVersion, $Kind) = @_;
-    if(defined $Cache{"get_Signature"}{$LibVersion}{$Method}{$Kind}) {
-        return $Cache{"get_Signature"}{$LibVersion}{$Method}{$Kind};
+    return getSignature($M, $V, "Full|HTML|Italic|Color");
+}
+
+sub getSignature($$$)
+{
+    my ($Method, $LVer, $Kind) = @_;
+    if(defined $Cache{"getSignature"}{$LVer}{$Method}{$Kind}) {
+        return $Cache{"getSignature"}{$LVer}{$Method}{$Kind};
     }
     
     # settings
     my ($Full, $Html, $Simple, $Italic, $Color,
-    $ShowParams, $ShowClass, $ShowAttr, $Target) = (0, 0, 0, 0, 0, 0, 0, 0, undef);
+    $ShowParams, $ShowClass, $ShowAttr, $Desc, $Target) = (0, 0, 0, 0, 0, 0, 0, 0, 0, undef);
     
     if($Kind=~/Full/) {
@@ -2883 +1982 @@
         $ShowAttr = 1;
     }
-    
-    if(not defined $MethodInfo{$LibVersion}{$Method}{"ShortName"})
+    if($Kind=~/Desc/) {
+        $Desc = 1;
+    }
+    
+    if(not defined $MethodInfo{$LVer}{$Method}{"ShortName"})
     { # from java.lang.Object
         if($Html or $Simple) {
-            return htmlSpecChars($Method);
-        }
-        else
-        {
+            return specChars($Method);
+        }
+        else {
             return $Method;
         }
     }
     
-    my $Signature = $MethodInfo{$LibVersion}{$Method}{"ShortName"};
+    my $Signature = $MethodInfo{$LVer}{$Method}{"ShortName"};
     if($Full or $ShowClass)
     {
-        my $Class = get_TypeName($MethodInfo{$LibVersion}{$Method}{"Class"}, $LibVersion);
-        
-        if($HideTemplates) {
+        my $Class = getTypeName($MethodInfo{$LVer}{$Method}{"Class"}, $LVer);
+        
+        if($In::Opt{"HideTemplates"}) {
             $Class=~s/<.*>//g;
         }
         
         if($Html) {
-            $Class = htmlSpecChars($Class);
+            $Class = specChars($Class);
         }
         
@@ -2912 +2013 @@
     my @Params = ();
     
-    if(defined $MethodInfo{$LibVersion}{$Method}{"Param"})
+    if(defined $MethodInfo{$LVer}{$Method}{"Param"})
     {
         foreach my $PPos (sort {int($a)<=>int($b)}
-        keys(%{$MethodInfo{$LibVersion}{$Method}{"Param"}}))
-        {
-            my $PTid = $MethodInfo{$LibVersion}{$Method}{"Param"}{$PPos}{"Type"};
-            if(my $PTName = get_TypeName($PTid, $LibVersion))
-            {
-                if($HideTemplates) {
+        keys(%{$MethodInfo{$LVer}{$Method}{"Param"}}))
+        {
+            my $PTid = $MethodInfo{$LVer}{$Method}{"Param"}{$PPos}{"Type"};
+            if(my $PTName = getTypeName($PTid, $LVer))
+            {
+                if($In::Opt{"HideTemplates"}) {
                     $PTName=~s/<.*>//g;
                 }
                 
-                if(not $ShowPackages) {
+                if(not $In::Opt{"ShowPackages"}) {
                     $PTName=~s/(\A|\<\s*|\,\s*)[a-z0-9\.]+\./$1/g;
                 }
                 
                 if($Html) {
-                    $PTName = htmlSpecChars($PTName);
+                    $PTName = specChars($PTName);
                 }
                 
                 if($Full or $ShowParams)
                 {
-                    my $PName = $MethodInfo{$LibVersion}{$Method}{"Param"}{$PPos}{"Name"};
+                    my $PName = $MethodInfo{$LVer}{$Method}{"Param"}{$PPos}{"Name"};
                     
                     if($Simple) {
@@ -2971 +2072 @@
     {
         $Signature .= "&#160;";
-        $Signature .= "<span class='sym_p'>";
+        if($Desc) {
+            $Signature .= "<span class='sym_pd'>";
+        }
+        else {
+            $Signature .= "<span class='sym_p'>";
+        }
         if(@Params)
         {
@@ -3013 +2119 @@
     if($Full or $ShowAttr)
     {
-        if($MethodInfo{$LibVersion}{$Method}{"Static"}) {
+        if($MethodInfo{$LVer}{$Method}{"Static"}) {
             $Signature .= " [static]";
         }
-        elsif($MethodInfo{$LibVersion}{$Method}{"Abstract"}) {
+        elsif($MethodInfo{$LVer}{$Method}{"Abstract"}) {
             $Signature .= " [abstract]";
         }
@@ -3023 +2129 @@
     if($Full)
     {
-        if($ShowAccess)
-        {
-            if(my $Access = $MethodInfo{$LibVersion}{$Method}{"Access"})
+        if($In::Opt{"ShowAccess"})
+        {
+            if(my $Access = $MethodInfo{$LVer}{$Method}{"Access"})
             {
                 if($Access ne "public") {
@@ -3033 +2139 @@
         }
         
-        if(my $ReturnId = $MethodInfo{$LibVersion}{$Method}{"Return"})
-        {
-            my $RName = get_TypeName($ReturnId, $LibVersion);
+        if(my $ReturnId = $MethodInfo{$LVer}{$Method}{"Return"})
+        {
+            my $RName = getTypeName($ReturnId, $LVer);
             
-            if($HideTemplates) {
+            if($In::Opt{"HideTemplates"}) {
                 $RName=~s/<.*>//g;
             }
             
-            if(not $ShowPackages) {
+            if(not $In::Opt{"ShowPackages"}) {
                 $RName=~s/(\A|\<\s*|\,\s*)[a-z0-9\.]+\./$1/g;
             }
             
             if($Simple) {
-                $Signature .= " <b>:</b> ".htmlSpecChars($RName);
+                $Signature .= " <b>:</b> ".specChars($RName);
             }
             elsif($Html) {
-                $Signature .= "<span class='sym_p nowrap'> &#160;<b>:</b>&#160;&#160;".htmlSpecChars($RName)."</span>";
+                $Signature .= "<span class='sym_p nowrap'> &#160;<b>:</b>&#160;&#160;".specChars($RName)."</span>";
             }
             else {
@@ -3056 +2162 @@
         }
         
-        if(not $SkipDeprecated)
-        {
-            if($MethodInfo{$LibVersion}{$Method}{"Deprecated"}) {
+        if(not $In::Opt{"SkipDeprecated"})
+        {
+            if($MethodInfo{$LVer}{$Method}{"Deprecated"}) {
                 $Signature .= " *DEPRECATED*";
             }
@@ -3068 +2174 @@
     if($Html)
     {
-        if(not $SkipDeprecated) {
+        if(not $In::Opt{"SkipDeprecated"}) {
             $Signature=~s!(\*deprecated\*)!<span class='deprecated'>$1</span>!ig;
         }
@@ -3084 +2190 @@
     }
     
-    return ($Cache{"get_Signature"}{$LibVersion}{$Method}{$Kind} = $Signature);
-}
-
-sub checkJavaCompiler($)
-{ # check javac: compile simple program
-    my $Cmd = $_[0];
-    
-    if(not $Cmd) {
-        return;
-    }
-    
-    writeFile($TMP_DIR."/test_javac/Simple.java",
-    "public class Simple {
-        public Integer f;
-        public void method(Integer p) { };
-    }");
-    chdir($TMP_DIR."/test_javac");
-    system("$Cmd Simple.java 2>errors.txt");
-    chdir($ORIG_DIR);
-    if($?)
-    {
-        my $Msg = "something is going wrong with the Java compiler (javac):\n";
-        my $Err = readFile($TMP_DIR."/test_javac/errors.txt");
-        $Msg .= $Err;
-        if($Err=~/elf\/start\.S/ and $Err=~/undefined\s+reference\s+to/)
-        { # /usr/lib/gcc/i586-suse-linux/4.5/../../../crt1.o: In function _start:
-          # /usr/src/packages/BUILD/glibc-2.11.3/csu/../sysdeps/i386/elf/start.S:115: undefined reference to main
-            $Msg .= "\nDid you install a JDK-devel package?";
-        }
-        exitStatus("Error", $Msg);
-    }
-}
-
-sub runTests($$$$)
-{
-    my ($TestsPath, $PackageName, $Path_v1, $Path_v2) = @_;
-    # compile with old version of package
-    my $JavacCmd = get_CmdPath("javac");
-    if(not $JavacCmd) {
-        exitStatus("Not_Found", "can't find \"javac\" compiler");
-    }
-    my $JavaCmd = get_CmdPath("java");
-    if(not $JavaCmd) {
-        exitStatus("Not_Found", "can't find \"java\" command");
-    }
-    mkpath($TestsPath."/$PackageName/");
-    foreach my $ClassPath (cmd_find($Path_v1,"","*\.class",""))
-    {# create a compile-time package copy
-        copy($ClassPath, $TestsPath."/$PackageName/");
-    }
-    chdir($TestsPath);
-    system($JavacCmd." -g *.java");
-    chdir($ORIG_DIR);
-    foreach my $TestSrc (cmd_find($TestsPath,"","*\.java",""))
-    { # remove test source
-        unlink($TestSrc);
-    }
-    
-    my $PkgPath = $TestsPath."/".$PackageName;
-    if(-d $PkgPath) {
-        rmtree($PkgPath);
-    }
-    mkpath($PkgPath);
-    foreach my $ClassPath (cmd_find($Path_v2,"","*\.class",""))
-    {# create a run-time package copy
-        copy($ClassPath, $PkgPath."/");
-    }
-    my $TEST_REPORT = "";
-    foreach my $TestPath (cmd_find($TestsPath,"","*\.class",1))
-    {# run tests
-        my $Name = get_filename($TestPath);
-        $Name=~s/\.class\Z//g;
-        chdir($TestsPath);
-        system($JavaCmd." $Name >result.txt 2>&1");
-        chdir($ORIG_DIR);
-        my $Result = readFile($TestsPath."/result.txt");
-        unlink($TestsPath."/result.txt");
-        $TEST_REPORT .= "TEST CASE: $Name\n";
-        if($Result) {
-            $TEST_REPORT .= "RESULT: FAILED\n";
-            $TEST_REPORT .= "OUTPUT:\n$Result\n";
-        }
-        else {
-            $TEST_REPORT .= "RESULT: SUCCESS\n";
-        }
-        $TEST_REPORT .= "\n";
-    }
-    writeFile("$TestsPath/Journal.txt", $TEST_REPORT);
-    
-    if(-d $PkgPath) {
-        rmtree($PkgPath);
-    }
-}
-
-sub compileJavaLib($$$)
-{
-    my ($LibName, $BuildRoot1, $BuildRoot2) = @_;
-    my $JavacCmd = get_CmdPath("javac");
-    if(not $JavacCmd) {
-        exitStatus("Not_Found", "can't find \"javac\" compiler");
-    }
-    checkJavaCompiler($JavacCmd);
-    my $JarCmd = get_CmdPath("jar");
-    if(not $JarCmd) {
-        exitStatus("Not_Found", "can't find \"jar\" command");
-    }
-    writeFile("$BuildRoot1/MANIFEST.MF", "Implementation-Version: 1.0\n");
-    # space before value, new line
-    writeFile("$BuildRoot2/MANIFEST.MF", "Implementation-Version: 2.0\n");
-    my (%SrcDir1, %SrcDir2) = ();
-    foreach my $Path (cmd_find($BuildRoot1,"f","*.java","")) {
-        $SrcDir1{get_dirname($Path)} = 1;
-    }
-    foreach my $Path (cmd_find($BuildRoot2,"f","*.java","")) {
-        $SrcDir2{get_dirname($Path)} = 1;
-    }
-    # build classes v.1
-    foreach my $Dir (keys(%SrcDir1))
-    {
-        chdir($Dir);
-        system("$JavacCmd -g *.java");
-        chdir($ORIG_DIR);
-        if($?) {
-            exitStatus("Error", "can't compile classes v.1");
-        }
-    }
-    # create java archive v.1
-    chdir($BuildRoot1);
-    system("$JarCmd -cmf MANIFEST.MF $LibName.jar TestPackage");
-    chdir($ORIG_DIR);
-    
-    # build classes v.2
-    foreach my $Dir (keys(%SrcDir2))
-    {
-        chdir($Dir);
-        system("$JavacCmd -g *.java");
-        chdir($ORIG_DIR);
-        if($?) {
-            exitStatus("Error", "can't compile classes v.2");
-        }
-    }
-    # create java archive v.2
-    chdir($BuildRoot2);
-    system("$JarCmd -cmf MANIFEST.MF $LibName.jar TestPackage");
-    chdir($ORIG_DIR);
-    
-    foreach my $SrcPath (cmd_find($BuildRoot1,"","*\.java","")) {
-        unlink($SrcPath);
-    }
-    foreach my $SrcPath (cmd_find($BuildRoot2,"","*\.java","")) {
-        unlink($SrcPath);
-    }
-    return 1;
-}
-
-sub readLineNum($$)
-{
-    my ($Path, $Num) = @_;
-    return "" if(not $Path or not -f $Path);
-    open (FILE, $Path);
-    foreach (1 ... $Num) {
-        <FILE>;
-    }
-    my $Line = <FILE>;
-    close(FILE);
-    return $Line;
-}
-
-sub readAttributes($$)
-{
-    my ($Path, $Num) = @_;
-    return () if(not $Path or not -f $Path);
-    my %Attributes = ();
-    if(readLineNum($Path, $Num)=~/<!--\s+(.+)\s+-->/)
-    {
-        foreach my $AttrVal (split(/;/, $1))
-        {
-            if($AttrVal=~/(.+):(.+)/)
-            {
-                my ($Name, $Value) = ($1, $2);
-                $Attributes{$Name} = $Value;
-            }
-        }
-    }
-    return \%Attributes;
-}
-
-sub runChecker($$$)
-{
-    my ($LibName, $Path1, $Path2) = @_;
-    writeFile("$LibName/v1.xml", "
-        <version>
-            1.0
-        </version>
-        <archives>
-            ".get_abs_path($Path1)."
-        </archives>");
-    writeFile("$LibName/v2.xml", "
-        <version>
-            2.0
-        </version>
-        <archives>
-            ".get_abs_path($Path2)."
-        </archives>");
-    my $Cmd = "perl $0 -l $LibName $LibName/v1.xml $LibName/v2.xml";
-    if($Quick) {
-        $Cmd .= " -quick";
-    }
-    if(defined $SkipDeprecated) {
-        $Cmd .= " -skip-deprecated";
-    }
-    if(defined $OldStyle) {
-        $Cmd .= " -old-style";
-    }
-    writeFile($TMP_DIR."/skip-annotations.list", "TestPackage.Beta");
-    $Cmd .= " -skip-annotations-list ".$TMP_DIR."/skip-annotations.list";
-    if($Debug)
-    {
-        $Cmd .= " -debug";
-        printMsg("INFO", "running $Cmd");
-    }
-    system($Cmd);
-    my $Report = "compat_reports/$LibName/1.0_to_2.0/compat_report.html";
-    # Binary
-    my $BReport = readAttributes($Report, 0);
-    my $NProblems = $BReport->{"type_problems_high"}+$BReport->{"type_problems_medium"};
-    $NProblems += $BReport->{"method_problems_high"}+$BReport->{"method_problems_medium"};
-    $NProblems += $BReport->{"removed"};
-    # Source
-    my $SReport = readAttributes($Report, 1);
-    $NProblems += $SReport->{"type_problems_high"}+$SReport->{"type_problems_medium"};
-    $NProblems += $SReport->{"method_problems_high"}+$SReport->{"method_problems_medium"};
-    $NProblems += $SReport->{"removed"};
-    if($NProblems>=100) {
-        printMsg("INFO", "test result: SUCCESS ($NProblems breaks found)\n");
-    }
-    else {
-        printMsg("ERROR", "test result: FAILED ($NProblems breaks found)\n");
-    }
-}
-
-sub writeFile($$)
-{
-    my ($Path, $Content) = @_;
-    return if(not $Path);
-    if(my $Dir = get_dirname($Path)) {
-        mkpath($Dir);
-    }
-    open (FILE, ">".$Path) || die ("can't open file \'$Path\': $!\n");
-    print FILE $Content;
-    close(FILE);
-}
-
-sub readFile($)
-{
-    my $Path = $_[0];
-    return "" if(not $Path or not -f $Path);
-    open (FILE, $Path);
-    my $Content = join("", <FILE>);
-    close(FILE);
-    $Content=~s/\r//g;
-    return $Content;
-}
-
-sub appendFile($$)
-{
-    my ($Path, $Content) = @_;
-    return if(not $Path);
-    if(my $Dir = get_dirname($Path)) {
-        mkpath($Dir);
-    }
-    open(FILE, ">>".$Path) || die ("can't open file \'$Path\': $!\n");
-    print FILE $Content;
-    close(FILE);
-}
-
-sub get_Report_Header($)
+    return ($Cache{"getSignature"}{$LVer}{$Method}{$Kind} = $Signature);
+}
+
+sub getReportHeader($)
 {
     my $Level = $_[0];
@@ -3373 +2206 @@
         $Report_Header .= "API compatibility";
     }
-    $Report_Header .= " report for the <span style='color:Blue;'>$TargetTitle</span> library between <span style='color:Red;'>".$Descriptor{1}{"Version"}."</span> and <span style='color:Red;'>".$Descriptor{2}{"Version"}."</span> versions";
-    if($ClientPath) {
-        $Report_Header .= " (concerning portability of the client: <span style='color:Blue;'>".get_filename($ClientPath)."</span>)";
+    $Report_Header .= " report for the <span style='color:Blue;'>".$In::Opt{"TargetTitle"}."</span> library between <span style='color:Red;'>".$In::Desc{1}{"Version"}."</span> and <span style='color:Red;'>".$In::Desc{2}{"Version"}."</span> versions";
+    if($In::Opt{"ClientPath"}) {
+        $Report_Header .= " (concerning portability of the client: <span style='color:Blue;'>".getFilename($In::Opt{"ClientPath"})."</span>)";
     }
     $Report_Header .= "</h1>\n";
@@ -3381 +2214 @@
 }
 
-sub get_SourceInfo()
+sub getSourceInfo()
 {
     my $CheckedArchives = "<a name='Checked_Archives'></a>";
-    if($OldStyle) {
-        $CheckedArchives .= "<h2>Java ARchives (".keys(%{$LibArchives{1}}).")</h2>";
+    if($In::Opt{"OldStyle"}) {
+        $CheckedArchives .= "<h2>Java Archives (".keys(%{$LibArchives{1}}).")</h2>";
     }
     else {
-        $CheckedArchives .= "<h2>Java ARchives <span class='gray'>&nbsp;".keys(%{$LibArchives{1}})."&nbsp;</span></h2>";
+        $CheckedArchives .= "<h2>Java Archives <span class='gray'>&nbsp;".keys(%{$LibArchives{1}})."&nbsp;</span></h2>";
     }
     $CheckedArchives .= "\n<hr/><div class='jar_list'>\n";
     foreach my $ArchivePath (sort {lc($a) cmp lc($b)}  keys(%{$LibArchives{1}})) {
-        $CheckedArchives .= get_filename($ArchivePath)."<br/>\n";
+        $CheckedArchives .= getFilename($ArchivePath)."<br/>\n";
     }
     $CheckedArchives .= "</div><br/>$TOP_REF<br/>\n";
@@ -3398 +2231 @@
 }
 
-sub get_TypeProblems_Count($$)
+sub getTypeProblemsCount($$)
 {
     my ($TargetSeverity, $Level) = @_;
@@ -3408 +2241 @@
         foreach my $Kind (sort keys(%{$TypeChanges{$Level}{$Type_Name}}))
         {
-            if($TypeProblems_Kind{$Level}{$Kind} ne $TargetSeverity) {
+            if($CompatRules{$Level}{$Kind}{"Severity"} ne $TargetSeverity) {
                 next;
             }
+            
             foreach my $Location (sort keys(%{$TypeChanges{$Level}{$Type_Name}{$Kind}}))
             {
@@ -3428 +2262 @@
 }
 
-sub show_number($)
+sub showNum($)
 {
     if($_[0])
     {
-        my $Num = cut_off_number($_[0], 2, 0);
+        my $Num = cutNum($_[0], 2, 0);
         if($Num eq "0")
         {
             foreach my $P (3 .. 7)
             {
-                $Num = cut_off_number($_[0], $P, 1);
+                $Num = cutNum($_[0], $P, 1);
                 if($Num ne "0") {
                     last;
@@ -3451 +2285 @@
 }
 
-sub cut_off_number($$$)
+sub cutNum($$$)
 {
     my ($num, $digs_to_cut, $z) = @_;
@@ -3477 +2311 @@
 }
 
-sub get_Summary($)
+sub getSummary($)
 {
     my $Level = $_[0];
     my ($Added, $Removed, $M_Problems_High, $M_Problems_Medium, $M_Problems_Low,
-    $T_Problems_High, $T_Problems_Medium, $T_Problems_Low, $M_Other, $T_Other) = (0,0,0,0,0,0,0,0,0,0);
+    $T_Problems_High, $T_Problems_Medium, $T_Problems_Low, $M_Other, $T_Other) = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
     
     %{$RESULT{$Level}} = (
         "Problems"=>0,
         "Warnings"=>0,
-        "Affected"=>0 );
+        "Affected"=>0);
     
     foreach my $Method (sort keys(%CompatProblems))
@@ -3492 +2326 @@
         foreach my $Kind (sort keys(%{$CompatProblems{$Method}}))
         {
-            if(my $Severity = $MethodProblems_Kind{$Level}{$Kind})
-            {
-                foreach my $Location (sort keys(%{$CompatProblems{$Method}{$Kind}}))
+            if($CompatRules{$Level}{$Kind}{"Kind"} eq "Methods")
+            {
+                my $Severity = $CompatRules{$Level}{$Kind}{"Severity"};
+                foreach my $Loc (sort keys(%{$CompatProblems{$Method}{$Kind}}))
                 {
                     if($Kind eq "Added_Method")
@@ -3531 +2366 @@
                             $M_Problems_Low+=1;
                         }
-                        if(($Severity ne "Low" or $StrictCompat)
+                        if(($Severity ne "Low" or $In::Opt{"StrictCompat"})
                         and $Severity ne "Safe") {
                             $TotalAffected{$Level}{$Method} = $Severity;
@@ -3545 +2380 @@
     foreach my $Method (sort keys(%CompatProblems))
     {
-        my @Kinds = sort keys(%{$CompatProblems{$Method}});
-        foreach my $Kind (@Kinds)
-        {
-            if(my $Severity = $TypeProblems_Kind{$Level}{$Kind})
-            {
-                my @Locs = sort {length($a)<=>length($b)} sort keys(%{$CompatProblems{$Method}{$Kind}});
-                foreach my $Location (@Locs)
+        foreach my $Kind (sort keys(%{$CompatProblems{$Method}}))
+        {
+            if($CompatRules{$Level}{$Kind}{"Kind"} eq "Types")
+            {
+                my $Severity = $CompatRules{$Level}{$Kind}{"Severity"};
+                if(($Severity ne "Low" or $In::Opt{"StrictCompat"})
+                and $Severity ne "Safe")
                 {
-                    my $Type_Name = $CompatProblems{$Method}{$Kind}{$Location}{"Type_Name"};
-                    my $Target = $CompatProblems{$Method}{$Kind}{$Location}{"Target"};
+                    if(my $Sev = $TotalAffected{$Level}{$Method})
+                    {
+                        if($Severity_Val{$Severity}>$Severity_Val{$Sev}) {
+                            $TotalAffected{$Level}{$Method} = $Severity;
+                        }
+                    }
+                    else {
+                        $TotalAffected{$Level}{$Method} = $Severity;
+                    }
+                }
+                
+                my $MK = $CompatProblems{$Method}{$Kind};
+                my (@Locs1, @Locs2) = ();
+                foreach my $Loc (sort {length($a)<=>length($b)} sort keys(%{$MK}))
+                {
+                    if(index($Loc, "retval")==0 or index($Loc, "this")==0) {
+                        push(@Locs2, $Loc);
+                    }
+                    else {
+                        push(@Locs1, $Loc);
+                    }
+                }
+                foreach my $Loc (@Locs1, @Locs2)
+                {
+                    my $Type = $MK->{$Loc}{"Type_Name"};
+                    my $Target = $MK->{$Loc}{"Target"};
                     
-                    if(defined $MethodTypeIndex{$Method}{$Type_Name}{$Kind}{$Target})
+                    if(defined $MethodTypeIndex{$Method}{$Type}{$Kind}{$Target})
                     { # one location for one type and target
                         next;
                     }
-                    $MethodTypeIndex{$Method}{$Type_Name}{$Kind}{$Target} = 1;
-                    $TypeChanges{$Level}{$Type_Name}{$Kind}{$Location} = $CompatProblems{$Method}{$Kind}{$Location};
+                    $MethodTypeIndex{$Method}{$Type}{$Kind}{$Target} = 1;
                     
-                    if(($Severity ne "Low" or $StrictCompat)
-                    and $Severity ne "Safe")
-                    {
-                        if(my $Sev = $TotalAffected{$Level}{$Method})
-                        {
-                            if($Severity_Val{$Severity}>$Severity_Val{$Sev}) {
-                                $TotalAffected{$Level}{$Method} = $Severity;
-                            }
-                        }
-                        else {
-                            $TotalAffected{$Level}{$Method} = $Severity;
-                        }
-                    }
+                    $TypeChanges{$Level}{$Type}{$Kind}{$Loc} = $MK->{$Loc};
+                    $TypeProblemsIndex{$Level}{$Type}{$Kind}{$Loc}{$Method} = 1;
                 }
             }
@@ -3583 +2430 @@
     %MethodTypeIndex = (); # clear memory
     
-    
-    $T_Problems_High = get_TypeProblems_Count("High", $Level);
-    $T_Problems_Medium = get_TypeProblems_Count("Medium", $Level);
-    $T_Problems_Low = get_TypeProblems_Count("Low", $Level);
-    $T_Other = get_TypeProblems_Count("Safe", $Level);
+    $T_Problems_High = getTypeProblemsCount("High", $Level);
+    $T_Problems_Medium = getTypeProblemsCount("Medium", $Level);
+    $T_Problems_Low = getTypeProblemsCount("Low", $Level);
+    $T_Other = getTypeProblemsCount("Safe", $Level);
     
     my $SCount = keys(%CheckedMethods)-$Added;
@@ -3605 +2451 @@
         $RESULT{$Level}{"Affected"} = 0;
     }
-    $RESULT{$Level}{"Affected"} = show_number($RESULT{$Level}{"Affected"});
+    $RESULT{$Level}{"Affected"} = showNum($RESULT{$Level}{"Affected"});
     if($RESULT{$Level}{"Affected"}>=100) {
         $RESULT{$Level}{"Affected"} = 100;
@@ -3615 +2461 @@
     $TestInfo .= "<h2>Test Info</h2><hr/>\n";
     $TestInfo .= "<table class='summary'>\n";
-    $TestInfo .= "<tr><th>Library Name</th><td>$TargetTitle</td></tr>\n";
-    $TestInfo .= "<tr><th>Version #1</th><td>".$Descriptor{1}{"Version"}."</td></tr>\n";
-    $TestInfo .= "<tr><th>Version #2</th><td>".$Descriptor{2}{"Version"}."</td></tr>\n";
-    
-    if($JoinReport)
+    $TestInfo .= "<tr><th>Library Name</th><td>".$In::Opt{"TargetTitle"}."</td></tr>\n";
+    $TestInfo .= "<tr><th>Version #1</th><td>".$In::Desc{1}{"Version"}."</td></tr>\n";
+    $TestInfo .= "<tr><th>Version #2</th><td>".$In::Desc{2}{"Version"}."</td></tr>\n";
+    
+    if($In::Opt{"JoinReport"})
     {
         if($Level eq "Binary") {
@@ -3631 +2477 @@
     
     # test results
-    $TestResults .= "<h2>Test Results</h2><hr/>";
-    $TestResults .= "<table class='summary'>";
+    $TestResults .= "<h2>Test Results</h2><hr/>\n";
+    $TestResults .= "<table class='summary'>\n";
     
     my $Checked_Archives_Link = "0";
@@ -3641 +2487 @@
     
     $RESULT{$Level}{"Problems"} += $Removed+$M_Problems_High+$T_Problems_High+$T_Problems_Medium+$M_Problems_Medium;
-    if($StrictCompat) {
+    if($In::Opt{"StrictCompat"}) {
         $RESULT{$Level}{"Problems"}+=$T_Problems_Low+$M_Problems_Low;
     }
@@ -3652 +2498 @@
     $TestResults .= "<tr><th>Compatibility</th>\n";
     
-    my $BC_Rate = show_number(100 - $RESULT{$Level}{"Affected"});
+    my $BC_Rate = showNum(100 - $RESULT{$Level}{"Affected"});
     
     if($RESULT{$Level}{"Problems"})
@@ -3677 +2523 @@
     
     # Problem Summary
-    $Problem_Summary .= "<h2>Problem Summary</h2><hr/>";
-    $Problem_Summary .= "<table class='summary'>";
-    $Problem_Summary .= "<tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr>";
+    $Problem_Summary .= "<h2>Problem Summary</h2><hr/>\n";
+    $Problem_Summary .= "<table class='summary'>\n";
+    $Problem_Summary .= "<tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr>\n";
     
     my $Added_Link = "0";
     if($Added>0)
     {
-        if($ShortMode) {
+        if($In::Opt{"ShortMode"}) {
             $Added_Link = $Added;
         }
         else
         {
-            if($JoinReport) {
+            if($In::Opt{"JoinReport"}) {
                 $Added_Link = "<a href='#".$Level."_Added' style='color:Blue;'>$Added</a>";
             }
@@ -3698 +2544 @@
     }
     $META_DATA .= "added:$Added;";
-    $Problem_Summary .= "<tr><th>Added Methods</th><td>-</td><td".getStyle("M", "Added", $Added).">$Added_Link</td></tr>";
+    $Problem_Summary .= "<tr><th>Added Methods</th><td>-</td><td".getStyle("M", "Added", $Added).">$Added_Link</td></tr>\n";
     
     my $Removed_Link = "0";
     if($Removed>0)
     {
-        if($ShortMode) {
+        if($In::Opt{"ShortMode"}) {
             $Removed_Link = $Removed;
         }
         else
         {
-            if($JoinReport) {
+            if($In::Opt{"JoinReport"}) {
                 $Removed_Link = "<a href='#".$Level."_Removed' style='color:Blue;'>$Removed</a>"
             }
@@ -3718 +2564 @@
     $META_DATA .= "removed:$Removed;";
     $Problem_Summary .= "<tr><th>Removed Methods</th>";
-    $Problem_Summary .= "<td>High</td><td".getStyle("M", "Removed", $Removed).">$Removed_Link</td></tr>";
+    $Problem_Summary .= "<td>High</td><td".getStyle("M", "Removed", $Removed).">$Removed_Link</td></tr>\n";
     
     my $TH_Link = "0";
-    $TH_Link = "<a href='#".get_Anchor("Type", $Level, "High")."' style='color:Blue;'>$T_Problems_High</a>" if($T_Problems_High>0);
+    $TH_Link = "<a href='#".getAnchor("Type", $Level, "High")."' style='color:Blue;'>$T_Problems_High</a>" if($T_Problems_High>0);
     $META_DATA .= "type_problems_high:$T_Problems_High;";
     $Problem_Summary .= "<tr><th rowspan='3'>Problems with<br/>Data Types</th>";
-    $Problem_Summary .= "<td>High</td><td".getStyle("T", "High", $T_Problems_High).">$TH_Link</td></tr>";
+    $Problem_Summary .= "<td>High</td><td".getStyle("T", "High", $T_Problems_High).">$TH_Link</td></tr>\n";
     
     my $TM_Link = "0";
-    $TM_Link = "<a href='#".get_Anchor("Type", $Level, "Medium")."' style='color:Blue;'>$T_Problems_Medium</a>" if($T_Problems_Medium>0);
+    $TM_Link = "<a href='#".getAnchor("Type", $Level, "Medium")."' style='color:Blue;'>$T_Problems_Medium</a>" if($T_Problems_Medium>0);
     $META_DATA .= "type_problems_medium:$T_Problems_Medium;";
-    $Problem_Summary .= "<tr><td>Medium</td><td".getStyle("T", "Medium", $T_Problems_Medium).">$TM_Link</td></tr>";
+    $Problem_Summary .= "<tr><td>Medium</td><td".getStyle("T", "Medium", $T_Problems_Medium).">$TM_Link</td></tr>\n";
     
     my $TL_Link = "0";
-    $TL_Link = "<a href='#".get_Anchor("Type", $Level, "Low")."' style='color:Blue;'>$T_Problems_Low</a>" if($T_Problems_Low>0);
+    $TL_Link = "<a href='#".getAnchor("Type", $Level, "Low")."' style='color:Blue;'>$T_Problems_Low</a>" if($T_Problems_Low>0);
     $META_DATA .= "type_problems_low:$T_Problems_Low;";
-    $Problem_Summary .= "<tr><td>Low</td><td".getStyle("T", "Low", $T_Problems_Low).">$TL_Link</td></tr>";
+    $Problem_Summary .= "<tr><td>Low</td><td".getStyle("T", "Low", $T_Problems_Low).">$TL_Link</td></tr>\n";
     
     my $MH_Link = "0";
-    $MH_Link = "<a href='#".get_Anchor("Method", $Level, "High")."' style='color:Blue;'>$M_Problems_High</a>" if($M_Problems_High>0);
+    $MH_Link = "<a href='#".getAnchor("Method", $Level, "High")."' style='color:Blue;'>$M_Problems_High</a>" if($M_Problems_High>0);
     $META_DATA .= "method_problems_high:$M_Problems_High;";
     $Problem_Summary .= "<tr><th rowspan='3'>Problems with<br/>Methods</th>";
-    $Problem_Summary .= "<td>High</td><td".getStyle("M", "High", $M_Problems_High).">$MH_Link</td></tr>";
+    $Problem_Summary .= "<td>High</td><td".getStyle("M", "High", $M_Problems_High).">$MH_Link</td></tr>\n";
     
     my $MM_Link = "0";
-    $MM_Link = "<a href='#".get_Anchor("Method", $Level, "Medium")."' style='color:Blue;'>$M_Problems_Medium</a>" if($M_Problems_Medium>0);
+    $MM_Link = "<a href='#".getAnchor("Method", $Level, "Medium")."' style='color:Blue;'>$M_Problems_Medium</a>" if($M_Problems_Medium>0);
     $META_DATA .= "method_problems_medium:$M_Problems_Medium;";
-    $Problem_Summary .= "<tr><td>Medium</td><td".getStyle("M", "Medium", $M_Problems_Medium).">$MM_Link</td></tr>";
+    $Problem_Summary .= "<tr><td>Medium</td><td".getStyle("M", "Medium", $M_Problems_Medium).">$MM_Link</td></tr>\n";
     
     my $ML_Link = "0";
-    $ML_Link = "<a href='#".get_Anchor("Method", $Level, "Low")."' style='color:Blue;'>$M_Problems_Low</a>" if($M_Problems_Low>0);
+    $ML_Link = "<a href='#".getAnchor("Method", $Level, "Low")."' style='color:Blue;'>$M_Problems_Low</a>" if($M_Problems_Low>0);
     $META_DATA .= "method_problems_low:$M_Problems_Low;";
-    $Problem_Summary .= "<tr><td>Low</td><td".getStyle("M", "Low", $M_Problems_Low).">$ML_Link</td></tr>";
+    $Problem_Summary .= "<tr><td>Low</td><td".getStyle("M", "Low", $M_Problems_Low).">$ML_Link</td></tr>\n";
     
     # Safe Changes
     if($T_Other)
     {
-        my $TS_Link = "<a href='#".get_Anchor("Type", $Level, "Safe")."' style='color:Blue;'>$T_Other</a>";
+        my $TS_Link = "<a href='#".getAnchor("Type", $Level, "Safe")."' style='color:Blue;'>$T_Other</a>";
         $Problem_Summary .= "<tr><th>Other Changes<br/>in Data Types</th><td>-</td><td".getStyle("T", "Safe", $T_Other).">$TS_Link</td></tr>\n";
     }
@@ -3761 +2607 @@
     if($M_Other)
     {
-        my $MS_Link = "<a href='#".get_Anchor("Method", $Level, "Safe")."' style='color:Blue;'>$M_Other</a>";
+        my $MS_Link = "<a href='#".getAnchor("Method", $Level, "Safe")."' style='color:Blue;'>$M_Other</a>";
         $Problem_Summary .= "<tr><th>Other Changes<br/>in Methods</th><td>-</td><td".getStyle("M", "Safe", $M_Other).">$MS_Link</td></tr>\n";
     }
@@ -3790 +2636 @@
 }
 
-sub get_Anchor($$$)
+sub getAnchor($$$)
 {
     my ($Kind, $Level, $Severity) = @_;
-    if($JoinReport)
+    if($In::Opt{"JoinReport"})
     {
         if($Severity eq "Safe") {
@@ -3813 +2659 @@
 }
 
-sub get_Report_Added($)
-{
-    if($ShortMode) {
+sub getReportAdded($)
+{
+    if($In::Opt{"ShortMode"}) {
         return "";
     }
@@ -3828 +2674 @@
             {
                 my $ArchiveName = $MethodInfo{2}{$Method}{"Archive"};
-                my $ClassName = get_ShortName($MethodInfo{2}{$Method}{"Class"}, 2);
+                my $ClassName = getShortName($MethodInfo{2}{$Method}{"Class"}, 2);
                 if($Level eq "Source")
                 {
@@ -3854 +2700 @@
             foreach my $NameSpace (sort keys(%NameSpace_Method))
             {
-                $ADDED_METHODS .= "<span class='jar'>$ArchiveName</span>, <span class='cname'>".htmlSpecChars($ShowClass).".class</span><br/>\n";
+                $ADDED_METHODS .= "<span class='jar'>$ArchiveName</span>, <span class='cname'>".specChars($ShowClass).".class</span><br/>\n";
                 
                 if($NameSpace) {
@@ -3860 +2706 @@
                 }
                 
-                if($Compact) {
+                if($In::Opt{"Compact"}) {
                     $ADDED_METHODS .= "<div class='symbols'>";
                 }
@@ -3871 +2717 @@
                     my $Signature = undef;
                     
-                    if($Compact) {
-                        $Signature = get_Signature($Method, 2, "Full|HTML|Simple");
+                    if($In::Opt{"Compact"}) {
+                        $Signature = getSignature($Method, 2, "Full|HTML|Simple");
                     }
                     else {
-                        $Signature = highLight_Signature_Italic_Color($Method, 2);
+                        $Signature = highLight_ItalicColor($Method, 2);
                     }
                     
@@ -3882 +2728 @@
                     }
                     
-                    if($Compact) {
+                    if($In::Opt{"Compact"}) {
                         $ADDED_METHODS .= "&nbsp;".$Signature."<br/>\n";
                     }
                     else {
-                        $ADDED_METHODS .= insertIDs($ContentSpanStart.$Signature.$ContentSpanEnd."<br/>\n".$ContentDivStart."<span class='mngl'>[mangled: <b>".htmlSpecChars($Method)."</b>]</span><br/><br/>".$ContentDivEnd."\n");
+                        $ADDED_METHODS .= insertIDs($ContentSpanStart.$Signature.$ContentSpanEnd."<br/>\n".$ContentDivStart."<span class='mngl'>".specChars($Method)."</span><br/><br/>".$ContentDivEnd."\n");
                     }
                 }
                 
-                if($Compact) {
+                if($In::Opt{"Compact"}) {
                     $ADDED_METHODS .= "</div>";
                 }
@@ -3902 +2748 @@
     {
         my $Anchor = "<a name='Added'></a>";
-        if($JoinReport) {
+        if($In::Opt{"JoinReport"}) {
             $Anchor = "<a name='".$Level."_Added'></a>";
         }
-        if($OldStyle) {
+        if($In::Opt{"OldStyle"}) {
             $ADDED_METHODS = "<h2>Added Methods ($Added_Number)</h2><hr/>\n".$ADDED_METHODS;
         }
@@ -3916 +2762 @@
 }
 
-sub get_Report_Removed($)
-{
-    if($ShortMode) {
+sub getReportRemoved($)
+{
+    if($In::Opt{"ShortMode"}) {
         return "";
     }
@@ -3937 +2783 @@
                 }
                 my $ArchiveName = $MethodInfo{1}{$Method}{"Archive"};
-                my $ClassName = get_ShortName($MethodInfo{1}{$Method}{"Class"}, 1);
+                my $ClassName = getShortName($MethodInfo{1}{$Method}{"Class"}, 1);
                 $MethodRemovedFromArchiveClass{$ArchiveName}{$ClassName}{$Method} = 1;
             }
@@ -3958 +2804 @@
             foreach my $NameSpace (sort keys(%NameSpace_Method))
             {
-                $REMOVED_METHODS .= "<span class='jar'>$ArchiveName</span>, <span class='cname'>".htmlSpecChars($ShowClass).".class</span><br/>\n";
+                $REMOVED_METHODS .= "<span class='jar'>$ArchiveName</span>, <span class='cname'>".specChars($ShowClass).".class</span><br/>\n";
                 
                 if($NameSpace) {
@@ -3964 +2810 @@
                 }
                 
-                if($Compact) {
+                if($In::Opt{"Compact"}) {
                     $REMOVED_METHODS .= "<div class='symbols'>";
                 }
@@ -3975 +2821 @@
                     my $Signature = undef;
                     
-                    if($Compact) {
-                        $Signature = get_Signature($Method, 1, "Full|HTML|Simple");
+                    if($In::Opt{"Compact"}) {
+                        $Signature = getSignature($Method, 1, "Full|HTML|Simple");
                     }
                     else {
-                        $Signature = highLight_Signature_Italic_Color($Method, 1);
+                        $Signature = highLight_ItalicColor($Method, 1);
                     }
                     
@@ -3986 +2832 @@
                     }
                     
-                    if($Compact) {
+                    if($In::Opt{"Compact"}) {
                         $REMOVED_METHODS .= "&nbsp;".$Signature."<br/>\n";
                     }
                     else {
-                        $REMOVED_METHODS .= insertIDs($ContentSpanStart.$Signature.$ContentSpanEnd."<br/>\n".$ContentDivStart."<span class='mngl'>[mangled: <b>".htmlSpecChars($Method)."</b>]</span><br/><br/>".$ContentDivEnd."\n");
+                        $REMOVED_METHODS .= insertIDs($ContentSpanStart.$Signature.$ContentSpanEnd."<br/>\n".$ContentDivStart."<span class='mngl'>".specChars($Method)."</span><br/><br/>".$ContentDivEnd."\n");
                     }
                 }
                 
-                if($Compact) {
+                if($In::Opt{"Compact"}) {
                     $REMOVED_METHODS .= "</div>";
                 }
@@ -4005 +2851 @@
     {
         my $Anchor = "<a name='Removed'></a><a name='Withdrawn'></a>";
-        if($JoinReport) {
+        if($In::Opt{"JoinReport"}) {
             $Anchor = "<a name='".$Level."_Removed'></a><a name='".$Level."_Withdrawn'></a>";
         }
-        if($OldStyle) {
+        if($In::Opt{"OldStyle"}) {
             $REMOVED_METHODS = "<h2>Removed Methods ($Removed_Number)</h2><hr/>\n".$REMOVED_METHODS;
         }
@@ -4019 +2865 @@
 }
 
-sub get_Report_MethodProblems($$)
+sub readRules($)
+{
+    my $Kind = $_[0];
+    if(not -f $RULES_PATH{$Kind}) {
+        exitStatus("Module_Error", "can't access \'".$RULES_PATH{$Kind}."\'");
+    }
+    my $Content = readFile($RULES_PATH{$Kind});
+    while(my $Rule = parseTag(\$Content, "rule"))
+    {
+        my $RId = parseTag(\$Rule, "id");
+        my @Properties = ("Severity", "Change", "Effect", "Overcome", "Kind");
+        foreach my $Prop (@Properties) {
+            if(my $Value = parseTag(\$Rule, lc($Prop)))
+            {
+                $Value=~s/\n[ ]*//;
+                $CompatRules{$Kind}{$RId}{$Prop} = $Value;
+            }
+        }
+        if($CompatRules{$Kind}{$RId}{"Kind"}=~/\A(Methods|Parameters)\Z/) {
+            $CompatRules{$Kind}{$RId}{"Kind"} = "Methods";
+        }
+        else { # Types, Fields
+            $CompatRules{$Kind}{$RId}{"Kind"} = "Types";
+        }
+    }
+}
+
+sub addMarkup($)
+{
+    my $Content = $_[0];
+    
+    # auto-markup
+    $Content=~s/\n[ ]*//; # spaces
+    $Content=~s!([2-9]\))!<br/>$1!g; # 1), 2), ...
+    if($Content=~/\ANOTE:/)
+    { # notes
+        $Content=~s!(NOTE):!<b>$1</b>:!g;
+    }
+    else {
+        $Content=~s!(NOTE):!<br/><br/><b>$1</b>:!g;
+    }
+    
+    my @Keywords = (
+        "static",
+        "abstract",
+        "default",
+        "final",
+        "synchronized"
+    );
+    
+    my $MKeys = join("|", @Keywords);
+    foreach (@Keywords) {
+        $MKeys .= "|non-".$_;
+    }
+    
+    $Content=~s!(became\s*)($MKeys)([^\w-]|\Z)!$1<b>$2</b>$3!ig; # intrinsic types, modifiers
+    
+    # Markdown
+    $Content=~s!\*\*([\w\-\@]+)\*\*!<b>$1</b>!ig;
+    $Content=~s!\*([\w\-]+)\*!<i>$1</i>!ig;
+    
+    return $Content;
+}
+
+sub applyMacroses($$$$$)
+{
+    my ($Level, $Kind, $Content, $Problem, $AddAttr) = @_;
+    
+    $Content = addMarkup($Content);
+    
+    # macros
+    foreach my $Attr (sort {$b cmp $a} (keys(%{$Problem}), keys(%{$AddAttr})))
+    {
+        my $Macro = "\@".lc($Attr);
+        my $Value = undef;
+        
+        if(defined $Problem->{$Attr}) {
+            $Value = $Problem->{$Attr};
+        }
+        else {
+            $Value = $AddAttr->{$Attr};
+        }
+        
+        if(not defined $Value
+        or $Value eq "") {
+            next;
+        }
+        
+        if(index($Content, $Macro)==-1) {
+            next;
+        }
+        
+        if($Attr eq "Param_Pos") {
+            $Value = showPos($Value);
+        }
+        
+        if($Attr eq "Invoked") {
+            $Value = blackName(specChars($Value));
+        }
+        elsif($Value=~/\s/) {
+            $Value = "<span class='value'>".specChars($Value)."</span>";
+        }
+        else
+        {
+            my $Fmt = "Class|HTML|Desc";
+            
+            if($Attr ne "Invoked_By")
+            {
+                if($Attr eq "Method_Short"
+                or $Kind!~/Overridden|Moved_Up/) {
+                    $Fmt = "HTML|Desc";
+                }
+            }
+            
+            if(defined $MethodInfo{1}{$Value}
+            and defined $MethodInfo{1}{$Value}{"ShortName"}) {
+                $Value = blackName(getSignature($Value, 1, $Fmt));
+            }
+            elsif(defined $MethodInfo{2}{$Value}
+            and defined $MethodInfo{2}{$Value}{"ShortName"}) {
+                $Value = blackName(getSignature($Value, 2, $Fmt));
+            }
+            else
+            {
+                $Value = specChars($Value);
+                if($Attr ne "Type_Type") {
+                    $Value = "<b>".$Value."</b>";
+                }
+            }
+        }
+        $Content=~s/\Q$Macro\E/$Value/g;
+    }
+    
+    if($Content=~/(\A|[^\@\w])(\@\w+)/)
+    {
+        if(not $IncompleteRules{$Level}{$Kind})
+        { # only one warning
+            printMsg("WARNING", "incomplete $2 in the rule \"$Kind\" (\"$Level\")");
+            $IncompleteRules{$Level}{$Kind} = 1;
+        }
+    }
+    
+    return $Content;
+}
+
+sub getReportMethodProblems($$)
 {
     my ($TargetSeverity, $Level) = @_;
@@ -4028 +3019 @@
     {
         my $ArchiveName = $MethodInfo{1}{$Method}{"Archive"};
-        my $ClassName = get_ShortName($MethodInfo{1}{$Method}{"Class"}, 1);
+        my $ClassName = getShortName($MethodInfo{1}{$Method}{"Class"}, 1);
         
         foreach my $Kind (sort keys(%{$CompatProblems{$Method}}))
         {
-            if($Kind eq "Added_Method"
-            or $Kind eq "Removed_Method") {
-                next;
-            }
-            
-            if(my $Severity = $MethodProblems_Kind{$Level}{$Kind})
-            {
-                if($Severity ne $TargetSeverity) {
+            if($CompatRules{$Level}{$Kind}{"Kind"} eq "Methods")
+            {
+                if($Kind eq "Added_Method"
+                or $Kind eq "Removed_Method") {
                     next;
                 }
                 
-                $MethodChanges{$Method}{$Kind} = $CompatProblems{$Method}{$Kind};
-                $ReportMap{$ArchiveName}{$ClassName}{$Method} = 1;
+                if(my $Severity = $CompatRules{$Level}{$Kind}{"Severity"})
+                {
+                    if($Severity ne $TargetSeverity) {
+                        next;
+                    }
+                    
+                    $MethodChanges{$Method}{$Kind} = $CompatProblems{$Method}{$Kind};
+                    $ReportMap{$ArchiveName}{$ClassName}{$Method} = 1;
+                }
             }
         }
@@ -4063 +3057 @@
             foreach my $NameSpace (sort keys(%NameSpace_Method))
             {
-                $METHOD_PROBLEMS .= "<span class='jar'>$ArchiveName</span>, <span class='cname'>".htmlSpecChars($ShowClass).".class</span><br/>\n";
+                $METHOD_PROBLEMS .= "<span class='jar'>$ArchiveName</span>, <span class='cname'>".specChars($ShowClass).".class</span><br/>\n";
                 if($NameSpace) {
                     $METHOD_PROBLEMS .= "<span class='pkg_t'>package</span> <span class='pkg'>$NameSpace</span><br/>\n";
@@ -4071 +3065 @@
                 foreach my $Method (@SortedMethods)
                 {
-                    my $ShortSignature = get_Signature($Method, 1, "Short");
-                    my $ClassName_Full = get_TypeName($MethodInfo{1}{$Method}{"Class"}, 1);
+                    my %AddAttr = ();
+                    
+                    $AddAttr{"Method_Short"} = $Method;
+                    $AddAttr{"Class"} = getTypeName($MethodInfo{1}{$Method}{"Class"}, 1);
+                    
                     my $METHOD_REPORT = "";
                     my $ProblemNum = 1;
                     foreach my $Kind (sort keys(%{$MethodChanges{$Method}}))
                     {
-                        foreach my $Location (sort keys(%{$MethodChanges{$Method}{$Kind}}))
+                        foreach my $Loc (sort keys(%{$MethodChanges{$Method}{$Kind}}))
                         {
-                            my %Problems = %{$MethodChanges{$Method}{$Kind}{$Location}};
+                            my $ProblemAttr = $MethodChanges{$Method}{$Kind}{$Loc};
                             
-                            my $Target = $Problems{"Target"};
-                            
-                            my ($Change, $Effect) = ("", "");
-                            my $Old_Value = htmlSpecChars($Problems{"Old_Value"});
-                            my $New_Value = htmlSpecChars($Problems{"New_Value"});
-                            
-                            if($Kind eq "Method_Became_Static")
+                            if(my $Change = applyMacroses($Level, $Kind, $CompatRules{$Level}{$Kind}{"Change"}, $ProblemAttr, \%AddAttr))
                             {
-                                $Change = "Method became <b>static</b>.\n";
-                                $Effect = "A client program may be interrupted by <b>NoSuchMethodError</b> exception.";
-                            }
-                            elsif($Kind eq "Method_Became_NonStatic")
-                            {
-                                $Change = "Method became <b>non-static</b>.\n";
-                                if($Level eq "Binary") {
-                                    $Effect = "A client program may be interrupted by <b>NoSuchMethodError</b> exception.";
-                                }
-                                else {
-                                    $Effect = "Recompilation of a client program may be terminated with the message: non-static method ".htmlSpecChars($ShortSignature)." cannot be referenced from a static context.";
-                                }
-                            }
-                            elsif($Kind eq "Changed_Method_Return_From_Void")
-                            {
-                                $Change = "Return value type has been changed from <b>void</b> to <b>".htmlSpecChars($New_Value)."</b>.\n";
-                                $Effect = "This method has been removed because the return type is part of the method signature.";
-                            }
-                            elsif($Kind eq "Static_Method_Became_Final")
-                            {# Source Only
-                                $Change = "Method became <b>final</b>.\n";
-                                $Effect = "Recompilation of a client program may be terminated with the message: ".htmlSpecChars($ShortSignature)." in client class C cannot override ".htmlSpecChars($ShortSignature)." in ".htmlSpecChars($ClassName_Full)."; overridden method is final.";
-                            }
-                            elsif($Kind eq "NonStatic_Method_Became_Final")
-                            {
-                                $Change = "Method became <b>final</b>.\n";
-                                if($Level eq "Binary") {
-                                    $Effect = "A client program trying to reimplement this method may be interrupted by <b>VerifyError</b> exception.";
-                                }
-                                else {
-                                    $Effect = "Recompilation of a client program may be terminated with the message: ".htmlSpecChars($ShortSignature)." in client class C cannot override ".htmlSpecChars($ShortSignature)." in ".htmlSpecChars($ClassName_Full)."; overridden method is final.";
-                                }
-                            }
-                            elsif($Kind eq "Method_Became_Abstract")
-                            {
-                                $Change = "Method became <b>abstract</b>.\n";
-                                if($Level eq "Binary") {
-                                    $Effect = "A client program trying to create an instance of the method's class may be interrupted by <b>InstantiationError</b> exception.";
-                                }
-                                else {
-                                    $Effect = "Recompilation of a client program may be terminated with the message: A client class C is not abstract and does not override abstract method ".htmlSpecChars($ShortSignature)." in ".htmlSpecChars($ClassName_Full).".";
-                                }
-                            }
-                            elsif($Kind eq "Method_Became_NonAbstract")
-                            {
-                                $Change = "Method became <b>non-abstract</b>.\n";
-                                if($Level eq "Binary") {
-                                    $Effect = "A client program may change behavior.";
-                                }
-                                else {
-                                    $Effect = "No effect.";
-                                }
-                            }
-                            elsif($Kind eq "Method_Became_Default")
-                            {
-                                $Change = "Method became <b>default</b>.\n";
-                                if($Level eq "Binary") {
-                                    $Effect = "No effect.";
-                                }
-                                else {
-                                    $Effect = "No effect.";
-                                }
-                            }
-                            elsif($Kind eq "Method_Became_NonDefault")
-                            {
-                                $Change = "Method became <b>non-default</b>.\n";
-                                if($Level eq "Binary") {
-                                    $Effect = "A client program trying to create an instance of a class may be interrupted by <b>AbstractMethodError</b> exception.";
-                                }
-                                else {
-                                    $Effect = "Recompilation of a client program may be terminated with the message: A client class C is not abstract and does not override abstract method ".htmlSpecChars($ShortSignature)." in ".htmlSpecChars($ClassName_Full).".";
-                                }
-                            }
-                            elsif($Kind eq "Method_Became_Synchronized")
-                            {
-                                $Change = "Method became <b>synchronized</b>.\n";
-                                $Effect = "A multi-threaded client program may change behavior.";
-                            }
-                            elsif($Kind eq "Method_Became_NonSynchronized")
-                            {
-                                $Change = "Method became <b>non-synchronized</b>.\n";
-                                $Effect = "A multi-threaded client program may change behavior.";
-                            }
-                            elsif($Kind eq "Changed_Method_Access")
-                            {
-                                $Change = "Access level has been changed from <span class='nowrap'><b>".htmlSpecChars($Old_Value)."</b></span> to <span class='nowrap'><b>".htmlSpecChars($New_Value)."</b></span>.";
-                                if($Level eq "Binary") {
-                                    $Effect = "A client program may be interrupted by <b>IllegalAccessError</b> exception.";
-                                }
-                                else {
-                                    $Effect = "Recompilation of a client program may be terminated with the message: ".htmlSpecChars($ShortSignature)." has $New_Value access in ".htmlSpecChars($ClassName_Full).".";
-                                }
-                            }
-                            elsif($Kind eq "Abstract_Method_Added_Checked_Exception")
-                            {# Source Only
-                                $Change = "Added <b>".htmlSpecChars($Target)."</b> exception thrown.\n";
-                                $Effect = "Recompilation of a client program may be terminated with the message: unreported exception ".htmlSpecChars($Target)." must be caught or declared to be thrown.";
-                            }
-                            elsif($Kind eq "NonAbstract_Method_Added_Checked_Exception")
-                            {
-                                $Change = "Added <b>".htmlSpecChars($Target)."</b> exception thrown.\n";
-                                if($Level eq "Binary") {
-                                    $Effect = "A client program may be interrupted by added exception.";
-                                }
-                                else {
-                                    $Effect = "Recompilation of a client program may be terminated with the message: unreported exception ".htmlSpecChars($Target)." must be caught or declared to be thrown.";
-                                }
-                            }
-                            elsif($Kind eq "Abstract_Method_Removed_Checked_Exception")
-                            {# Source Only
-                                $Change = "Removed <b>".htmlSpecChars($Target)."</b> exception thrown.\n";
-                                $Effect = "Recompilation of a client program may be terminated with the message: cannot override ".htmlSpecChars($ShortSignature)." in ".htmlSpecChars($ClassName_Full)."; overridden method does not throw ".htmlSpecChars($Target).".";
-                            }
-                            elsif($Kind eq "NonAbstract_Method_Removed_Checked_Exception")
-                            {
-                                $Change = "Removed <b>".htmlSpecChars($Target)."</b> exception thrown.\n";
-                                if($Level eq "Binary") {
-                                    $Effect = "A client program may change behavior because the removed exception will not be thrown any more and client will not catch and handle it.";
-                                }
-                                else {
-                                    $Effect = "Recompilation of a client program may be terminated with the message: cannot override ".htmlSpecChars($ShortSignature)." in ".htmlSpecChars($ClassName_Full)."; overridden method does not throw ".htmlSpecChars($Target).".";
-                                }
-                            }
-                            elsif($Kind eq "Added_Unchecked_Exception")
-                            {# Binary Only
-                                $Change = "Added <b>".htmlSpecChars($Target)."</b> exception thrown.\n";
-                                $Effect = "A client program may be interrupted by added exception.";
-                            }
-                            elsif($Kind eq "Removed_Unchecked_Exception")
-                            {# Binary Only
-                                $Change = "Removed <b>".htmlSpecChars($Target)."</b> exception thrown.\n";
-                                $Effect = "A client program may change behavior because the removed exception will not be thrown any more and client will not catch and handle it.";
-                            }
-                            if($Change)
-                            {
-                                $METHOD_REPORT .= "<tr><th>$ProblemNum</th><td>".$Change."</td><td>".$Effect."</td></tr>\n";
+                                my $Effect = applyMacroses($Level, $Kind, $CompatRules{$Level}{$Kind}{"Effect"}, $ProblemAttr, \%AddAttr);
+                                $METHOD_REPORT .= "<tr>\n<th>$ProblemNum</th>\n<td>".$Change."</td>\n<td>".$Effect."</td>\n</tr>\n";
                                 $ProblemNum += 1;
                                 $ProblemsNum += 1;
@@ -4233 +3090 @@
                     if($METHOD_REPORT)
                     {
-                        my $ShowMethod = highLight_Signature_Italic_Color($Method, 1);
+                        my $ShowMethod = highLight_ItalicColor($Method, 1);
                         if($NameSpace)
                         {
-                            $METHOD_REPORT = cut_Namespace($METHOD_REPORT, $NameSpace);
-                            $ShowMethod = cut_Namespace($ShowMethod, $NameSpace);
+                            $METHOD_REPORT = cutNs($METHOD_REPORT, $NameSpace);
+                            $ShowMethod = cutNs($ShowMethod, $NameSpace);
                         }
                         
                         $METHOD_PROBLEMS .= $ContentSpanStart."<span class='ext'>[+]</span> ".$ShowMethod;
-                        if($OldStyle) {
+                        if($In::Opt{"OldStyle"}) {
                             $METHOD_PROBLEMS .= " ($ProblemNum)";
                         }
@@ -4250 +3107 @@
                         $METHOD_PROBLEMS .= $ContentDivStart;
                         
-                        if(not $Compact) {
-                            $METHOD_PROBLEMS .= "<span class='mngl'>&#160;&#160;&#160;[mangled: <b>".htmlSpecChars($Method)."</b>]</span><br/>\n";
+                        if(not $In::Opt{"Compact"}) {
+                            $METHOD_PROBLEMS .= "<span class='mngl pleft'>".specChars($Method)."</span><br/>\n";
                         }
                         
@@ -4272 +3129 @@
             $Title = "Other Changes in Methods";
         }
-        if($OldStyle) {
+        if($In::Opt{"OldStyle"}) {
             $METHOD_PROBLEMS = "<h2>$Title ($ProblemsNum)</h2><hr/>\n".$METHOD_PROBLEMS;
         }
@@ -4278 +3135 @@
             $METHOD_PROBLEMS = "<h2>$Title <span".getStyle("M", $TargetSeverity, $ProblemsNum).">&nbsp;$ProblemsNum&nbsp;</span></h2><hr/>\n".$METHOD_PROBLEMS;
         }
-        $METHOD_PROBLEMS = "<a name='".get_Anchor("Method", $Level, $TargetSeverity)."'></a>\n".$METHOD_PROBLEMS;
+        $METHOD_PROBLEMS = "<a name='".getAnchor("Method", $Level, $TargetSeverity)."'></a>\n".$METHOD_PROBLEMS;
         $METHOD_PROBLEMS .= $TOP_REF."<br/>\n";
     }
@@ -4284 +3141 @@
 }
 
-sub get_Report_TypeProblems($$)
+sub showType($$$)
+{
+    my ($Name, $Html, $LVer) = @_;
+    my $TType = $TypeInfo{$LVer}{$TName_Tid{$LVer}{$Name}}{"Type"};
+    if($Html) {
+        $Name = "<span class='ttype'>".$TType."</span> ".specChars($Name);
+    }
+    else {
+        $Name = $TType." ".$Name;
+    }
+    return $Name;
+}
+
+sub getReportTypeProblems($$)
 {
     my ($TargetSeverity, $Level) = @_;
     my $TYPE_PROBLEMS = "";
+    
     my %ReportMap = ();
     my %TypeChanges_Sev = ();
@@ -4297 +3168 @@
         foreach my $Kind (keys(%{$TypeChanges{$Level}{$TypeName}}))
         {
-            my $Severity = $TypeProblems_Kind{$Level}{$Kind};
+            if($CompatRules{$Level}{$Kind}{"Severity"} ne $TargetSeverity) {
+                next;
+            }
             
-            if($Severity ne $TargetSeverity) {
-                next;
-            }
-            
-            foreach my $Location (keys(%{$TypeChanges{$Level}{$TypeName}{$Kind}}))
+            foreach my $Loc (keys(%{$TypeChanges{$Level}{$TypeName}{$Kind}}))
             {
                 $ReportMap{$ArchiveName}{$TypeName} = 1;
-                $TypeChanges_Sev{$TypeName}{$Kind}{$Location} = $TypeChanges{$Level}{$TypeName}{$Kind}{$Location};
+                $TypeChanges_Sev{$TypeName}{$Kind}{$Loc} = $TypeChanges{$Level}{$TypeName}{$Kind}{$Loc};
             }
         }
@@ -4314 +3183 @@
     foreach my $ArchiveName (sort {lc($a) cmp lc($b)} keys(%ReportMap))
     {
-        my ($HEADER_REPORT, %NameSpace_Type) = ();
-        foreach my $TypeName (keys(%{$ReportMap{$ArchiveName}}))
-        {
+        my %NameSpace_Type = ();
+        foreach my $TypeName (keys(%{$ReportMap{$ArchiveName}})) {
             $NameSpace_Type{$TypeInfo{1}{$TName_Tid{1}{$TypeName}}{"Package"}}{$TypeName} = 1;
         }
@@ -4326 +3194 @@
             }
             
-            my @SortedTypes = sort {lc($a) cmp lc($b)} keys(%{$NameSpace_Type{$NameSpace}});
+            my @SortedTypes = sort {lc(showType($a, 0, 1)) cmp lc(showType($b, 0, 1))} keys(%{$NameSpace_Type{$NameSpace}});
             foreach my $TypeName (@SortedTypes)
             {
                 my $TypeId = $TName_Tid{1}{$TypeName};
+                
                 my $ProblemNum = 1;
                 my $TYPE_REPORT = "";
                 my (%Kinds_Locations, %Kinds_Target) = ();
+                
                 foreach my $Kind (sort keys(%{$TypeChanges_Sev{$TypeName}}))
                 {
@@ -4345 +3215 @@
                         $Kinds_Target{$Kind}{$Target} = 1;
                         
-                        my ($Change, $Effect) = ("", "");
-                        my %Problems = %{$TypeChanges_Sev{$TypeName}{$Kind}{$Location}};
+                        my %AddAttr = ();
                         
-                        my $Old_Value = $Problems{"Old_Value"};
-                        my $New_Value = $Problems{"New_Value"};
-                        my $Field_Type = $Problems{"Field_Type"};
-                        my $Field_Value = $Problems{"Field_Value"};
-                        my $Type_Type = $Problems{"Type_Type"};
-                        
-                        if($Kind eq "NonAbstract_Class_Added_Abstract_Method")
+                        if($Kind=~/Method/)
                         {
-                            $Change = "Abstract method ".black_Name($Target, 2)." has been added to this $Type_Type.";
-                            if($Level eq "Binary") {
-                                $Effect = "This class became <b>abstract</b> and a client program may be interrupted by <b>InstantiationError</b> exception.";
+                            if(defined $MethodInfo{1}{$Target} and $MethodInfo{1}{$Target}{"Name"})
+                            {
+                                $AddAttr{"Method_Short"} = $Target;
+                                $AddAttr{"Class"} = getTypeName($MethodInfo{1}{$Target}{"Class"}, 1);
                             }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method <b>".htmlSpecChars(get_Signature($Target, 2, "Short"))."</b> in <b>".htmlSpecChars(get_TypeName($MethodInfo{2}{$Target}{"Class"}, 2))."</b>.";
+                            elsif(defined $MethodInfo{2}{$Target} and $MethodInfo{2}{$Target}{"Name"})
+                            {
+                                $AddAttr{"Method_Short"} = $Target;
+                                $AddAttr{"Class"} = getTypeName($MethodInfo{2}{$Target}{"Class"}, 2);
                             }
                         }
-                        elsif($Kind eq "Abstract_Class_Added_Abstract_Method")
+                        
+                        my $ProblemAttr = $TypeChanges_Sev{$TypeName}{$Kind}{$Location};
+                        
+                        if(my $Change = applyMacroses($Level, $Kind, $CompatRules{$Level}{$Kind}{"Change"}, $ProblemAttr, \%AddAttr))
                         {
-                            $Change = "Abstract method ".black_Name($Target, 2)." has been added to this $Type_Type.";
-                            if($Level eq "Binary") {
-                                $Effect = "No effect.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method <b>".htmlSpecChars(get_Signature($Target, 2, "Short"))."</b> in <b>".htmlSpecChars(get_TypeName($MethodInfo{2}{$Target}{"Class"}, 2))."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Abstract_Class_Added_Abstract_Method_Invoked_By_Others")
-                        {
-                            $Change = "Abstract method ".black_Name($Target, 2)." has been added to this $Type_Type.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>AbstractMethodError</b> exception. Added abstract method is called in 2nd library version by the method ".black_Name($Problems{"InvokedBy"}, 1)." and may not be implemented by old clients.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method <b>".htmlSpecChars(get_Signature($Target, 2, "Short"))."</b> in <b>".htmlSpecChars(get_TypeName($MethodInfo{2}{$Target}{"Class"}, 2))."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Class_Removed_Abstract_Method"
-                        or $Kind eq "Interface_Removed_Abstract_Method")
-                        {
-                            $Change = "Abstract method ".black_Name($Target, 1)." has been removed from this $Type_Type.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>NoSuchMethodError</b> exception.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: cannot find method <b>".htmlSpecChars(get_Signature($Target, 1, "Short"))."</b> in $Type_Type <b>".htmlSpecChars(get_TypeName($MethodInfo{1}{$Target}{"Class"}, 1))."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Interface_Added_Abstract_Method")
-                        {
-                            $Change = "Abstract method ".black_Name($Target, 2)." has been added to this $Type_Type.";
-                            if($Level eq "Binary") {
-                                $Effect = "No effect.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method <b>".htmlSpecChars(get_Signature($Target, 2, "Short"))."</b> in <b>".htmlSpecChars(get_TypeName($MethodInfo{2}{$Target}{"Class"}, 2))."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Interface_Added_Abstract_Method_Invoked_By_Others")
-                        {
-                            $Change = "Abstract method ".black_Name($Target, 2)." has been added to this $Type_Type.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>AbstractMethodError</b> exception. Added abstract method is called in 2nd library version by the method ".black_Name($Problems{"InvokedBy"}, 1)." and may not be implemented by old clients.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method <b>".htmlSpecChars(get_Signature($Target, 2, "Short"))."</b> in <b>".htmlSpecChars(get_TypeName($MethodInfo{2}{$Target}{"Class"}, 2))."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Class_Method_Became_Abstract")
-                        {
-                            $Change = "Method ".black_Name($Target, 1)." became <b>abstract</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>InstantiationError</b> exception.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method <b>".htmlSpecChars(get_Signature($Target, 1, "Short"))."</b> in <b>".htmlSpecChars(get_TypeName($MethodInfo{1}{$Target}{"Class"}, 1))."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Class_Method_Became_NonAbstract")
-                        {
-                            $Change = "Abstract method ".black_Name($Target, 1)." became <b>non-abstract</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "Some methods in this class may change behavior.";
-                            }
-                            else {
-                                $Effect = "No effect.";
-                            }
-                        }
-                        elsif($Kind eq "Interface_Method_Became_NonDefault")
-                        {
-                            $Change = "Method ".black_Name($Target, 1)." became <b>non-default</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>AbstractMethodError</b> exception.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method <b>".htmlSpecChars(get_Signature($Target, 1, "Short"))."</b> in <b>".htmlSpecChars(get_TypeName($MethodInfo{1}{$Target}{"Class"}, 1))."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Interface_Method_Became_Default")
-                        {
-                            $Change = "Method ".black_Name($Target, 1)." became <b>default</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "No effect.";
-                            }
-                            else {
-                                $Effect = "No effect.";
-                            }
-                        }
-                        elsif($Kind eq "Class_Overridden_Method")
-                        {
-                            $Change = "Method ".black_Name($Old_Value, 2)." has been overridden by ".black_Name($New_Value, 2);
-                            $Effect = "Method ".black_Name($New_Value, 2)." will be called instead of ".black_Name($Old_Value, 2)." in a client program.";
-                        }
-                        elsif($Kind eq "Class_Method_Moved_Up_Hierarchy")
-                        {
-                            $Change = "Method ".black_Name($Old_Value, 1)." has been moved up type hierarchy to ".black_Name($New_Value, 2);
-                            $Effect = "Method ".black_Name($New_Value, 2)." will be called instead of ".black_Name($Old_Value, 1)." in a client program.";
-                        }
-                        elsif($Kind eq "Abstract_Class_Added_Super_Interface")
-                        {
-                            $Change = "Added super-interface <b>".htmlSpecChars($Target)."</b>.";
-                            if($Level eq "Binary")
-                            {
-                                $Effect = "No effect.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method in <b>".htmlSpecChars($Target)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Abstract_Class_Added_Super_Interface_Invoked_By_Others")
-                        {
-                            $Change = "Added super-interface <b>".htmlSpecChars($Target)."</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "If abstract methods from an added super-interface must be implemented by client then it may be interrupted by <b>AbstractMethodError</b> exception.<br/><br/>Abstract method ".black_Name_S(htmlSpecChars($Problems{"Invoked"}))." from the added super-interface is called by the method ".black_Name($Problems{"InvokedBy"}, 2)." in 2nd library version and may not be implemented by old clients.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method in <b>".htmlSpecChars($Target)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Abstract_Class_Added_Super_Interface_With_Implemented_Methods")
-                        {
-                            $Change = "Added super-interface <b>".htmlSpecChars($Target)."</b>.";
-                            $Effect = "No effect.";
-                        }
-                        elsif($Kind eq "Interface_Added_Super_Interface")
-                        {
-                            $Change = "Added super-interface <b>".htmlSpecChars($Target)."</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "No effect.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method in <b>".htmlSpecChars($Target)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Interface_Added_Super_Interface_Used_By_Others")
-                        {
-                            $Change = "Added super-interface <b>".htmlSpecChars($Target)."</b>.";
-                            if($Level eq "Binary")
-                            {
-                                $Effect = "If abstract methods from an added super-interface must be implemented by client then it may be interrupted by <b>AbstractMethodError</b> exception.<br/><br/>Abstract method ".black_Name_S(htmlSpecChars($Problems{"Invoked"}))." from the added super-interface is called by the method ".black_Name($Problems{"InvokedBy"}, 2)." in 2nd library version and may not be implemented by old clients.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method in <b>".htmlSpecChars($Target)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Interface_Added_Super_Interface_With_Implemented_Methods")
-                        {
-                            $Change = "Added super-interface <b>".htmlSpecChars($Target)."</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "No effect.";
-                            }
-                            else {
-                                $Effect = "No effect.";
-                            }
-                        }
-                        elsif($Kind eq "Interface_Added_Super_Constant_Interface")
-                        {
-                            $Change = "Added super-interface <b>".htmlSpecChars($Target)."</b> containing constants only.";
-                            if($Level eq "Binary") {
-                                $Effect = "A static field from a super-interface of a client class may hide a field (with the same name) inherited from a super-class and cause <b>IncompatibleClassChangeError</b> exception.";
-                            }
-                            else {
-                                $Effect = "A static field from a super-interface of a client class may hide a field (with the same name) inherited from a super-class. Recompilation of a client class may be terminated with the message: reference to variable is ambiguous.";
-                            }
-                        }
-                        elsif($Kind eq "Interface_Removed_Super_Interface"
-                        or $Kind eq "Class_Removed_Super_Interface")
-                        {
-                            $Change = "Removed super-interface <b>".htmlSpecChars($Target)."</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>NoSuchMethodError</b> exception.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: cannot find method in $Type_Type <b>".htmlSpecChars($TypeName)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Interface_Removed_Super_Constant_Interface")
-                        {
-                            $Change = "Removed super-interface <b>".htmlSpecChars($Target)."</b> containing constants only.";
-                            if($Level eq "Binary") {
-                                $Effect = "No effect.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: cannot find variable in $Type_Type <b>".htmlSpecChars($TypeName)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Added_Super_Class")
-                        {
-                            $Change = "Added super-class <b>".htmlSpecChars($Target)."</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "A static field from a super-interface of a client class may hide a field (with the same name) inherited from new super-class and cause <b>IncompatibleClassChangeError</b> exception.";
-                            }
-                            else {
-                                $Effect = "A static field from a super-interface of a client class may hide a field (with the same name) inherited from new super-class. Recompilation of a client class may be terminated with the message: reference to variable is ambiguous.";
-                            }
-                        }
-                        elsif($Kind eq "Abstract_Class_Added_Super_Abstract_Class")
-                        {
-                            $Change = "Added abstract super-class <b>".htmlSpecChars($Target)."</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "No effect.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method in <b>".htmlSpecChars($Target)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Abstract_Class_Added_Super_Abstract_Class_Invoked_By_Others")
-                        {
-                            $Change = "Added abstract super-class <b>".htmlSpecChars($Target)."</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "If abstract methods from an added super-class must be implemented by client then it may be interrupted by <b>AbstractMethodError</b> exception.<br/><br/>Abstract method ".black_Name_S(htmlSpecChars($Problems{"Invoked"}))." from the added abstract super-class is called by the method ".black_Name($Problems{"InvokedBy"}, 2)." in 2nd library version and may not be implemented by old clients.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: a client class C is not abstract and does not override abstract method in <b>".htmlSpecChars($Target)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Removed_Super_Class")
-                        {
-                            $Change = "Removed super-class <b>".htmlSpecChars($Target)."</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "Access of a client program to the fields or methods of the old super-class may be interrupted by <b>NoSuchFieldError</b> or <b>NoSuchMethodError</b> exceptions.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: cannot find variable (or method) in <b>".htmlSpecChars($TypeName)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Changed_Super_Class")
-                        {
-                            $Change = "Superclass has been changed from <b>".htmlSpecChars($Old_Value)."</b> to <b>".htmlSpecChars($New_Value)."</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "1) Access of a client program to the fields or methods of the old super-class may be interrupted by <b>NoSuchFieldError</b> or <b>NoSuchMethodError</b> exceptions.<br/>2) A static field from a super-interface of a client class may hide a field (with the same name) inherited from new super-class and cause <b>IncompatibleClassChangeError</b> exception.";
-                            }
-                            else {
-                                $Effect = "1) Recompilation of a client program may be terminated with the message: cannot find variable (or method) in <b>".htmlSpecChars($TypeName)."</b>.<br/>2) A static field from a super-interface of a client class may hide a field (with the same name) inherited from new super-class. Recompilation of a client class may be terminated with the message: reference to variable is ambiguous.";
-                            }
-                        }
-                        elsif($Kind eq "Class_Added_Field")
-                        {
-                            $Change = "Field <b>$Target</b> has been added to this class.";
-                            if($Level eq "Binary")
-                            {
-                                $Effect = "No effect.";
-                                # $Effect .= "<br/><b>NOTE</b>: A static field from a super-interface of a client class may hide an added field (with the same name) inherited from the super-class of a client class and cause <b>IncompatibleClassChangeError</b> exception.";
-                            }
-                            else
-                            {
-                                $Effect = "No effect.";
-                                # $Effect .= "<br/><b>NOTE</b>: A static field from a super-interface of a client class may hide an added field (with the same name) inherited from the super-class of a client class. Recompilation of a client class may be terminated with the message: reference to <b>$Target</b> is ambiguous.";
-                            }
-                        }
-                        elsif($Kind eq "Interface_Added_Field")
-                        {
-                            $Change = "Field <b>$Target</b> has been added to this interface.";
-                            if($Level eq "Binary") {
-                                $Effect = "No effect.<br/><b>NOTE</b>: An added static field from a super-interface of a client class may hide a field (with the same name) inherited from the super-class of a client class and cause <b>IncompatibleClassChangeError</b> exception.";
-                            }
-                            else {
-                                $Effect = "No effect.<br/><b>NOTE</b>: An added static field from a super-interface of a client class may hide a field (with the same name) inherited from the super-class of a client class. Recompilation of a client class may be terminated with the message: reference to <b>$Target</b> is ambiguous.";
-                            }
-                        }
-                        elsif($Kind eq "Renamed_Field")
-                        {
-                            $Change = "Field <b>$Target</b> has been renamed to <b>".htmlSpecChars($New_Value)."</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>NoSuchFieldError</b> exception.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: cannot find variable <b>$Target</b> in <b>".htmlSpecChars($TypeName)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Renamed_Constant_Field")
-                        {
-                            if($Level eq "Binary") {
-                                $Change = "Field <b>$Target</b> (".htmlSpecChars($Field_Type).") with the compile-time constant value <b>$Field_Value</b> has been renamed to <b>".htmlSpecChars($New_Value)."</b>.";
-                                $Effect = "A client program may change behavior.";
-                            }
-                            else {
-                                $Change = "Field <b>$Target</b> has been renamed to <b>".htmlSpecChars($New_Value)."</b>.";
-                                $Effect = "Recompilation of a client program may be terminated with the message: cannot find variable <b>$Target</b> in <b>".htmlSpecChars($TypeName)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Removed_NonConstant_Field")
-                        {
-                            $Change = "Field <b>$Target</b> of type ".htmlSpecChars($Field_Type)." has been removed from this $Type_Type.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>NoSuchFieldError</b> exception.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: cannot find variable <b>$Target</b> in <b>".htmlSpecChars($TypeName)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Removed_Constant_Field")
-                        {
-                            $Change = "Field <b>$Target</b> (".htmlSpecChars($Field_Type).") with the compile-time constant value <b>$Field_Value</b> has been removed from this $Type_Type.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may change behavior.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: cannot find variable <b>$Target</b> in <b>".htmlSpecChars($TypeName)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Changed_Field_Type")
-                        {
-                            $Change = "Type of field <b>$Target</b> has been changed from <span class='nowrap'><b>".htmlSpecChars($Old_Value)."</b></span> to <span class='nowrap'><b>".htmlSpecChars($New_Value)."</b></span>.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>NoSuchFieldError</b> exception.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: incompatible types, found: <b>".htmlSpecChars($Old_Value)."</b>, required: <b>".htmlSpecChars($New_Value)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Changed_Field_Access")
-                        {
-                            $Change = "Access level of field <b>$Target</b> has been changed from <span class='nowrap'><b>$Old_Value</b></span> to <span class='nowrap'><b>$New_Value</b></span>.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>IllegalAccessError</b> exception.";
-                            }
-                            else
-                            {
-                                if($New_Value eq "package-private") {
-                                    $Effect = "Recompilation of a client program may be terminated with the message: <b>$Target</b> is not public in <b>".htmlSpecChars($TypeName)."</b>; cannot be accessed from outside package.";
-                                }
-                                else {
-                                    $Effect = "Recompilation of a client program may be terminated with the message: <b>$Target</b> has <b>$New_Value</b> access in <b>".htmlSpecChars($TypeName)."</b>.";
-                                }
-                            }
-                        }
-                        elsif($Kind eq "Changed_Final_Field_Value")
-                        { # Binary Only
-                            $Change = "Value of final field <b>$Target</b> (<b>$Field_Type</b>) has been changed from <span class='nowrap'><b>".htmlSpecChars($Old_Value)."</b></span> to <span class='nowrap'><b>".htmlSpecChars($New_Value)."</b></span>.";
-                            $Effect = "Old value of the field will be inlined to the client code at compile-time and will be used instead of a new one.";
-                        }
-                        elsif($Kind eq "Changed_Final_Version_Field_Value")
-                        { # Binary Only
-                            $Change = "Value of final field <b>$Target</b> (<b>$Field_Type</b>) has been changed from <span class='nowrap'><b>".htmlSpecChars($Old_Value)."</b></span> to <span class='nowrap'><b>".htmlSpecChars($New_Value)."</b></span>.";
-                            $Effect = "Old value of the field will be inlined to the client code at compile-time and will be used instead of a new one.";
-                        }
-                        elsif($Kind eq "Field_Became_Final")
-                        {
-                            $Change = "Field <b>$Target</b> became <b>final</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>IllegalAccessError</b> exception when attempt to assign new values to the field.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: cannot assign a value to final variable $Target.";
-                            }
-                        }
-                        elsif($Kind eq "Field_Became_NonFinal")
-                        { # Binary Only
-                            $Change = "Field <b>$Target</b> became <b>non-final</b>.";
-                            $Effect = "Old value of the field will be inlined to the client code at compile-time and will be used instead of a new one.";
-                        }
-                        elsif($Kind eq "NonConstant_Field_Became_Static")
-                        { # Binary Only
-                            $Change = "Non-final field <b>$Target</b> became <b>static</b>.";
-                            $Effect = "A client program may be interrupted by <b>IncompatibleClassChangeError</b> exception.";
-                        }
-                        elsif($Kind eq "NonConstant_Field_Became_NonStatic")
-                        {
-                            if($Level eq "Binary") {
-                                $Change = "Non-constant field <b>$Target</b> became <b>non-static</b>.";
-                                $Effect = "A client program may be interrupted by <b>IncompatibleClassChangeError</b> exception.";
-                            }
-                            else {
-                                $Change = "Field <b>$Target</b> became <b>non-static</b>.";
-                                $Effect = "Recompilation of a client program may be terminated with the message: non-static variable <b>$Target</b> cannot be referenced from a static context.";
-                            }
-                        }
-                        elsif($Kind eq "Constant_Field_Became_NonStatic")
-                        { # Source Only
-                            $Change = "Field <b>$Target</b> became <b>non-static</b>.";
-                            $Effect = "Recompilation of a client program may be terminated with the message: non-static variable <b>$Target</b> cannot be referenced from a static context.";
-                        }
-                        elsif($Kind eq "Class_Became_Interface")
-                        {
-                            $Change = "This <b>class</b> became <b>interface</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>IncompatibleClassChangeError</b> or <b>InstantiationError</b> exception dependent on the usage of this class.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: <b>".htmlSpecChars($TypeName)."</b> is abstract; cannot be instantiated.";
-                            }
-                        }
-                        elsif($Kind eq "Interface_Became_Class")
-                        {
-                            $Change = "This <b>interface</b> became <b>class</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>IncompatibleClassChangeError</b> exception.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: interface expected.";
-                            }
-                        }
-                        elsif($Kind eq "Class_Became_Final")
-                        {
-                            $Change = "This class became <b>final</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>VerifyError</b> exception.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: cannot inherit from final <b>".htmlSpecChars($TypeName)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Class_Became_Abstract")
-                        {
-                            $Change = "This class became <b>abstract</b>.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>InstantiationError</b> exception.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: <b>".htmlSpecChars($TypeName)."</b> is abstract; cannot be instantiated.";
-                            }
-                        }
-                        elsif($Kind eq "Removed_Class")
-                        {
-                            $Change = "This class has been removed.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>NoClassDefFoundError</b> exception.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: cannot find class <b>".htmlSpecChars($TypeName)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Removed_Interface")
-                        {
-                            $Change = "This interface has been removed.";
-                            if($Level eq "Binary") {
-                                $Effect = "A client program may be interrupted by <b>NoClassDefFoundError</b> exception.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the message: cannot find class <b>".htmlSpecChars($TypeName)."</b>.";
-                            }
-                        }
-                        elsif($Kind eq "Removed_Annotation")
-                        {
-                            $Change = "This annotation type has been removed.";
-                            if($Level eq "Binary") {
-                                $Effect = "No effect.";
-                            }
-                            else {
-                                $Effect = "Recompilation of a client program may be terminated with the error message: cannot find symbol <b>\@".htmlSpecChars($TypeName)."</b>.";
-                            }
-                        }
-                        if($Change)
-                        {
-                            $TYPE_REPORT .= "<tr><th>$ProblemNum</th><td>".$Change."</td><td>".$Effect."</td></tr>\n";
+                            my $Effect = applyMacroses($Level, $Kind, $CompatRules{$Level}{$Kind}{"Effect"}, $ProblemAttr, \%AddAttr);
+                            
+                            $TYPE_REPORT .= "<tr>\n<th>$ProblemNum</th>\n<td>".$Change."</td>\n<td>".$Effect."</td>\n</tr>\n";
                             $ProblemNum += 1;
                             $ProblemsNum += 1;
-                            $Kinds_Locations{$Kind}{$Location} = 1;
                         }
                     }
@@ -4827 +3251 @@
                     }
                     
-                    my $ShowType = $TypeName;
+                    my $ShowType = showType($TypeName, 1, 1);
                     if($NameSpace)
                     {
-                        $TYPE_REPORT = cut_Namespace($TYPE_REPORT, $NameSpace);
-                        $ShowType = cut_Namespace($ShowType, $NameSpace);
-                        $Affected = cut_Namespace($Affected, $NameSpace);
+                        $TYPE_REPORT = cutNs($TYPE_REPORT, $NameSpace);
+                        $ShowType = cutNs($ShowType, $NameSpace);
+                        $Affected = cutNs($Affected, $NameSpace);
                     }
                     
-                    $TYPE_PROBLEMS .= $ContentSpanStart."<span class='ext'>[+]</span> ".htmlSpecChars($ShowType);
-                    if($OldStyle) {
+                    $TYPE_PROBLEMS .= $ContentSpanStart."<span class='ext'>[+]</span> ".$ShowType;
+                    if($In::Opt{"OldStyle"}) {
                         $TYPE_PROBLEMS .= " ($ProblemNum)";
                     }
@@ -4861 +3285 @@
             $Title = "Other Changes in Data Types";
         }
-        if($OldStyle) {
+        if($In::Opt{"OldStyle"}) {
             $TYPE_PROBLEMS = "<h2>$Title ($ProblemsNum)</h2><hr/>\n".$TYPE_PROBLEMS;
         }
@@ -4867 +3291 @@
             $TYPE_PROBLEMS = "<h2>$Title <span".getStyle("T", $TargetSeverity, $ProblemsNum).">&nbsp;$ProblemsNum&nbsp;</span></h2><hr/>\n".$TYPE_PROBLEMS;
         }
-        $TYPE_PROBLEMS = "<a name='".get_Anchor("Type", $Level, $TargetSeverity)."'></a>\n".$TYPE_PROBLEMS;
+        $TYPE_PROBLEMS = "<a name='".getAnchor("Type", $Level, $TargetSeverity)."'></a>\n".$TYPE_PROBLEMS;
         $TYPE_PROBLEMS .= $TOP_REF."<br/>\n";
     }
@@ -4873 +3297 @@
 }
 
-sub cut_Namespace($$)
+sub cutNs($$)
 {
     my ($N, $Ns) = @_;
@@ -4885 +3309 @@
     
     my $LIMIT = 10;
-    if(defined $AffectLimit) {
-        $LIMIT = $AffectLimit;
-    }
-    
-    my @Kinds = sort keys(%{$Kinds_Locations});
-    my %KLocs = ();
-    foreach my $Kind (@Kinds)
-    {
-        my @Locs = sort {$a=~/retval/ cmp $b=~/retval/} sort {length($a)<=>length($b)} sort keys(%{$Kinds_Locations->{$Kind}});
-        $KLocs{$Kind} = \@Locs;
-    }
-    
-    my %SymLocKind = ();
-    foreach my $Method (sort keys(%{$TypeProblemsIndex{$Target_TypeName}}))
-    {
-        if($Method eq ".client_method") {
-            next;
-        }
-        
-        foreach my $Kind (@Kinds)
-        {
-            foreach my $Loc (@{$KLocs{$Kind}})
-            {
-                if(not defined $CompatProblems{$Method}{$Kind}{$Loc}) {
+    if(defined $In::Opt{"AffectLimit"}) {
+        $LIMIT = $In::Opt{"AffectLimit"};
+    }
+    
+    my %SymSel = ();
+    
+    foreach my $Kind (sort keys(%{$Kinds_Locations}))
+    {
+        my @Locs = sort {(index($a, "retval")!=-1) cmp (index($b, "retval")!=-1)} sort {length($a)<=>length($b)} sort keys(%{$Kinds_Locations->{$Kind}});
+        
+        foreach my $Loc (@Locs)
+        {
+            foreach my $Method (keys(%{$TypeProblemsIndex{$Level}{$Target_TypeName}{$Kind}{$Loc}}))
+            {
+                if($Method eq ".client_method") {
                     next;
                 }
                 
-                my $Type_Name = $CompatProblems{$Method}{$Kind}{$Loc}{"Type_Name"};
-                if($Type_Name ne $Target_TypeName) {
-                    next;
-                }
-                
-                $SymLocKind{$Method}{$Loc}{$Kind} = 1;
-                last;
-            }
-        }
-    }
-    
-    %KLocs = (); # clear
-    
-    if(not keys(%SymLocKind)) {
+                if(not defined $SymSel{$Method})
+                {
+                    $SymSel{$Method}{"Kind"} = $Kind;
+                    $SymSel{$Method}{"Loc"} = $Loc;
+                }
+            }
+        }
+    }
+    
+    my $Total = keys(%SymSel);
+    
+    if(not $Total) {
         return "";
     }
     
-    my %SymSel = ();
-    my $Num = 0;
-    foreach my $Method (sort keys(%SymLocKind))
-    {
-        LOOP: foreach my $Loc (sort {$a=~/retval/ cmp $b=~/retval/} sort {length($a)<=>length($b)} sort keys(%{$SymLocKind{$Method}}))
-        {
-            foreach my $Kind (sort keys(%{$SymLocKind{$Method}{$Loc}}))
-            {
-                $SymSel{$Method}{"Loc"} = $Loc;
-                $SymSel{$Method}{"Kind"} = $Kind;
-                last LOOP;
-            }
-        }
-        
-        $Num += 1;
-        
-        if($Num>=$LIMIT) {
-            last;
-        }
-    }
-    
     my $Affected = "";
+    my $SNum = 0;
     
     foreach my $Method (sort {lc($a) cmp lc($b)} keys(%SymSel))
@@ -4961 +3354 @@
         my $Pos = getParamPos($PName, $Method, 1);
         
-        $Affected .= "<span class='iname_a'>".get_Signature($Method, 1, "HTML|Italic|Param|Class|Target=".$Pos)."</span><br/>";
+        $Affected .= "<span class='iname_a'>".getSignature($Method, 1, "HTML|Italic|Param|Class|Target=".$Pos)."</span><br/>";
         $Affected .= "<div class='affect'>".$Desc."</div>\n";
-    }
-    
-    if(keys(%SymLocKind)>$LIMIT) {
+        
+        if(++$SNum>=$LIMIT) {
+            last;
+        }
+    }
+    
+    if($Total>$LIMIT) {
         $Affected .= " <b>...</b>\n<br/>\n"; # and others ...
     }
@@ -4972 +3369 @@
     if($Affected)
     {
-        my $Num = keys(%SymLocKind);
-        my $Per = show_number($Num*100/keys(%CheckedMethods));
+        my $Per = showNum($Total*100/keys(%CheckedMethods));
         $Affected =  $ContentDivStart.$Affected.$ContentDivEnd;
-        $Affected =  $ContentSpanStart_Affected."[+] affected methods: $Num ($Per\%)".$ContentSpanEnd.$Affected;
-    }
-    
-    return ($Affected);
+        $Affected =  $ContentSpanStart_Affected."[+] affected methods: $Total ($Per\%)".$ContentSpanEnd.$Affected;
+    }
+    
+    return $Affected;
 }
 
@@ -4991 +3387 @@
     $Location=~s/\.[^.]+?\Z//;
     
-    my %TypeAttr = get_Type($MethodInfo{1}{$Method}{"Class"}, 1);
-    my $Type_Type = $TypeAttr{"Type"};
+    my $TypeAttr = getType($MethodInfo{1}{$Method}{"Class"}, 1);
+    my $Type_Type = $TypeAttr->{"Type"};
     
     my $ABSTRACT_M = $MethodInfo{1}{$Method}{"Abstract"}?" abstract":"";
-    my $ABSTRACT_C = $TypeAttr{"Abstract"}?" abstract":"";
+    my $ABSTRACT_C = $TypeAttr->{"Abstract"}?" abstract":"";
     my $METHOD_TYPE = $MethodInfo{1}{$Method}{"Constructor"}?"constructor":"method";
     
     if($Kind eq "Class_Overridden_Method" or $Kind eq "Class_Method_Moved_Up_Hierarchy") {
-        return "Method '".highLight_Signature($New_Value, 2)."' will be called instead of this method in a client program.";
-    }
-    elsif($TypeProblems_Kind{$Level}{$Kind})
+        return "Method '".getSignature($New_Value, 2, "Class|HTML|Italic")."' will be called instead of this method in a client program.";
+    }
+    elsif($CompatRules{$Level}{$Kind}{"Kind"} eq "Types")
     {
         my %MInfo = %{$MethodInfo{1}{$Method}};
         
         if($Location eq "this") {
-            return "This$ABSTRACT_M $METHOD_TYPE is from \'".htmlSpecChars($Type_Name)."\'$ABSTRACT_C $Type_Type.";
+            return "This$ABSTRACT_M $METHOD_TYPE is from \'".specChars($Type_Name)."\'$ABSTRACT_C $Type_Type.";
         }
         
@@ -5014 +3410 @@
         { # return value
             if($Location=~/\./) {
-                push(@Sentence_Parts, "Field \'".htmlSpecChars($Location)."\' in return value");
+                push(@Sentence_Parts, "Field \'".specChars($Location)."\' in the return value");
             }
             else {
@@ -5024 +3420 @@
         elsif($Location=~/this/)
         { # "this" reference
-            push(@Sentence_Parts, "Field \'".htmlSpecChars($Location)."\' in the object");
+            push(@Sentence_Parts, "Field \'".specChars($Location)."\' in the object");
             
             $TypeID = $MInfo{"Class"};
@@ -5034 +3430 @@
             
             if($Location=~/\./) {
-                push(@Sentence_Parts, "Field \'".htmlSpecChars($Location)."\' in ".showPos($PPos)." parameter");
+                push(@Sentence_Parts, "Field \'".specChars($Location)."\' in ".showPos($PPos)." parameter");
             }
             else {
@@ -5058 +3454 @@
         
         if($TypeInfo{1}{$TypeID_Problem}{"Name"} eq $Type_Name) {
-            push(@Sentence_Parts, "has type \'".htmlSpecChars($Type_Name)."\'.");
+            push(@Sentence_Parts, "is of type \'".specChars($Type_Name)."\'.");
         }
         else {
-            push(@Sentence_Parts, "has base type \'".htmlSpecChars($Type_Name)."\'.");
+            push(@Sentence_Parts, "has base type \'".specChars($Type_Name)."\'.");
         }
     }
@@ -5069 +3465 @@
 sub getParamPos($$$)
 {
-    my ($Name, $Method, $LibVersion) = @_;
-    
-    if(defined $MethodInfo{$LibVersion}{$Method}
-    and defined $MethodInfo{$LibVersion}{$Method}{"Param"})
-    {
-        my $Info = $MethodInfo{$LibVersion}{$Method};
+    my ($Name, $Method, $LVer) = @_;
+    
+    if(defined $MethodInfo{$LVer}{$Method}
+    and defined $MethodInfo{$LVer}{$Method}{"Param"})
+    {
+        my $Info = $MethodInfo{$LVer}{$Method};
         foreach (keys(%{$Info->{"Param"}}))
         {
@@ -5096 +3492 @@
 sub getFieldType($$$)
 {
-    my ($Location, $TypeId, $LibVersion) = @_;
+    my ($Location, $TypeId, $LVer) = @_;
     
     my @Fields = split(/\./, $Location);
@@ -5102 +3498 @@
     foreach my $Name (@Fields)
     {
-        my %Info = get_BaseType($TypeId, $LibVersion);
-        
-        foreach my $N (keys(%{$Info{"Fields"}}))
+        my $TInfo = getBaseType($TypeId, $LVer);
+        
+        foreach my $N (keys(%{$TInfo->{"Fields"}}))
         {
             if($N eq $Name)
             {
-                $TypeId = $Info{"Fields"}{$N}{"Type"};
+                $TypeId = $TInfo->{"Fields"}{$N}{"Type"};
                 last;
             }
@@ -5124 +3520 @@
 }
 
-sub getRelPath($$)
-{
-    my ($A, $B) = @_;
-    return abs2rel($A, get_dirname($B));
-}
-
 sub createReport()
 {
-    if($JoinReport)
-    { # --stdout
+    if($In::Opt{"JoinReport"}) {
         writeReport("Join", getReport("Join"));
     }
-    elsif($DoubleReport)
+    elsif($In::Opt{"DoubleReport"})
     { # default
         writeReport("Binary", getReport("Binary"));
         writeReport("Source", getReport("Source"));
     }
-    elsif($BinaryOnly)
+    elsif($In::Opt{"BinaryOnly"})
     { # --binary
         writeReport("Binary", getReport("Binary"));
     }
-    elsif($SourceOnly)
+    elsif($In::Opt{"SourceOnly"})
     { # --source
         writeReport("Source", getReport("Source"));
@@ -5151 +3540 @@
 }
 
-sub getCssStyles()
-{
-    my $CssStyles = "
-    body {
-        font-family:Arial, sans-serif;
-        background-color:White;
-        color:Black;
-    }
-    hr {
-        color:Black;
-        background-color:Black;
-        height:1px;
-        border:0;
-    }
-    h1 {
-        margin-bottom:0px;
-        padding-bottom:0px;
-        font-size:1.625em;
-    }
-    h2 {
-        margin-bottom:0px;
-        padding-bottom:0px;
-        font-size:1.25em;
-        white-space:nowrap;
-    }
-    div.symbols {
-        color:#003E69;
-    }
-    div.symbols i {
-        color:Brown;
-    }
-    span.section {
-        font-weight:bold;
-        cursor:pointer;
-        color:#003E69;
-        white-space:nowrap;
-        margin-left:5px;
-    }
-    span:hover.section {
-        color:#336699;
-    }
-    span.sect_aff {
-        cursor:pointer;
-        margin-left:7px;
-        padding-left:15px;
-        font-size:0.875em;
-        color:#cc3300;
-    }
-    span.ext {
-        font-weight:100;
-    }
-    span.jar {
-        color:#cc3300;
-        font-size:0.875em;
-        font-weight:bold;
-    }
-    div.jar_list {
-        padding-left:5px;
-        font-size:0.94em;
-    }
-    span.pkg_t {
-        color:#408080;
-        font-size:0.875em;
-    }
-    span.pkg {
-        color:#408080;
-        font-size:0.875em;
-        font-weight:bold;
-    }
-    span.cname {
-        color:Green;
-        font-size:0.875em;
-        font-weight:bold;
-    }
-    span.iname_b {
-        font-weight:bold;
-        font-size:1.1em;
-    }
-    span.iname_a {
-        color:#333333;
-        font-weight:bold;
-        font-size:0.94em;
-    }
-    span.sym_p {
-        font-weight:normal;
-        white-space:normal;
-    }
-    span.sym_p span {
-        white-space:nowrap;
-    }
-    span.attr {
-        color:Black;
-        font-weight:100;
-    }
-    span.deprecated {
-        color:Red;
-        font-weight:bold;
-        font-family:Monaco, monospace;
-    }
-    div.affect {
-        padding-left:15px;
-        padding-bottom:10px;
-        font-size:0.87em;
-        font-style:italic;
-        line-height:0.75em;
-    }
-    div.affected {
-        padding-left:30px;
-        padding-top:10px;
-    }
-    table.ptable {
-        border-collapse:collapse;
-        border:1px outset black;
-        line-height:1em;
-        margin-left:15px;
-        margin-top:3px;
-        margin-bottom:3px;
-        width:900px;
-    }
-    table.ptable td {
-        border:1px solid Gray;
-        padding: 3px;
-        font-size:0.875em;
-        text-align:left;
-        vertical-align:top;
-    }
-    table.ptable th {
-        background-color:#eeeeee;
-        font-weight:bold;
-        color:#333333;
-        font-family:Verdana, Arial;
-        font-size:0.875em;
-        border:1px solid Gray;
-        text-align:center;
-        vertical-align:top;
-        white-space:nowrap;
-        padding: 3px;
-    }
-    table.summary {
-        border-collapse:collapse;
-        border:1px outset black;
-    }
-    table.summary th {
-        background-color:#eeeeee;
-        font-weight:100;
-        text-align:left;
-        font-size:0.94em;
-        white-space:nowrap;
-        border:1px inset Gray;
-        padding: 3px;
-    }
-    table.summary td {
-        text-align:right;
-        white-space:nowrap;
-        border:1px inset Gray;
-        padding: 3px 5px 3px 10px;
-    }
-    span.mngl {
-        padding-left:15px;
-        font-size:0.875em;
-        cursor:text;
-        color:#444444;
-    }
-    span.color_p {
-        font-style:italic;
-        color:Brown;
-    }
-    span.param {
-        font-style:italic;
-    }
-    span.focus_p {
-        font-style:italic;
-        background-color:#DCDCDC;
-    }
-    span.nowrap {
-        white-space:nowrap;
-    }
-    .passed {
-        background-color:#CCFFCC;
-        font-weight:100;
-    }
-    .warning {
-        background-color:#F4F4AF;
-        font-weight:100;
-    }
-    .failed {
-        background-color:#FFCCCC;
-        font-weight:100;
-    }
-    .new {
-        background-color:#C6DEFF;
-        font-weight:100;
-    }
-    
-    .compatible {
-        background-color:#CCFFCC;
-        font-weight:100;
-    }
-    .almost_compatible {
-        background-color:#FFDAA3;
-        font-weight:100;
-    }
-    .incompatible {
-        background-color:#FFCCCC;
-        font-weight:100;
-    }
-    .gray {
-        background-color:#DCDCDC;
-        font-weight:100;
-    }
-    
-    .top_ref {
-        font-size:0.69em;
-    }
-    .footer {
-        font-size:0.75em;
-    }";
-    
-    if($JoinReport or $ExternCss)
-    {
-        $CssStyles .= "
-    .tabset {
-        float:left;
-    }
-    a.tab {
-        border:1px solid Black;
-        float:left;
-        margin:0px 5px -1px 0px;
-        padding:3px 5px 3px 5px;
-        position:relative;
-        font-size:0.875em;
-        background-color:#DDD;
-        text-decoration:none;
-        color:Black;
-    }
-    a.disabled:hover
-    {
-        color:Black;
-        background:#EEE;
-    }
-    a.active:hover
-    {
-        color:Black;
-        background:White;
-    }
-    a.active {
-        border-bottom-color:White;
-        background-color:White;
-    }
-    div.tab {
-        border-top:1px solid Black;
-        padding:0px;
-        width:100%;
-        clear:both;
-    }";
+sub getCssStyles($)
+{
+    my $Level = $_[0];
+    
+    my $CssStyles = readModule("Css", "Report.css");
+    
+    if($Level eq "Join" or $In::Opt{"ExternCss"}) {
+        $CssStyles .= readModule("Css", "Tabs.css");
     }
     
@@ -5411 +3553 @@
 }
 
-sub getJsScript()
-{
-    my $JScripts = "
-    function sC(header, id)
-    {
-        e = document.getElementById(id);
-        if(e.style.display == 'none')
-        {
-            e.style.display = 'block';
-            e.style.visibility = 'visible';
-            header.innerHTML = header.innerHTML.replace(/\\\[[^0-9 ]\\\]/gi,\"[&minus;]\");
-        }
-        else
-        {
-            e.style.display = 'none';
-            e.style.visibility = 'hidden';
-            header.innerHTML = header.innerHTML.replace(/\\\[[^0-9 ]\\\]/gi,\"[+]\");
-        }
-    }";
-    
-    if($JoinReport or $ExternJs)
-    {
-        $JScripts .= "
-    function initTabs()
-    {
-        var url = window.location.href;
-        if(url.indexOf('_Source_')!=-1 || url.indexOf('#Source')!=-1)
-        {
-            var tab1 = document.getElementById('BinaryID');
-            var tab2 = document.getElementById('SourceID');
-            tab1.className='tab disabled';
-            tab2.className='tab active';
-        }
-        var sets = document.getElementsByTagName('div');
-        for (var i = 0; i < sets.length; i++)
-        {
-            if (sets[i].className.indexOf('tabset') != -1)
-            {
-                var tabs = [];
-                var links = sets[i].getElementsByTagName('a');
-                for (var j = 0; j < links.length; j++)
-                {
-                    if (links[j].className.indexOf('tab') != -1)
-                    {
-                        tabs.push(links[j]);
-                        links[j].tabs = tabs;
-                        var tab = document.getElementById(links[j].href.substr(links[j].href.indexOf('#') + 1));
-                        //reset all tabs on start
-                        if (tab)
-                        {
-                            if (links[j].className.indexOf('active')!=-1) {
-                                tab.style.display = 'block';
-                            }
-                            else {
-                                tab.style.display = 'none';
-                            }
-                        }
-                        links[j].onclick = function()
-                        {
-                            var tab = document.getElementById(this.href.substr(this.href.indexOf('#') + 1));
-                            if (tab)
-                            {
-                                //reset all tabs before change
-                                for (var k = 0; k < this.tabs.length; k++)
-                                {
-                                    document.getElementById(this.tabs[k].href.substr(this.tabs[k].href.indexOf('#') + 1)).style.display = 'none';
-                                    this.tabs[k].className = this.tabs[k].className.replace('active', 'disabled');
-                                }
-                                this.className = 'tab active';
-                                tab.style.display = 'block';
-                                // window.location.hash = this.id.replace('ID', '');
-                                return false;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        if(url.indexOf('#')!=-1) {
-            location.href=location.href;
-        }
-    }
-    if (window.addEventListener) window.addEventListener('load', initTabs, false);
-    else if (window.attachEvent) window.attachEvent('onload', initTabs);";
+sub getJsScript($)
+{
+    my $Level = $_[0];
+    
+    my $JScripts = readModule("Js", "Sections.js");
+    
+    if($Level eq "Join" or $In::Opt{"ExternJs"}) {
+        $JScripts .= readModule("Js", "Tabs.js");
     }
     
@@ -5504 +3570 @@
     my $Level = $_[0];
     
-    my $CssStyles = getCssStyles();
-    my $JScripts = getJsScript();
-    
-    if(defined $ExternCss)
-    {
-        $CssStyles=~s/\n    /\n/g;
-        writeFile($ExternCss, $CssStyles);
-    }
-    
-    if(defined $ExternJs)
-    {
-        $JScripts=~s/\n    /\n/g;
-        writeFile($ExternJs, $JScripts);
+    my $CssStyles = getCssStyles($Level);
+    my $JScripts = getJsScript($Level);
+    
+    if(defined $In::Opt{"ExternCss"}) {
+        writeFile($In::Opt{"ExternCss"}, $CssStyles);
+    }
+    
+    if(defined $In::Opt{"ExternJs"}) {
+        writeFile($In::Opt{"ExternJs"}, $JScripts);
     }
     
     if($Level eq "Join")
     {
-        my $Title = "$TargetTitle: ".$Descriptor{1}{"Version"}." to ".$Descriptor{2}{"Version"}." compatibility report";
-        my $Keywords = "$TargetTitle, compatibility";
-        my $Description = "Compatibility report for the $TargetTitle library between ".$Descriptor{1}{"Version"}." and ".$Descriptor{2}{"Version"}." versions";
-        my ($BSummary, $BMetaData) = get_Summary("Binary");
-        my ($SSummary, $SMetaData) = get_Summary("Source");
+        my $Title = $In::Opt{"TargetTitle"}.": ".$In::Desc{1}{"Version"}." to ".$In::Desc{2}{"Version"}." compatibility report";
+        my $Keywords = $In::Opt{"TargetTitle"}.", compatibility";
+        my $Description = "Compatibility report for the ".$In::Opt{"TargetTitle"}." library between ".$In::Desc{1}{"Version"}." and ".$In::Desc{2}{"Version"}." versions";
+        
+        my ($BSummary, $BMetaData) = getSummary("Binary");
+        my ($SSummary, $SMetaData) = getSummary("Source");
+        
         my $Report = "<!-\- $BMetaData -\->\n<!-\- $SMetaData -\->\n".composeHTML_Head($Level, $Title, $Keywords, $Description, $CssStyles, $JScripts)."<body><a name='Source'></a><a name='Binary'></a><a name='Top'></a>";
-        $Report .= get_Report_Header("Join")."
-        <br/><div class='tabset'>
-        <a id='BinaryID' href='#BinaryTab' class='tab active'>Binary<br/>Compatibility</a>
-        <a id='SourceID' href='#SourceTab' style='margin-left:3px' class='tab disabled'>Source<br/>Compatibility</a>
-        </div>";
-        $Report .= "<div id='BinaryTab' class='tab'>\n$BSummary\n".get_Report_Added("Binary").get_Report_Removed("Binary").get_Report_Problems("High", "Binary").get_Report_Problems("Medium", "Binary").get_Report_Problems("Low", "Binary").get_Report_Problems("Safe", "Binary").get_SourceInfo()."<br/><br/><br/></div>";
-        $Report .= "<div id='SourceTab' class='tab'>\n$SSummary\n".get_Report_Added("Source").get_Report_Removed("Source").get_Report_Problems("High", "Source").get_Report_Problems("Medium", "Source").get_Report_Problems("Low", "Source").get_Report_Problems("Safe", "Source").get_SourceInfo()."<br/><br/><br/></div>";
+        
+        $Report .= getReportHeader("Join");
+        $Report .= "<br/><div class='tabset'>\n";
+        $Report .= "<a id='BinaryID' href='#BinaryTab' class='tab active'>Binary<br/>Compatibility</a>\n";
+        $Report .= "<a id='SourceID' href='#SourceTab' style='margin-left:3px' class='tab disabled'>Source<br/>Compatibility</a>\n";
+        $Report .= "</div>\n";
+        
+        $Report .= "<div id='BinaryTab' class='tab'>\n$BSummary\n".getReportAdded("Binary").getReportRemoved("Binary").getReportProblems("High", "Binary").getReportProblems("Medium", "Binary").getReportProblems("Low", "Binary").getReportProblems("Safe", "Binary").getSourceInfo()."<br/><br/><br/></div>";
+        
+        $Report .= "<div id='SourceTab' class='tab'>\n$SSummary\n".getReportAdded("Source").getReportRemoved("Source").getReportProblems("High", "Source").getReportProblems("Medium", "Source").getReportProblems("Low", "Source").getReportProblems("Safe", "Source").getSourceInfo()."<br/><br/><br/></div>";
+        
         $Report .= getReportFooter();
         $Report .= "\n</body></html>";
@@ -5540 +3608 @@
     else
     {
-        my ($Summary, $MetaData) = get_Summary($Level);
-        my $Title = "$TargetTitle: ".$Descriptor{1}{"Version"}." to ".$Descriptor{2}{"Version"}." ".lc($Level)." compatibility report";
-        my $Keywords = "$TargetTitle, ".lc($Level).", compatibility";
-        my $Description = "$Level compatibility report for the $TargetTitle library between ".$Descriptor{1}{"Version"}." and ".$Descriptor{2}{"Version"}." versions";
+        my ($Summary, $MetaData) = getSummary($Level);
+        
+        my $Title = $In::Opt{"TargetTitle"}.": ".$In::Desc{1}{"Version"}." to ".$In::Desc{2}{"Version"}." ".lc($Level)." compatibility report";
+        my $Keywords = $In::Opt{"TargetTitle"}.", ".lc($Level).", compatibility";
+        my $Description = "$Level compatibility report for the ".$In::Opt{"TargetTitle"}." library between ".$In::Desc{1}{"Version"}." and ".$In::Desc{2}{"Version"}." versions";
         
         my $Report = "<!-\- $MetaData -\->\n".composeHTML_Head($Level, $Title, $Keywords, $Description, $CssStyles, $JScripts)."<body><a name='Top'></a>";
-        $Report .= get_Report_Header($Level)."\n".$Summary."\n";
-        $Report .= get_Report_Added($Level).get_Report_Removed($Level);
-        $Report .= get_Report_Problems("High", $Level).get_Report_Problems("Medium", $Level).get_Report_Problems("Low", $Level).get_Report_Problems("Safe", $Level);
-        $Report .= get_SourceInfo()."<br/><br/><br/>\n";
+        $Report .= getReportHeader($Level)."\n".$Summary."\n";
+        $Report .= getReportAdded($Level).getReportRemoved($Level);
+        $Report .= getReportProblems("High", $Level).getReportProblems("Medium", $Level).getReportProblems("Low", $Level).getReportProblems("Safe", $Level);
+        $Report .= getSourceInfo()."<br/><br/><br/>\n";
         $Report .= getReportFooter();
         $Report .= "\n</body></html>";
@@ -5567 +3636 @@
 }
 
-sub get_Report_Problems($$)
+sub getReportProblems($$)
 {
     my ($Priority, $Level) = @_;
-    my $Report = get_Report_TypeProblems($Priority, $Level);
-    if(my $MProblems = get_Report_MethodProblems($Priority, $Level)) {
+    my $Report = getReportTypeProblems($Priority, $Level);
+    if(my $MProblems = getReportMethodProblems($Priority, $Level)) {
         $Report .= $MProblems;
     }
     if($Report)
     {
-        if($JoinReport)
+        if($In::Opt{"JoinReport"})
         {
             if($Priority eq "Safe") {
@@ -5611 +3680 @@
     my $RPath = getReportPath($Level);
     
-    if(defined $ExternCss) {
-        $Head .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"".getRelPath($ExternCss, $RPath)."\" />\n";
-    }
-    
-    if(defined $ExternJs) {
-        $Head .= "<script type=\"text/javascript\" src=\"".getRelPath($ExternJs, $RPath)."\"></script>\n";
+    if(defined $In::Opt{"ExternCss"}) {
+        $Head .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"".getRelPath($In::Opt{"ExternCss"}, $RPath)."\" />\n";
+    }
+    
+    if(defined $In::Opt{"ExternJs"}) {
+        $Head .= "<script type=\"text/javascript\" src=\"".getRelPath($In::Opt{"ExternJs"}, $RPath)."\"></script>\n";
     }
     
     $Head .= "<title>$Title</title>\n";
     
-    if(not defined $ExternCss) {
+    if(not defined $In::Opt{"ExternCss"}) {
         $Head .= "<style type=\"text/css\">\n$Styles\n</style>\n";
     }
     
-    if(not defined $ExternJs) {
+    if(not defined $In::Opt{"ExternJs"}) {
         $Head .= "<script type=\"text/javascript\" language=\"JavaScript\">\n<!--\n$Scripts\n-->\n</script>\n";
     }