diff options
| author | Christian W. Damus | 2014-03-12 14:08:38 +0000 |
|---|---|---|
| committer | Christian W. Damus | 2014-03-12 14:13:28 +0000 |
| commit | cf2b7513da5996962b79428cd2ad862c3ca66867 (patch) | |
| tree | 68db13dbcc7cd4652fa351942f3bfef4b0d57074 /extraplugins/cdo | |
| parent | 2971aa73c48a50f34f52d64e92298e9b5f591172 (diff) | |
| download | org.eclipse.papyrus-cf2b7513da5996962b79428cd2ad862c3ca66867.tar.gz org.eclipse.papyrus-cf2b7513da5996962b79428cd2ad862c3ca66867.tar.xz org.eclipse.papyrus-cf2b7513da5996962b79428cd2ad862c3ca66867.zip | |
[Releng] Adapt to source-incompatible API change in CDO Luna M6
Diffstat (limited to 'extraplugins/cdo')
2 files changed, 7 insertions, 4 deletions
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlink.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlink.java index 8df258f961a..6bebe5aff00 100644 --- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlink.java +++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlink.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2009, 2013 CEA LIST and others. + * Copyright (c) 2009, 2014 CEA LIST and others. * * * All rights reserved. This program and the accompanying materials @@ -10,6 +10,7 @@ * Contributors: * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation * Christian W. Damus (CEA LIST) - adapted for CDO repository resource hyperlinks + * Christian W. Damus (CEA) - adapt to source-incompatible API change in CDO Luna M6 * *****************************************************************************/ package org.eclipse.papyrus.cdo.internal.ui.hyperlink; @@ -106,7 +107,7 @@ public class CDOResourceHyperlink extends HyperLinkObject { new EresourceSwitch<Void>() { @Override - public Void caseCDOFileResource(CDOFileResource<?> object) { + public <IO> Void caseCDOFileResource(CDOFileResource<IO> object) { CDOEditorUtil.openEditor(page, object); return null; } diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/CDOResourceLabelProvider.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/CDOResourceLabelProvider.java index eb7f1cc3fb3..98d193afd45 100644 --- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/CDOResourceLabelProvider.java +++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/CDOResourceLabelProvider.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013 CEA LIST. + * Copyright (c) 2013, 2014 CEA LIST and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -8,6 +8,8 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Christian W. Damus (CEA) - adapt to source-incompatible API change in CDO Luna M6 + * *****************************************************************************/ package org.eclipse.papyrus.cdo.internal.ui.providers; @@ -113,7 +115,7 @@ public class CDOResourceLabelProvider extends LabelProvider implements IFiltered } @Override - public String caseCDOFileResource(CDOFileResource<?> object) { + public <IO> String caseCDOFileResource(CDOFileResource<IO> object) { return Messages.CDOResLabels_fileKind; } |