You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by lu...@apache.org on 2012/09/28 18:37:19 UTC

svn commit: r1391529 - in /commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward: analysis/ arithmetic/ instructions/ trimming/

Author: luc
Date: Fri Sep 28 16:37:18 2012
New Revision: 1391529

URL: http://svn.apache.org/viewvc?rev=1391529&view=rev
Log:
removed unneeded singletons.

Modified:
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/analysis/MethodDifferentiator.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer1.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer12.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer2.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer1.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer12.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer2.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer1.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer12.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer2.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DNegTransformer.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer1.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer12.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer2.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer1.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer12.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer2.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DLoadTransformer.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DReturnTransformer.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DStoreTransformer.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer1.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer12.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer2.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2Transformer.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X1Transformer.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer1.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer12.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer2.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/NarrowingTransformer.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/WideningTransformer.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/DLoadPop2Trimmer.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/SwappedDloadTrimmer.java
    commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/SwappedDstoreTrimmer.java

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/analysis/MethodDifferentiator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/analysis/MethodDifferentiator.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/analysis/MethodDifferentiator.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/analysis/MethodDifferentiator.java Fri Sep 28 16:37:18 2012
@@ -242,9 +242,9 @@ public class MethodDifferentiator {
                 changeCode(method.instructions, changes);
 
                 // trim generated instructions list
-                SwappedDloadTrimmer.getInstance().trim(method.instructions);
-                SwappedDstoreTrimmer.getInstance().trim(method.instructions);
-                DLoadPop2Trimmer.getInstance().trim(method.instructions);
+                new SwappedDloadTrimmer().trim(method.instructions);
+                new SwappedDstoreTrimmer().trim(method.instructions);
+                new DLoadPop2Trimmer().trim(method.instructions);
 
             }
 
@@ -488,93 +488,93 @@ public class MethodDifferentiator {
         switch(insn.getOpcode()) {
         case Opcodes.DLOAD :
             useLocal(((VarInsnNode) insn).var, 4);
-            return  DLoadTransformer.getInstance().getReplacement(insn, this);
+            return new DLoadTransformer().getReplacement(insn, this);
         case Opcodes.DALOAD :
             // TODO add support for DALOAD differentiation
             throw new RuntimeException("DALOAD not handled yet");
         case Opcodes.DSTORE :
             useLocal(((VarInsnNode) insn).var, 4);
-            return  DStoreTransformer.getInstance().getReplacement(insn, this);
+            return new DStoreTransformer().getReplacement(insn, this);
         case Opcodes.DASTORE :
             // TODO add support for DASTORE differentiation
             throw new RuntimeException("DASTORE not handled yet");
         case Opcodes.DUP2 :
-            return Dup2Transformer.getInstance().getReplacement(insn, this);
+            return new Dup2Transformer().getReplacement(insn, this);
         case Opcodes.DUP2_X1 :
-            return Dup2X1Transformer.getInstance().getReplacement(insn, this);
+            return new Dup2X1Transformer().getReplacement(insn, this);
         case Opcodes.DUP2_X2 :
             if (stack1Converted) {
                 if (stack0Converted) {
-                    return Dup2X2Transformer12.getInstance().getReplacement(insn, this);
+                    return new Dup2X2Transformer12().getReplacement(insn, this);
                 }
-                return Dup2X2Transformer1.getInstance().getReplacement(insn, this);
+                return new Dup2X2Transformer1().getReplacement(insn, this);
             }
-            return Dup2X2Transformer2.getInstance().getReplacement(insn, this);
+            return new Dup2X2Transformer2().getReplacement(insn, this);
         case Opcodes.DADD :
             if (stack1Converted) {
                 if (stack0Converted) {
-                    return DAddTransformer12.getInstance().getReplacement(insn, this);
+                    return new DAddTransformer12().getReplacement(insn, this);
                 }
-                return DAddTransformer1.getInstance().getReplacement(insn, this);
+                return new DAddTransformer1().getReplacement(insn, this);
             }
-            return  DAddTransformer2.getInstance().getReplacement(insn, this);
+            return new DAddTransformer2().getReplacement(insn, this);
         case Opcodes.DSUB :
             if (stack1Converted) {
                 if (stack0Converted) {
-                    return DSubTransformer12.getInstance().getReplacement(insn, this);
+                    return new DSubTransformer12().getReplacement(insn, this);
                 }
-                return DSubTransformer1.getInstance().getReplacement(insn, this);
+                return new DSubTransformer1().getReplacement(insn, this);
             }
-            return  DSubTransformer2.getInstance().getReplacement(insn, this);
+            return new DSubTransformer2().getReplacement(insn, this);
         case Opcodes.DMUL :
             if (stack1Converted) {
                 if (stack0Converted) {
-                    return  DMulTransformer12.getInstance().getReplacement(insn, this);
+                    return new DMulTransformer12().getReplacement(insn, this);
                 }
-                return  DMulTransformer1.getInstance().getReplacement(insn, this);
+                return new DMulTransformer1().getReplacement(insn, this);
             }
-            return  DMulTransformer2.getInstance().getReplacement(insn, this);
+            return new DMulTransformer2().getReplacement(insn, this);
         case Opcodes.DDIV :
             if (stack1Converted) {
                 if (stack0Converted) {
-                    return  DDivTransformer12.getInstance().getReplacement(insn, this);
+                    return new DDivTransformer12().getReplacement(insn, this);
                 }
-                return  DDivTransformer1.getInstance().getReplacement(insn, this);
+                return new DDivTransformer1().getReplacement(insn, this);
             }
-            return  DDivTransformer2.getInstance().getReplacement(insn, this);
+            return new DDivTransformer2().getReplacement(insn, this);
         case Opcodes.DREM :
             if (stack1Converted) {
                 if (stack0Converted) {
-                    return  DRemTransformer12.getInstance().getReplacement(insn, this);
+                    return new DRemTransformer12().getReplacement(insn, this);
                 }
-                return  DRemTransformer1.getInstance().getReplacement(insn, this);
+                return new DRemTransformer1().getReplacement(insn, this);
             }
-            return  DRemTransformer2.getInstance().getReplacement(insn, this);
+            return new DRemTransformer2().getReplacement(insn, this);
         case Opcodes.DNEG :
-            return  DNegTransformer.getInstance().getReplacement(insn, this);
+            return new DNegTransformer().getReplacement(insn, this);
         case Opcodes.DCONST_0 :
         case Opcodes.DCONST_1 :
         case Opcodes.LDC :
         case Opcodes.I2D :
         case Opcodes.L2D :
         case Opcodes.F2D :
-            return WideningTransformer.getInstance().getReplacement(insn, this);
+            return new WideningTransformer().getReplacement(insn, this);
         case Opcodes.POP2 :
         case Opcodes.D2I :
         case Opcodes.D2L :
         case Opcodes.D2F :
-            return NarrowingTransformer.getInstance().getReplacement(insn, this);
+            return new NarrowingTransformer().getReplacement(insn, this);
         case Opcodes.DCMPL :
         case Opcodes.DCMPG :
             if (stack1Converted) {
                 if (stack0Converted) {
-                    return  DcmpTransformer12.getInstance().getReplacement(insn, this);
+                    return new DcmpTransformer12().getReplacement(insn, this);
                 }
-                return  DcmpTransformer1.getInstance().getReplacement(insn, this);
+                return new DcmpTransformer1().getReplacement(insn, this);
             }
-            return  DcmpTransformer2.getInstance().getReplacement(insn, this);
+            return new DcmpTransformer2().getReplacement(insn, this);
         case Opcodes.DRETURN :
-            return  DReturnTransformer.getInstance().getReplacement(insn, this);
+            return new DReturnTransformer().getReplacement(insn, this);
         case Opcodes.GETSTATIC :
             // TODO add support for GETSTATIC differentiation
             throw new RuntimeException("GETSTATIC not handled yet");

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer1.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer1.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer1.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer1.java Fri Sep 28 16:37:18 2012
@@ -34,25 +34,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DAddTransformer1 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DAddTransformer1();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DAddTransformer1() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DAddTransformer1() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer12.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer12.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer12.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer12.java Fri Sep 28 16:37:18 2012
@@ -34,25 +34,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DAddTransformer12 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DAddTransformer12();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DAddTransformer12() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DAddTransformer12() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer2.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer2.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer2.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DAddTransformer2.java Fri Sep 28 16:37:18 2012
@@ -34,25 +34,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DAddTransformer2 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DAddTransformer2();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DAddTransformer2() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DAddTransformer2() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer1.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer1.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer1.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer1.java Fri Sep 28 16:37:18 2012
@@ -34,25 +34,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DDivTransformer1 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DDivTransformer1();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DDivTransformer1() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DDivTransformer1() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer12.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer12.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer12.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer12.java Fri Sep 28 16:37:18 2012
@@ -34,25 +34,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DDivTransformer12 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DDivTransformer12();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DDivTransformer12() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DDivTransformer12() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer2.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer2.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer2.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DDivTransformer2.java Fri Sep 28 16:37:18 2012
@@ -34,25 +34,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DDivTransformer2 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DDivTransformer2();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DDivTransformer2() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DDivTransformer2() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer1.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer1.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer1.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer1.java Fri Sep 28 16:37:18 2012
@@ -34,25 +34,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DMulTransformer1 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DMulTransformer1();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DMulTransformer1() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DMulTransformer1() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer12.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer12.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer12.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer12.java Fri Sep 28 16:37:18 2012
@@ -34,25 +34,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DMulTransformer12 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DMulTransformer12();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DMulTransformer12() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DMulTransformer12() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer2.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer2.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer2.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DMulTransformer2.java Fri Sep 28 16:37:18 2012
@@ -35,24 +35,9 @@ import org.objectweb.asm.tree.VarInsnNod
 public class DMulTransformer2 implements InstructionsTransformer {
 
     // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DMulTransformer2();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DMulTransformer2() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DMulTransformer2() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DNegTransformer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DNegTransformer.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DNegTransformer.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DNegTransformer.java Fri Sep 28 16:37:18 2012
@@ -29,25 +29,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DNegTransformer implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DNegTransformer();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DNegTransformer() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DNegTransformer() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer1.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer1.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer1.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer1.java Fri Sep 28 16:37:18 2012
@@ -35,25 +35,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DRemTransformer1 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DRemTransformer1();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DRemTransformer1() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DRemTransformer1() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer12.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer12.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer12.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer12.java Fri Sep 28 16:37:18 2012
@@ -35,25 +35,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DRemTransformer12 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DRemTransformer12();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DRemTransformer12() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DRemTransformer12() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer2.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer2.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer2.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DRemTransformer2.java Fri Sep 28 16:37:18 2012
@@ -35,25 +35,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DRemTransformer2 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DRemTransformer2();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DRemTransformer2() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DRemTransformer2() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer1.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer1.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer1.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer1.java Fri Sep 28 16:37:18 2012
@@ -34,25 +34,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DSubTransformer1 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DSubTransformer1();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DSubTransformer1() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DSubTransformer1() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer12.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer12.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer12.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer12.java Fri Sep 28 16:37:18 2012
@@ -34,25 +34,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DSubTransformer12 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DSubTransformer12();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DSubTransformer12() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DSubTransformer12() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer2.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer2.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer2.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/arithmetic/DSubTransformer2.java Fri Sep 28 16:37:18 2012
@@ -34,25 +34,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DSubTransformer2 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DSubTransformer2();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DSubTransformer2() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DSubTransformer2() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DLoadTransformer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DLoadTransformer.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DLoadTransformer.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DLoadTransformer.java Fri Sep 28 16:37:18 2012
@@ -31,25 +31,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DLoadTransformer implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DLoadTransformer();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DLoadTransformer() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DLoadTransformer() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DReturnTransformer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DReturnTransformer.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DReturnTransformer.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DReturnTransformer.java Fri Sep 28 16:37:18 2012
@@ -37,25 +37,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DReturnTransformer implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DReturnTransformer();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DReturnTransformer() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DReturnTransformer() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DStoreTransformer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DStoreTransformer.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DStoreTransformer.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DStoreTransformer.java Fri Sep 28 16:37:18 2012
@@ -31,25 +31,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class DStoreTransformer implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DStoreTransformer();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DStoreTransformer() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DStoreTransformer() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer1.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer1.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer1.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer1.java Fri Sep 28 16:37:18 2012
@@ -31,25 +31,9 @@ import org.objectweb.asm.tree.InsnNode;
  */
 public class DcmpTransformer1 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DcmpTransformer1();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DcmpTransformer1() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DcmpTransformer1() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer12.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer12.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer12.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer12.java Fri Sep 28 16:37:18 2012
@@ -31,25 +31,9 @@ import org.objectweb.asm.tree.InsnNode;
  */
 public class DcmpTransformer12 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DcmpTransformer12();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DcmpTransformer12() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DcmpTransformer12() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer2.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer2.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer2.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/DcmpTransformer2.java Fri Sep 28 16:37:18 2012
@@ -31,25 +31,9 @@ import org.objectweb.asm.tree.InsnNode;
  */
 public class DcmpTransformer2 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new DcmpTransformer2();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private DcmpTransformer2() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public DcmpTransformer2() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2Transformer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2Transformer.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2Transformer.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2Transformer.java Fri Sep 28 16:37:18 2012
@@ -31,25 +31,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class Dup2Transformer implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new Dup2Transformer();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private Dup2Transformer() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public Dup2Transformer() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X1Transformer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X1Transformer.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X1Transformer.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X1Transformer.java Fri Sep 28 16:37:18 2012
@@ -31,25 +31,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class Dup2X1Transformer implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new Dup2X1Transformer();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private Dup2X1Transformer() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public Dup2X1Transformer() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer1.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer1.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer1.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer1.java Fri Sep 28 16:37:18 2012
@@ -31,25 +31,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class Dup2X2Transformer1 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new Dup2X2Transformer1();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private Dup2X2Transformer1() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public Dup2X2Transformer1() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer12.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer12.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer12.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer12.java Fri Sep 28 16:37:18 2012
@@ -31,25 +31,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class Dup2X2Transformer12 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new Dup2X2Transformer12();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private Dup2X2Transformer12() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public Dup2X2Transformer12() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer2.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer2.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer2.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/Dup2X2Transformer2.java Fri Sep 28 16:37:18 2012
@@ -31,25 +31,9 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class Dup2X2Transformer2 implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new Dup2X2Transformer2();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private Dup2X2Transformer2() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public Dup2X2Transformer2() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/NarrowingTransformer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/NarrowingTransformer.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/NarrowingTransformer.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/NarrowingTransformer.java Fri Sep 28 16:37:18 2012
@@ -32,25 +32,9 @@ import org.objectweb.asm.tree.InsnNode;
  */
 public class NarrowingTransformer implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new NarrowingTransformer();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private NarrowingTransformer() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public NarrowingTransformer() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/WideningTransformer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/WideningTransformer.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/WideningTransformer.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/instructions/WideningTransformer.java Fri Sep 28 16:37:18 2012
@@ -33,25 +33,9 @@ import org.objectweb.asm.tree.InsnNode;
  */
 public class WideningTransformer implements InstructionsTransformer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final InstructionsTransformer INSTANCE = new WideningTransformer();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
-     */
-    private WideningTransformer() {
-    }
-
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
+    /** Simple constructor.
      */
-    public static InstructionsTransformer getInstance() {
-        return LazyHolder.INSTANCE;
+    public WideningTransformer() {
     }
 
     /** {@inheritDoc} */

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/DLoadPop2Trimmer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/DLoadPop2Trimmer.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/DLoadPop2Trimmer.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/DLoadPop2Trimmer.java Fri Sep 28 16:37:18 2012
@@ -24,28 +24,12 @@ import org.objectweb.asm.tree.InsnList;
  */
 public class DLoadPop2Trimmer extends BytecodeTrimmer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final BytecodeTrimmer INSTANCE = new DLoadPop2Trimmer();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
+    /** Simple constructor.
      */
-    private DLoadPop2Trimmer() {
+    public DLoadPop2Trimmer() {
         super(2);
     }
 
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
-     */
-    public static BytecodeTrimmer getInstance() {
-        return LazyHolder.INSTANCE;
-    }
-
     /** {@inheritDoc} */
     @Override
     protected boolean trimWindow(final InsnList instructions,

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/SwappedDloadTrimmer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/SwappedDloadTrimmer.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/SwappedDloadTrimmer.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/SwappedDloadTrimmer.java Fri Sep 28 16:37:18 2012
@@ -25,28 +25,12 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class SwappedDloadTrimmer extends BytecodeTrimmer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final BytecodeTrimmer INSTANCE = new SwappedDloadTrimmer();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
+    /** Simple constructor.
      */
-    private SwappedDloadTrimmer() {
+    public SwappedDloadTrimmer() {
         super(4);
     }
 
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
-     */
-    public static BytecodeTrimmer getInstance() {
-        return LazyHolder.INSTANCE;
-    }
-
     /** {@inheritDoc} */
     @Override
     protected boolean trimWindow(final InsnList instructions,

Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/SwappedDstoreTrimmer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/SwappedDstoreTrimmer.java?rev=1391529&r1=1391528&r2=1391529&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/SwappedDstoreTrimmer.java (original)
+++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/forward/trimming/SwappedDstoreTrimmer.java Fri Sep 28 16:37:18 2012
@@ -25,28 +25,12 @@ import org.objectweb.asm.tree.VarInsnNod
  */
 public class SwappedDstoreTrimmer extends BytecodeTrimmer {
 
-    // CHECKSTYLE: stop HideUtilityClassConstructor
-    /** Holder for the singleton instance.*/
-    private static class LazyHolder  {
-        /** The singleton instance. */
-        private static final BytecodeTrimmer INSTANCE = new SwappedDstoreTrimmer();
-    }
-    // CHECKSTYLE: resume HideUtilityClassConstructor
-
-    /** Hidden constructor.
+    /** Simple constructor.
      */
-    private SwappedDstoreTrimmer() {
+    public SwappedDstoreTrimmer() {
         super(4);
     }
 
-    /** Get the singleton instance.
-     * <p>We use here the Initialization on Demand Holder idiom.</p>
-     * @return the singleton instance
-     */
-    public static BytecodeTrimmer getInstance() {
-        return LazyHolder.INSTANCE;
-    }
-
     /** {@inheritDoc} */
     @Override
     protected boolean trimWindow(final InsnList instructions,