Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Goubet2013-03-06 10:55:52 +0000
committerLaurent Goubet2013-03-07 08:43:15 +0000
commit31be5288929061fd57eb1217a8db29064c9cc261 (patch)
tree620cde40f239f23e8754e9c413d775733f1ed962
parenta9750a01c2c652583306bf1b8eb8b91b45d03a35 (diff)
downloadorg.eclipse.emf.compare-31be5288929061fd57eb1217a8db29064c9cc261.tar.gz
org.eclipse.emf.compare-31be5288929061fd57eb1217a8db29064c9cc261.tar.xz
org.eclipse.emf.compare-31be5288929061fd57eb1217a8db29064c9cc261.zip
Code style
Remove references to Guava's Cache, replacing them with LoadingCache. Both are marked as Beta, but LoadingCache is frozen API-wise.
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/MatchSpec.java2
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/DefaultEqualityHelperFactory.java4
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ByTypeIndex.java4
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java4
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EqualityHelper.java7
5 files changed, 11 insertions, 10 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/MatchSpec.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/MatchSpec.java
index de955baea..9fcde8d5b 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/MatchSpec.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/MatchSpec.java
@@ -105,7 +105,7 @@ public class MatchSpec extends MatchImpl {
*
* @see org.eclipse.emf.ecore.impl.BasicEObjectImpl#toString()
*/
- @SuppressWarnings({"boxing", "nls" })
+ @SuppressWarnings("nls")
@Override
public String toString() {
// @formatter:off
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/DefaultEqualityHelperFactory.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/DefaultEqualityHelperFactory.java
index bdf897c5b..1d86178d6 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/DefaultEqualityHelperFactory.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/DefaultEqualityHelperFactory.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.emf.compare.match;
-import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.LoadingCache;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.compare.utils.EqualityHelper;
@@ -50,7 +50,7 @@ public class DefaultEqualityHelperFactory implements IEqualityHelperFactory {
* @see org.eclipse.emf.compare.match.IEqualityHelperFactory#createEqualityHelper()
*/
public IEqualityHelper createEqualityHelper() {
- Cache<EObject, URI> cache = EqualityHelper.createDefaultCache(getCacheBuilder());
+ LoadingCache<EObject, URI> cache = EqualityHelper.createDefaultCache(getCacheBuilder());
IEqualityHelper equalityHelper = new EqualityHelper(cache);
return equalityHelper;
}
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ByTypeIndex.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ByTypeIndex.java
index a9114072d..32237ea77 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ByTypeIndex.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ByTypeIndex.java
@@ -11,9 +11,9 @@
package org.eclipse.emf.compare.match.eobject;
import com.google.common.base.Function;
-import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -37,7 +37,7 @@ class ByTypeIndex implements EObjectIndex {
/**
* All the type specific indexes, created on demand.
*/
- private Cache<String, EObjectIndex> allIndexes;
+ private LoadingCache<String, EObjectIndex> allIndexes;
/**
* The distance function to use to create the delegates indexes.
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java
index 8587631e5..4aa9fdcc2 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java
@@ -11,7 +11,7 @@
package org.eclipse.emf.compare.match.eobject;
import com.google.common.base.Predicate;
-import com.google.common.cache.Cache;
+import com.google.common.cache.LoadingCache;
import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators;
import com.google.common.collect.Sets;
@@ -96,7 +96,7 @@ public class EditionDistance implements DistanceFunction {
IEqualityHelperFactory fakeEqualityHelperFactory = new DefaultEqualityHelperFactory() {
@Override
public IEqualityHelper createEqualityHelper() {
- final Cache<EObject, URI> cache = EqualityHelper.createDefaultCache(getCacheBuilder());
+ final LoadingCache<EObject, URI> cache = EqualityHelper.createDefaultCache(getCacheBuilder());
return new EqualityHelper(cache) {
@Override
protected boolean matchingURIs(EObject object1, EObject object2) {
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EqualityHelper.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EqualityHelper.java
index fa3b67675..5efeb2ef4 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EqualityHelper.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EqualityHelper.java
@@ -14,6 +14,7 @@ import com.google.common.base.Function;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
import java.lang.reflect.Array;
import java.util.concurrent.ExecutionException;
@@ -35,7 +36,7 @@ import org.eclipse.emf.ecore.util.FeatureMap;
*/
public class EqualityHelper extends AdapterImpl implements IEqualityHelper {
/** A cache keeping track of the URIs for EObjects. */
- private final Cache<EObject, URI> uriCache;
+ private final LoadingCache<EObject, URI> uriCache;
/**
* Creates a new EqualityHelper.
@@ -54,7 +55,7 @@ public class EqualityHelper extends AdapterImpl implements IEqualityHelper {
* @param uriCache
* the cache to be used for {@link EcoreUtil#getURI(EObject)} calls.
*/
- public EqualityHelper(Cache<EObject, URI> uriCache) {
+ public EqualityHelper(LoadingCache<EObject, URI> uriCache) {
this.uriCache = uriCache;
}
@@ -285,7 +286,7 @@ public class EqualityHelper extends AdapterImpl implements IEqualityHelper {
* The builder to use to instantiate the cache.
* @return the new cache.
*/
- public static Cache<EObject, URI> createDefaultCache(CacheBuilder<Object, Object> cacheBuilder) {
+ public static LoadingCache<EObject, URI> createDefaultCache(CacheBuilder<Object, Object> cacheBuilder) {
return cacheBuilder.build(CacheLoader.from(new URICacheFunction()));
}

Back to the top