Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2021-03-03 04:27:23 -0500
committerQuentin Le Menez2021-03-09 08:05:27 -0500
commit805fbae0ccc8112ec518472caec909df8f85e7a6 (patch)
tree4162ad234dce9dcec26148b02f1ebe090dc7da7a /plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse
parent812c8a8df9044e286865fba10da05ae9d6e25933 (diff)
downloadorg.eclipse.papyrus-805fbae0ccc8112ec518472caec909df8f85e7a6.tar.gz
org.eclipse.papyrus-805fbae0ccc8112ec518472caec909df8f85e7a6.tar.xz
org.eclipse.papyrus-805fbae0ccc8112ec518472caec909df8f85e7a6.zip
Bug 570177 - [Releng] Update for 2021-03 RC1
- Update maven plugin versions - Remove the jboss mecanism (not necessary anymore) - Add guava dependency plugin to paliate the API loss - Add missing @since tags - Add API filters because... reasons Change-Id: If0b5cb48172eed2e2079d38f1cc0c2a61fbaca1d Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse')
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/AbstractNestedDiagramViewsSyncFeature.java3
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/UISyncUtils.java7
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/AbstractNestedDiagramViewsSyncFeature.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/AbstractNestedDiagramViewsSyncFeature.java
index a583835cbae..68e6003b0f5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/AbstractNestedDiagramViewsSyncFeature.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/AbstractNestedDiagramViewsSyncFeature.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2014, 2015, 2021 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -12,6 +12,7 @@
* CEA LIST - Initial API and implementation
* Christian W. Damus - bug 465416
* Christian W. Damus - bug 477384
+ * Quentin Le Menez - bug 570177
*
*****************************************************************************/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/UISyncUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/UISyncUtils.java
index 63d4615d2c6..b946f6bb219 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/UISyncUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/UISyncUtils.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2015 Christian W. Damus and others.
+ * Copyright (c) 2015, 2021 Christian W. Damus and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,18 +10,18 @@
*
* Contributors:
* Christian W. Damus - Initial API and implementation
+ * Quentin Le Menez - bug 570177
*
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.common.sync;
+import org.eclipse.papyrus.infra.guava.internal.CheckedFuture;
import org.eclipse.papyrus.infra.sync.ISyncObject;
import org.eclipse.papyrus.infra.sync.service.ISyncService;
import org.eclipse.papyrus.infra.sync.service.SyncServiceRunnable;
import org.eclipse.swt.widgets.Display;
-import com.google.common.util.concurrent.CheckedFuture;
-
/**
* Sync framework utilities for a UI context.
*/
@@ -46,6 +46,7 @@ public class UISyncUtils {
* @return the future result of the {@code operation}
*
* @see SyncServiceRunnable.Safe
+ * @since 4.1
*/
public static <V, X extends Exception> CheckedFuture<V, X> asyncExec(final ISyncObject syncObject, final SyncServiceRunnable<V, X> operation) {
return syncObject.runAsync(operation);

Back to the top