Moves TypeUtil.java from jdt sub-package to util sub-package because …

…these utilities should outlive the migration code in jdt. Change on 2016/08/09 by kstanger <kstanger@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=129740347
google · Sep 7, 2016 · 5dfe2c2 · 5dfe2c2
1 parent 08b92cd
commit 5dfe2c2
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 19 deletions.
diff --git a/translator/Makefile b/translator/Makefile
@@ -214,7 +214,6 @@ JAVA_SOURCES = \
 	jdt/JdtWildcardType.java \
 	jdt/StringName.java \
 	jdt/TreeConverter.java \
-	jdt/TypeUtil.java \
 	pipeline/AnnotationPreProcessor.java \
 	pipeline/BuildClosureQueue.java \
 	pipeline/FileProcessor.java \
@@ -295,6 +294,7 @@ JAVA_SOURCES = \
 	util/SourceVersion.java \
 	util/TimeTracker.java \
 	util/TranslationUtil.java \
+	util/TypeUtil.java \
 	util/UnicodeUtils.java \
 	util/Version.java
 

diff --git a/translator/src/main/java/com/google/devtools/j2objc/ast/DebugASTPrinter.java b/translator/src/main/java/com/google/devtools/j2objc/ast/DebugASTPrinter.java
@@ -16,18 +16,16 @@
 
 import com.google.devtools.j2objc.gen.JavadocGenerator;
 import com.google.devtools.j2objc.gen.SourceBuilder;
-import com.google.devtools.j2objc.jdt.TypeUtil;
 import com.google.devtools.j2objc.util.BindingUtil;
+import com.google.devtools.j2objc.util.TypeUtil;
 import com.google.devtools.j2objc.util.UnicodeUtils;
-
+import java.util.Iterator;
+import java.util.List;
 import org.eclipse.jdt.core.dom.IMethodBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.IVariableBinding;
 import org.eclipse.jdt.core.dom.Modifier;
 
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * Simple AST printer, suitable for node toString() results. This printer is based on
  * org.eclipse.jdt.internal.core.dom.NaiveASTFlattener.

diff --git a/translator/src/main/java/com/google/devtools/j2objc/gen/StatementGenerator.java b/translator/src/main/java/com/google/devtools/j2objc/gen/StatementGenerator.java
@@ -103,27 +103,24 @@
 import com.google.devtools.j2objc.ast.VariableDeclarationStatement;
 import com.google.devtools.j2objc.ast.WhileStatement;
 import com.google.devtools.j2objc.jdt.JdtTypes;
-import com.google.devtools.j2objc.jdt.TypeUtil;
 import com.google.devtools.j2objc.types.IOSTypeBinding;
 import com.google.devtools.j2objc.util.BindingUtil;
 import com.google.devtools.j2objc.util.ElementUtil;
 import com.google.devtools.j2objc.util.NameTable;
+import com.google.devtools.j2objc.util.TypeUtil;
 import com.google.devtools.j2objc.util.UnicodeUtils;
-
-import org.eclipse.jdt.core.dom.IAnnotationBinding;
-import org.eclipse.jdt.core.dom.IMemberValuePairBinding;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.IVariableBinding;
-
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import javax.lang.model.element.Element;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
+import org.eclipse.jdt.core.dom.IAnnotationBinding;
+import org.eclipse.jdt.core.dom.IMemberValuePairBinding;
+import org.eclipse.jdt.core.dom.IMethodBinding;
+import org.eclipse.jdt.core.dom.ITypeBinding;
+import org.eclipse.jdt.core.dom.IVariableBinding;
 
 /**
  * Returns an Objective-C equivalent of a Java AST node.

diff --git a/translator/src/main/java/com/google/devtools/j2objc/translate/OuterReferenceResolver.java b/translator/src/main/java/com/google/devtools/j2objc/translate/OuterReferenceResolver.java
@@ -37,10 +37,10 @@
 import com.google.devtools.j2objc.ast.TypeDeclaration;
 import com.google.devtools.j2objc.ast.VariableDeclaration;
 import com.google.devtools.j2objc.ast.VariableDeclarationFragment;
-import com.google.devtools.j2objc.jdt.TypeUtil;
 import com.google.devtools.j2objc.types.GeneratedVariableElement;
 import com.google.devtools.j2objc.types.Types;
 import com.google.devtools.j2objc.util.ElementUtil;
+import com.google.devtools.j2objc.util.TypeUtil;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;

diff --git a/translator/src/main/java/com/google/devtools/j2objc/util/ElementUtil.java b/translator/src/main/java/com/google/devtools/j2objc/util/ElementUtil.java
@@ -16,7 +16,6 @@
 
 import com.google.devtools.j2objc.jdt.BindingConverter;
 import com.google.devtools.j2objc.jdt.JdtTypes;
-import com.google.devtools.j2objc.jdt.TypeUtil;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashMap;

diff --git a/.../google/devtools/j2objc/jdt/TypeUtil.java → ...google/devtools/j2objc/util/TypeUtil.java b/.../google/devtools/j2objc/jdt/TypeUtil.java → ...google/devtools/j2objc/util/TypeUtil.java
@@ -12,8 +12,10 @@
  * limitations under the License.
  */
 
-package com.google.devtools.j2objc.jdt;
+package com.google.devtools.j2objc.util;
 
+import com.google.devtools.j2objc.jdt.BindingConverter;
+import com.google.devtools.j2objc.jdt.JdtIntersectionType;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.TypeElement;

diff --git a/translator/src/test/java/com/google/devtools/j2objc/types/CompoundTypeTest.java b/translator/src/test/java/com/google/devtools/j2objc/types/CompoundTypeTest.java
@@ -22,9 +22,9 @@
 import com.google.devtools.j2objc.ast.FunctionDeclaration;
 import com.google.devtools.j2objc.ast.MethodDeclaration;
 import com.google.devtools.j2objc.ast.ReturnStatement;
-import com.google.devtools.j2objc.jdt.TypeUtil;
 import com.google.devtools.j2objc.util.BindingUtil;
 import com.google.devtools.j2objc.util.SourceVersion;
+import com.google.devtools.j2objc.util.TypeUtil;
 
 import org.eclipse.jdt.core.dom.ITypeBinding;