diff options
| author | Christian W. Damus | 2016-05-25 13:36:53 +0000 |
|---|---|---|
| committer | Christian W. Damus | 2016-05-25 13:42:01 +0000 |
| commit | b5e35f3ee54e3011c73b14a1482ddf59f857f2e9 (patch) | |
| tree | 3b297d688d53f477ee71572cba7c486a655eb17e /plugins/infra/core | |
| parent | 1aca1546916a68f6b99046b71762645cedbe8176 (diff) | |
| download | org.eclipse.papyrus-b5e35f3ee54e3011c73b14a1482ddf59f857f2e9.tar.gz org.eclipse.papyrus-b5e35f3ee54e3011c73b14a1482ddf59f857f2e9.tar.xz org.eclipse.papyrus-b5e35f3ee54e3011c73b14a1482ddf59f857f2e9.zip | |
Bug 494543: [Source Repository] Compilation errors in developer workspace
https://bugs.eclipse.org/bugs/show_bug.cgi?id=494543
Delete a project that is no longer used/built and apply a work-around
that should not be needed for spurious compilation errors in what
appears to be a bug in the compiler's type inference.
Change-Id: I6e350df8a5b87a6a7802e2ce661a4ff3bef850c9
Diffstat (limited to 'plugins/infra/core')
2 files changed, 12 insertions, 7 deletions
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java index b79c1a7e1de..497377e8b8b 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2009, 2015 CEA LIST & LIFL, Christian W. Damus, and others
+ * Copyright (c) 2009, 2016 CEA LIST & LIFL, Christian W. Damus, and others
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,11 +9,13 @@ *
* Contributors:
* Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Christian W. Damus - bug 469188
+ * Christian W. Damus - bugs 469188, 494543
*
*****************************************************************************/
package org.eclipse.papyrus.infra.core.sasheditor.internal;
+import java.util.function.Supplier;
+
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.papyrus.infra.core.sasheditor.Activator;
@@ -62,7 +64,8 @@ public class ComponentPart extends PagePart implements IComponentPage { @Override
public <T> T getAdapter(Class<T> adapter) {
- return PlatformHelper.getAdapter(partModel, adapter, () -> super.getAdapter(adapter));
+ Supplier<T> fallback = () -> super.getAdapter(adapter);
+ return PlatformHelper.getAdapter(partModel, adapter, fallback);
}
/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java index 695848cec83..43d17f21b29 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java @@ -8,13 +8,14 @@ * * Contributors: * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation - * Christian W. Damus - bugs 469188, 474467 + * Christian W. Damus - bugs 469188, 474467, 494543 * *****************************************************************************/ package org.eclipse.papyrus.infra.core.sasheditor.internal; import java.io.PrintWriter; import java.io.StringWriter; +import java.util.function.Supplier; import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.IStatus; @@ -25,6 +26,7 @@ import org.eclipse.papyrus.infra.core.sasheditor.Activator; import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.AbstractPageModel; import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel; import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage; +import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart.GarbageState; import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.IMultiPageEditorSite; import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.MultiPageEditorSite; import org.eclipse.papyrus.infra.tools.util.PlatformHelper; @@ -176,9 +178,9 @@ public class EditorPart extends PagePart implements IEditorPage { @Override public <T> T getAdapter(Class<T> adapter) { - return PlatformHelper.getAdapter(editorPart, adapter, ()// - -> PlatformHelper.getAdapter(editorModel, adapter, ()// - -> super.getAdapter(adapter))); + Supplier<T> fallbackFallback = () -> super.getAdapter(adapter); + Supplier<T> fallback = () -> PlatformHelper.getAdapter(editorModel, adapter, fallbackFallback); + return PlatformHelper.getAdapter(editorPart, adapter, fallback); } /** |