Moved Types to TL

build/runtime.dependencies

@@ -1 +1 @@
-mvn://repo.bodar.com/com.googlecode.totallylazy:totallylazy:pack|sources:2.172
+mvn://repo.bodar.com/com.googlecode.totallylazy:totallylazy:pack|sources:2.182

src/com/googlecode/yadic/BaseTypeMap.java

@@ -18,7 +18,7 @@
 import static com.googlecode.totallylazy.Option.some;
 import static com.googlecode.totallylazy.predicates.Predicates.where;
 import static com.googlecode.totallylazy.Sequences.sequence;
-import static com.googlecode.yadic.generics.Types.matches;
+import static com.googlecode.totallylazy.reflection.Types.matches;
 import static com.googlecode.yadic.resolvers.LazyResolver.lazy;
 import static com.googlecode.yadic.resolvers.Resolvers.activator;
 import static com.googlecode.yadic.resolvers.Resolvers.decorator;

src/com/googlecode/yadic/Containers.java

@@ -1,11 +1,9 @@
 package com.googlecode.yadic;
 
 import com.googlecode.yadic.closeable.CloseableContainer;
-import com.googlecode.yadic.generics.Types;
+import com.googlecode.totallylazy.reflection.Types;
 import com.googlecode.yadic.resolvers.DecoratorResolver;
-import com.googlecode.yadic.resolvers.MissingResolver;
 
-import java.lang.reflect.Type;
 import java.util.concurrent.Callable;
 
 import static com.googlecode.yadic.resolvers.Resolvers.activator;

src/com/googlecode/yadic/TypeCoercer.java

@@ -19,7 +19,7 @@
 import static com.googlecode.totallylazy.predicates.Predicates.not;
 import static com.googlecode.totallylazy.predicates.Predicates.where;
 import static com.googlecode.totallylazy.Sequences.sequence;
-import static com.googlecode.yadic.generics.Types.matches;
+import static com.googlecode.totallylazy.reflection.Types.matches;
 import static java.lang.reflect.Modifier.PUBLIC;
 import static java.lang.reflect.Modifier.STATIC;
 

src/com/googlecode/yadic/closeable/CloseableTypeMap.java

@@ -13,7 +13,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import static com.googlecode.totallylazy.Sequences.sequence;
-import static com.googlecode.yadic.generics.Types.classOption;
+import static com.googlecode.totallylazy.reflection.Types.classOption;
 
 public class CloseableTypeMap extends BaseTypeMap implements CloseableMap<CloseableTypeMap> {
     private final Map<Type, Closeable> mightClose = new ConcurrentHashMap<Type, Closeable>();

src/com/googlecode/yadic/generics/TypeConverter.java

@@ -3,6 +3,7 @@
 import com.googlecode.totallylazy.functions.Function1;
 import com.googlecode.totallylazy.Maps;
 import com.googlecode.totallylazy.Sequence;
+import com.googlecode.totallylazy.reflection.Types;
 import com.googlecode.yadic.Resolver;
 
 import java.lang.reflect.ParameterizedType;

src/com/googlecode/yadic/resolvers/ConstructorResolver.java

@@ -23,8 +23,8 @@
 import static com.googlecode.totallylazy.predicates.Predicates.not;
 import static com.googlecode.totallylazy.predicates.Predicates.where;
 import static com.googlecode.totallylazy.Sequences.sequence;
-import static com.googlecode.yadic.generics.Types.classOf;
-import static com.googlecode.yadic.generics.Types.matches;
+import static com.googlecode.totallylazy.reflection.Types.classOf;
+import static com.googlecode.totallylazy.reflection.Types.matches;
 import static java.lang.String.format;
 
 public class ConstructorResolver<T> implements Resolver<T> {

src/com/googlecode/yadic/resolvers/DecoratorResolver.java

@@ -3,7 +3,7 @@
 import com.googlecode.totallylazy.Unchecked;
 import com.googlecode.yadic.Resolver;
 import com.googlecode.yadic.TypeMap;
-import com.googlecode.yadic.generics.Types;
+import com.googlecode.totallylazy.reflection.Types;
 
 import java.lang.reflect.Type;
 

src/com/googlecode/yadic/resolvers/Resolvers.java

@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.concurrent.Callable;
 
-import static com.googlecode.yadic.generics.Types.classOf;
+import static com.googlecode.totallylazy.reflection.Types.classOf;
 import static com.googlecode.yadic.resolvers.StaticMethodResolver.staticMethodResolver;
 
 public class Resolvers {

src/com/googlecode/yadic/resolvers/StaticMethodResolver.java

@@ -24,8 +24,8 @@
 import static com.googlecode.totallylazy.predicates.Predicates.where;
 import static com.googlecode.totallylazy.Sequences.sequence;
 import static com.googlecode.yadic.generics.TypeConverter.convertParametersToInstances;
-import static com.googlecode.yadic.generics.Types.classOf;
-import static com.googlecode.yadic.generics.Types.matches;
+import static com.googlecode.totallylazy.reflection.Types.classOf;
+import static com.googlecode.totallylazy.reflection.Types.matches;
 import static java.lang.String.format;
 import static java.lang.reflect.Modifier.PUBLIC;
 import static java.lang.reflect.Modifier.STATIC;

test/com/googlecode/yadic/generics/GenericsTest.java

@@ -14,7 +14,7 @@
 import org.junit.Test;
 
 import static com.googlecode.totallylazy.predicates.Predicates.always;
-import static com.googlecode.yadic.generics.Types.parameterizedType;
+import static com.googlecode.totallylazy.reflection.Types.parameterizedType;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;

test/com/googlecode/yadic/generics/TypesTest.java

@@ -5,9 +5,9 @@
 import com.googlecode.yadic.examples.GenericType;
 import org.junit.Test;
 
-import static com.googlecode.yadic.generics.Types.equalTo;
-import static com.googlecode.yadic.generics.Types.matches;
-import static com.googlecode.yadic.generics.Types.parameterizedType;
+import static com.googlecode.totallylazy.reflection.Types.equalTo;
+import static com.googlecode.totallylazy.reflection.Types.matches;
+import static com.googlecode.totallylazy.reflection.Types.parameterizedType;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;