diff options
author | glefur | 2012-02-08 10:04:54 +0000 |
---|---|---|
committer | glefur | 2012-02-08 10:04:54 +0000 |
commit | f30f9c9cdb5275f692ec3c346a0bbcf5606aca5d (patch) | |
tree | 5dd8b09df42b4e6e246f2f65fb9cdde8d024f060 | |
parent | 0fa13602c09e8ce31992c08153437cdfacd7c84a (diff) | |
download | org.eclipse.eef-f30f9c9cdb5275f692ec3c346a0bbcf5606aca5d.tar.gz org.eclipse.eef-f30f9c9cdb5275f692ec3c346a0bbcf5606aca5d.tar.xz org.eclipse.eef-f30f9c9cdb5275f692ec3c346a0bbcf5606aca5d.zip |
UPDATED: Synchronized generation
10 files changed, 19 insertions, 21 deletions
diff --git a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/DynamicEEFEditorContributionBasePropertiesEditionComponent.java b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/DynamicEEFEditorContributionBasePropertiesEditionComponent.java index 2076dd580..a53319aa1 100644 --- a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/DynamicEEFEditorContributionBasePropertiesEditionComponent.java +++ b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/DynamicEEFEditorContributionBasePropertiesEditionComponent.java @@ -8,7 +8,6 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.WrappedException; -import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EcorePackage; @@ -59,7 +58,7 @@ public class DynamicEEFEditorContributionBasePropertiesEditionComponent extends /** * Settings for model EObjectFlatComboViewer */ - private EObjectFlatComboSettings modelSettings; + private EObjectFlatComboSettings modelSettings; /** @@ -130,7 +129,7 @@ public class DynamicEEFEditorContributionBasePropertiesEditionComponent extends * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ public boolean select(Viewer viewer, Object parentElement, Object element) { - return (element instanceof EClassifier); + return (element instanceof org.eclipse.emf.ecore.EClassifier); } }); @@ -191,7 +190,7 @@ public class DynamicEEFEditorContributionBasePropertiesEditionComponent extends } if (EditorViewsRepository.DynamicEEFEditorContribution.Binding.model == event.getAffectedEditor()) { if (event.getKind() == PropertiesEditionEvent.SET) { - modelSettings.setToReference((EClassifier)event.getNewValue()); + modelSettings.setToReference((org.eclipse.emf.ecore.EClassifier)event.getNewValue()); } else if (event.getKind() == PropertiesEditionEvent.ADD) { EReferencePropertiesEditionContext context = new EReferencePropertiesEditionContext(editingContext, this, modelSettings, editingContext.getAdapterFactory()); PropertiesEditingProvider provider = (PropertiesEditingProvider)editingContext.getAdapterFactory().adapt(semanticObject, PropertiesEditingProvider.class); @@ -210,7 +209,7 @@ public class DynamicEEFEditorContributionBasePropertiesEditionComponent extends * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification) */ public void updatePart(Notification msg) { - if (editingPart.isVisible()) { + if (editingPart.isVisible()) { DynamicEEFEditorContributionPropertiesEditionPart basePart = (DynamicEEFEditorContributionPropertiesEditionPart)editingPart; if (MappingPackage.eINSTANCE.getAbstractElementBinding_Name().equals(msg.getFeature()) && basePart != null && isAccessible(EditorViewsRepository.DynamicEEFEditorContribution.Naming.name)) { if (msg.getNewValue() != null) { diff --git a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/EEFEditorContributionsBasePropertiesEditionComponent.java b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/EEFEditorContributionsBasePropertiesEditionComponent.java index 7a5e18a73..3238d5b6f 100644 --- a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/EEFEditorContributionsBasePropertiesEditionComponent.java +++ b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/EEFEditorContributionsBasePropertiesEditionComponent.java @@ -106,7 +106,7 @@ public class EEFEditorContributionsBasePropertiesEditionComponent extends Single * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification) */ public void updatePart(Notification msg) { - if (editingPart.isVisible()) { + if (editingPart.isVisible()) { EEFEditorContributionsPropertiesEditionPart basePart = (EEFEditorContributionsPropertiesEditionPart)editingPart; if (MappingPackage.eINSTANCE.getCategory_Name().equals(msg.getFeature()) && basePart != null && isAccessible(EditorViewsRepository.EEFEditorContributions.Naming.name)) { if (msg.getNewValue() != null) { diff --git a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/EEFEditorPagesBasePropertiesEditionComponent.java b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/EEFEditorPagesBasePropertiesEditionComponent.java index 3d44bfd43..febe9be7e 100644 --- a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/EEFEditorPagesBasePropertiesEditionComponent.java +++ b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/EEFEditorPagesBasePropertiesEditionComponent.java @@ -106,7 +106,7 @@ public class EEFEditorPagesBasePropertiesEditionComponent extends SinglePartProp * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification) */ public void updatePart(Notification msg) { - if (editingPart.isVisible()) { + if (editingPart.isVisible()) { EEFEditorPagesPropertiesEditionPart basePart = (EEFEditorPagesPropertiesEditionPart)editingPart; if (ViewsPackage.eINSTANCE.getCategory_Name().equals(msg.getFeature()) && basePart != null && isAccessible(EditorViewsRepository.EEFEditorPages.Properties.name)) { if (msg.getNewValue() != null) { diff --git a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/EEFMasterPageBasePropertiesEditionComponent.java b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/EEFMasterPageBasePropertiesEditionComponent.java index 2efe955cb..c80562b32 100644 --- a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/EEFMasterPageBasePropertiesEditionComponent.java +++ b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/EEFMasterPageBasePropertiesEditionComponent.java @@ -140,7 +140,7 @@ public class EEFMasterPageBasePropertiesEditionComponent extends SinglePartPrope * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification) */ public void updatePart(Notification msg) { - if (editingPart.isVisible()) { + if (editingPart.isVisible()) { EEFMasterPagePropertiesEditionPart basePart = (EEFMasterPagePropertiesEditionPart)editingPart; if (ViewsPackage.eINSTANCE.getViewElement_Name().equals(msg.getFeature()) && basePart != null && isAccessible(EditorViewsRepository.EEFMasterPage.Naming.name)) { if (msg.getNewValue() != null) { diff --git a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/PartFilterBasePropertiesEditionComponent.java b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/PartFilterBasePropertiesEditionComponent.java index 9f8a10a75..71bda7c75 100644 --- a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/PartFilterBasePropertiesEditionComponent.java +++ b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/PartFilterBasePropertiesEditionComponent.java @@ -52,12 +52,12 @@ public class PartFilterBasePropertiesEditionComponent extends SinglePartProperti /** * Settings for filteredPart EObjectFlatComboViewer */ - private EObjectFlatComboSettings filteredPartSettings; + private EObjectFlatComboSettings filteredPartSettings; /** * Settings for contextualComponent EObjectFlatComboViewer */ - private EObjectFlatComboSettings contextualComponentSettings; + private EObjectFlatComboSettings contextualComponentSettings; /** @@ -226,7 +226,7 @@ public class PartFilterBasePropertiesEditionComponent extends SinglePartProperti * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification) */ public void updatePart(Notification msg) { - if (editingPart.isVisible()) { + if (editingPart.isVisible()) { PartFilterPropertiesEditionPart basePart = (PartFilterPropertiesEditionPart)editingPart; if (FiltersPackage.eINSTANCE.getBindingFilter_Name().equals(msg.getFeature()) && basePart != null && isAccessible(EditorViewsRepository.PartFilter.Naming.name)) { if (msg.getNewValue() != null) { diff --git a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/StandardFormPageBasePropertiesEditionComponent.java b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/StandardFormPageBasePropertiesEditionComponent.java index e052dae14..142e805f4 100644 --- a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/StandardFormPageBasePropertiesEditionComponent.java +++ b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/StandardFormPageBasePropertiesEditionComponent.java @@ -118,7 +118,7 @@ public class StandardFormPageBasePropertiesEditionComponent extends SinglePartPr * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification) */ public void updatePart(Notification msg) { - if (editingPart.isVisible()) { + if (editingPart.isVisible()) { StandardFormPagePropertiesEditionPart basePart = (StandardFormPagePropertiesEditionPart)editingPart; if (ViewsPackage.eINSTANCE.getViewElement_Name().equals(msg.getFeature()) && basePart != null && isAccessible(EditorViewsRepository.StandardFormPage.Naming.name)) { if (msg.getNewValue() != null) { diff --git a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/StaticEEFEditorContributionBasePropertiesEditionComponent.java b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/StaticEEFEditorContributionBasePropertiesEditionComponent.java index f6e677e9e..39e019003 100644 --- a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/StaticEEFEditorContributionBasePropertiesEditionComponent.java +++ b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/StaticEEFEditorContributionBasePropertiesEditionComponent.java @@ -156,7 +156,7 @@ public class StaticEEFEditorContributionBasePropertiesEditionComponent extends S * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification) */ public void updatePart(Notification msg) { - if (editingPart.isVisible()) { + if (editingPart.isVisible()) { StaticEEFEditorContributionPropertiesEditionPart basePart = (StaticEEFEditorContributionPropertiesEditionPart)editingPart; if (MappingPackage.eINSTANCE.getAbstractElementBinding_Name().equals(msg.getFeature()) && basePart != null && isAccessible(EditorViewsRepository.StaticEEFEditorContribution.Naming.name)) { if (msg.getNewValue() != null) { diff --git a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/TreeMasterPageBasePropertiesEditionComponent.java b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/TreeMasterPageBasePropertiesEditionComponent.java index c22d04b14..cbd939025 100644 --- a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/TreeMasterPageBasePropertiesEditionComponent.java +++ b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/editor/components/TreeMasterPageBasePropertiesEditionComponent.java @@ -129,7 +129,7 @@ public class TreeMasterPageBasePropertiesEditionComponent extends SinglePartProp * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification) */ public void updatePart(Notification msg) { - if (editingPart.isVisible()) { + if (editingPart.isVisible()) { TreeMasterPagePropertiesEditionPart basePart = (TreeMasterPagePropertiesEditionPart)editingPart; if (ViewsPackage.eINSTANCE.getViewElement_Name().equals(msg.getFeature()) && basePart != null && isAccessible(EditorViewsRepository.TreeMasterPage.Naming.name)) { if (msg.getNewValue() != null) { diff --git a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/query/components/ExplicitPathQueryPropertiesEditionComponent.java b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/query/components/ExplicitPathQueryPropertiesEditionComponent.java index 4c9216180..1cc959f18 100644 --- a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/query/components/ExplicitPathQueryPropertiesEditionComponent.java +++ b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/query/components/ExplicitPathQueryPropertiesEditionComponent.java @@ -45,7 +45,7 @@ public class ExplicitPathQueryPropertiesEditionComponent extends SinglePartPrope /** * Settings for query EObjectFlatComboViewer */ - private EObjectFlatComboSettings querySettings; + private EObjectFlatComboSettings querySettings; /** @@ -147,7 +147,7 @@ public class ExplicitPathQueryPropertiesEditionComponent extends SinglePartPrope * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification) */ public void updatePart(Notification msg) { - if (editingPart.isVisible()) { + if (editingPart.isVisible()) { ExplicitPathQueryPropertiesEditionPart basePart = (ExplicitPathQueryPropertiesEditionPart)editingPart; if (QueryPackage.eINSTANCE.getExplicitPathQuery_Query().equals(msg.getFeature()) && basePart != null && isAccessible(QueryViewsRepository.ExplicitPathQuery.Properties.query_)) basePart.setQuery((EObject)msg.getNewValue()); diff --git a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/query/components/OCLQueryPropertiesEditionComponent.java b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/query/components/OCLQueryPropertiesEditionComponent.java index 7b0d655a8..c59ce42f2 100644 --- a/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/query/components/OCLQueryPropertiesEditionComponent.java +++ b/plugins/org.eclipse.emf.eef.editor.model/src-gen/org/eclipse/emf/eef/extended/query/components/OCLQueryPropertiesEditionComponent.java @@ -8,7 +8,6 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.WrappedException; -import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EcorePackage; @@ -49,7 +48,7 @@ public class OCLQueryPropertiesEditionComponent extends SinglePartPropertiesEdit /** * Settings for context EObjectFlatComboViewer */ - private EObjectFlatComboSettings contextSettings; + private EObjectFlatComboSettings contextSettings; /** @@ -97,7 +96,7 @@ public class OCLQueryPropertiesEditionComponent extends SinglePartPropertiesEdit * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ public boolean select(Viewer viewer, Object parentElement, Object element) { - return (element instanceof EClassifier); + return (element instanceof org.eclipse.emf.ecore.EClassifier); } }); @@ -143,7 +142,7 @@ public class OCLQueryPropertiesEditionComponent extends SinglePartPropertiesEdit } if (QueryViewsRepository.OCLQuery.Properties.context == event.getAffectedEditor()) { if (event.getKind() == PropertiesEditionEvent.SET) { - contextSettings.setToReference((EClassifier)event.getNewValue()); + contextSettings.setToReference((org.eclipse.emf.ecore.EClassifier)event.getNewValue()); } else if (event.getKind() == PropertiesEditionEvent.ADD) { EReferencePropertiesEditionContext context = new EReferencePropertiesEditionContext(editingContext, this, contextSettings, editingContext.getAdapterFactory()); PropertiesEditingProvider provider = (PropertiesEditingProvider)editingContext.getAdapterFactory().adapt(semanticObject, PropertiesEditingProvider.class); @@ -162,7 +161,7 @@ public class OCLQueryPropertiesEditionComponent extends SinglePartPropertiesEdit * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updatePart(org.eclipse.emf.common.notify.Notification) */ public void updatePart(Notification msg) { - if (editingPart.isVisible()) { + if (editingPart.isVisible()) { OCLQueryPropertiesEditionPart basePart = (OCLQueryPropertiesEditionPart)editingPart; if (QueryPackage.eINSTANCE.getOCLQuery_Query().equals(msg.getFeature()) && basePart != null && isAccessible(QueryViewsRepository.OCLQuery.Properties.query_)) { if (msg.getNewValue() != null) { |