434163: Dynamic Domain Model References
https://bugs.eclipse.org/bugs/show_bug.cgi?id=434163
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.ui.view.swt/.settings/.api_filters
index 169bfb1..b036e6b 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt/.settings/.api_filters
@@ -29,12 +29,24 @@
<message_argument value="getGridDescription(GridDescription)"/>
</message_arguments>
</filter>
+ <filter comment="SPI change (1.3)" id="336695337">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.swt.AbstractSWTRenderer"/>
+ <message_argument value="getGridDescription(SWTGridDescription)"/>
+ </message_arguments>
+ </filter>
<filter comment="This is SPI" id="336695337">
<message_arguments>
<message_argument value="org.eclipse.emf.ecp.view.spi.swt.AbstractSWTRenderer"/>
<message_argument value="renderControl(GridCell, Composite)"/>
</message_arguments>
</filter>
+ <filter comment="SPI change (1.3)" id="336695337">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.swt.AbstractSWTRenderer"/>
+ <message_argument value="renderControl(SWTGridCell, Composite)"/>
+ </message_arguments>
+ </filter>
<filter comment="This is SPI" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.emf.ecp.view.spi.swt.AbstractSWTRenderer"/>
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/AbstractSWTRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/AbstractSWTRenderer.java
index b1a9276..f70195c 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/AbstractSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/AbstractSWTRenderer.java
@@ -57,6 +57,10 @@
*/
public abstract class AbstractSWTRenderer<VELEMENT extends VElement> extends AbstractRenderer<VELEMENT> {
+ /**
+ * Variant constant for indicating RAP controls.
+ */
+ protected static final String CUSTOM_VARIANT = "org.eclipse.rap.rwt.customVariant"; //$NON-NLS-1$
private ModelChangeListener listener;
private Map<SWTGridCell, Control> controls;
private SWTRendererFactory rendererFactory;
@@ -88,6 +92,14 @@
*/
public abstract SWTGridDescription getGridDescription(SWTGridDescription gridDescription);
+ /**
+ *
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.view.model.common.AbstractRenderer#init(org.eclipse.emf.ecp.view.spi.model.VElement,
+ * org.eclipse.emf.ecp.view.spi.context.ViewModelContext)
+ * @since 1.3
+ */
@Override
public final void init(final VELEMENT vElement, final ViewModelContext viewContext) {
super.init(vElement, viewContext);
@@ -157,6 +169,8 @@
/**
* Disposes all resources used by the renderer.
* Don't forget to call super.dispose if overwriting this method.
+ *
+ * @since 1.3
*/
@Override
protected void dispose() {
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/layout/SWTGridCell.java b/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/layout/SWTGridCell.java
index 0da0050..2b4b334 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/layout/SWTGridCell.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/layout/SWTGridCell.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* 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:
* Eugen - initial API and implementation
******************************************************************************/
@@ -17,15 +17,16 @@
/**
* A {@link SWTGridCell} has a row, a column and a renderer it is rendered by.
- *
+ *
* @author Eugen Neufeld
- *
+ * @since 1.3
+ *
*/
public class SWTGridCell extends AbstractGridCell<AbstractSWTRenderer<?>> {
/**
* Default constructor to create a grid cell.
- *
+ *
* @param row the row of the cell
* @param column the column of the cell
* @param renderer the {@link AbstractSWTRenderer} that renderes the cell
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/layout/SWTGridDescription.java b/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/layout/SWTGridDescription.java
index f3b1377..affaf1d 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/layout/SWTGridDescription.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/layout/SWTGridDescription.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* 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:
* Eugen - initial API and implementation
******************************************************************************/
@@ -19,11 +19,12 @@
/**
* A {@link SWTGridDescription} describes the grid of the renderer using a list of {@link SWTGridCell GridCells} and the
* number of rows and columns it has.
- *
+ *
* Use the {@link GridDescriptionFactory} to create {@link SWTGridDescription GridDescriptions}.
- *
- * @author Eugen
- *
+ *
+ * @author Eugen Neufeld
+ * @since 1.3
+ *
*/
public class SWTGridDescription extends AbstractGridDescription<SWTGridCell> {
@@ -36,7 +37,7 @@
/**
* Creating a filled grid.
- *
+ *
* @param rows number of rows in this description
* @param columns number of columns in this description
* @param grid the List of {@link SWTGridCell GridCells} describing the grid
@@ -47,7 +48,7 @@
/**
* Creates a copy of the grid.
- *
+ *
* @return a copy of the grid
*/
public SWTGridDescription copy() {
diff --git a/bundles/org.eclipse.emf.ecp.ui.view/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.ui.view/.settings/.api_filters
new file mode 100644
index 0000000..c63c60b
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.ui.view/.settings/.api_filters
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emf.ecp.ui.view" version="2">
+ <resource path="META-INF/MANIFEST.MF">
+ <filter comment="SPI change" id="923795461">
+ <message_arguments>
+ <message_argument value="1.3.0"/>
+ <message_argument value="1.2.1"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.ecp.view.spi.context.ModelChangeNotification">
+ <filter comment="SPI change" id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.context.ModelChangeNotification"/>
+ <message_argument value="org.eclipse.emf.ecp.ui.view_1.2.1"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/bundles/org.eclipse.emf.ecp.view.context/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.context/.settings/.api_filters
index 328a549..ad55bf4 100644
--- a/bundles/org.eclipse.emf.ecp.view.context/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.context/.settings/.api_filters
@@ -8,6 +8,14 @@
</message_arguments>
</filter>
</resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.ecp.view.spi.context.ModelChangeNotification">
+ <filter comment="SPI Change (1.3)" id="305324134">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.context.ModelChangeNotification"/>
+ <message_argument value="org.eclipse.emf.ecp.view.context_1.3.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/ecp/view/spi/context/ViewModelContext.java" type="org.eclipse.emf.ecp.view.spi.context.ViewModelContext">
<filter comment="This is SPI" id="403804204">
<message_arguments>
@@ -21,5 +29,59 @@
<message_argument value="getControlsFor(UniqueSetting)"/>
</message_arguments>
</filter>
+ <filter comment="SPI Change (1.3)" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.context.ViewModelContext"/>
+ <message_argument value="registerDomainChangeListener(ModelChangeListener)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change (1.3)" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.context.ViewModelContext"/>
+ <message_argument value="registerViewChangeListener(ModelChangeListener)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change (1.3)" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.context.ViewModelContext"/>
+ <message_argument value="unregisterDomainChangeListener(ModelChangeListener)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change (1.3)" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.context.ViewModelContext"/>
+ <message_argument value="unregisterViewChangeListener(ModelChangeListener)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change (1.3)" id="405901410">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.context.ViewModelContext"/>
+ <message_argument value="registerDomainChangeListener(ViewModelContext.ModelChangeListener)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change (1.3)" id="405901410">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.context.ViewModelContext"/>
+ <message_argument value="registerViewChangeListener(ViewModelContext.ModelChangeListener)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change (1.3)" id="405901410">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.context.ViewModelContext"/>
+ <message_argument value="unregisterDomainChangeListener(ViewModelContext.ModelChangeListener)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change (1.3)" id="405901410">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.context.ViewModelContext"/>
+ <message_argument value="unregisterViewChangeListener(ViewModelContext.ModelChangeListener)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change (1.3)" id="405995624">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.context.ViewModelContext.ModelChangeListener"/>
+ <message_argument value="org.eclipse.emf.ecp.view.context_1.3.0"/>
+ </message_arguments>
+ </filter>
</resource>
</component>
diff --git a/bundles/org.eclipse.emf.ecp.view.context/src/org/eclipse/emf/ecp/view/spi/context/ViewModelContext.java b/bundles/org.eclipse.emf.ecp.view.context/src/org/eclipse/emf/ecp/view/spi/context/ViewModelContext.java
index a9b857d..baceb7b 100644
--- a/bundles/org.eclipse.emf.ecp.view.context/src/org/eclipse/emf/ecp/view/spi/context/ViewModelContext.java
+++ b/bundles/org.eclipse.emf.ecp.view.context/src/org/eclipse/emf/ecp/view/spi/context/ViewModelContext.java
@@ -32,6 +32,7 @@
* Register domain change listener.
*
* @param modelChangeListener the model change listener
+ * @since 1.3
*/
void registerDomainChangeListener(ModelChangeListener modelChangeListener);
@@ -39,6 +40,7 @@
* Unregister domain change listener.
*
* @param modelChangeListener the model change listener
+ * @since 1.3
*/
void unregisterDomainChangeListener(ModelChangeListener modelChangeListener);
@@ -60,6 +62,7 @@
* Register view change listener.
*
* @param modelChangeListener the model change listener
+ * @since 1.3
*/
void registerViewChangeListener(ModelChangeListener modelChangeListener);
@@ -67,6 +70,7 @@
* Unregister view change listener.
*
* @param modelChangeListener the model change listener
+ * @since 1.3
*/
void unregisterViewChangeListener(ModelChangeListener modelChangeListener);
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/src/org/eclipse/emf/ecp/view/spi/custom/model/provider/CustomControlItemProvider.java b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/src/org/eclipse/emf/ecp/view/spi/custom/model/provider/CustomControlItemProvider.java
index fb6aff1..4f4a7d9 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/src/org/eclipse/emf/ecp/view/spi/custom/model/provider/CustomControlItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/src/org/eclipse/emf/ecp/view/spi/custom/model/provider/CustomControlItemProvider.java
@@ -34,7 +34,9 @@
/**
* This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.custom.model.VCustomControl} object.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -154,7 +156,7 @@
@Override
public String getText(Object object)
{
- String label = ((VCustomControl) object).getName();
+ final String label = ((VCustomControl) object).getName();
return label == null || label.length() == 0 ?
getString("_UI_CustomControl_type") : //$NON-NLS-1$
getString("_UI_CustomControl_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/src/org/eclipse/emf/ecp/view/spi/custom/model/provider/CustomDomainModelReferenceItemProvider.java b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/src/org/eclipse/emf/ecp/view/spi/custom/model/provider/CustomDomainModelReferenceItemProvider.java
index c04c603..b5a8741 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/src/org/eclipse/emf/ecp/view/spi/custom/model/provider/CustomDomainModelReferenceItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/src/org/eclipse/emf/ecp/view/spi/custom/model/provider/CustomDomainModelReferenceItemProvider.java
@@ -38,7 +38,9 @@
* This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.custom.model.VCustomDomainModelReference}
* object.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -220,7 +222,7 @@
@Override
public String getText(Object object)
{
- String label = ((VCustomDomainModelReference) object).getBundleName();
+ final String label = ((VCustomDomainModelReference) object).getBundleName();
return label == null || label.length() == 0 ?
getString("_UI_CustomDomainModelReference_type") : //$NON-NLS-1$
getString("_UI_CustomDomainModelReference_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/src/org/eclipse/emf/ecp/view/spi/custom/model/provider/CustomItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/src/org/eclipse/emf/ecp/view/spi/custom/model/provider/CustomItemProviderAdapterFactory.java
index 83ecdca..9f67a35 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/src/org/eclipse/emf/ecp/view/spi/custom/model/provider/CustomItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/src/org/eclipse/emf/ecp/view/spi/custom/model/provider/CustomItemProviderAdapterFactory.java
@@ -113,7 +113,9 @@
* This keeps track of the one adapter used for all {@link org.eclipse.emf.ecp.view.spi.custom.model.VCustomControl}
* instances.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -141,7 +143,9 @@
* This keeps track of the one adapter used for all
* {@link org.eclipse.emf.ecp.view.spi.custom.model.VCustomDomainModelReference} instances.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -222,8 +226,8 @@
public Object adapt(Object object, Object type) {
if (isFactoryForType(type))
{
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter)))
+ final Object adapter = super.adapt(object, type);
+ if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter))
{
return adapter;
}
@@ -314,10 +318,12 @@
*/
@Override
public void dispose() {
- if (customControlItemProvider != null)
+ if (customControlItemProvider != null) {
customControlItemProvider.dispose();
- if (customDomainModelReferenceItemProvider != null)
+ }
+ if (customDomainModelReferenceItemProvider != null) {
customDomainModelReferenceItemProvider.dispose();
+ }
}
/**
@@ -436,7 +442,7 @@
*/
@Override
public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
- ArrayList<Object> result = new ArrayList<Object>();
+ final ArrayList<Object> result = new ArrayList<Object>();
new CreationSwitch(result, editingDomain).doSwitch((EObject) object);
return result;
}
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomControl.java b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomControl.java
index 0bd1fe8..d1e2120 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomControl.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomControl.java
@@ -29,6 +29,7 @@
* @see org.eclipse.emf.ecp.view.spi.custom.model.VCustomPackage#getCustomControl()
* @model
* @generated
+ * @since 1.3
*/
public interface VCustomControl extends VControl
{
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomDomainModelReference.java b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomDomainModelReference.java
index 493186b..19b5fc1 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomDomainModelReference.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomDomainModelReference.java
@@ -34,6 +34,7 @@
* @see org.eclipse.emf.ecp.view.spi.custom.model.VCustomPackage#getCustomDomainModelReference()
* @model
* @generated
+ * @since 1.3
*/
public interface VCustomDomainModelReference extends VDomainModelReference
{
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomFactory.java b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomFactory.java
index 638c857..1856b40 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomFactory.java
@@ -39,6 +39,7 @@
*
* @return a new object of class '<em>Control</em>'.
* @generated
+ * @since 1.3
*/
VCustomControl createCustomControl();
@@ -49,6 +50,7 @@
*
* @return a new object of class '<em>Domain Model Reference</em>'.
* @generated
+ * @since 1.3
*/
VCustomDomainModelReference createCustomDomainModelReference();
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomPackage.java b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomPackage.java
index 26b8108..2ce0ee9 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomPackage.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/VCustomPackage.java
@@ -27,11 +27,14 @@
* <li>each enum,</li>
* <li>and each data type</li>
* </ul>
- * <!-- end-user-doc -->
+ *
+ * @noimplement This interface is not intended to be implemented by clients.
+ * <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecp.view.spi.custom.model.VCustomFactory
* @model kind="package"
* @generated
+ *
*/
public interface VCustomPackage extends EPackage {
/**
@@ -74,7 +77,9 @@
* The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomControlImpl
* <em>Control</em>}' class.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomControlImpl
* @see org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomPackageImpl#getCustomControl()
@@ -85,7 +90,9 @@
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -95,7 +102,9 @@
/**
* The feature id for the '<em><b>Visible</b></em>' attribute.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -105,7 +114,9 @@
/**
* The feature id for the '<em><b>Enabled</b></em>' attribute.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -115,7 +126,9 @@
/**
* The feature id for the '<em><b>Readonly</b></em>' attribute.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -125,7 +138,9 @@
/**
* The feature id for the '<em><b>Diagnostic</b></em>' containment reference.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -135,7 +150,9 @@
/**
* The feature id for the '<em><b>Attachments</b></em>' containment reference list.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -145,7 +162,9 @@
/**
* The feature id for the '<em><b>Label Alignment</b></em>' attribute.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -155,7 +174,9 @@
/**
* The feature id for the '<em><b>Domain Model Reference</b></em>' containment reference.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -165,7 +186,9 @@
/**
* The feature id for the '<em><b>Bundle Name</b></em>' attribute.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -175,7 +198,9 @@
/**
* The feature id for the '<em><b>Class Name</b></em>' attribute.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -185,7 +210,9 @@
/**
* The number of structural features of the '<em>Control</em>' class.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -197,7 +224,9 @@
* {@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl
* <em>Domain Model Reference</em>}' class.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl
* @see org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomPackageImpl#getCustomDomainModelReference()
@@ -208,7 +237,9 @@
/**
* The feature id for the '<em><b>Change Listener</b></em>' attribute list.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -218,7 +249,9 @@
/**
* The feature id for the '<em><b>Domain Model References</b></em>' containment reference list.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -228,7 +261,9 @@
/**
* The feature id for the '<em><b>Bundle Name</b></em>' attribute.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -238,7 +273,9 @@
/**
* The feature id for the '<em><b>Class Name</b></em>' attribute.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -248,7 +285,9 @@
/**
* The feature id for the '<em><b>Control Checked</b></em>' attribute.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -258,7 +297,9 @@
/**
* The number of structural features of the '<em>Domain Model Reference</em>' class.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -269,7 +310,9 @@
* Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.custom.model.VCustomControl
* <em>Control</em>}'.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the meta object for class '<em>Control</em>'.
* @see org.eclipse.emf.ecp.view.spi.custom.model.VCustomControl
@@ -281,7 +324,9 @@
* Returns the meta object for the attribute '
* {@link org.eclipse.emf.ecp.view.spi.custom.model.VCustomControl#getBundleName <em>Bundle Name</em>}'.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Bundle Name</em>'.
* @see org.eclipse.emf.ecp.view.spi.custom.model.VCustomControl#getBundleName()
@@ -294,7 +339,9 @@
* Returns the meta object for the attribute '
* {@link org.eclipse.emf.ecp.view.spi.custom.model.VCustomControl#getClassName <em>Class Name</em>}'.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Class Name</em>'.
* @see org.eclipse.emf.ecp.view.spi.custom.model.VCustomControl#getClassName()
@@ -307,7 +354,9 @@
* Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.custom.model.VCustomDomainModelReference
* <em>Domain Model Reference</em>}'.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the meta object for class '<em>Domain Model Reference</em>'.
* @see org.eclipse.emf.ecp.view.spi.custom.model.VCustomDomainModelReference
@@ -320,7 +369,9 @@
* {@link org.eclipse.emf.ecp.view.spi.custom.model.VCustomDomainModelReference#getDomainModelReferences
* <em>Domain Model References</em>}'.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the meta object for the containment reference list '<em>Domain Model References</em>'.
* @see org.eclipse.emf.ecp.view.spi.custom.model.VCustomDomainModelReference#getDomainModelReferences()
@@ -334,7 +385,9 @@
* {@link org.eclipse.emf.ecp.view.spi.custom.model.VCustomDomainModelReference#getBundleName <em>Bundle Name</em>}
* '.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Bundle Name</em>'.
* @see org.eclipse.emf.ecp.view.spi.custom.model.VCustomDomainModelReference#getBundleName()
@@ -347,7 +400,9 @@
* Returns the meta object for the attribute '
* {@link org.eclipse.emf.ecp.view.spi.custom.model.VCustomDomainModelReference#getClassName <em>Class Name</em>}'.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Class Name</em>'.
* @see org.eclipse.emf.ecp.view.spi.custom.model.VCustomDomainModelReference#getClassName()
@@ -361,7 +416,9 @@
* {@link org.eclipse.emf.ecp.view.spi.custom.model.VCustomDomainModelReference#isControlChecked
* <em>Control Checked</em>}'.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Control Checked</em>'.
* @see org.eclipse.emf.ecp.view.spi.custom.model.VCustomDomainModelReference#isControlChecked()
@@ -398,7 +455,9 @@
* The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomControlImpl
* <em>Control</em>}' class.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomControlImpl
* @see org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomPackageImpl#getCustomControl()
@@ -409,7 +468,9 @@
/**
* The meta object literal for the '<em><b>Bundle Name</b></em>' attribute feature.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -418,7 +479,9 @@
/**
* The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -429,7 +492,9 @@
* {@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl
* <em>Domain Model Reference</em>}' class.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl
* @see org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomPackageImpl#getCustomDomainModelReference()
@@ -440,7 +505,9 @@
/**
* The meta object literal for the '<em><b>Domain Model References</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -450,7 +517,9 @@
/**
* The meta object literal for the '<em><b>Bundle Name</b></em>' attribute feature.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -459,7 +528,9 @@
/**
* The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -468,7 +539,9 @@
/**
* The meta object literal for the '<em><b>Control Checked</b></em>' attribute feature.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomControlImpl.java b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomControlImpl.java
index 2c699af..a041d90 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomControlImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomControlImpl.java
@@ -21,14 +21,18 @@
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Control</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomControlImpl#getBundleName <em>Bundle Name</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomControlImpl#getClassName <em>Class Name</em>}</li>
- * </ul>
- * </p>
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomControlImpl#getBundleName <em>Bundle Name
+ * </em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomControlImpl#getClassName <em>Class Name</em>}
+ * </li>
+ * </ul>
+ * </p>
*
* @generated
*/
@@ -122,11 +126,12 @@
@Override
public void setBundleName(String newBundleName)
{
- String oldBundleName = bundleName;
+ final String oldBundleName = bundleName;
bundleName = newBundleName;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, VCustomPackage.CUSTOM_CONTROL__BUNDLE_NAME,
oldBundleName, bundleName));
+ }
}
/**
@@ -150,11 +155,12 @@
@Override
public void setClassName(String newClassName)
{
- String oldClassName = className;
+ final String oldClassName = className;
className = newClassName;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, VCustomPackage.CUSTOM_CONTROL__CLASS_NAME,
oldClassName, className));
+ }
}
/**
@@ -246,10 +252,11 @@
@Override
public String toString()
{
- if (eIsProxy())
+ if (eIsProxy()) {
return super.toString();
+ }
- StringBuffer result = new StringBuffer(super.toString());
+ final StringBuffer result = new StringBuffer(super.toString());
result.append(" (bundleName: "); //$NON-NLS-1$
result.append(bundleName);
result.append(", className: "); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomDomainModelReferenceImpl.java b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomDomainModelReferenceImpl.java
index 494d389..11e4071 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomDomainModelReferenceImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomDomainModelReferenceImpl.java
@@ -43,22 +43,25 @@
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Domain Model Reference</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl#getChangeListener <em>
- * Change Listener</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl#getDomainModelReferences
- * <em>Domain Model References</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl#getBundleName <em>Bundle
- * Name</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl#getClassName <em>Class Name
- * </em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl#isControlChecked <em>
- * Control Checked</em>}</li>
- * </ul>
- * </p>
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl#getChangeListener
+ * <em> Change Listener</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl#getDomainModelReferences
+ * <em>Domain Model References</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl#getBundleName <em>
+ * Bundle Name</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl#getClassName <em>
+ * Class Name </em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.custom.model.impl.VCustomDomainModelReferenceImpl#isControlChecked
+ * <em> Control Checked</em>}</li>
+ * </ul>
+ * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomFactoryImpl.java b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomFactoryImpl.java
index 8bf35ac..e088ece 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomFactoryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomFactoryImpl.java
@@ -39,13 +39,13 @@
public static VCustomFactory init() {
try
{
- VCustomFactory theCustomFactory = (VCustomFactory) EPackage.Registry.INSTANCE
+ final VCustomFactory theCustomFactory = (VCustomFactory) EPackage.Registry.INSTANCE
.getEFactory(VCustomPackage.eNS_URI);
if (theCustomFactory != null)
{
return theCustomFactory;
}
- } catch (Exception exception)
+ } catch (final Exception exception)
{
EcorePlugin.INSTANCE.log(exception);
}
@@ -84,27 +84,31 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@Override
public VCustomControl createCustomControl()
{
- VCustomControlImpl customControl = new VCustomControlImpl();
+ final VCustomControlImpl customControl = new VCustomControlImpl();
return customControl;
}
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@Override
public VCustomDomainModelReference createCustomDomainModelReference()
{
- VCustomDomainModelReferenceImpl customDomainModelReference = new VCustomDomainModelReferenceImpl();
+ final VCustomDomainModelReferenceImpl customDomainModelReference = new VCustomDomainModelReferenceImpl();
return customDomainModelReference;
}
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomPackageImpl.java b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomPackageImpl.java
index 6a617e8..554ad25 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomPackageImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/VCustomPackageImpl.java
@@ -85,12 +85,14 @@
* @generated
*/
public static VCustomPackage init() {
- if (isInited)
+ if (isInited) {
return (VCustomPackage) EPackage.Registry.INSTANCE.getEPackage(VCustomPackage.eNS_URI);
+ }
// Obtain or create and register package
- VCustomPackageImpl theCustomPackage = (VCustomPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VCustomPackageImpl ? EPackage.Registry.INSTANCE
- .get(eNS_URI) : new VCustomPackageImpl());
+ final VCustomPackageImpl theCustomPackage = (VCustomPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VCustomPackageImpl ? EPackage.Registry.INSTANCE
+ .get(eNS_URI)
+ : new VCustomPackageImpl());
isInited = true;
@@ -113,7 +115,9 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -125,7 +129,9 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -137,7 +143,9 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -149,7 +157,9 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -161,7 +171,9 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -173,7 +185,9 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -185,7 +199,9 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -197,7 +213,9 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -235,8 +253,9 @@
* @generated
*/
public void createPackageContents() {
- if (isCreated)
+ if (isCreated) {
return;
+ }
isCreated = true;
// Create classes and their features
@@ -268,8 +287,9 @@
* @generated
*/
public void initializePackageContents() {
- if (isInitialized)
+ if (isInitialized) {
return;
+ }
isInitialized = true;
// Initialize package
@@ -278,7 +298,7 @@
setNsURI(eNS_URI);
// Obtain other dependent packages
- VViewPackage theViewPackage = (VViewPackage) EPackage.Registry.INSTANCE.getEPackage(VViewPackage.eNS_URI);
+ final VViewPackage theViewPackage = (VViewPackage) EPackage.Registry.INSTANCE.getEPackage(VViewPackage.eNS_URI);
// Create type parameters
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/util/CustomAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/util/CustomAdapterFactory.java
index 5164aad..c0166f3 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/util/CustomAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/util/CustomAdapterFactory.java
@@ -152,7 +152,9 @@
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the new adapter.
* @see org.eclipse.emf.ecp.view.spi.custom.model.VCustomControl
@@ -169,7 +171,9 @@
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the new adapter.
* @see org.eclipse.emf.ecp.view.spi.custom.model.VCustomDomainModelReference
@@ -202,7 +206,9 @@
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the new adapter.
* @see org.eclipse.emf.ecp.view.spi.model.VElement
@@ -219,7 +225,9 @@
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the new adapter.
* @see org.eclipse.emf.ecp.view.spi.model.VContainedElement
@@ -236,7 +244,9 @@
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the new adapter.
* @see org.eclipse.emf.ecp.view.spi.model.VControl
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/util/CustomSwitch.java b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/util/CustomSwitch.java
index 777065b..5bb2c6c 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/util/CustomSwitch.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/util/CustomSwitch.java
@@ -88,25 +88,31 @@
switch (classifierID)
{
case VCustomPackage.CUSTOM_CONTROL: {
- VCustomControl customControl = (VCustomControl) theEObject;
+ final VCustomControl customControl = (VCustomControl) theEObject;
T result = caseCustomControl(customControl);
- if (result == null)
+ if (result == null) {
result = caseControl(customControl);
- if (result == null)
+ }
+ if (result == null) {
result = caseContainedElement(customControl);
- if (result == null)
+ }
+ if (result == null) {
result = caseElement(customControl);
- if (result == null)
+ }
+ if (result == null) {
result = defaultCase(theEObject);
+ }
return result;
}
case VCustomPackage.CUSTOM_DOMAIN_MODEL_REFERENCE: {
- VCustomDomainModelReference customDomainModelReference = (VCustomDomainModelReference) theEObject;
+ final VCustomDomainModelReference customDomainModelReference = (VCustomDomainModelReference) theEObject;
T result = caseCustomDomainModelReference(customDomainModelReference);
- if (result == null)
+ if (result == null) {
result = caseDomainModelReference(customDomainModelReference);
- if (result == null)
+ }
+ if (result == null) {
result = defaultCase(theEObject);
+ }
return result;
}
default:
@@ -119,7 +125,9 @@
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Control</em>'.
@@ -136,7 +144,9 @@
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Domain Model Reference</em>'.
@@ -169,7 +179,9 @@
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Element</em>'.
@@ -186,7 +198,9 @@
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Contained Element</em>'.
@@ -203,7 +217,9 @@
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Control</em>'.
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/.settings/.api_filters
index 19a1018..212b131 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/.settings/.api_filters
@@ -41,6 +41,12 @@
<message_argument value="renderControl(GridCell, Composite)"/>
</message_arguments>
</filter>
+ <filter comment="SPI change (1.3)" id="336695337">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.custom.swt.ECPAbstractCustomControlSWT"/>
+ <message_argument value="renderControl(SWTGridCell, Composite)"/>
+ </message_arguments>
+ </filter>
<filter comment="This is SPI" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.emf.ecp.view.spi.custom.swt.ECPAbstractCustomControlSWT"/>
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/src/org/eclipse/emf/ecp/view/spi/custom/swt/ECPAbstractCustomControlSWT.java b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/src/org/eclipse/emf/ecp/view/spi/custom/swt/ECPAbstractCustomControlSWT.java
index fff3429..48750a5 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/src/org/eclipse/emf/ecp/view/spi/custom/swt/ECPAbstractCustomControlSWT.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/src/org/eclipse/emf/ecp/view/spi/custom/swt/ECPAbstractCustomControlSWT.java
@@ -671,6 +671,7 @@
* @param gridCell the {@link SWTGridCell} to enable/disable
* @param control the {@link Control} to enable/disable
* @param enabled true if the control should be enabled false otherwise
+ * @since 1.3
*/
protected void setControlEnabled(SWTGridCell gridCell, Control control, boolean enabled) {
// ignore labels as they are readonly per definition
diff --git a/bundles/org.eclipse.emf.ecp.view.model.common/src/org/eclipse/emf/ecp/view/model/common/AbstractRenderer.java b/bundles/org.eclipse.emf.ecp.view.model.common/src/org/eclipse/emf/ecp/view/model/common/AbstractRenderer.java
index 8b647c3..94c3ba3 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.common/src/org/eclipse/emf/ecp/view/model/common/AbstractRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.common/src/org/eclipse/emf/ecp/view/model/common/AbstractRenderer.java
@@ -22,10 +22,7 @@
*
*/
public abstract class AbstractRenderer<VELEMENT extends VElement> {
- /**
- * Variant constant for indicating RAP controls.
- */
- protected static final String CUSTOM_VARIANT = "org.eclipse.rap.rwt.customVariant"; //$NON-NLS-1$
+
private VELEMENT vElement;
private ViewModelContext viewModelContext;
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.model.editor/.settings/.api_filters
new file mode 100644
index 0000000..38c91bc
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor/.settings/.api_filters
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emf.ecp.view.model.editor" version="2">
+ <resource path="META-INF/MANIFEST.MF">
+ <filter comment="Bundle should not be imported by anyone" id="927989779">
+ <message_arguments>
+ <message_argument value="1.2.1"/>
+ <message_argument value="org.eclipse.core.resources"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/bundles/org.eclipse.emf.ecp.view.model/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.model/.settings/.api_filters
new file mode 100644
index 0000000..5a6bac3
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.model/.settings/.api_filters
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emf.ecp.view.model" version="2">
+ <resource path="META-INF/MANIFEST.MF">
+ <filter comment="SPI change (1.3)" id="923795461">
+ <message_arguments>
+ <message_argument value="1.3.0"/>
+ <message_argument value="1.2.1"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/spi/model/VDomainModelReference.java" type="org.eclipse.emf.ecp.view.spi.model.VDomainModelReference">
+ <filter comment="SPI change (1.3)" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.model.VDomainModelReference"/>
+ <message_argument value="getChangeListener()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change (1.3)" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.model.VDomainModelReference"/>
+ <message_argument value="getFullPathIterator()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change (1.3)" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.model.VDomainModelReference"/>
+ <message_argument value="init(EObject)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change (1.3)" id="405901410">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.model.VDomainModelReference"/>
+ <message_argument value="resolve(EObject)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/spi/model/VViewPackage.java" type="org.eclipse.emf.ecp.view.spi.model.VViewPackage">
+ <filter comment="SPI change (1.3)" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage"/>
+ <message_argument value="DOMAIN_MODEL_REFERENCE_FEATURE_COUNT"/>
+ <message_argument value="0"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change (1.3)" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage"/>
+ <message_argument value="FEATURE_PATH_DOMAIN_MODEL_REFERENCE_FEATURE_COUNT"/>
+ <message_argument value="2"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change (1.3)" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage"/>
+ <message_argument value="FEATURE_PATH_DOMAIN_MODEL_REFERENCE__DOMAIN_MODEL_EFEATURE"/>
+ <message_argument value="0"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change (1.3)" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage"/>
+ <message_argument value="FEATURE_PATH_DOMAIN_MODEL_REFERENCE__DOMAIN_MODEL_EREFERENCE_PATH"/>
+ <message_argument value="1"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/spi/model/VViewPackage.java" type="org.eclipse.emf.ecp.view.spi.model.VViewPackage$Literals">
+ <filter comment="SPI change (1.3)" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage.Literals"/>
+ <message_argument value="DOMAIN_MODEL_REFERENCE_CHANGE_LISTENER"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change (1.3)" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage.Literals"/>
+ <message_argument value="DOMAIN_MODEL_REFERENCE__CHANGE_LISTENER"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/spi/model/impl/VFeaturePathDomainModelReferenceImpl.java" type="org.eclipse.emf.ecp.view.spi.model.impl.VFeaturePathDomainModelReferenceImpl">
+ <filter comment="SPI change (1.3)" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.model.impl.VFeaturePathDomainModelReferenceImpl"/>
+ <message_argument value="resolve(EObject)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/spi/model/util/ViewModelUtil.java" type="org.eclipse.emf.ecp.view.spi.model.util.ViewModelUtil">
+ <filter comment="SPI change (1.3)" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.model.util.ViewModelUtil"/>
+ <message_argument value="resolveDomainReferences(VElement, EObject)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/DomainModelReferenceChangeListener.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/DomainModelReferenceChangeListener.java
index e3788b2..bf10c59 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/DomainModelReferenceChangeListener.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/DomainModelReferenceChangeListener.java
@@ -7,18 +7,22 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Eugen - initial API and implementation
+ * Eugen Neufeld - initial API and implementation
******************************************************************************/
package org.eclipse.emf.ecp.view.spi.model;
/**
- * @author Eugen
+ * The {@link DomainModelReferenceChangeListener} allows to subscribe to {@link VDomainModelReference
+ * DomainModelReferences} and thus be notified when the {@link VDomainModelReference} changes.
+ *
+ * @author Eugen Neufeld
+ * @since 1.3
*
*/
public interface DomainModelReferenceChangeListener {
/**
- *
+ * Gets called in order to notify the listener, that the {@link VDomainModelReference} has changed.
*/
void notifyChange();
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/ModelChangeNotification.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/ModelChangeNotification.java
index a540423..f34743e 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/ModelChangeNotification.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/ModelChangeNotification.java
@@ -20,7 +20,7 @@
* Such a notification is issued by the {@link ViewModelContext} when a change in the domain or the view model occurs.
*
* @author Eugen Neufeld
- * @since 1.2
+ * @since 1.3
*/
public class ModelChangeNotification {
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/SettingPath.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/SettingPath.java
index a277ac6..76bd5fe 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/SettingPath.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/SettingPath.java
@@ -7,7 +7,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Eugen - initial API and implementation
+ * Eugen Neufeld - initial API and implementation
******************************************************************************/
package org.eclipse.emf.ecp.view.spi.model;
@@ -16,10 +16,19 @@
import org.eclipse.emf.ecore.EStructuralFeature.Setting;
/**
- * @author Eugen
+ * Provides the whole path for the a {@link Setting}. So by iterating over the path, each step through the domain model
+ * is contained.
+ *
+ * @author Eugen Neufeld
+ * @since 1.3
*
*/
public interface SettingPath {
+ /**
+ * The path to the bound {@link Setting}.
+ *
+ * @return the iterator for the path
+ */
Iterator<Setting> getPath();
}
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDomainModelReference.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDomainModelReference.java
index b7faef9..3887e16 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDomainModelReference.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDomainModelReference.java
@@ -47,7 +47,9 @@
* If the meaning of the '<em>Change Listener</em>' attribute list isn't clear, there really should be more of a
* description here...
* </p>
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the value of the '<em>Change Listener</em>' attribute list.
* @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getDomainModelReference_ChangeListener()
@@ -63,6 +65,7 @@
*
* @param eObject the root domain model to use to resolve the path
* @return true if resolution succeeded and false otherwise
+ * @since 1.3
*/
boolean init(EObject object);
@@ -80,9 +83,17 @@
*
* @return the {@link Iterator} over all {@link EStructuralFeature EStructuralFeatures} for this domain model
* reference
+ * @since 1.3
*/
Iterator<EStructuralFeature> getEStructuralFeatureIterator();
+ /**
+ * Returns an iterator allowing to iterate over all setting paths for this domain model reference.
+ * Will return an empty Iterator if resolve was not successfully completed.
+ *
+ * @return the {@link Iterator} over setting paths for this domain model reference
+ * @since 1.3
+ */
Iterator<SettingPath> getFullPathIterator();
} // VDomainModelReference
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewPackage.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewPackage.java
index a9092fe..ee755d7 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewPackage.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewPackage.java
@@ -28,7 +28,9 @@
* <li>each enum,</li>
* <li>and each data type</li>
* </ul>
- * <!-- end-user-doc -->
+ *
+ * @noimplement This interface is not intended to be implemented by clients.
+ * <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecp.view.spi.model.VViewFactory
* @model kind="package"
@@ -174,7 +176,9 @@
/**
* The feature id for the '<em><b>Change Listener</b></em>' attribute list.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
@@ -210,6 +214,7 @@
*
* @generated
* @ordered
+ * @since 1.3
*/
int FEATURE_PATH_DOMAIN_MODEL_REFERENCE__CHANGE_LISTENER = DOMAIN_MODEL_REFERENCE__CHANGE_LISTENER;
@@ -682,7 +687,9 @@
/**
* The meta object id for the '<em>Domain Model Reference Change Listener</em>' data type.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecp.view.spi.model.DomainModelReferenceChangeListener
* @see org.eclipse.emf.ecp.view.spi.model.impl.VViewPackageImpl#getDomainModelReferenceChangeListener()
@@ -930,7 +937,9 @@
* {@link org.eclipse.emf.ecp.view.spi.model.DomainModelReferenceChangeListener
* <em>Domain Model Reference Change Listener</em>}'.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the meta object for data type '<em>Domain Model Reference Change Listener</em>'.
* @see org.eclipse.emf.ecp.view.spi.model.DomainModelReferenceChangeListener
@@ -955,7 +964,9 @@
* Returns the meta object for the attribute list '
* {@link org.eclipse.emf.ecp.view.spi.model.VDomainModelReference#getChangeListener <em>Change Listener</em>}'.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @return the meta object for the attribute list '<em>Change Listener</em>'.
* @see org.eclipse.emf.ecp.view.spi.model.VDomainModelReference#getChangeListener()
@@ -1034,7 +1045,9 @@
* <li>each enum,</li>
* <li>and each data type</li>
* </ul>
- * <!-- end-user-doc -->
+ *
+ * @noimplement This interface is not intended to be implemented by clients.
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -1239,6 +1252,7 @@
* @see org.eclipse.emf.ecp.view.spi.model.DomainModelReferenceChangeListener
* @see org.eclipse.emf.ecp.view.spi.model.impl.VViewPackageImpl#getDomainModelReferenceChangeListener()
* @generated
+ * @since 1.3
*/
EDataType DOMAIN_MODEL_REFERENCE_CHANGE_LISTENER = eINSTANCE.getDomainModelReferenceChangeListener();
@@ -1257,7 +1271,9 @@
/**
* The meta object literal for the '<em><b>Change Listener</b></em>' attribute list feature.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VFeaturePathDomainModelReferenceImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VFeaturePathDomainModelReferenceImpl.java
index 19cbe7e..bca1628 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VFeaturePathDomainModelReferenceImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VFeaturePathDomainModelReferenceImpl.java
@@ -66,7 +66,9 @@
/**
* The cached value of the '{@link #getChangeListener() <em>Change Listener</em>}' attribute list.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @see #getChangeListener()
* @generated
@@ -120,7 +122,9 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -452,6 +456,7 @@
* {@inheritDoc}
*
* @see org.eclipse.emf.ecp.view.spi.model.VDomainModelReference#init(org.eclipse.emf.ecore.EObject)
+ * @since 1.3
*/
@Override
public boolean init(final EObject object) {
@@ -464,6 +469,7 @@
* {@inheritDoc}
*
* @see org.eclipse.emf.ecp.view.spi.model.VDomainModelReference#getFullPathIterator()
+ * @since 1.3
*/
@Override
public Iterator<SettingPath> getFullPathIterator() {
@@ -533,6 +539,7 @@
* {@inheritDoc}
*
* @see org.eclipse.emf.ecp.view.spi.model.ModelChangeListener#notifyChange(org.eclipse.emf.ecp.view.spi.model.ModelChangeNotification)
+ * @since 1.3
*/
@Override
public void notifyChange(ModelChangeNotification notification) {
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewFactoryImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewFactoryImpl.java
index 6aec940..5ac1cc0 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewFactoryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewFactoryImpl.java
@@ -17,7 +17,7 @@
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.ecp.view.spi.model.*;
+import org.eclipse.emf.ecp.view.spi.model.DomainModelReferenceChangeListener;
import org.eclipse.emf.ecp.view.spi.model.LabelAlignment;
import org.eclipse.emf.ecp.view.spi.model.VControl;
import org.eclipse.emf.ecp.view.spi.model.VDiagnostic;
@@ -44,12 +44,13 @@
public static VViewFactory init() {
try
{
- VViewFactory theViewFactory = (VViewFactory) EPackage.Registry.INSTANCE.getEFactory(VViewPackage.eNS_URI);
+ final VViewFactory theViewFactory = (VViewFactory) EPackage.Registry.INSTANCE
+ .getEFactory(VViewPackage.eNS_URI);
if (theViewFactory != null)
{
return theViewFactory;
}
- } catch (Exception exception)
+ } catch (final Exception exception)
{
EcorePlugin.INSTANCE.log(exception);
}
@@ -135,9 +136,10 @@
*
* @generated
*/
+ @Override
public VDiagnostic createDiagnostic()
{
- VDiagnosticImpl diagnostic = new VDiagnosticImpl();
+ final VDiagnosticImpl diagnostic = new VDiagnosticImpl();
return diagnostic;
}
@@ -146,8 +148,9 @@
*
* @generated
*/
+ @Override
public VView createView() {
- VViewImpl view = new VViewImpl();
+ final VViewImpl view = new VViewImpl();
return view;
}
@@ -156,8 +159,9 @@
*
* @generated
*/
+ @Override
public VControl createControl() {
- VControlImpl control = new VControlImpl();
+ final VControlImpl control = new VControlImpl();
return control;
}
@@ -169,10 +173,12 @@
*/
public LabelAlignment createLabelAlignmentFromString(EDataType eDataType, String initialValue)
{
- LabelAlignment result = LabelAlignment.get(initialValue);
+ final LabelAlignment result = LabelAlignment.get(initialValue);
if (result == null)
+ {
throw new IllegalArgumentException(
"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
return result;
}
@@ -189,7 +195,9 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -201,7 +209,9 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -216,9 +226,10 @@
*
* @generated
*/
+ @Override
public VFeaturePathDomainModelReference createFeaturePathDomainModelReference()
{
- VFeaturePathDomainModelReferenceImpl featurePathDomainModelReference = new VFeaturePathDomainModelReferenceImpl();
+ final VFeaturePathDomainModelReferenceImpl featurePathDomainModelReference = new VFeaturePathDomainModelReferenceImpl();
return featurePathDomainModelReference;
}
@@ -227,6 +238,7 @@
*
* @generated
*/
+ @Override
public VViewPackage getViewPackage() {
return (VViewPackage) getEPackage();
}
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewPackageImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewPackageImpl.java
index da1ed63..4936766 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewPackageImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewPackageImpl.java
@@ -168,12 +168,14 @@
* @generated
*/
public static VViewPackage init() {
- if (isInited)
+ if (isInited) {
return (VViewPackage) EPackage.Registry.INSTANCE.getEPackage(VViewPackage.eNS_URI);
+ }
// Obtain or create and register package
- VViewPackageImpl theViewPackage = (VViewPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VViewPackageImpl ? EPackage.Registry.INSTANCE
- .get(eNS_URI) : new VViewPackageImpl());
+ final VViewPackageImpl theViewPackage = (VViewPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VViewPackageImpl ? EPackage.Registry.INSTANCE
+ .get(eNS_URI)
+ : new VViewPackageImpl());
isInited = true;
@@ -200,6 +202,7 @@
*
* @generated
*/
+ @Override
public EClass getElement()
{
return elementEClass;
@@ -211,6 +214,7 @@
*
* @generated
*/
+ @Override
public EAttribute getElement_Name()
{
return (EAttribute) elementEClass.getEStructuralFeatures().get(0);
@@ -222,6 +226,7 @@
*
* @generated
*/
+ @Override
public EAttribute getElement_Visible()
{
return (EAttribute) elementEClass.getEStructuralFeatures().get(1);
@@ -233,6 +238,7 @@
*
* @generated
*/
+ @Override
public EAttribute getElement_Enabled()
{
return (EAttribute) elementEClass.getEStructuralFeatures().get(2);
@@ -244,6 +250,7 @@
*
* @generated
*/
+ @Override
public EAttribute getElement_Readonly()
{
return (EAttribute) elementEClass.getEStructuralFeatures().get(3);
@@ -255,6 +262,7 @@
*
* @generated
*/
+ @Override
public EReference getElement_Diagnostic()
{
return (EReference) elementEClass.getEStructuralFeatures().get(4);
@@ -266,6 +274,7 @@
*
* @generated
*/
+ @Override
public EReference getElement_Attachments()
{
return (EReference) elementEClass.getEStructuralFeatures().get(5);
@@ -277,6 +286,7 @@
*
* @generated
*/
+ @Override
public EClass getDiagnostic()
{
return diagnosticEClass;
@@ -288,6 +298,7 @@
*
* @generated
*/
+ @Override
public EAttribute getDiagnostic_Diagnostics()
{
return (EAttribute) diagnosticEClass.getEStructuralFeatures().get(0);
@@ -298,6 +309,7 @@
*
* @generated
*/
+ @Override
public EClass getView() {
return viewEClass;
}
@@ -307,6 +319,7 @@
*
* @generated
*/
+ @Override
public EReference getView_RootEClass() {
return (EReference) viewEClass.getEStructuralFeatures().get(0);
}
@@ -317,6 +330,7 @@
*
* @generated
*/
+ @Override
public EReference getView_Children() {
return (EReference) viewEClass.getEStructuralFeatures().get(1);
}
@@ -327,6 +341,7 @@
*
* @generated
*/
+ @Override
public EClass getContainedElement()
{
return containedElementEClass;
@@ -337,6 +352,7 @@
*
* @generated
*/
+ @Override
public EClass getControl() {
return controlEClass;
}
@@ -347,6 +363,7 @@
*
* @generated
*/
+ @Override
public EReference getControl_DomainModelReference()
{
return (EReference) controlEClass.getEStructuralFeatures().get(1);
@@ -358,6 +375,7 @@
*
* @generated
*/
+ @Override
public EClass getContainer()
{
return containerEClass;
@@ -369,6 +387,7 @@
*
* @generated
*/
+ @Override
public EReference getContainer_Children()
{
return (EReference) containerEClass.getEStructuralFeatures().get(0);
@@ -380,6 +399,7 @@
*
* @generated
*/
+ @Override
public EAttribute getControl_LabelAlignment()
{
return (EAttribute) controlEClass.getEStructuralFeatures().get(0);
@@ -390,7 +410,9 @@
* <!-- end-user-doc -->
*
* @generated
+ * @since 1.3
*/
+ @Override
public EEnum getLabelAlignment()
{
return labelAlignmentEEnum;
@@ -398,10 +420,13 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
+ @Override
public EDataType getDomainModelReferenceChangeListener()
{
return domainModelReferenceChangeListenerEDataType;
@@ -413,6 +438,7 @@
*
* @generated
*/
+ @Override
public EClass getDomainModelReference()
{
return domainModelReferenceEClass;
@@ -420,10 +446,13 @@
/**
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.3
+ * <!-- end-user-doc -->
*
* @generated
*/
+ @Override
public EAttribute getDomainModelReference_ChangeListener()
{
return (EAttribute) domainModelReferenceEClass.getEStructuralFeatures().get(0);
@@ -435,6 +464,7 @@
*
* @generated
*/
+ @Override
public EClass getFeaturePathDomainModelReference()
{
return featurePathDomainModelReferenceEClass;
@@ -446,6 +476,7 @@
*
* @generated
*/
+ @Override
public EReference getFeaturePathDomainModelReference_DomainModelEFeature()
{
return (EReference) featurePathDomainModelReferenceEClass.getEStructuralFeatures().get(0);
@@ -457,6 +488,7 @@
*
* @generated
*/
+ @Override
public EReference getFeaturePathDomainModelReference_DomainModelEReferencePath()
{
return (EReference) featurePathDomainModelReferenceEClass.getEStructuralFeatures().get(1);
@@ -468,6 +500,7 @@
*
* @generated
*/
+ @Override
public EClass getAttachment()
{
return attachmentEClass;
@@ -479,6 +512,7 @@
*
* @generated
*/
+ @Override
public VViewFactory getViewFactory() {
return (VViewFactory) getEFactoryInstance();
}
@@ -499,8 +533,9 @@
* @generated
*/
public void createPackageContents() {
- if (isCreated)
+ if (isCreated) {
return;
+ }
isCreated = true;
// Create classes and their features
@@ -561,8 +596,9 @@
* @generated
*/
public void initializePackageContents() {
- if (isInitialized)
+ if (isInitialized) {
return;
+ }
isInitialized = true;
// Initialize package
@@ -571,18 +607,19 @@
setNsURI(eNS_URI);
// Obtain other dependent packages
- EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+ final EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE
+ .getEPackage(EcorePackage.eNS_URI);
// Create type parameters
// Set bounds for type parameters
// Add supertypes to classes
- featurePathDomainModelReferenceEClass.getESuperTypes().add(this.getDomainModelReference());
- viewEClass.getESuperTypes().add(this.getElement());
- containedElementEClass.getESuperTypes().add(this.getElement());
- containerEClass.getESuperTypes().add(this.getContainedElement());
- controlEClass.getESuperTypes().add(this.getContainedElement());
+ featurePathDomainModelReferenceEClass.getESuperTypes().add(getDomainModelReference());
+ viewEClass.getESuperTypes().add(getElement());
+ containedElementEClass.getESuperTypes().add(getElement());
+ containerEClass.getESuperTypes().add(getContainedElement());
+ controlEClass.getESuperTypes().add(getContainedElement());
// Initialize classes and features; add operations and parameters
initEClass(diagnosticEClass, VDiagnostic.class,
@@ -599,7 +636,7 @@
"DomainModelReference", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(
getDomainModelReference_ChangeListener(),
- this.getDomainModelReferenceChangeListener(),
+ getDomainModelReferenceChangeListener(),
"changeListener", null, 0, -1, VDomainModelReference.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(featurePathDomainModelReferenceEClass, VFeaturePathDomainModelReference.class,
@@ -634,12 +671,12 @@
"readonly", "false", 0, 1, VElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
initEReference(
getElement_Diagnostic(),
- this.getDiagnostic(),
+ getDiagnostic(),
null,
"diagnostic", null, 0, 1, VElement.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(
getElement_Attachments(),
- this.getAttachment(),
+ getAttachment(),
null,
"attachments", null, 0, -1, VElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
@@ -651,7 +688,7 @@
"rootEClass", null, 1, 1, VView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(
getView_Children(),
- this.getContainedElement(),
+ getContainedElement(),
null,
"children", null, 0, -1, VView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
@@ -662,18 +699,18 @@
"Container", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(
getContainer_Children(),
- this.getContainedElement(),
+ getContainedElement(),
null,
"children", null, 0, -1, VContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(controlEClass, VControl.class, "Control", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(
getControl_LabelAlignment(),
- this.getLabelAlignment(),
+ getLabelAlignment(),
"labelAlignment", "Left", 1, 1, VControl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
initEReference(
getControl_DomainModelReference(),
- this.getDomainModelReference(),
+ getDomainModelReference(),
null,
"domainModelReference", null, 1, 1, VControl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewModelUtil.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewModelUtil.java
index daa041f..5c3fd9d 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewModelUtil.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewModelUtil.java
@@ -38,6 +38,7 @@
* @param renderable the renderable to analyze for {@link org.eclipse.emf.ecp.view.spi.model.VDomainModelReference
* VDomainModelReferences}
* @param domainModelRoot the domain model to use for resolving
+ * @since 1.3
*/
public static void resolveDomainReferences(EObject renderable,
EObject domainModelRoot) {
