cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [2/3] cayenne git commit: generics
Date Thu, 22 Oct 2015 14:21:38 GMT
generics


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/055eaac6
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/055eaac6
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/055eaac6

Branch: refs/heads/master
Commit: 055eaac646b97aa07ec9e19184810d3560cc1c77
Parents: 455b9c0
Author: aadamchik <aadamchik@apache.org>
Authored: Thu Oct 22 17:10:41 2015 +0300
Committer: aadamchik <aadamchik@apache.org>
Committed: Thu Oct 22 17:10:41 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java  | 2 +-
 .../src/main/java/org/apache/cayenne/di/spi/ListProvider.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/055eaac6/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java
index f337681..e3f741b 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java
@@ -49,7 +49,7 @@ class DefaultListBuilder<T> implements ListBuilder<T> {
     public ListBuilder<T> add(Class<? extends T> interfaceType)
             throws DIRuntimeException {
 
-        Key key = Key.get(interfaceType);
+        Key<?> key = Key.get(interfaceType);
         getListProvider().add(key, injector.getProvider(key));
         return this;
     }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/055eaac6/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ListProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ListProvider.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ListProvider.java
index d5ddc1f..1ea4b50 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ListProvider.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ListProvider.java
@@ -33,12 +33,12 @@ import java.util.Map;
 class ListProvider implements Provider<List<?>> {
 
     private Map<Key<?>, Provider<?>> providers;
-    private DIGraph graph;
+    private DIGraph<Key<?>> graph;
     private Key<?> lastKey;
 
     public ListProvider() {
         this.providers = new HashMap<>();
-        this.graph = new DIGraph();
+        this.graph = new DIGraph<>();
     }
 
     @Override


Mime
View raw message