[495036] Remove obsolete types IExpressionProposal and DefaultExpressionProposal
Bug: 495036
Change-Id: I8b89376551fd14fcf46822f35e3602c14c826dc8
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/DefaultExpressionProposal.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/DefaultExpressionProposal.java
deleted file mode 100644
index a662462..0000000
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/DefaultExpressionProposal.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 THALES GLOBAL SERVICES.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.common.tools.api.interpreter;
-
-import org.eclipse.sirius.common.tools.Messages;
-
-/**
- * Default implementation of {@link IExpressionProposal}.
- *
- * @author ymortier
- */
-public class DefaultExpressionProposal implements IExpressionProposal {
-
- /** The description. */
- private String description;
-
- /** The proposal. */
- private String proposal;
-
- /**
- * Creates a new {@link DefaultExpressionProposal} with the given proposal.
- *
- * @param proposal
- * the proposal (mandatory).
- */
- public DefaultExpressionProposal(final String proposal) {
- this(proposal, null);
- }
-
- /**
- * Creates a new {@link DefaultExpressionProposal} with the given proposal
- * and description.
- *
- * @param proposal
- * the proposal
- * @param description
- * the description of the proposal.
- */
- public DefaultExpressionProposal(final String proposal, final String description) {
- if (proposal == null) {
- throw new IllegalArgumentException(Messages.DefaultExpressionProposal_nullProposal);
- }
- this.proposal = proposal;
- this.description = description;
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.sirius.common.tools.api.interpreter.IExpressionProposal#getDescription()
- */
- public String getDescription() {
- return this.description;
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.sirius.common.tools.api.interpreter.IExpressionProposal#getProposal()
- */
- public String getProposal() {
- return this.proposal;
- }
-
-}
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IExpressionProposal.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IExpressionProposal.java
deleted file mode 100644
index b160ecd..0000000
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IExpressionProposal.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 THALES GLOBAL SERVICES.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.common.tools.api.interpreter;
-
-/**
- * Contract of a proposal for an expression to evaluate.
- *
- * @author ymortier
- */
-public interface IExpressionProposal {
-
- /**
- * Returns the proposal.
- *
- * @return the proposal.
- */
- String getProposal();
-
- /**
- * Returns the description.
- *
- * @return the description.
- */
- String getDescription();
-
-}
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/JavaExtensionsManager.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/JavaExtensionsManager.java
index c08fca85..719b7ee 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/JavaExtensionsManager.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/JavaExtensionsManager.java
@@ -394,6 +394,7 @@
if (genModel != null) {
EClass eClass = genModel.eClass();
if (eClass.getEPackage() != null && "GenModel".equals(eClass.getName()) && "genmodel".equals(eClass.getEPackage().getName())) { //$NON-NLS-1$ //$NON-NLS-2$
+ @SuppressWarnings("unchecked")
Collection<EObject> genPackages = (Collection<EObject>) genModel.eGet(eClass.getEStructuralFeature("genPackages")); //$NON-NLS-1$
collectEPackages(ecorePackages, genPackages);
}
@@ -408,6 +409,7 @@
if (ePak instanceof EPackage && !StringUtil.isEmpty(((EPackage) ePak).getNsURI())) {
ecorePackages.put(((EPackage) ePak).getNsURI(), (EPackage) ePak);
}
+ @SuppressWarnings("unchecked")
Collection<EObject> subGenPackages = (Collection<EObject>) genPackage.eGet(genPackage.eClass().getEStructuralFeature("nestedGenPackages")); //$NON-NLS-1$
collectEPackages(ecorePackages, subGenPackages);
}
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index 24acbe8..e8a6f84 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -133,6 +133,16 @@
</ul>
<h3 id="SpecifierVisibleChanges">Specifier-Visible Changes</h3>
<h3 id="DeveloperVisibleChanges">Developer-Visible Changes</h3>
+ <h4 id="Changesinorg.eclipse.sirius.common">Changes in
+ <code>org.eclipse.sirius.common</code>
+ </h4>
+ <ul>
+ <li><span class="label label-danger">Removed</span> The interface
+ <code>org.eclipse.sirius.common.tools.api.interpreter.IExpressionProposal</code> and its only implementation
+ <code>DefaultExpressionProposal</code> (in the same package) have been removed. They were not used anywhere, expression completion API is actually defined in package
+ <code>org.eclipse.sirius.common.tools.api.contentassist</code> which has its own types.
+ </li>
+ </ul>
<h4 id="Migrations">Migrations</h4>
<h4 id="TranslationKeysChanges">Translation Keys Changes</h4>
<h2 id="sirius5.1.1">Changes in Sirius 5.1.1</h2>
@@ -398,7 +408,7 @@
<code>DialectManagerImpl</code>.
</li>
</ul>
- <h4 id="Changesinorg.eclipse.sirius.common">Changes in
+ <h4 id="Changesinorg.eclipse.sirius.common2">Changes in
<code>org.eclipse.sirius.common</code>
</h4>
<ul>
@@ -623,7 +633,7 @@
<p>See
<a href="i18n_changes.html#sirius50">this document</a> for the complete list of message keys added or removed in Sirius 5.0.
</p>
- <h4 id="Changesinorg.eclipse.sirius.common2">Changes in
+ <h4 id="Changesinorg.eclipse.sirius.common3">Changes in
<code>org.eclipse.sirius.common</code>
</h4>
<ul>
@@ -1887,7 +1897,7 @@
<code>MetamodelDescriptorProvider</code>.
</li>
</ul>
- <h4 id="Changesinorg.eclipse.sirius.common3">Changes in
+ <h4 id="Changesinorg.eclipse.sirius.common4">Changes in
<code>org.eclipse.sirius.common</code>
</h4>
<ul>
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
index 9b0f85a..dce4656 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -14,6 +14,11 @@
h3. Developer-Visible Changes
+h4. Changes in @org.eclipse.sirius.common@
+
+* <span class="label label-danger">Removed</span> The interface @org.eclipse.sirius.common.tools.api.interpreter.IExpressionProposal@ and its only implementation @DefaultExpressionProposal@ (in the same package) have been removed. They were not used anywhere, expression completion API is actually defined in package @org.eclipse.sirius.common.tools.api.contentassist@ which has its own types.
+
+
h4. Migrations
h4. Translation Keys Changes
