From 44ad36ef97aa90bdd5ae82b960509d3a4c72ade2 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 4 Dec 2013 21:23:47 +0400
Subject: [PATCH] Minor cleanup in FunctionGenerationStrategy and inheritors

---
 .../jet/codegen/FunctionGenerationStrategy.java  | 14 ++++----------
 .../jet/codegen/ImplementationBodyCodegen.java   |  1 -
 .../jetbrains/jet/codegen/PropertyCodegen.java   | 16 ++++------------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionGenerationStrategy.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionGenerationStrategy.java
index 86d934bc9c0..fcb100bcf6b 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionGenerationStrategy.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionGenerationStrategy.java
@@ -19,7 +19,6 @@ package org.jetbrains.jet.codegen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.asm4.MethodVisitor;
-import org.jetbrains.asm4.Type;
 import org.jetbrains.jet.codegen.context.MethodContext;
 import org.jetbrains.jet.codegen.signature.JvmMethodSignature;
 import org.jetbrains.jet.codegen.state.GenerationState;
@@ -31,9 +30,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 public abstract class FunctionGenerationStrategy {
-
     private final Collection<String> localVariableNames = new ArrayList<String>();
-
     private FrameMap frameMap;
 
     public abstract void generateBody(
@@ -66,7 +63,6 @@ public abstract class FunctionGenerationStrategy {
     }
 
     public static class FunctionDefault extends CodegenBased<CallableDescriptor> {
-
         private final JetDeclarationWithBody declaration;
 
         public FunctionDefault(
@@ -85,18 +81,16 @@ public abstract class FunctionGenerationStrategy {
     }
 
     public abstract static class CodegenBased<T extends CallableDescriptor> extends FunctionGenerationStrategy {
-
         protected final GenerationState state;
-
         protected final T callableDescriptor;
 
-        public CodegenBased(@NotNull GenerationState state, T callableDescriptor) {
+        public CodegenBased(@NotNull GenerationState state, @NotNull T callableDescriptor) {
             this.state = state;
             this.callableDescriptor = callableDescriptor;
         }
 
         @Override
-        public void generateBody(
+        public final void generateBody(
                 @NotNull MethodVisitor mv,
                 @NotNull JvmMethodSignature signature,
                 @NotNull MethodContext context,
@@ -108,9 +102,9 @@ public abstract class FunctionGenerationStrategy {
             generateLocalVarNames(codegen);
         }
 
-        abstract public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature);
+        public abstract void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature);
 
-        public void generateLocalVarNames(@NotNull ExpressionCodegen codegen) {
+        private void generateLocalVarNames(@NotNull ExpressionCodegen codegen) {
             for (String name : codegen.getLocalVariableNamesForExpression()) {
                 addLocalVariableName(name);
             }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
index 40447f75aee..8ed033043bf 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
@@ -1139,7 +1139,6 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
 
         functionCodegen.generateMethod(null, constructorSignature, constructorDescriptor, constructorContext,
                    new FunctionGenerationStrategy.CodegenBased<ConstructorDescriptor>(state, constructorDescriptor) {
-
                        @NotNull
                        @Override
                        protected FrameMap createFrameMap(@NotNull JetTypeMapper typeMapper, @NotNull MethodContext context) {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
index cf2d29e50c7..7c5209b42ad 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
@@ -311,18 +311,12 @@ public class PropertyCodegen extends GenerationStateAware {
 
 
     private static class DefaultPropertyAccessorStrategy extends FunctionGenerationStrategy.CodegenBased<PropertyAccessorDescriptor> {
-
-        public DefaultPropertyAccessorStrategy(
-                @NotNull GenerationState state,
-                @NotNull PropertyAccessorDescriptor callableDescriptor
-        ) {
-            super(state, callableDescriptor);
+        public DefaultPropertyAccessorStrategy(@NotNull GenerationState state, @NotNull PropertyAccessorDescriptor descriptor) {
+            super(state, descriptor);
         }
 
         @Override
-        public void doGenerateBody(
-                ExpressionCodegen codegen, JvmMethodSignature signature
-        ) {
+        public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) {
             generateDefaultAccessor(callableDescriptor, codegen.v, codegen);
         }
     }
@@ -371,9 +365,7 @@ public class PropertyCodegen extends GenerationStateAware {
         }
 
         @Override
-        public void doGenerateBody(
-                @NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature
-        ) {
+        public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) {
             JetTypeMapper typeMapper = codegen.typeMapper;
             OwnerKind kind = codegen.context.getContextKind();
             InstructionAdapter iv = codegen.v;