Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Elder2014-01-29 14:50:12 +0000
committerGerrit Code Review @ Eclipse.org2014-01-29 14:56:14 +0000
commit059fbb24bd5da853e93a0548943ba83ffbf5d9d3 (patch)
treeb0e7873c998945da23b0dff4431e17a6eb0472d8
parentac817367cd3b1ec42681cfb15561f96c258f182f (diff)
downloadeclipse.platform.ui-059fbb24bd5da853e93a0548943ba83ffbf5d9d3.tar.gz
eclipse.platform.ui-059fbb24bd5da853e93a0548943ba83ffbf5d9d3.tar.xz
eclipse.platform.ui-059fbb24bd5da853e93a0548943ba83ffbf5d9d3.zip
Clean-up ecore model and generated output:
* put @since tag in doc element of Localizable * regenerated with latest EMF version Change-Id: If6a9039af594ce47a83f4efa068476264c506d93
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore2
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java3
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToObjectMapImpl.java3
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToStringMapImpl.java3
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MElementContainer.java1
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MLocalizable.java2
6 files changed, 5 insertions, 9 deletions
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore b/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore
index e5ea90df661..d53852ec5ad 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore
+++ b/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore
@@ -572,7 +572,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Localizable" abstract="true" interface="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;This class should be mixed into any UI element that should participate in the&#xD;&#xA;Locale update handling.&#xD;&#xA;&lt;/p>"/>
+ <details key="documentation" value="&lt;p>&#xD;&#xA;This class should be mixed into any UI element that should participate in the&#xD;&#xA;Locale update handling.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.1"/>
</eAnnotations>
<eOperations name="updateLocalization">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java
index d1b7842233c..29cf81c271e 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container;
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EcoreEMap;
import org.eclipse.emf.ecore.util.InternalEList;
@@ -44,7 +43,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
*
* @generated
*/
-public abstract class ApplicationElementImpl extends Container implements MApplicationElement {
+public abstract class ApplicationElementImpl extends org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container implements MApplicationElement {
/**
* The default value of the '{@link #getElementId() <em>Element Id</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToObjectMapImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToObjectMapImpl.java
index d9afeb6e1de..049079ef54c 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToObjectMapImpl.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToObjectMapImpl.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.common.util.EMap;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container;
/**
* <!-- begin-user-doc -->
@@ -32,7 +31,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container;
*
* @generated
*/
-public class StringToObjectMapImpl extends Container implements BasicEMap.Entry<String,Object> {
+public class StringToObjectMapImpl extends org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container implements BasicEMap.Entry<String,Object> {
/**
* The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToStringMapImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToStringMapImpl.java
index 0e1e4dd26f5..ef3439b9986 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToStringMapImpl.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToStringMapImpl.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.common.util.EMap;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container;
/**
* <!-- begin-user-doc -->
@@ -32,7 +31,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container;
*
* @generated
*/
-public class StringToStringMapImpl extends Container implements BasicEMap.Entry<String,String> {
+public class StringToStringMapImpl extends org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container implements BasicEMap.Entry<String,String> {
/**
* The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MElementContainer.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MElementContainer.java
index 9a4bd1676b6..4ed9c6d04c0 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MElementContainer.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MElementContainer.java
@@ -47,7 +47,6 @@ import java.util.List;
public interface MElementContainer<T extends MUIElement> extends MUIElement {
/**
* Returns the value of the '<em><b>Children</b></em>' containment reference list.
- * The list contents are of type {@link T}.
* It is bidirectional and its opposite is '{@link org.eclipse.e4.ui.model.application.ui.MUIElement#getParent <em>Parent</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MLocalizable.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MLocalizable.java
index 05ee26624f9..c291f16cb15 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MLocalizable.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MLocalizable.java
@@ -21,12 +21,12 @@ package org.eclipse.e4.ui.model.application.ui;
* This class should be mixed into any UI element that should participate in the
* Locale update handling.
* </p>
+ * @since 1.1
* <!-- end-model-doc -->
*
*
* @model interface="true" abstract="true"
* @generated
- * @since 1.1
*/
public interface MLocalizable {
/**

Back to the top