commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r911328 [12/12] - in /websites/production/commons/content/proper/commons-weaver: ./ apidocs/org/apache/commons/weaver/normalizer/ apidocs/src-html/org/apache/commons/weaver/normalizer/ commons-weaver-antlib-parent/ commons-weaver-antlib-par...
Date Wed, 04 Jun 2014 17:56:45 GMT
Modified: websites/production/commons/content/proper/commons-weaver/xref/org/apache/commons/weaver/normalizer/Normalizer.html
==============================================================================
--- websites/production/commons/content/proper/commons-weaver/xref/org/apache/commons/weaver/normalizer/Normalizer.html (original)
+++ websites/production/commons/content/proper/commons-weaver/xref/org/apache/commons/weaver/normalizer/Normalizer.html Wed Jun  4 17:56:40 2014
@@ -37,623 +37,617 @@
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> java.util.LinkedHashMap;
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> java.util.LinkedHashSet;
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> java.util.Map;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> java.util.Map.Entry;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> java.util.Set;
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">import</strong> javax.activation.DataSource;
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.io.IOUtils;
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.ArrayUtils;
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.CharEncoding;
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.Conversion;
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.Validate;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.mutable.MutableBoolean;
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.tuple.ImmutablePair;
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.tuple.MutablePair;
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.tuple.Pair;
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.weaver.model.ScanRequest;
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.weaver.model.ScanResult;
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.weaver.model.Scanner;
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.weaver.model.WeavableClass;
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.weaver.model.WeaveEnvironment;
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.weaver.spi.Weaver;
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.AnnotationVisitor;
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.ClassReader;
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.ClassVisitor;
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.ClassWriter;
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.MethodVisitor;
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.Opcodes;
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.Type;
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.commons.GeneratorAdapter;
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.commons.Method;
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.commons.Remapper;
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.commons.RemappingClassAdapter;
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.commons.SimpleRemapper;
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  <em class="jxr_javadoccomment"> * Handles the work of "normalizing" anonymous class definitions.</em>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Normalizer</a> {
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String INIT = <span class="jxr_string">"&lt;init&gt;"</span>;
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Type OBJECT_TYPE = Type.getType(Object.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Inspector</a> <strong class="jxr_keyword">extends</strong> ClassVisitor {
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>          <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">InspectConstructor</a> <strong class="jxr_keyword">extends</strong> MethodVisitor {
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>              <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">InspectConstructor</a>() {
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>                  <strong class="jxr_keyword">super</strong>(Opcodes.ASM5);
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>              }
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>              @Override
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>              <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitMethodInsn(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> opcode, <strong class="jxr_keyword">final</strong> String owner, <strong class="jxr_keyword">final</strong> String name,
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>                  <strong class="jxr_keyword">final</strong> String desc, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> itf) {
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>                  <strong class="jxr_keyword">if</strong> (INIT.equals(name) &amp;&amp; owner.equals(superName)) {
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>                      key.setRight(desc);
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>                  } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>                      valid.setValue(false);
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>                  }
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>              }
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>              @Override
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>              <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitFieldInsn(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> opcode, <strong class="jxr_keyword">final</strong> String owner, <strong class="jxr_keyword">final</strong> String name,
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>                  <strong class="jxr_keyword">final</strong> String desc) {
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>                  <strong class="jxr_keyword">if</strong> (<span class="jxr_string">"this$0"</span>.equals(name) &amp;&amp; opcode == Opcodes.PUTFIELD) {
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>                      mustRewriteConstructor.setValue(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>                      <strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>                  }
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>                  valid.setValue(false);
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>              }
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>          }
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  
-<a class="jxr_linenumber" name="L100" href="#L100">100</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> MutableBoolean mustRewriteConstructor = <strong class="jxr_keyword">new</strong> MutableBoolean();
-<a class="jxr_linenumber" name="L101" href="#L101">101</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> MutablePair&lt;String, String&gt; key = <strong class="jxr_keyword">new</strong> MutablePair&lt;String, String&gt;();
-<a class="jxr_linenumber" name="L102" href="#L102">102</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> MutableBoolean ignore = <strong class="jxr_keyword">new</strong> MutableBoolean();
-<a class="jxr_linenumber" name="L103" href="#L103">103</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> MutableBoolean valid = <strong class="jxr_keyword">new</strong> MutableBoolean();
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> 
-<a class="jxr_linenumber" name="L105" href="#L105">105</a>         <strong class="jxr_keyword">private</strong> String superName;
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> 
-<a class="jxr_linenumber" name="L107" href="#L107">107</a>         <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Inspector</a>() {
-<a class="jxr_linenumber" name="L108" href="#L108">108</a>             <strong class="jxr_keyword">super</strong>(Opcodes.ASM5);
-<a class="jxr_linenumber" name="L109" href="#L109">109</a>         }
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> 
-<a class="jxr_linenumber" name="L111" href="#L111">111</a>         @Override
-<a class="jxr_linenumber" name="L112" href="#L112">112</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visit(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> version, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String signature,
-<a class="jxr_linenumber" name="L113" href="#L113">113</a>             <strong class="jxr_keyword">final</strong> String superName, <strong class="jxr_keyword">final</strong> String[] interfaces) {
-<a class="jxr_linenumber" name="L114" href="#L114">114</a>             <strong class="jxr_keyword">super</strong>.visit(version, access, name, signature, superName, interfaces);
-<a class="jxr_linenumber" name="L115" href="#L115">115</a>             <strong class="jxr_keyword">this</strong>.superName = superName;
-<a class="jxr_linenumber" name="L116" href="#L116">116</a>             <strong class="jxr_keyword">final</strong> String left;
-<a class="jxr_linenumber" name="L117" href="#L117">117</a>             <strong class="jxr_keyword">if</strong> (signature != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L118" href="#L118">118</a>                 left = signature;
-<a class="jxr_linenumber" name="L119" href="#L119">119</a>             } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (ArrayUtils.getLength(interfaces) == 1) {
-<a class="jxr_linenumber" name="L120" href="#L120">120</a>                 left = interfaces[0];
-<a class="jxr_linenumber" name="L121" href="#L121">121</a>             } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L122" href="#L122">122</a>                 left = superName;
-<a class="jxr_linenumber" name="L123" href="#L123">123</a>             }
-<a class="jxr_linenumber" name="L124" href="#L124">124</a>             key.setLeft(left);
-<a class="jxr_linenumber" name="L125" href="#L125">125</a>         }
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 
-<a class="jxr_linenumber" name="L127" href="#L127">127</a>         @Override
-<a class="jxr_linenumber" name="L128" href="#L128">128</a>         <strong class="jxr_keyword">public</strong> AnnotationVisitor visitAnnotation(<strong class="jxr_keyword">final</strong> String desc, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> visible) {
-<a class="jxr_linenumber" name="L129" href="#L129">129</a>             <strong class="jxr_keyword">if</strong> (Type.getType(Marker.<strong class="jxr_keyword">class</strong>).getDescriptor().equals(desc)) {
-<a class="jxr_linenumber" name="L130" href="#L130">130</a>                 ignore.setValue(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L131" href="#L131">131</a>             }
-<a class="jxr_linenumber" name="L132" href="#L132">132</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>         }
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> 
-<a class="jxr_linenumber" name="L135" href="#L135">135</a>         @Override
-<a class="jxr_linenumber" name="L136" href="#L136">136</a>         <strong class="jxr_keyword">public</strong> MethodVisitor visitMethod(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String desc,
-<a class="jxr_linenumber" name="L137" href="#L137">137</a>             <strong class="jxr_keyword">final</strong> String signature, <strong class="jxr_keyword">final</strong> String[] exceptions) {
-<a class="jxr_linenumber" name="L138" href="#L138">138</a>             <strong class="jxr_keyword">if</strong> (INIT.equals(name)) {
-<a class="jxr_linenumber" name="L139" href="#L139">139</a>                 <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">InspectConstructor</a>();
-<a class="jxr_linenumber" name="L140" href="#L140">140</a>             }
-<a class="jxr_linenumber" name="L141" href="#L141">141</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> java.util.Set;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> javax.activation.DataSource;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.io.IOUtils;
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.ArrayUtils;
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.CharEncoding;
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.Conversion;
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.Validate;
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.mutable.MutableBoolean;
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.tuple.ImmutablePair;
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.tuple.MutablePair;
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.tuple.Pair;
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.weaver.model.ScanRequest;
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.weaver.model.ScanResult;
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.weaver.model.Scanner;
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.weaver.model.WeavableClass;
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.weaver.model.WeaveEnvironment;
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.weaver.spi.Weaver;
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.AnnotationVisitor;
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.ClassReader;
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.ClassVisitor;
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.ClassWriter;
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.MethodVisitor;
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.Opcodes;
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.Type;
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.commons.GeneratorAdapter;
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.commons.Method;
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.commons.Remapper;
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.commons.RemappingClassAdapter;
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  <strong class="jxr_keyword">import</strong> org.objectweb.asm.commons.SimpleRemapper;
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  <em class="jxr_javadoccomment"> * Handles the work of "normalizing" anonymous class definitions.</em>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Normalizer</a> {
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String INIT = <span class="jxr_string">"&lt;init&gt;"</span>;
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Type OBJECT_TYPE = Type.getType(Object.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Inspector</a> <strong class="jxr_keyword">extends</strong> ClassVisitor {
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>          <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">InspectConstructor</a> <strong class="jxr_keyword">extends</strong> MethodVisitor {
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>              <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">InspectConstructor</a>() {
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>                  <strong class="jxr_keyword">super</strong>(Opcodes.ASM5);
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>              }
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>              @Override
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>              <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitMethodInsn(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> opcode, <strong class="jxr_keyword">final</strong> String owner, <strong class="jxr_keyword">final</strong> String name,
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>                  <strong class="jxr_keyword">final</strong> String desc, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> itf) {
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>                  <strong class="jxr_keyword">if</strong> (INIT.equals(name) &amp;&amp; owner.equals(superName)) {
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>                      key.setRight(desc);
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>                  } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>                      valid.setValue(false);
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>                  }
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>              }
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>              @Override
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>              <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitFieldInsn(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> opcode, <strong class="jxr_keyword">final</strong> String owner, <strong class="jxr_keyword">final</strong> String name,
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>                  <strong class="jxr_keyword">final</strong> String desc) {
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>                  <strong class="jxr_keyword">if</strong> (<span class="jxr_string">"this$0"</span>.equals(name) &amp;&amp; opcode == Opcodes.PUTFIELD) {
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>                      mustRewriteConstructor.setValue(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>                      <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>                  }
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>                  valid.setValue(false);
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>              }
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>          }
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>          <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> MutablePair&lt;String, String&gt; key = <strong class="jxr_keyword">new</strong> MutablePair&lt;String, String&gt;();
+<a class="jxr_linenumber" name="L100" href="#L100">100</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> MutableBoolean ignore = <strong class="jxr_keyword">new</strong> MutableBoolean(false);
+<a class="jxr_linenumber" name="L101" href="#L101">101</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> MutableBoolean valid = <strong class="jxr_keyword">new</strong> MutableBoolean(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L102" href="#L102">102</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> MutableBoolean mustRewriteConstructor = <strong class="jxr_keyword">new</strong> MutableBoolean(false);
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> 
+<a class="jxr_linenumber" name="L104" href="#L104">104</a>         <strong class="jxr_keyword">private</strong> String superName;
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> 
+<a class="jxr_linenumber" name="L106" href="#L106">106</a>         <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Inspector</a>() {
+<a class="jxr_linenumber" name="L107" href="#L107">107</a>             <strong class="jxr_keyword">super</strong>(Opcodes.ASM5);
+<a class="jxr_linenumber" name="L108" href="#L108">108</a>         }
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> 
+<a class="jxr_linenumber" name="L110" href="#L110">110</a>         @Override
+<a class="jxr_linenumber" name="L111" href="#L111">111</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visit(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> version, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String signature,
+<a class="jxr_linenumber" name="L112" href="#L112">112</a>             <strong class="jxr_keyword">final</strong> String superName, <strong class="jxr_keyword">final</strong> String[] interfaces) {
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>             <strong class="jxr_keyword">super</strong>.visit(version, access, name, signature, superName, interfaces);
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>             <strong class="jxr_keyword">this</strong>.superName = superName;
+<a class="jxr_linenumber" name="L115" href="#L115">115</a>             <strong class="jxr_keyword">final</strong> String left;
+<a class="jxr_linenumber" name="L116" href="#L116">116</a>             <strong class="jxr_keyword">if</strong> (signature != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L117" href="#L117">117</a>                 left = signature;
+<a class="jxr_linenumber" name="L118" href="#L118">118</a>             } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (ArrayUtils.getLength(interfaces) == 1) {
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>                 left = interfaces[0];
+<a class="jxr_linenumber" name="L120" href="#L120">120</a>             } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L121" href="#L121">121</a>                 left = superName;
+<a class="jxr_linenumber" name="L122" href="#L122">122</a>             }
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>             key.setLeft(left);
+<a class="jxr_linenumber" name="L124" href="#L124">124</a>         }
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 
+<a class="jxr_linenumber" name="L126" href="#L126">126</a>         @Override
+<a class="jxr_linenumber" name="L127" href="#L127">127</a>         <strong class="jxr_keyword">public</strong> AnnotationVisitor visitAnnotation(<strong class="jxr_keyword">final</strong> String desc, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> visible) {
+<a class="jxr_linenumber" name="L128" href="#L128">128</a>             <strong class="jxr_keyword">if</strong> (Type.getType(Marker.<strong class="jxr_keyword">class</strong>).getDescriptor().equals(desc)) {
+<a class="jxr_linenumber" name="L129" href="#L129">129</a>                 ignore.setValue(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>             }
+<a class="jxr_linenumber" name="L131" href="#L131">131</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L132" href="#L132">132</a>         }
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 
+<a class="jxr_linenumber" name="L134" href="#L134">134</a>         @Override
+<a class="jxr_linenumber" name="L135" href="#L135">135</a>         <strong class="jxr_keyword">public</strong> MethodVisitor visitMethod(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String desc,
+<a class="jxr_linenumber" name="L136" href="#L136">136</a>             <strong class="jxr_keyword">final</strong> String signature, <strong class="jxr_keyword">final</strong> String[] exceptions) {
+<a class="jxr_linenumber" name="L137" href="#L137">137</a>             <strong class="jxr_keyword">return</strong> INIT.equals(name) ? <strong class="jxr_keyword">new</strong> InspectConstructor() : <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L138" href="#L138">138</a>         }
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> 
+<a class="jxr_linenumber" name="L140" href="#L140">140</a>         Pair&lt;String, String&gt; key() {
+<a class="jxr_linenumber" name="L141" href="#L141">141</a>             <strong class="jxr_keyword">return</strong> ImmutablePair.of(key.getLeft(), key.getRight());
 <a class="jxr_linenumber" name="L142" href="#L142">142</a>         }
 <a class="jxr_linenumber" name="L143" href="#L143">143</a> 
-<a class="jxr_linenumber" name="L144" href="#L144">144</a>         <strong class="jxr_keyword">boolean</strong> mustRewriteConstructor() {
-<a class="jxr_linenumber" name="L145" href="#L145">145</a>             <strong class="jxr_keyword">return</strong> mustRewriteConstructor.booleanValue();
+<a class="jxr_linenumber" name="L144" href="#L144">144</a>         <strong class="jxr_keyword">boolean</strong> ignore() {
+<a class="jxr_linenumber" name="L145" href="#L145">145</a>             <strong class="jxr_keyword">return</strong> ignore.booleanValue();
 <a class="jxr_linenumber" name="L146" href="#L146">146</a>         }
 <a class="jxr_linenumber" name="L147" href="#L147">147</a> 
-<a class="jxr_linenumber" name="L148" href="#L148">148</a>         Pair&lt;String, String&gt; key() {
-<a class="jxr_linenumber" name="L149" href="#L149">149</a>             <strong class="jxr_keyword">return</strong> ImmutablePair.of(key.getLeft(), key.getRight());
+<a class="jxr_linenumber" name="L148" href="#L148">148</a>         <strong class="jxr_keyword">boolean</strong> valid() {
+<a class="jxr_linenumber" name="L149" href="#L149">149</a>             <strong class="jxr_keyword">return</strong> valid.booleanValue();
 <a class="jxr_linenumber" name="L150" href="#L150">150</a>         }
 <a class="jxr_linenumber" name="L151" href="#L151">151</a> 
-<a class="jxr_linenumber" name="L152" href="#L152">152</a>         <strong class="jxr_keyword">boolean</strong> ignore() {
-<a class="jxr_linenumber" name="L153" href="#L153">153</a>             <strong class="jxr_keyword">return</strong> ignore.booleanValue();
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>         <strong class="jxr_keyword">boolean</strong> mustRewriteConstructor() {
+<a class="jxr_linenumber" name="L153" href="#L153">153</a>             <strong class="jxr_keyword">return</strong> mustRewriteConstructor.booleanValue();
 <a class="jxr_linenumber" name="L154" href="#L154">154</a>         }
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> 
-<a class="jxr_linenumber" name="L156" href="#L156">156</a>         <strong class="jxr_keyword">boolean</strong> valid() {
-<a class="jxr_linenumber" name="L157" href="#L157">157</a>             <strong class="jxr_keyword">return</strong> valid.booleanValue();
-<a class="jxr_linenumber" name="L158" href="#L158">158</a>         }
-<a class="jxr_linenumber" name="L159" href="#L159">159</a>     }
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> 
-<a class="jxr_linenumber" name="L161" href="#L161">161</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Remap</a> <strong class="jxr_keyword">extends</strong> RemappingClassAdapter {
-<a class="jxr_linenumber" name="L162" href="#L162">162</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">RewriteConstructor</a> <strong class="jxr_keyword">extends</strong> MethodVisitor {
-<a class="jxr_linenumber" name="L163" href="#L163">163</a>             <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">RewriteConstructor</a>(<strong class="jxr_keyword">final</strong> MethodVisitor mv) {
-<a class="jxr_linenumber" name="L164" href="#L164">164</a>                 <strong class="jxr_keyword">super</strong>(Opcodes.ASM5, mv);
-<a class="jxr_linenumber" name="L165" href="#L165">165</a>             }
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> 
-<a class="jxr_linenumber" name="L167" href="#L167">167</a>             @Override
-<a class="jxr_linenumber" name="L168" href="#L168">168</a>             <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitMethodInsn(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> opcode, <strong class="jxr_keyword">final</strong> String owner, <strong class="jxr_keyword">final</strong> String name,
-<a class="jxr_linenumber" name="L169" href="#L169">169</a>                 <strong class="jxr_keyword">final</strong> String desc, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> itf) {
-<a class="jxr_linenumber" name="L170" href="#L170">170</a>                 String useDescriptor = desc;
-<a class="jxr_linenumber" name="L171" href="#L171">171</a>                 <strong class="jxr_keyword">if</strong> (INIT.equals(name)) {
-<a class="jxr_linenumber" name="L172" href="#L172">172</a>                     <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">ClassWrapper</a> wrapper = entry.getValue().get(owner);
-<a class="jxr_linenumber" name="L173" href="#L173">173</a>                     <strong class="jxr_keyword">if</strong> (wrapper != <strong class="jxr_keyword">null</strong> &amp;&amp; wrapper.mustRewriteConstructor) {
-<a class="jxr_linenumber" name="L174" href="#L174">174</a>                         <em class="jxr_comment">// simply replace first argument type with OBJECT_TYPE:</em>
-<a class="jxr_linenumber" name="L175" href="#L175">175</a>                         <strong class="jxr_keyword">final</strong> Type[] args = Type.getArgumentTypes(desc);
-<a class="jxr_linenumber" name="L176" href="#L176">176</a>                         args[0] = OBJECT_TYPE;
-<a class="jxr_linenumber" name="L177" href="#L177">177</a>                         useDescriptor = <strong class="jxr_keyword">new</strong> Method(INIT, Type.VOID_TYPE, args).getDescriptor();
-<a class="jxr_linenumber" name="L178" href="#L178">178</a>                     }
-<a class="jxr_linenumber" name="L179" href="#L179">179</a>                 }
-<a class="jxr_linenumber" name="L180" href="#L180">180</a>                 <strong class="jxr_keyword">super</strong>.visitMethodInsn(opcode, owner, name, useDescriptor, itf);
-<a class="jxr_linenumber" name="L181" href="#L181">181</a>             }
-<a class="jxr_linenumber" name="L182" href="#L182">182</a>         }
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> 
-<a class="jxr_linenumber" name="L184" href="#L184">184</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;String, String&gt; classMap;
-<a class="jxr_linenumber" name="L185" href="#L185">185</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Entry&lt;String, Map&lt;String, ClassWrapper&gt;&gt; entry;
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> 
-<a class="jxr_linenumber" name="L187" href="#L187">187</a>         <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Remap</a>(<strong class="jxr_keyword">final</strong> ClassVisitor cv, <strong class="jxr_keyword">final</strong> Remapper remapper, <strong class="jxr_keyword">final</strong> Map&lt;String, String&gt; classMap,
-<a class="jxr_linenumber" name="L188" href="#L188">188</a>             <strong class="jxr_keyword">final</strong> Map.Entry&lt;String, Map&lt;String, ClassWrapper&gt;&gt; entry) {
-<a class="jxr_linenumber" name="L189" href="#L189">189</a>             <strong class="jxr_keyword">super</strong>(cv, remapper);
-<a class="jxr_linenumber" name="L190" href="#L190">190</a>             <strong class="jxr_keyword">this</strong>.classMap = classMap;
-<a class="jxr_linenumber" name="L191" href="#L191">191</a>             <strong class="jxr_keyword">this</strong>.entry = entry;
-<a class="jxr_linenumber" name="L192" href="#L192">192</a>         }
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> 
-<a class="jxr_linenumber" name="L194" href="#L194">194</a>         @Override
-<a class="jxr_linenumber" name="L195" href="#L195">195</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitInnerClass(<strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String outerName, <strong class="jxr_keyword">final</strong> String innerName,
-<a class="jxr_linenumber" name="L196" href="#L196">196</a>             <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access) {
-<a class="jxr_linenumber" name="L197" href="#L197">197</a>             <strong class="jxr_keyword">if</strong> (!classMap.containsKey(name)) {
-<a class="jxr_linenumber" name="L198" href="#L198">198</a>                 <strong class="jxr_keyword">super</strong>.visitInnerClass(name, outerName, innerName, access);
-<a class="jxr_linenumber" name="L199" href="#L199">199</a>             }
-<a class="jxr_linenumber" name="L200" href="#L200">200</a>         }
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> 
-<a class="jxr_linenumber" name="L202" href="#L202">202</a>         @Override
-<a class="jxr_linenumber" name="L203" href="#L203">203</a>         <strong class="jxr_keyword">public</strong> MethodVisitor visitMethod(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String desc,
-<a class="jxr_linenumber" name="L204" href="#L204">204</a>             <strong class="jxr_keyword">final</strong> String signature, <strong class="jxr_keyword">final</strong> String[] exceptions) {
-<a class="jxr_linenumber" name="L205" href="#L205">205</a>             <strong class="jxr_keyword">final</strong> MethodVisitor mv = <strong class="jxr_keyword">super</strong>.visitMethod(access, name, desc, signature, exceptions);
-<a class="jxr_linenumber" name="L206" href="#L206">206</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">RewriteConstructor</a>(mv);
-<a class="jxr_linenumber" name="L207" href="#L207">207</a>         }
-<a class="jxr_linenumber" name="L208" href="#L208">208</a>     }
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> 
-<a class="jxr_linenumber" name="L210" href="#L210">210</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> <em class="jxr_javadoccomment">     * Marker annotation.</em>
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L213" href="#L213">213</a>     @Target(ElementType.TYPE)
-<a class="jxr_linenumber" name="L214" href="#L214">214</a>     <strong class="jxr_keyword">private</strong> @<strong class="jxr_keyword">interface</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Marker</a> {
-<a class="jxr_linenumber" name="L215" href="#L215">215</a>     }
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> 
-<a class="jxr_linenumber" name="L217" href="#L217">217</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">ClassWrapper</a> {
-<a class="jxr_linenumber" name="L218" href="#L218">218</a>         <strong class="jxr_keyword">final</strong> Class&lt;?&gt; wrapped;
-<a class="jxr_linenumber" name="L219" href="#L219">219</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> mustRewriteConstructor;
+<a class="jxr_linenumber" name="L155" href="#L155">155</a>     }
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> 
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Remap</a> <strong class="jxr_keyword">extends</strong> RemappingClassAdapter {
+<a class="jxr_linenumber" name="L158" href="#L158">158</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">RewriteConstructor</a> <strong class="jxr_keyword">extends</strong> MethodVisitor {
+<a class="jxr_linenumber" name="L159" href="#L159">159</a>             <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">RewriteConstructor</a>(<strong class="jxr_keyword">final</strong> MethodVisitor wrapped) {
+<a class="jxr_linenumber" name="L160" href="#L160">160</a>                 <strong class="jxr_keyword">super</strong>(Opcodes.ASM5, wrapped);
+<a class="jxr_linenumber" name="L161" href="#L161">161</a>             }
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 
+<a class="jxr_linenumber" name="L163" href="#L163">163</a>             @Override
+<a class="jxr_linenumber" name="L164" href="#L164">164</a>             <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitMethodInsn(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> opcode, <strong class="jxr_keyword">final</strong> String owner, <strong class="jxr_keyword">final</strong> String name,
+<a class="jxr_linenumber" name="L165" href="#L165">165</a>                 <strong class="jxr_keyword">final</strong> String desc, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> itf) {
+<a class="jxr_linenumber" name="L166" href="#L166">166</a>                 String useDescriptor = desc;
+<a class="jxr_linenumber" name="L167" href="#L167">167</a>                 <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">ClassWrapper</a> wrapper = wrappers.get(owner);
+<a class="jxr_linenumber" name="L168" href="#L168">168</a>                 <strong class="jxr_keyword">if</strong> (wrapper != <strong class="jxr_keyword">null</strong> &amp;&amp; wrapper.mustRewriteConstructor) {
+<a class="jxr_linenumber" name="L169" href="#L169">169</a>                     <em class="jxr_comment">// simply replace first argument type with OBJECT_TYPE:</em>
+<a class="jxr_linenumber" name="L170" href="#L170">170</a>                     <strong class="jxr_keyword">final</strong> Type[] args = Type.getArgumentTypes(desc);
+<a class="jxr_linenumber" name="L171" href="#L171">171</a>                     args[0] = OBJECT_TYPE;
+<a class="jxr_linenumber" name="L172" href="#L172">172</a>                     useDescriptor = <strong class="jxr_keyword">new</strong> Method(INIT, Type.VOID_TYPE, args).getDescriptor();
+<a class="jxr_linenumber" name="L173" href="#L173">173</a>                 }
+<a class="jxr_linenumber" name="L174" href="#L174">174</a>                 <strong class="jxr_keyword">super</strong>.visitMethodInsn(opcode, owner, name, useDescriptor, itf);
+<a class="jxr_linenumber" name="L175" href="#L175">175</a>             }
+<a class="jxr_linenumber" name="L176" href="#L176">176</a>         }
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> 
+<a class="jxr_linenumber" name="L178" href="#L178">178</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;String, String&gt; classMap;
+<a class="jxr_linenumber" name="L179" href="#L179">179</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;String, ClassWrapper&gt; wrappers;
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> 
+<a class="jxr_linenumber" name="L181" href="#L181">181</a>         <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Remap</a>(<strong class="jxr_keyword">final</strong> ClassVisitor wrapped, <strong class="jxr_keyword">final</strong> Remapper remapper, <strong class="jxr_keyword">final</strong> Map&lt;String, String&gt; classMap,
+<a class="jxr_linenumber" name="L182" href="#L182">182</a>             <strong class="jxr_keyword">final</strong> Map&lt;String, ClassWrapper&gt; wrappers) {
+<a class="jxr_linenumber" name="L183" href="#L183">183</a>             <strong class="jxr_keyword">super</strong>(wrapped, remapper);
+<a class="jxr_linenumber" name="L184" href="#L184">184</a>             <strong class="jxr_keyword">this</strong>.classMap = classMap;
+<a class="jxr_linenumber" name="L185" href="#L185">185</a>             <strong class="jxr_keyword">this</strong>.wrappers = wrappers;
+<a class="jxr_linenumber" name="L186" href="#L186">186</a>         }
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 
+<a class="jxr_linenumber" name="L188" href="#L188">188</a>         @Override
+<a class="jxr_linenumber" name="L189" href="#L189">189</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitInnerClass(<strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String outerName, <strong class="jxr_keyword">final</strong> String innerName,
+<a class="jxr_linenumber" name="L190" href="#L190">190</a>             <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access) {
+<a class="jxr_linenumber" name="L191" href="#L191">191</a>             <strong class="jxr_keyword">if</strong> (!classMap.containsKey(name)) {
+<a class="jxr_linenumber" name="L192" href="#L192">192</a>                 <strong class="jxr_keyword">super</strong>.visitInnerClass(name, outerName, innerName, access);
+<a class="jxr_linenumber" name="L193" href="#L193">193</a>             }
+<a class="jxr_linenumber" name="L194" href="#L194">194</a>         }
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> 
+<a class="jxr_linenumber" name="L196" href="#L196">196</a>         @Override
+<a class="jxr_linenumber" name="L197" href="#L197">197</a>         <strong class="jxr_keyword">public</strong> MethodVisitor visitMethod(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String desc,
+<a class="jxr_linenumber" name="L198" href="#L198">198</a>             <strong class="jxr_keyword">final</strong> String signature, <strong class="jxr_keyword">final</strong> String[] exceptions) {
+<a class="jxr_linenumber" name="L199" href="#L199">199</a>             <strong class="jxr_keyword">final</strong> MethodVisitor toWrap = <strong class="jxr_keyword">super</strong>.visitMethod(access, name, desc, signature, exceptions);
+<a class="jxr_linenumber" name="L200" href="#L200">200</a>             <strong class="jxr_keyword">return</strong> INIT.equals(name) ? <strong class="jxr_keyword">new</strong> RewriteConstructor(toWrap) : toWrap;
+<a class="jxr_linenumber" name="L201" href="#L201">201</a>         }
+<a class="jxr_linenumber" name="L202" href="#L202">202</a>     }
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> 
+<a class="jxr_linenumber" name="L204" href="#L204">204</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> <em class="jxr_javadoccomment">     * Marker annotation.</em>
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L207" href="#L207">207</a>     @Target(ElementType.TYPE)
+<a class="jxr_linenumber" name="L208" href="#L208">208</a>     <strong class="jxr_keyword">private</strong> @<strong class="jxr_keyword">interface</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Marker</a> {
+<a class="jxr_linenumber" name="L209" href="#L209">209</a>     }
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> 
+<a class="jxr_linenumber" name="L211" href="#L211">211</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">ClassWrapper</a> {
+<a class="jxr_linenumber" name="L212" href="#L212">212</a>         <strong class="jxr_keyword">final</strong> Class&lt;?&gt; wrapped;
+<a class="jxr_linenumber" name="L213" href="#L213">213</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> mustRewriteConstructor;
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> 
+<a class="jxr_linenumber" name="L215" href="#L215">215</a>         <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">ClassWrapper</a>(<strong class="jxr_keyword">final</strong> Class&lt;?&gt; wrapped, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> mustRewriteConstructor) {
+<a class="jxr_linenumber" name="L216" href="#L216">216</a>             <strong class="jxr_keyword">this</strong>.wrapped = wrapped;
+<a class="jxr_linenumber" name="L217" href="#L217">217</a>             <strong class="jxr_keyword">this</strong>.mustRewriteConstructor = mustRewriteConstructor;
+<a class="jxr_linenumber" name="L218" href="#L218">218</a>         }
+<a class="jxr_linenumber" name="L219" href="#L219">219</a>     }
 <a class="jxr_linenumber" name="L220" href="#L220">220</a> 
-<a class="jxr_linenumber" name="L221" href="#L221">221</a>         <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">ClassWrapper</a>(<strong class="jxr_keyword">final</strong> Class&lt;?&gt; wrapped, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> mustRewriteConstructor) {
-<a class="jxr_linenumber" name="L222" href="#L222">222</a>             <strong class="jxr_keyword">this</strong>.wrapped = wrapped;
-<a class="jxr_linenumber" name="L223" href="#L223">223</a>             <strong class="jxr_keyword">this</strong>.mustRewriteConstructor = mustRewriteConstructor;
-<a class="jxr_linenumber" name="L224" href="#L224">224</a>         }
-<a class="jxr_linenumber" name="L225" href="#L225">225</a>     }
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 
-<a class="jxr_linenumber" name="L227" href="#L227">227</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> <em class="jxr_javadoccomment">     * Necessary to resolve supertypes against WeaveEnvironment ClassLoader.</em>
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L230" href="#L230">230</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a> <strong class="jxr_keyword">extends</strong> ClassWriter {
-<a class="jxr_linenumber" name="L231" href="#L231">231</a>         <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a>(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> flags) {
-<a class="jxr_linenumber" name="L232" href="#L232">232</a>             <strong class="jxr_keyword">super</strong>(flags);
-<a class="jxr_linenumber" name="L233" href="#L233">233</a>         }
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> 
-<a class="jxr_linenumber" name="L235" href="#L235">235</a>         <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a>(<strong class="jxr_keyword">final</strong> ClassReader classReader, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> flags) {
-<a class="jxr_linenumber" name="L236" href="#L236">236</a>             <strong class="jxr_keyword">super</strong>(classReader, flags);
-<a class="jxr_linenumber" name="L237" href="#L237">237</a>         }
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> 
-<a class="jxr_linenumber" name="L239" href="#L239">239</a>         @Override
-<a class="jxr_linenumber" name="L240" href="#L240">240</a>         <strong class="jxr_keyword">protected</strong> String getCommonSuperClass(<strong class="jxr_keyword">final</strong> String type1, <strong class="jxr_keyword">final</strong> String type2) {
-<a class="jxr_linenumber" name="L241" href="#L241">241</a>             Class&lt;?&gt; <strong class="jxr_keyword">class</strong>1;
-<a class="jxr_linenumber" name="L242" href="#L242">242</a>             Class&lt;?&gt; <strong class="jxr_keyword">class</strong>2;
-<a class="jxr_linenumber" name="L243" href="#L243">243</a>             <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L244" href="#L244">244</a>                 <strong class="jxr_keyword">class</strong>1 = Class.forName(type1.replace('/', '.'), false, env.classLoader);
-<a class="jxr_linenumber" name="L245" href="#L245">245</a>                 <strong class="jxr_keyword">class</strong>2 = Class.forName(type2.replace('/', '.'), false, env.classLoader);
-<a class="jxr_linenumber" name="L246" href="#L246">246</a>             } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="L247" href="#L247">247</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e.toString());
+<a class="jxr_linenumber" name="L221" href="#L221">221</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> <em class="jxr_javadoccomment">     * Necessary to resolve supertypes against WeaveEnvironment ClassLoader.</em>
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L224" href="#L224">224</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a> <strong class="jxr_keyword">extends</strong> ClassWriter {
+<a class="jxr_linenumber" name="L225" href="#L225">225</a>         <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a>(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> flags) {
+<a class="jxr_linenumber" name="L226" href="#L226">226</a>             <strong class="jxr_keyword">super</strong>(flags);
+<a class="jxr_linenumber" name="L227" href="#L227">227</a>         }
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> 
+<a class="jxr_linenumber" name="L229" href="#L229">229</a>         <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a>(<strong class="jxr_keyword">final</strong> ClassReader classReader, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> flags) {
+<a class="jxr_linenumber" name="L230" href="#L230">230</a>             <strong class="jxr_keyword">super</strong>(classReader, flags);
+<a class="jxr_linenumber" name="L231" href="#L231">231</a>         }
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> 
+<a class="jxr_linenumber" name="L233" href="#L233">233</a>         @Override
+<a class="jxr_linenumber" name="L234" href="#L234">234</a>         <strong class="jxr_keyword">protected</strong> String getCommonSuperClass(<strong class="jxr_keyword">final</strong> String type1, <strong class="jxr_keyword">final</strong> String type2) {
+<a class="jxr_linenumber" name="L235" href="#L235">235</a>             Class&lt;?&gt; <strong class="jxr_keyword">class</strong>1;
+<a class="jxr_linenumber" name="L236" href="#L236">236</a>             Class&lt;?&gt; <strong class="jxr_keyword">class</strong>2;
+<a class="jxr_linenumber" name="L237" href="#L237">237</a>             <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L238" href="#L238">238</a>                 <strong class="jxr_keyword">class</strong>1 = Class.forName(type1.replace('/', '.'), false, env.classLoader);
+<a class="jxr_linenumber" name="L239" href="#L239">239</a>                 <strong class="jxr_keyword">class</strong>2 = Class.forName(type2.replace('/', '.'), false, env.classLoader);
+<a class="jxr_linenumber" name="L240" href="#L240">240</a>             } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="L241" href="#L241">241</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e.toString());
+<a class="jxr_linenumber" name="L242" href="#L242">242</a>             }
+<a class="jxr_linenumber" name="L243" href="#L243">243</a>             <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">class</strong>1.isAssignableFrom(<strong class="jxr_keyword">class</strong>2)) {
+<a class="jxr_linenumber" name="L244" href="#L244">244</a>                 <strong class="jxr_keyword">return</strong> type1;
+<a class="jxr_linenumber" name="L245" href="#L245">245</a>             }
+<a class="jxr_linenumber" name="L246" href="#L246">246</a>             <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">class</strong>2.isAssignableFrom(<strong class="jxr_keyword">class</strong>1)) {
+<a class="jxr_linenumber" name="L247" href="#L247">247</a>                 <strong class="jxr_keyword">return</strong> type2;
 <a class="jxr_linenumber" name="L248" href="#L248">248</a>             }
-<a class="jxr_linenumber" name="L249" href="#L249">249</a>             <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">class</strong>1.isAssignableFrom(<strong class="jxr_keyword">class</strong>2)) {
-<a class="jxr_linenumber" name="L250" href="#L250">250</a>                 <strong class="jxr_keyword">return</strong> type1;
+<a class="jxr_linenumber" name="L249" href="#L249">249</a>             <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">class</strong>1.isInterface() || <strong class="jxr_keyword">class</strong>2.isInterface()) {
+<a class="jxr_linenumber" name="L250" href="#L250">250</a>                 <strong class="jxr_keyword">return</strong> <span class="jxr_string">"java/lang/Object"</span>;
 <a class="jxr_linenumber" name="L251" href="#L251">251</a>             }
-<a class="jxr_linenumber" name="L252" href="#L252">252</a>             <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">class</strong>2.isAssignableFrom(<strong class="jxr_keyword">class</strong>1)) {
-<a class="jxr_linenumber" name="L253" href="#L253">253</a>                 <strong class="jxr_keyword">return</strong> type2;
-<a class="jxr_linenumber" name="L254" href="#L254">254</a>             }
-<a class="jxr_linenumber" name="L255" href="#L255">255</a>             <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">class</strong>1.isInterface() || <strong class="jxr_keyword">class</strong>2.isInterface()) {
-<a class="jxr_linenumber" name="L256" href="#L256">256</a>                 <strong class="jxr_keyword">return</strong> <span class="jxr_string">"java/lang/Object"</span>;
-<a class="jxr_linenumber" name="L257" href="#L257">257</a>             }
-<a class="jxr_linenumber" name="L258" href="#L258">258</a>             <strong class="jxr_keyword">do</strong> {
-<a class="jxr_linenumber" name="L259" href="#L259">259</a>                 <strong class="jxr_keyword">class</strong>1 = <strong class="jxr_keyword">class</strong>1.getSuperclass();
-<a class="jxr_linenumber" name="L260" href="#L260">260</a>             } <strong class="jxr_keyword">while</strong> (!<strong class="jxr_keyword">class</strong>1.isAssignableFrom(<strong class="jxr_keyword">class</strong>2));
-<a class="jxr_linenumber" name="L261" href="#L261">261</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">class</strong>1.getName().replace('.', '/');
-<a class="jxr_linenumber" name="L262" href="#L262">262</a>         }
-<a class="jxr_linenumber" name="L263" href="#L263">263</a>     }
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> 
-<a class="jxr_linenumber" name="L265" href="#L265">265</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a> <strong class="jxr_keyword">extends</strong> ClassVisitor {
-<a class="jxr_linenumber" name="L266" href="#L266">266</a>         <strong class="jxr_keyword">private</strong> String className;
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> 
-<a class="jxr_linenumber" name="L268" href="#L268">268</a>         <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a>() {
-<a class="jxr_linenumber" name="L269" href="#L269">269</a>             <strong class="jxr_keyword">super</strong>(Opcodes.ASM5, <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a>(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
-<a class="jxr_linenumber" name="L270" href="#L270">270</a>         }
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> 
-<a class="jxr_linenumber" name="L272" href="#L272">272</a>         <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a>(<strong class="jxr_keyword">final</strong> ClassReader reader) {
-<a class="jxr_linenumber" name="L273" href="#L273">273</a>             <strong class="jxr_keyword">super</strong>(Opcodes.ASM5, <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a>(reader, 0));
-<a class="jxr_linenumber" name="L274" href="#L274">274</a>         }
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 
-<a class="jxr_linenumber" name="L276" href="#L276">276</a>         @Override
-<a class="jxr_linenumber" name="L277" href="#L277">277</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visit(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> version, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String signature,
-<a class="jxr_linenumber" name="L278" href="#L278">278</a>             <strong class="jxr_keyword">final</strong> String superName, <strong class="jxr_keyword">final</strong> String[] intrfces) {
-<a class="jxr_linenumber" name="L279" href="#L279">279</a>             <strong class="jxr_keyword">super</strong>.visit(version, access, name, signature, superName, intrfces);
-<a class="jxr_linenumber" name="L280" href="#L280">280</a>             className = name;
-<a class="jxr_linenumber" name="L281" href="#L281">281</a>         }
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> 
-<a class="jxr_linenumber" name="L283" href="#L283">283</a>         @Override
-<a class="jxr_linenumber" name="L284" href="#L284">284</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitEnd() {
-<a class="jxr_linenumber" name="L285" href="#L285">285</a>             <strong class="jxr_keyword">super</strong>.visitEnd();
-<a class="jxr_linenumber" name="L286" href="#L286">286</a>             <strong class="jxr_keyword">final</strong> byte[] bytecode = ((ClassWriter) cv).toByteArray();
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> 
-<a class="jxr_linenumber" name="L288" href="#L288">288</a>             <strong class="jxr_keyword">final</strong> DataSource classfile = env.getClassfile(className);
-<a class="jxr_linenumber" name="L289" href="#L289">289</a>             env.debug(<span class="jxr_string">"Writing class %s to %s"</span>, className, classfile.getName());
-<a class="jxr_linenumber" name="L290" href="#L290">290</a>             OutputStream outputStream = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L291" href="#L291">291</a>             <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L292" href="#L292">292</a>                 outputStream = classfile.getOutputStream();
-<a class="jxr_linenumber" name="L293" href="#L293">293</a>                 IOUtils.write(bytecode, outputStream);
-<a class="jxr_linenumber" name="L294" href="#L294">294</a>             } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> IOException e) {
-<a class="jxr_linenumber" name="L295" href="#L295">295</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e);
-<a class="jxr_linenumber" name="L296" href="#L296">296</a>             } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="L297" href="#L297">297</a>                 IOUtils.closeQuietly(outputStream);
-<a class="jxr_linenumber" name="L298" href="#L298">298</a>             }
-<a class="jxr_linenumber" name="L299" href="#L299">299</a>         }
-<a class="jxr_linenumber" name="L300" href="#L300">300</a>     }
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> 
-<a class="jxr_linenumber" name="L302" href="#L302">302</a>     <strong class="jxr_keyword">private</strong> enum <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">IneligibilityReason</a> {
-<a class="jxr_linenumber" name="L303" href="#L303">303</a>         NOT_ANONYMOUS, TOO_MANY_CONSTRUCTORS, IMPLEMENTS_METHODS, TOO_BUSY_CONSTRUCTOR;
-<a class="jxr_linenumber" name="L304" href="#L304">304</a>     }
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 
-<a class="jxr_linenumber" name="L306" href="#L306">306</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> <em class="jxr_javadoccomment">     * Configuration prefix for this {@link Weaver}.</em>
+<a class="jxr_linenumber" name="L252" href="#L252">252</a>             <strong class="jxr_keyword">do</strong> {
+<a class="jxr_linenumber" name="L253" href="#L253">253</a>                 <strong class="jxr_keyword">class</strong>1 = <strong class="jxr_keyword">class</strong>1.getSuperclass();
+<a class="jxr_linenumber" name="L254" href="#L254">254</a>             } <strong class="jxr_keyword">while</strong> (!<strong class="jxr_keyword">class</strong>1.isAssignableFrom(<strong class="jxr_keyword">class</strong>2));
+<a class="jxr_linenumber" name="L255" href="#L255">255</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">class</strong>1.getName().replace('.', '/');
+<a class="jxr_linenumber" name="L256" href="#L256">256</a>         }
+<a class="jxr_linenumber" name="L257" href="#L257">257</a>     }
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> 
+<a class="jxr_linenumber" name="L259" href="#L259">259</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a> <strong class="jxr_keyword">extends</strong> ClassVisitor {
+<a class="jxr_linenumber" name="L260" href="#L260">260</a>         <strong class="jxr_keyword">private</strong> String className;
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> 
+<a class="jxr_linenumber" name="L262" href="#L262">262</a>         <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a>() {
+<a class="jxr_linenumber" name="L263" href="#L263">263</a>             <strong class="jxr_keyword">super</strong>(Opcodes.ASM5, <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a>(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
+<a class="jxr_linenumber" name="L264" href="#L264">264</a>         }
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> 
+<a class="jxr_linenumber" name="L266" href="#L266">266</a>         <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a>(<strong class="jxr_keyword">final</strong> ClassReader reader) {
+<a class="jxr_linenumber" name="L267" href="#L267">267</a>             <strong class="jxr_keyword">super</strong>(Opcodes.ASM5, <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a>(reader, 0));
+<a class="jxr_linenumber" name="L268" href="#L268">268</a>         }
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> 
+<a class="jxr_linenumber" name="L270" href="#L270">270</a>         @Override
+<a class="jxr_linenumber" name="L271" href="#L271">271</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visit(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> version, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String signature,
+<a class="jxr_linenumber" name="L272" href="#L272">272</a>             <strong class="jxr_keyword">final</strong> String superName, <strong class="jxr_keyword">final</strong> String[] intrfces) {
+<a class="jxr_linenumber" name="L273" href="#L273">273</a>             <strong class="jxr_keyword">super</strong>.visit(version, access, name, signature, superName, intrfces);
+<a class="jxr_linenumber" name="L274" href="#L274">274</a>             className = name;
+<a class="jxr_linenumber" name="L275" href="#L275">275</a>         }
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> 
+<a class="jxr_linenumber" name="L277" href="#L277">277</a>         @Override
+<a class="jxr_linenumber" name="L278" href="#L278">278</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitEnd() {
+<a class="jxr_linenumber" name="L279" href="#L279">279</a>             <strong class="jxr_keyword">super</strong>.visitEnd();
+<a class="jxr_linenumber" name="L280" href="#L280">280</a>             <strong class="jxr_keyword">final</strong> byte[] bytecode = ((ClassWriter) cv).toByteArray();
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> 
+<a class="jxr_linenumber" name="L282" href="#L282">282</a>             <strong class="jxr_keyword">final</strong> DataSource classfile = env.getClassfile(className);
+<a class="jxr_linenumber" name="L283" href="#L283">283</a>             env.debug(<span class="jxr_string">"Writing class %s to %s"</span>, className, classfile.getName());
+<a class="jxr_linenumber" name="L284" href="#L284">284</a>             OutputStream outputStream = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L285" href="#L285">285</a>             <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L286" href="#L286">286</a>                 outputStream = classfile.getOutputStream();
+<a class="jxr_linenumber" name="L287" href="#L287">287</a>                 IOUtils.write(bytecode, outputStream);
+<a class="jxr_linenumber" name="L288" href="#L288">288</a>             } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> IOException e) {
+<a class="jxr_linenumber" name="L289" href="#L289">289</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e);
+<a class="jxr_linenumber" name="L290" href="#L290">290</a>             } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="L291" href="#L291">291</a>                 IOUtils.closeQuietly(outputStream);
+<a class="jxr_linenumber" name="L292" href="#L292">292</a>             }
+<a class="jxr_linenumber" name="L293" href="#L293">293</a>         }
+<a class="jxr_linenumber" name="L294" href="#L294">294</a>     }
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> 
+<a class="jxr_linenumber" name="L296" href="#L296">296</a>     <strong class="jxr_keyword">private</strong> enum <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">IneligibilityReason</a> {
+<a class="jxr_linenumber" name="L297" href="#L297">297</a>         NOT_ANONYMOUS, TOO_MANY_CONSTRUCTORS, IMPLEMENTS_METHODS, TOO_BUSY_CONSTRUCTOR;
+<a class="jxr_linenumber" name="L298" href="#L298">298</a>     }
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> 
+<a class="jxr_linenumber" name="L300" href="#L300">300</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> <em class="jxr_javadoccomment">     * Configuration prefix for this {@link Weaver}.</em>
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L303" href="#L303">303</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CONFIG_WEAVER = <span class="jxr_string">"normalizer."</span>;
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 
+<a class="jxr_linenumber" name="L305" href="#L305">305</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> <em class="jxr_javadoccomment">     * Property name referencing a comma-delimited list of types whose subclasses/implementations should be normalized,</em>
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> <em class="jxr_javadoccomment">     * e.g. {@code javax.enterprise.util.TypeLiteral}.</em>
 <a class="jxr_linenumber" name="L308" href="#L308">308</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L309" href="#L309">309</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CONFIG_WEAVER = <span class="jxr_string">"normalizer."</span>;
+<a class="jxr_linenumber" name="L309" href="#L309">309</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CONFIG_SUPER_TYPES = CONFIG_WEAVER + <span class="jxr_string">"superTypes"</span>;
 <a class="jxr_linenumber" name="L310" href="#L310">310</a> 
 <a class="jxr_linenumber" name="L311" href="#L311">311</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> <em class="jxr_javadoccomment">     * Property name referencing a comma-delimited list of types whose subclasses/implementations should be normalized,</em>
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> <em class="jxr_javadoccomment">     * e.g. {@code javax.enterprise.util.TypeLiteral}.</em>
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L315" href="#L315">315</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CONFIG_SUPER_TYPES = CONFIG_WEAVER + <span class="jxr_string">"superTypes"</span>;
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> 
-<a class="jxr_linenumber" name="L317" href="#L317">317</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> <em class="jxr_javadoccomment">     * Property name referencing a package name to which merged types should be added.</em>
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L320" href="#L320">320</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CONFIG_TARGET_PACKAGE = CONFIG_WEAVER + <span class="jxr_string">"targetPackage"</span>;
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> 
-<a class="jxr_linenumber" name="L322" href="#L322">322</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Charset UTF8 = Charset.forName(CharEncoding.UTF_8);
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> 
-<a class="jxr_linenumber" name="L324" href="#L324">324</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/model/WeaveEnvironment.html">WeaveEnvironment</a> env;
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> 
-<a class="jxr_linenumber" name="L326" href="#L326">326</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Set&lt;Class&lt;?&gt;&gt; normalizeTypes;
-<a class="jxr_linenumber" name="L327" href="#L327">327</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String targetPackage;
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> 
-<a class="jxr_linenumber" name="L329" href="#L329">329</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> <em class="jxr_javadoccomment">     * Create a new {@link Normalizer} instance.</em>
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> <em class="jxr_javadoccomment">     * @param env {@link WeaveEnvironment}</em>
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L333" href="#L333">333</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Normalizer</a>(<strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/model/WeaveEnvironment.html">WeaveEnvironment</a> env) {
-<a class="jxr_linenumber" name="L334" href="#L334">334</a>         <strong class="jxr_keyword">this</strong>.env = env;
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> 
-<a class="jxr_linenumber" name="L336" href="#L336">336</a>         <strong class="jxr_keyword">this</strong>.targetPackage =
-<a class="jxr_linenumber" name="L337" href="#L337">337</a>             Utils.validatePackageName(Validate.notBlank(env.config.getProperty(CONFIG_TARGET_PACKAGE),
-<a class="jxr_linenumber" name="L338" href="#L338">338</a>                 <span class="jxr_string">"missing target package name"</span>));
-<a class="jxr_linenumber" name="L339" href="#L339">339</a>         <strong class="jxr_keyword">this</strong>.normalizeTypes =
-<a class="jxr_linenumber" name="L340" href="#L340">340</a>             Utils.parseTypes(
-<a class="jxr_linenumber" name="L341" href="#L341">341</a>                 Validate.notEmpty(env.config.getProperty(CONFIG_SUPER_TYPES), <span class="jxr_string">"no types specified for normalization"</span>),
-<a class="jxr_linenumber" name="L342" href="#L342">342</a>                 env.classLoader);
-<a class="jxr_linenumber" name="L343" href="#L343">343</a>     }
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> 
-<a class="jxr_linenumber" name="L345" href="#L345">345</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> <em class="jxr_javadoccomment">     * Normalize the classes found using the specified {@link Scanner}.</em>
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> <em class="jxr_javadoccomment">     * @param scanner to scan with</em>
-<a class="jxr_linenumber" name="L348" href="#L348">348</a> <em class="jxr_javadoccomment">     * @return whether any work was done</em>
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L350" href="#L350">350</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> normalize(<strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/model/Scanner.html">Scanner</a> scanner) {
-<a class="jxr_linenumber" name="L351" href="#L351">351</a>         <strong class="jxr_keyword">boolean</strong> result = false;
-<a class="jxr_linenumber" name="L352" href="#L352">352</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Class&lt;?&gt; supertype : normalizeTypes) {
-<a class="jxr_linenumber" name="L353" href="#L353">353</a>             <strong class="jxr_keyword">final</strong> Set&lt;Class&lt;?&gt;&gt; subtypes = getBroadlyEligibleSubclasses(supertype, scanner);
-<a class="jxr_linenumber" name="L354" href="#L354">354</a>             <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L355" href="#L355">355</a>                 <strong class="jxr_keyword">final</strong> Map&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; segregatedSubtypes = segregate(subtypes);
-<a class="jxr_linenumber" name="L356" href="#L356">356</a>                 <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Map.Entry&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; entry : segregatedSubtypes.entrySet()) {
-<a class="jxr_linenumber" name="L357" href="#L357">357</a>                     <strong class="jxr_keyword">final</strong> Set&lt;ClassWrapper&gt; likeTypes = entry.getValue();
-<a class="jxr_linenumber" name="L358" href="#L358">358</a>                     <strong class="jxr_keyword">if</strong> (likeTypes.size() &gt; 1) {
-<a class="jxr_linenumber" name="L359" href="#L359">359</a>                         result = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L360" href="#L360">360</a>                         rewrite(entry.getKey(), likeTypes);
-<a class="jxr_linenumber" name="L361" href="#L361">361</a>                     }
-<a class="jxr_linenumber" name="L362" href="#L362">362</a>                 }
-<a class="jxr_linenumber" name="L363" href="#L363">363</a>             } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> RuntimeException e) {
-<a class="jxr_linenumber" name="L364" href="#L364">364</a>                 <strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L365" href="#L365">365</a>             } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> Exception e) {
-<a class="jxr_linenumber" name="L366" href="#L366">366</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e);
-<a class="jxr_linenumber" name="L367" href="#L367">367</a>             }
-<a class="jxr_linenumber" name="L368" href="#L368">368</a>         }
-<a class="jxr_linenumber" name="L369" href="#L369">369</a>         <strong class="jxr_keyword">return</strong> result;
-<a class="jxr_linenumber" name="L370" href="#L370">370</a>     }
-<a class="jxr_linenumber" name="L371" href="#L371">371</a> 
-<a class="jxr_linenumber" name="L372" href="#L372">372</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> <em class="jxr_javadoccomment">     * Map a set of classes by their enclosing class.</em>
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> <em class="jxr_javadoccomment">     * @param sort values</em>
-<a class="jxr_linenumber" name="L375" href="#L375">375</a> <em class="jxr_javadoccomment">     * @return {@link Map} of enclosing classname to {@link Map} of internal name to {@link ClassWrapper}</em>
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L377" href="#L377">377</a>     <strong class="jxr_keyword">private</strong> Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; byEnclosingClass(<strong class="jxr_keyword">final</strong> Set&lt;ClassWrapper&gt; sort) {
-<a class="jxr_linenumber" name="L378" href="#L378">378</a>         <strong class="jxr_keyword">final</strong> Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; result = <strong class="jxr_keyword">new</strong> HashMap&lt;String, Map&lt;String, ClassWrapper&gt;&gt;();

[... 599 lines stripped ...]


Mime
View raw message