Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java2
-rw-r--r--plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF2
-rw-r--r--plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF3
-rw-r--r--plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java1
-rw-r--r--plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/internal/resource/index/InternalModelIndex.java2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/formatting2/AbstractCSSFormatter.java2
-rw-r--r--plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java4
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java15
-rw-r--r--plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/internal/properties/constraints/HasExternalizedProfileApplicationsConstraint.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF2
15 files changed, 26 insertions, 20 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java
index cf700faecae..431d632fa29 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java
@@ -36,7 +36,7 @@ public class VersionRules {
new CurrentVersionRule(), // The default behaviour
new FixedRangeRule(dep -> dep.startsWith("org.apache.batik"), "[1.6.0,1.7.0)"), //$NON-NLS-1$//$NON-NLS-2$
new SkipRule("com.ibm.icu"), //$NON-NLS-1$
- new FixedRangeRule("com.google.guava", "11.0.0") //$NON-NLS-1$
+ new FixedRangeRule("com.google.guava", "21.0.0") //$NON-NLS-1$
);
public VersionRules() {
diff --git a/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF
index 51ed057b920..46e3c4a8b6a 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
org.eclipse.papyrus.dev.tests.framework;bundle-version="[2.0.0,3.0.0)",
org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
diff --git a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF
index 2d08ad4a6cb..d8939b1eab5 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.jdt.launching;bundle-version="[3.8.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.10.0,4.0.0)"
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
index f4e1d4ae2ea..484f599f05b 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)",
org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ com.google.guava;bundle-version="21.0.0"
Export-Package: org.eclipse.papyrus.mwe2.utils,
org.eclipse.papyrus.mwe2.utils.components,
org.eclipse.papyrus.mwe2.utils.messages
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java b/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java
index ed376e5fbcf..66276e05b71 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java
+++ b/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.mwe2.runtime.workflow.Workflow;
import com.google.common.collect.Lists;
+
/**
* A workflow for Xtend transformations. Primarily, it provides Xtend-compatible access to
* the collections manipulated by the inherited {@link Workflow#addBean(Object)} and
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
index 200d6270381..d28ea9d4442 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
org.eclipse.oomph.setup.targlets;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.oomph.setup.workingsets;bundle-version="[1.3.0,2.0.0)",
fr.obeo.releng.targetplatform;bundle-version="2.1.1";resolution:=optional,
org.eclipse.cbi.p2repo.aggregator;bundle-version="1.0.0",
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
index 5394f74e043..056d5172e97 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Export-Package: org.eclipse.papyrus.infra.tools,
org.eclipse.papyrus.infra.tools.spi,
org.eclipse.papyrus.infra.tools.util
Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- com.google.guava;bundle-version="15.0.0";visibility:=reexport,
+ com.google.guava;bundle-version="21.0.0";visibility:=reexport,
org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.core.resources;bundle-version="3.11.0"
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/internal/resource/index/InternalModelIndex.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/internal/resource/index/InternalModelIndex.java
index f3b80534b50..dab1bab3b7f 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/internal/resource/index/InternalModelIndex.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/internal/resource/index/InternalModelIndex.java
@@ -98,7 +98,7 @@ public abstract class InternalModelIndex {
*/
protected <V> ListenableFuture<V> afterIndex(final Callable<V> callable) {
AsyncFunction<IndexManager, V> indexFunction = mgr -> mgr.afterIndex(this, callable);
- return Futures.transform(manager, indexFunction);
+ return Futures.transformAsync(manager, indexFunction);
}
/**
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
index 683640b4112..0bdc4499708 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=re
org.eclipse.xtext.util;bundle-version="[2.10.0,3.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)",
org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)",
- org.antlr.runtime;bundle-version="[3.2.0,4.0.0)"
+ org.antlr.runtime;bundle-version="[3.2.0,4.0.0)",
+ com.google.guava;bundle-version="21.0.0"
Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3,
org.eclipse.papyrus.infra.gmfdiag.css3.services,
org.eclipse.papyrus.infra.gmfdiag.css3.cSS,
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/formatting2/AbstractCSSFormatter.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/formatting2/AbstractCSSFormatter.java
index 0915d4b672d..b0f8bf8314c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/formatting2/AbstractCSSFormatter.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/formatting2/AbstractCSSFormatter.java
@@ -24,6 +24,8 @@ import org.eclipse.xtext.formatting2.regionaccess.internal.TextRegions;
import com.google.common.collect.Lists;
+
+
/**
* Workaround for Bug 493257: Override the default behavior for postProcess()
*
diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java
index 1d461d6f1a1..c21dbe7ee86 100644
--- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java
@@ -59,7 +59,7 @@ import com.google.common.util.concurrent.MoreExecutors;
*/
public class SyncService implements ISyncService {
- private static final ThreadLocal<SyncService> currentService = new ThreadLocal<SyncService>();
+ private static final ThreadLocal<SyncService> currentService = new ThreadLocal<>();
private ServicesRegistry services;
@@ -94,7 +94,7 @@ public class SyncService implements ISyncService {
public void startService() throws ServiceException {
editingDomain = ServiceUtils.getInstance().getTransactionalEditingDomain(services);
- setAsyncExecutor(TransactionHelper.createTransactionExecutor(editingDomain, MoreExecutors.sameThreadExecutor()));
+ setAsyncExecutor(TransactionHelper.createTransactionExecutor(editingDomain, MoreExecutors.directExecutor()));
policy = new SyncServiceOperation<ISyncPolicy>(this) {
@Override
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java
index 1c4c074654f..48adc46aef7 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java
@@ -17,6 +17,7 @@ package org.eclipse.papyrus.infra.ui.util;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.LinkedList;
@@ -126,7 +127,7 @@ public class UIUtil {
* @see #createUIExecutor(Display)
*/
public static <V> Future<V> syncCall(Display display, Callable<V> callable) {
- final FutureTask<V> result = new FutureTask<V>(callable);
+ final FutureTask<V> result = new FutureTask<>(callable);
display.syncExec(result);
return result;
}
@@ -159,7 +160,7 @@ public class UIUtil {
* @see #createUIExecutor(Display)
*/
public static <V> Future<V> asyncCall(Display display, Callable<V> callable) {
- final FutureTask<V> result = new FutureTask<V>(callable);
+ final FutureTask<V> result = new FutureTask<>(callable);
display.asyncExec(result);
return result;
}
@@ -289,7 +290,7 @@ public class UIUtil {
@Override
protected Iterator<? extends Control> getChildren(Object object) {
- return (object instanceof Composite) ? Iterators.forArray(((Composite) object).getChildren()) : Iterators.<Control> emptyIterator();
+ return (object instanceof Composite) ? Iterators.forArray(((Composite) object).getChildren()) : Collections.emptyIterator();
}
};
}
@@ -318,7 +319,7 @@ public class UIUtil {
private final Condition emptyCond = lock.newCondition();
- private final Queue<RunnableWrapper> pending = new LinkedList<RunnableWrapper>();
+ private final Queue<RunnableWrapper> pending = new LinkedList<>();
private volatile boolean shutdown;
@@ -367,7 +368,7 @@ public class UIUtil {
@Override
public List<Runnable> shutdownNow() {
- List<Runnable> result = new ArrayList<Runnable>();
+ List<Runnable> result = new ArrayList<>();
shutdown();
@@ -613,7 +614,7 @@ public class UIUtil {
@Override
public <V> Future<V> submit(IProgressCallable<V> callable) {
// No place to report progress in this case
- FutureTask<V> result = new FutureTask<V>(() -> callable.call(new NullProgressMonitor()));
+ FutureTask<V> result = new FutureTask<>(() -> callable.call(new NullProgressMonitor()));
asyncExec(result);
return result;
}
@@ -621,7 +622,7 @@ public class UIUtil {
@Override
public <V> V syncCall(IProgressCallable<V> callable) throws InterruptedException, ExecutionException {
// No place to report progress in this case
- FutureTask<V> result = new FutureTask<V>(() -> callable.call(new NullProgressMonitor()));
+ FutureTask<V> result = new FutureTask<>(() -> callable.call(new NullProgressMonitor()));
syncExec(result);
return result.get(); // It really should be completed, by now
}
diff --git a/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF b/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
index b438d6d87d4..c8bc03fe579 100644
--- a/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
+++ b/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
org.eclipse.emf.edit,
org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.team.core;bundle-version="3.7.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/internal/properties/constraints/HasExternalizedProfileApplicationsConstraint.java b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/internal/properties/constraints/HasExternalizedProfileApplicationsConstraint.java
index 3f2e801dc0e..da7e0e7fcae 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/internal/properties/constraints/HasExternalizedProfileApplicationsConstraint.java
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/internal/properties/constraints/HasExternalizedProfileApplicationsConstraint.java
@@ -57,7 +57,7 @@ public class HasExternalizedProfileApplicationsConstraint extends AbstractConstr
ListenableFuture<SetMultimap<URI, URI>> appliedProfiles = DecoratorModelIndex.getInstance().getAllAppliedProfilesAsync(EcoreUtil.getURI(package_));
// Optimistic enablement for responsiveness
- result = !appliedProfiles.isDone() || !Futures.get(appliedProfiles, CoreException.class).isEmpty();
+ result = !appliedProfiles.isDone() || !Futures.getChecked(appliedProfiles, CoreException.class).isEmpty();
}
} catch (CoreException e) {
// Oh, well. I guess we won't show this property
diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF
index 9b25173b560..094b9310063 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility
org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)"
Export-Package: org.eclipse.papyrus.infra.filters.internal;x-internal:=true,
org.eclipse.papyrus.uml.filters,

Back to the top