From 7064ccd320d6dbddbdcf9810848cbde9200c6f2e Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 31 May 2012 18:37:23 +0200
Subject: [PATCH] delete unnecessary interface

---
 src/org/jetbrains/jet/j2k/ast/Statements.kt   |  2 +-
 .../jet/j2k/visitors/ElementVisitor.kt        |  4 +--
 .../jet/j2k/visitors/J2KVisitor.java          | 28 -------------------
 .../jetbrains/jet/j2k/visitors/TypeVisitor.kt |  4 +--
 4 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 src/org/jetbrains/jet/j2k/visitors/J2KVisitor.java

diff --git a/src/org/jetbrains/jet/j2k/ast/Statements.kt b/src/org/jetbrains/jet/j2k/ast/Statements.kt
index 04cc9d234db..49bd2e50d9a 100644
--- a/src/org/jetbrains/jet/j2k/ast/Statements.kt
+++ b/src/org/jetbrains/jet/j2k/ast/Statements.kt
@@ -119,5 +119,5 @@ public open class DefaultSwitchLabelStatement(): Statement() {
 // Other ------------------------------------------------------------------------------------------------------
 
 public open class SynchronizedStatement(val expression: Expression, val block: Block): Statement() {
-    public override fun toKotlin() = "synchronized (" + expression?.toKotlin() + ") "+ block.toKotlin()
+    public override fun toKotlin() = "synchronized (" + expression.toKotlin() + ") "+ block.toKotlin()
 }
diff --git a/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt
index 29691186826..c102bf94895 100644
--- a/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt
+++ b/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt
@@ -7,10 +7,10 @@ import org.jetbrains.jet.j2k.ast.types.Type
 import java.util.List
 import org.jetbrains.jet.j2k.ConverterUtil.isAnnotatedAsNotNull
 
-public open class ElementVisitor(val myConverter : Converter) : JavaElementVisitor(), J2KVisitor {
+public open class ElementVisitor(val myConverter : Converter) : JavaElementVisitor() {
     private var myResult : Element = Element.EMPTY_ELEMENT
 
-    public override fun getConverter() : Converter {
+    public fun getConverter() : Converter {
         return myConverter
     }
 
diff --git a/src/org/jetbrains/jet/j2k/visitors/J2KVisitor.java b/src/org/jetbrains/jet/j2k/visitors/J2KVisitor.java
deleted file mode 100644
index 7be1fe9504a..00000000000
--- a/src/org/jetbrains/jet/j2k/visitors/J2KVisitor.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2010-2012 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.j2k.visitors;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.j2k.Converter;
-
-/**
- * @author abreslav
- */
-public interface J2KVisitor {
-    @NotNull
-    Converter getConverter();
-}
diff --git a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt
index d3732e9fc53..e0cd48c22d9 100644
--- a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt
+++ b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt
@@ -10,7 +10,7 @@ import org.jetbrains.jet.j2k.util.AstUtil
 import java.util.LinkedList
 import java.util.List
 
-public open class TypeVisitor(private val myConverter : Converter) : PsiTypeVisitor<Type>(), J2KVisitor {
+public open class TypeVisitor(private val myConverter : Converter) : PsiTypeVisitor<Type>() {
     private var myResult : Type = EmptyType()
     public open fun getResult() : Type {
         return myResult
@@ -120,8 +120,6 @@ public open class TypeVisitor(private val myConverter : Converter) : PsiTypeVisi
         return myResult
     }
 
-    public override fun getConverter() : Converter = myConverter
-
     class object {
         private fun createQualifiedName(classType : PsiClassType) : String {
             if (classType is PsiClassReferenceType)