diff options
author | Vincent Lorenzo | 2017-08-02 11:59:43 +0000 |
---|---|---|
committer | vincent lorenzo | 2017-08-29 12:09:18 +0000 |
commit | 90aac2b3591169c3fbd5707cd548e10757a4a83e (patch) | |
tree | db63ff0172c67e2e3534815e095c400639341e9a /plugins/infra | |
parent | e7b38945352d1326e12aa5bdead5ac89dce19c90 (diff) | |
download | org.eclipse.papyrus-90aac2b3591169c3fbd5707cd548e10757a4a83e.tar.gz org.eclipse.papyrus-90aac2b3591169c3fbd5707cd548e10757a4a83e.tar.xz org.eclipse.papyrus-90aac2b3591169c3fbd5707cd548e10757a4a83e.zip |
Bug 520271 - [Property View] Generator should ignore redefined properties.
Change-Id: I5d73f2441ff5e23f937ab155488cf29fb249a65c
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
Diffstat (limited to 'plugins/infra')
49 files changed, 796 insertions, 376 deletions
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF index eb6c7f6f1db..2bf9f39f5cb 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF @@ -13,11 +13,11 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.5.0,2.0.0)", ca.odell.glazedlists;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.services.navigation;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.editor.welcome;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-ClassPath: . Bundle-Localization: plugin Bundle-Name: %pluginName diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml index 0107417d1e0..2c42440f6e8 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.papyrus</groupId>
@@ -7,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.editor.welcome.nattable</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF index 7467aacfd50..908c7be63c7 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Export-Package: org.eclipse.papyrus.infra.editor.welcome, Require-Bundle: org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.editor.welcome.internal.constraints"
Bundle-Version: 2.0.0.qualifier
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/META-INF/MANIFEST.MF b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/META-INF/MANIFEST.MF index 454227ba726..936fba9340d 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)", +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/META-INF/MANIFEST.MF index 5d1da11ed8e..7d616a3102b 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.emf.types;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.views.properties;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.properties.editor;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.papyrus.infra.emf.types;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.views.properties;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.properties.editor;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.emf.types.ui;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.papyrus.infra.emf.types.ui;bundle-version="[4.0.0,5.0.0)"
Bundle-Vendor: %providerName
Bundle-ClassPath: .
Bundle-Version: 3.0.0.qualifier
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF index 4975609fa21..af88ee33f93 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types.ui;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider.RuntimeValuesAdviceEditPlugin$Implementation
Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.properties.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.properties.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml index 1c507ec7c37..c276e0a3c0d 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
@@ -7,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.emf.types.ui</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF index 20aadef8b65..060b5c41890 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.papyrus.infra.types.rulebased;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.properties.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.properties.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.uml2.uml.edit;bundle-version="[5.3.0,6.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)";visibility:=reexport @@ -17,7 +17,7 @@ Export-Package: org.eclipse.papyrus.infra.emf.types, Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml index 2f20cd35049..3be9ac86ae1 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml @@ -8,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.emf.types</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> +</project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF index 739ddd3d1a7..56d43f26261 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler
-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[2.1.0,3.0.0)",
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF index 0af0134cd79..f184ffad317 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.properties.creation, org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding, org.eclipse.papyrus.infra.gmfdiag.css.properties.provider -Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[4.0.0,5.0.0)", org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)", org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy -Bundle-Version: 2.1.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Name: CSS Properties Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.properties.Activator Bundle-ManifestVersion: 2 diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml index 97355e90cee..77cc362428d 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.papyrus</groupId>
@@ -7,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.properties</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF index 0c12103f9d3..e9d802b6c9b 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)", org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)", - org.eclipse.papyrus.infra.properties;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF index 680e18a9c78..dfe814bf827 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.infra.gmfdiag.properties.extension,
org.eclipse.papyrus.infra.gmfdiag.properties.modelelement
-Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.core.databinding.beans;bundle-version="[1.3.0,2.0.0)",
org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[2.0.0,3.0.0)",
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3 org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[1.0.0,2.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.gmfdiag.properties.constraint"
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %Bundle-Name
Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.properties.Activator
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml index 5e35cba73b1..0c93a56f8cf 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.papyrus</groupId>
@@ -7,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.properties</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF index 307e7b16fda..402287041b7 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Require-Bundle: org.eclipse.papyrus.infra.editor.welcome;bundle-version="[2.0.0, org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.services.navigation;bundle-version="[3.0.0,4.0.0)",
org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.papyrus.infra.editor.welcome.nattable;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.editor.welcome.nattable;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF index bcc21ca45c6..4cecaf2e6e1 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)", org.eclipse.jface.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)", - org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)" Export-Package: org.eclipse.papyrus.infra.gmfdiag.widgets, org.eclipse.papyrus.infra.gmfdiag.widgets.editors diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF index 0078589111f..ca344998e06 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF @@ -23,14 +23,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.ui.views.properties.tabbed;bundle-version="[3.7.0,4.0.0)", - org.eclipse.papyrus.views.properties;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.views.properties;bundle-version="[4.0.0,5.0.0)", org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)", org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)", org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)", org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)", - org.eclipse.papyrus.infra.emf.types;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.emf.types.ui;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.emf.types;bundle-version="[4.0.0,5.0.0)", + org.eclipse.papyrus.infra.emf.types.ui;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)" Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/META-INF/MANIFEST.MF index eca31bf9873..9d0c30d2acf 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.views.properties;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.views.properties;bundle-version="[4.0.0,5.0.0)", org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)", org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)", org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)", diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/META-INF/MANIFEST.MF index f16882e9ed9..62da35bf3ec 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/META-INF/MANIFEST.MF +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.5.0,2.0.0)", ca.odell.glazedlists;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.services.navigation;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.editor.welcome;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)", org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)", @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Localization: plugin Bundle-Name: %pluginName diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/pom.xml b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/pom.xml index 10fddc87376..0247d38f2d6 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/pom.xml +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/pom.xml @@ -8,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.editor.welcome.internationalization</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> +</project>
\ No newline at end of file diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF index 6c9c29a49c3..e7a71c44b4d 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.nattable.properties.constraints, org.eclipse.papyrus.infra.nattable.properties.observable -Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)", +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.settings/.api_filters b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.settings/.api_filters new file mode 100644 index 00000000000..b61e09c8bf3 --- /dev/null +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.settings/.api_filters @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.properties.edit" version="2"> + <resource path="src-gen/org/eclipse/papyrus/infra/properties/contexts/provider/PropertyItemProvider.java" type="org.eclipse.papyrus.infra.properties.contexts.provider.PropertyItemProvider"> + <filter comment="for generated code, we don't had the @since tag" id="1143996420"> + <message_arguments> + <message_argument value="addRedefinedByPropertiesPropertyDescriptor(Object)"/> + </message_arguments> + </filter> + <filter comment="for generated code, we don't had the @since tag" id="1143996420"> + <message_arguments> + <message_argument value="addRedefinedPropertiesPropertyDescriptor(Object)"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF index 90caf7ecf2c..8b44cde2b94 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.papyrus.infra.properties;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
@@ -12,7 +12,7 @@ Export-Package: org.eclipse.papyrus.infra.properties.contexts.provider, Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.infra.properties.environment.provider.PropertiesEditPlugin$Implementation
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/pom.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/pom.xml index 290acbf203c..b3ede121999 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/pom.xml +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/pom.xml @@ -1,4 +1,6 @@ -<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.eclipse.papyrus.infra-properties</artifactId>
@@ -6,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.properties.edit</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/src-gen/org/eclipse/papyrus/infra/properties/contexts/provider/PropertyItemProvider.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/src-gen/org/eclipse/papyrus/infra/properties/contexts/provider/PropertyItemProvider.java index eccff3a1e83..6fb7a572738 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/src-gen/org/eclipse/papyrus/infra/properties/contexts/provider/PropertyItemProvider.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/src-gen/org/eclipse/papyrus/infra/properties/contexts/provider/PropertyItemProvider.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. + * Copyright (c) 2011, 2017 CEA LIST. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -8,6 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Vincent Lorenzo - Bug 520271 *****************************************************************************/ package org.eclipse.papyrus.infra.properties.contexts.provider; @@ -75,6 +76,8 @@ public class PropertyItemProvider addTypePropertyDescriptor(object); addMultiplicityPropertyDescriptor(object); addDescriptionPropertyDescriptor(object); + addRedefinedPropertiesPropertyDescriptor(object); + addRedefinedByPropertiesPropertyDescriptor(object); } return itemPropertyDescriptors; } @@ -185,6 +188,48 @@ public class PropertyItemProvider } /** + * This adds a property descriptor for the Redefined Properties feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + protected void addRedefinedPropertiesPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Property_redefinedProperties_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Property_redefinedProperties_feature", "_UI_Property_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ContextsPackage.Literals.PROPERTY__REDEFINED_PROPERTIES, + true, + false, + true, + null, + null, + null)); + } + + /** + * This adds a property descriptor for the Redefined By Properties feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + protected void addRedefinedByPropertiesPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Property_redefinedByProperties_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Property_redefinedByProperties_feature", "_UI_Property_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ContextsPackage.Literals.PROPERTY__REDEFINED_BY_PROPERTIES, + true, + false, + true, + null, + null, + null)); + } + + /** * This returns Property.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.settings/.api_filters b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.settings/.api_filters new file mode 100644 index 00000000000..c4c2b0e0f5b --- /dev/null +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.settings/.api_filters @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.properties.editor" version="2"> + <resource path="src-gen/org/eclipse/papyrus/infra/properties/contexts/presentation/ContextsEditor.java" type="org.eclipse.papyrus.infra.properties.contexts.presentation.ContextsEditor"> + <filter comment="for generated code, we don't had the @since tag" id="1143996420"> + <message_arguments> + <message_argument value="propertySheetPages"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/properties/environment/presentation/EnvironmentEditor.java" type="org.eclipse.papyrus.infra.properties.environment.presentation.EnvironmentEditor"> + <filter comment="for generated code, we don't had the @since tag" id="1143996420"> + <message_arguments> + <message_argument value="propertySheetPages"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/properties/ui/presentation/UiEditor.java" type="org.eclipse.papyrus.infra.properties.ui.presentation.UiEditor"> + <filter comment="for generated code, we don't had the @since tag" id="1143996420"> + <message_arguments> + <message_argument value="propertySheetPages"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF index 9a8d82021b0..944c1b350b7 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.infra.properties.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.properties.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
@@ -15,7 +15,7 @@ Export-Package: org.eclipse.papyrus.infra.properties.contexts.presentation, Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.infra.properties.environment.presentation.PropertiesEditorPlugin$Implementation
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/pom.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/pom.xml index 998f54cabfc..fc6a3dc9c86 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/pom.xml +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/pom.xml @@ -1,4 +1,6 @@ -<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.eclipse.papyrus.infra-properties</artifactId>
@@ -6,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.properties.editor</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF index f8d5fbba9d3..7ca7fc840f0 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF @@ -18,14 +18,14 @@ Bundle-ClassPath: . Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.infra.properties;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
org.eclipse.xwt;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Eclipse-BuddyPolicy: dependent
Bundle-Activator: org.eclipse.papyrus.infra.properties.internal.ui.Activator
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/pom.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/pom.xml index 7b474182ce5..f403af2a073 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/pom.xml +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.eclipse.papyrus.infra-properties</artifactId>
@@ -7,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.properties.ui</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.settings/.api_filters b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.settings/.api_filters new file mode 100644 index 00000000000..2a1997aae7a --- /dev/null +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.settings/.api_filters @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.properties" version="2"> + <resource path="src-gen/org/eclipse/papyrus/infra/properties/contexts/ContextsPackage.java" type="org.eclipse.papyrus.infra.properties.contexts.ContextsPackage"> + <filter comment="for generated code, we don't had the @since tag" id="1211105284"> + <message_arguments> + <message_argument value="PROPERTY__REDEFINED_BY_PROPERTIES"/> + </message_arguments> + </filter> + <filter comment="for generated code, we don't had the @since tag" id="1211105284"> + <message_arguments> + <message_argument value="PROPERTY__REDEFINED_PROPERTIES"/> + </message_arguments> + </filter> + <filter comment="for generated code, we don't had the @since tag" id="1211105284"> + <message_arguments> + <message_argument value="UNKNOWN_PROPERTY__REDEFINED_BY_PROPERTIES"/> + </message_arguments> + </filter> + <filter comment="for generated code, we don't had the @since tag" id="1211105284"> + <message_arguments> + <message_argument value="UNKNOWN_PROPERTY__REDEFINED_PROPERTIES"/> + </message_arguments> + </filter> + <filter comment="for generated code, we don't had the @since tag" id="1211105284"> + <message_arguments> + <message_argument value="getProperty_RedefinedByProperties()"/> + </message_arguments> + </filter> + <filter comment="for generated code, we don't had the @since tag" id="1211105284"> + <message_arguments> + <message_argument value="getProperty_RedefinedProperties()"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/properties/contexts/ContextsPackage.java" type="org.eclipse.papyrus.infra.properties.contexts.ContextsPackage$Literals"> + <filter comment="for generated code, we don't had the @since tag" id="1211105284"> + <message_arguments> + <message_argument value="PROPERTY__REDEFINED_BY_PROPERTIES"/> + </message_arguments> + </filter> + <filter comment="for generated code, we don't had the @since tag" id="1211105284"> + <message_arguments> + <message_argument value="PROPERTY__REDEFINED_PROPERTIES"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/properties/contexts/Property.java" type="org.eclipse.papyrus.infra.properties.contexts.Property"> + <filter comment="for generated code, we don't had the @since tag" id="1211105284"> + <message_arguments> + <message_argument value="getRedefinedByProperties()"/> + </message_arguments> + </filter> + <filter comment="for generated code, we don't had the @since tag" id="1211105284"> + <message_arguments> + <message_argument value="getRedefinedProperties()"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/properties/contexts/impl/PropertyImpl.java" type="org.eclipse.papyrus.infra.properties.contexts.impl.PropertyImpl"> + <filter comment="for generated code, we don't had the @since tag" id="1143996420"> + <message_arguments> + <message_argument value="redefinedByProperties"/> + </message_arguments> + </filter> + <filter comment="for generated code, we don't had the @since tag" id="1143996420"> + <message_arguments> + <message_argument value="redefinedProperties"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF index 59b1e090363..49e7de03289 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibi Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/Properties.ecore b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/Properties.ecore index 5ef1bd0fb13..ab53e7ef35a 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/Properties.ecore +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/Model/Properties.ecore @@ -156,6 +156,10 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiplicity" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="1"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedProperties" + upperBound="-1" eType="#//contexts/Property" eOpposite="#//contexts/Property/redefinedByProperties"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedByProperties" + upperBound="-1" eType="#//contexts/Property" derived="true" eOpposite="#//contexts/Property/redefinedProperties"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="UnknownProperty" eSuperTypes="#//contexts/Property"/> <eClassifiers xsi:type="ecore:EClass" name="DataContextPackage" eSuperTypes="#//contexts/DataContextElement"> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/pom.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/pom.xml index 1e45acd0ba9..bb384bc42fb 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/pom.xml +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/pom.xml @@ -1,4 +1,6 @@ -<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.eclipse.papyrus.infra-properties</artifactId>
@@ -6,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.properties</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/ContextsPackage.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/ContextsPackage.java index a887437a385..fbb27e8abdb 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/ContextsPackage.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/ContextsPackage.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2011, 2015, 2017 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -10,6 +10,7 @@ * CEA LIST - Initial API and implementation * Christian W. Damus - add prototype reference to Context (CDO) * Christian W. Damus - bug 482927 + * Vincent Lorenzo - Bug 520271 *****************************************************************************/ package org.eclipse.papyrus.infra.properties.contexts; @@ -31,7 +32,7 @@ import org.eclipse.papyrus.infra.constraints.ConstraintsPackage; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.ContextsFactory * @model kind="package" * @generated @@ -42,7 +43,7 @@ public interface ContextsPackage extends EPackage { * The package name. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ String eNAME = "contexts"; @@ -51,7 +52,7 @@ public interface ContextsPackage extends EPackage { * The package namespace URI. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ String eNS_URI = "http://www.eclipse.org/papyrus/properties/contexts/0.9"; @@ -60,7 +61,7 @@ public interface ContextsPackage extends EPackage { * The package namespace name. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ String eNS_PREFIX = "contexts"; @@ -69,7 +70,7 @@ public interface ContextsPackage extends EPackage { * The singleton instance of the package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ ContextsPackage eINSTANCE = org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl.init(); @@ -78,7 +79,7 @@ public interface ContextsPackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.ContextImpl <em>Context</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getContext() * @generated @@ -89,7 +90,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -99,7 +100,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -109,7 +110,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Dependencies</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -119,7 +120,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Tabs</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -129,7 +130,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Views</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -139,7 +140,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Data Contexts</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -149,7 +150,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Prototype</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -159,7 +160,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Label</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -169,7 +170,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>User Label</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -179,7 +180,7 @@ public interface ContextsPackage extends EPackage { * The number of structural features of the '<em>Context</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -189,7 +190,7 @@ public interface ContextsPackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.TabImpl <em>Tab</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.TabImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getTab() * @generated @@ -200,7 +201,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Label</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -210,7 +211,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -220,7 +221,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Category</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -230,7 +231,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Image</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -240,7 +241,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>After Tab</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -250,7 +251,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Sections</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -260,7 +261,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Indented</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -270,7 +271,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Priority</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -280,7 +281,7 @@ public interface ContextsPackage extends EPackage { * The number of structural features of the '<em>Tab</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -290,7 +291,7 @@ public interface ContextsPackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.ViewImpl <em>View</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.ViewImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getView() * @generated @@ -301,7 +302,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Constraints</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -311,7 +312,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Element Multiplicity</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -321,7 +322,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -331,7 +332,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Sections</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -341,7 +342,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Context</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -351,7 +352,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Automatic Context</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -361,7 +362,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Datacontexts</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -371,7 +372,7 @@ public interface ContextsPackage extends EPackage { * The number of structural features of the '<em>View</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -381,7 +382,7 @@ public interface ContextsPackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.SectionImpl <em>Section</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.SectionImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getSection() * @generated @@ -392,7 +393,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Constraints</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -402,7 +403,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Element Multiplicity</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -412,7 +413,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -422,7 +423,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Tab</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -432,7 +433,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Section File</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -442,7 +443,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Widget</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -452,7 +453,7 @@ public interface ContextsPackage extends EPackage { * The number of structural features of the '<em>Section</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -462,7 +463,7 @@ public interface ContextsPackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.DataContextElementImpl <em>Data Context Element</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.DataContextElementImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getDataContextElement() * @generated @@ -473,7 +474,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -483,7 +484,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -493,7 +494,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Package</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -503,7 +504,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Supertypes</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -513,7 +514,7 @@ public interface ContextsPackage extends EPackage { * The number of structural features of the '<em>Data Context Element</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -523,7 +524,7 @@ public interface ContextsPackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.PropertyImpl <em>Property</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.PropertyImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getProperty() * @generated @@ -534,7 +535,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -544,7 +545,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Label</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -554,7 +555,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Type</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -564,7 +565,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Context Element</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -574,7 +575,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Multiplicity</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -584,27 +585,47 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Description</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ int PROPERTY__DESCRIPTION = 5; /** + * The feature id for the '<em><b>Redefined Properties</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PROPERTY__REDEFINED_PROPERTIES = 6; + + /** + * The feature id for the '<em><b>Redefined By Properties</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PROPERTY__REDEFINED_BY_PROPERTIES = 7; + + /** * The number of structural features of the '<em>Property</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ - int PROPERTY_FEATURE_COUNT = 6; + int PROPERTY_FEATURE_COUNT = 8; /** * The meta object id for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.UnknownPropertyImpl <em>Unknown Property</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.UnknownPropertyImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getUnknownProperty() * @generated @@ -615,7 +636,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -625,7 +646,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Label</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -635,7 +656,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Type</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -645,7 +666,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Context Element</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -655,7 +676,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Multiplicity</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -665,17 +686,37 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Description</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ int UNKNOWN_PROPERTY__DESCRIPTION = PROPERTY__DESCRIPTION; /** + * The feature id for the '<em><b>Redefined Properties</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int UNKNOWN_PROPERTY__REDEFINED_PROPERTIES = PROPERTY__REDEFINED_PROPERTIES; + + /** + * The feature id for the '<em><b>Redefined By Properties</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int UNKNOWN_PROPERTY__REDEFINED_BY_PROPERTIES = PROPERTY__REDEFINED_BY_PROPERTIES; + + /** * The number of structural features of the '<em>Unknown Property</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -685,7 +726,7 @@ public interface ContextsPackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.DataContextPackageImpl <em>Data Context Package</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.DataContextPackageImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getDataContextPackage() * @generated @@ -696,7 +737,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -706,7 +747,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -716,7 +757,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Package</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -726,7 +767,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Supertypes</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -736,7 +777,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Elements</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -746,7 +787,7 @@ public interface ContextsPackage extends EPackage { * The number of structural features of the '<em>Data Context Package</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -756,7 +797,7 @@ public interface ContextsPackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.DataContextRootImpl <em>Data Context Root</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.DataContextRootImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getDataContextRoot() * @generated @@ -767,7 +808,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -777,7 +818,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -787,7 +828,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Package</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -797,7 +838,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Supertypes</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -807,7 +848,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Elements</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -817,7 +858,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Label</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -827,7 +868,7 @@ public interface ContextsPackage extends EPackage { * The feature id for the '<em><b>Model Element Factory</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -837,7 +878,7 @@ public interface ContextsPackage extends EPackage { * The number of structural features of the '<em>Data Context Root</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -848,7 +889,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.papyrus.infra.properties.contexts.Context <em>Context</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Context</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Context * @generated @@ -859,7 +900,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Context#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Context#getName() * @see #getContext() @@ -871,7 +912,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.properties.contexts.Context#getDependencies <em>Dependencies</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the reference list '<em>Dependencies</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Context#getDependencies() * @see #getContext() @@ -883,7 +924,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.properties.contexts.Context#getTabs <em>Tabs</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the containment reference list '<em>Tabs</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Context#getTabs() * @see #getContext() @@ -895,7 +936,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.properties.contexts.Context#getViews <em>Views</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the containment reference list '<em>Views</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Context#getViews() * @see #getContext() @@ -907,7 +948,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.properties.contexts.Context#getDataContexts <em>Data Contexts</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the containment reference list '<em>Data Contexts</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Context#getDataContexts() * @see #getContext() @@ -919,7 +960,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.properties.contexts.Context#getPrototype <em>Prototype</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the reference '<em>Prototype</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Context#getPrototype() * @see #getContext() @@ -931,7 +972,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Context#getLabel <em>Label</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Label</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Context#getLabel() * @see #getContext() @@ -943,7 +984,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Context#getUserLabel <em>User Label</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>User Label</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Context#getUserLabel() * @see #getContext() @@ -955,7 +996,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.papyrus.infra.properties.contexts.Tab <em>Tab</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Tab</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Tab * @generated @@ -966,7 +1007,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Tab#getLabel <em>Label</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Label</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Tab#getLabel() * @see #getTab() @@ -978,7 +1019,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Tab#getId <em>Id</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Id</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Tab#getId() * @see #getTab() @@ -990,7 +1031,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Tab#getCategory <em>Category</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Category</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Tab#getCategory() * @see #getTab() @@ -1002,7 +1043,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Tab#getImage <em>Image</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Image</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Tab#getImage() * @see #getTab() @@ -1014,7 +1055,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.properties.contexts.Tab#getAfterTab <em>After Tab</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the reference '<em>After Tab</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Tab#getAfterTab() * @see #getTab() @@ -1026,7 +1067,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.properties.contexts.Tab#getSections <em>Sections</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the containment reference list '<em>Sections</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Tab#getSections() * @see #getTab() @@ -1038,7 +1079,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Tab#isIndented <em>Indented</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Indented</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Tab#isIndented() * @see #getTab() @@ -1050,7 +1091,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Tab#getPriority <em>Priority</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Priority</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Tab#getPriority() * @see #getTab() @@ -1062,7 +1103,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.papyrus.infra.properties.contexts.View <em>View</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>View</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.View * @generated @@ -1073,7 +1114,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.View#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.View#getName() * @see #getView() @@ -1085,7 +1126,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.properties.contexts.View#getSections <em>Sections</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the reference list '<em>Sections</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.View#getSections() * @see #getView() @@ -1097,7 +1138,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.properties.contexts.View#getContext <em>Context</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the container reference '<em>Context</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.View#getContext() * @see #getView() @@ -1109,7 +1150,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.View#isAutomaticContext <em>Automatic Context</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Automatic Context</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.View#isAutomaticContext() * @see #getView() @@ -1121,7 +1162,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.properties.contexts.View#getDatacontexts <em>Datacontexts</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the reference list '<em>Datacontexts</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.View#getDatacontexts() * @see #getView() @@ -1133,7 +1174,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.papyrus.infra.properties.contexts.Section <em>Section</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Section</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Section * @generated @@ -1144,7 +1185,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Section#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Section#getName() * @see #getSection() @@ -1156,7 +1197,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.properties.contexts.Section#getTab <em>Tab</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the container reference '<em>Tab</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Section#getTab() * @see #getSection() @@ -1168,7 +1209,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Section#getSectionFile <em>Section File</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Section File</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Section#getSectionFile() * @see #getSection() @@ -1180,7 +1221,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.properties.contexts.Section#getWidget <em>Widget</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the reference '<em>Widget</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Section#getWidget() * @see #getSection() @@ -1192,7 +1233,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.papyrus.infra.properties.contexts.DataContextElement <em>Data Context Element</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Data Context Element</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.DataContextElement * @generated @@ -1203,7 +1244,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.DataContextElement#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.DataContextElement#getName() * @see #getDataContextElement() @@ -1215,7 +1256,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.properties.contexts.DataContextElement#getProperties <em>Properties</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the containment reference list '<em>Properties</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.DataContextElement#getProperties() * @see #getDataContextElement() @@ -1227,7 +1268,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.properties.contexts.DataContextElement#getPackage <em>Package</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the container reference '<em>Package</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.DataContextElement#getPackage() * @see #getDataContextElement() @@ -1239,7 +1280,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.properties.contexts.DataContextElement#getSupertypes <em>Supertypes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the reference list '<em>Supertypes</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.DataContextElement#getSupertypes() * @see #getDataContextElement() @@ -1251,7 +1292,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.papyrus.infra.properties.contexts.Property <em>Property</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Property</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Property * @generated @@ -1262,7 +1303,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Property#getName() * @see #getProperty() @@ -1274,7 +1315,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getLabel <em>Label</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Label</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Property#getLabel() * @see #getProperty() @@ -1286,7 +1327,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getType <em>Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Type</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Property#getType() * @see #getProperty() @@ -1298,7 +1339,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getContextElement <em>Context Element</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the container reference '<em>Context Element</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Property#getContextElement() * @see #getProperty() @@ -1310,7 +1351,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getMultiplicity <em>Multiplicity</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Multiplicity</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Property#getMultiplicity() * @see #getProperty() @@ -1322,7 +1363,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getDescription <em>Description</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Description</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.Property#getDescription() * @see #getProperty() @@ -1331,10 +1372,34 @@ public interface ContextsPackage extends EPackage { EAttribute getProperty_Description(); /** + * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getRedefinedProperties <em>Redefined Properties</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the reference list '<em>Redefined Properties</em>'. + * @see org.eclipse.papyrus.infra.properties.contexts.Property#getRedefinedProperties() + * @see #getProperty() + * @generated + */ + EReference getProperty_RedefinedProperties(); + + /** + * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getRedefinedByProperties <em>Redefined By Properties</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the reference list '<em>Redefined By Properties</em>'. + * @see org.eclipse.papyrus.infra.properties.contexts.Property#getRedefinedByProperties() + * @see #getProperty() + * @generated + */ + EReference getProperty_RedefinedByProperties(); + + /** * Returns the meta object for class '{@link org.eclipse.papyrus.infra.properties.contexts.UnknownProperty <em>Unknown Property</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Unknown Property</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.UnknownProperty * @generated @@ -1345,7 +1410,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.papyrus.infra.properties.contexts.DataContextPackage <em>Data Context Package</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Data Context Package</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.DataContextPackage * @generated @@ -1356,7 +1421,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.properties.contexts.DataContextPackage#getElements <em>Elements</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the containment reference list '<em>Elements</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.DataContextPackage#getElements() * @see #getDataContextPackage() @@ -1368,7 +1433,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.papyrus.infra.properties.contexts.DataContextRoot <em>Data Context Root</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Data Context Root</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.DataContextRoot * @generated @@ -1379,7 +1444,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.properties.contexts.DataContextRoot#getLabel <em>Label</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Label</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.DataContextRoot#getLabel() * @see #getDataContextRoot() @@ -1391,7 +1456,7 @@ public interface ContextsPackage extends EPackage { * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.properties.contexts.DataContextRoot#getModelElementFactory <em>Model Element Factory</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the reference '<em>Model Element Factory</em>'. * @see org.eclipse.papyrus.infra.properties.contexts.DataContextRoot#getModelElementFactory() * @see #getDataContextRoot() @@ -1403,7 +1468,7 @@ public interface ContextsPackage extends EPackage { * Returns the factory that creates the instances of the model. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the factory that creates the instances of the model. * @generated */ @@ -1419,7 +1484,7 @@ public interface ContextsPackage extends EPackage { * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * + * * @generated */ interface Literals { @@ -1428,7 +1493,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.ContextImpl <em>Context</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getContext() * @generated @@ -1439,7 +1504,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Name</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute CONTEXT__NAME = eINSTANCE.getContext_Name(); @@ -1448,7 +1513,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Dependencies</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference CONTEXT__DEPENDENCIES = eINSTANCE.getContext_Dependencies(); @@ -1457,7 +1522,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Tabs</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference CONTEXT__TABS = eINSTANCE.getContext_Tabs(); @@ -1466,7 +1531,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Views</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference CONTEXT__VIEWS = eINSTANCE.getContext_Views(); @@ -1475,7 +1540,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Data Contexts</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference CONTEXT__DATA_CONTEXTS = eINSTANCE.getContext_DataContexts(); @@ -1484,7 +1549,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Prototype</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference CONTEXT__PROTOTYPE = eINSTANCE.getContext_Prototype(); @@ -1493,7 +1558,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Label</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute CONTEXT__LABEL = eINSTANCE.getContext_Label(); @@ -1502,7 +1567,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>User Label</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute CONTEXT__USER_LABEL = eINSTANCE.getContext_UserLabel(); @@ -1511,7 +1576,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.TabImpl <em>Tab</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.TabImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getTab() * @generated @@ -1522,7 +1587,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Label</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute TAB__LABEL = eINSTANCE.getTab_Label(); @@ -1531,7 +1596,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Id</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute TAB__ID = eINSTANCE.getTab_Id(); @@ -1540,7 +1605,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Category</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute TAB__CATEGORY = eINSTANCE.getTab_Category(); @@ -1549,7 +1614,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Image</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute TAB__IMAGE = eINSTANCE.getTab_Image(); @@ -1558,7 +1623,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>After Tab</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference TAB__AFTER_TAB = eINSTANCE.getTab_AfterTab(); @@ -1567,7 +1632,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Sections</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference TAB__SECTIONS = eINSTANCE.getTab_Sections(); @@ -1576,7 +1641,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Indented</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute TAB__INDENTED = eINSTANCE.getTab_Indented(); @@ -1585,7 +1650,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Priority</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute TAB__PRIORITY = eINSTANCE.getTab_Priority(); @@ -1594,7 +1659,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.ViewImpl <em>View</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.ViewImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getView() * @generated @@ -1605,7 +1670,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Name</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute VIEW__NAME = eINSTANCE.getView_Name(); @@ -1614,7 +1679,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Sections</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference VIEW__SECTIONS = eINSTANCE.getView_Sections(); @@ -1623,7 +1688,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Context</b></em>' container reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference VIEW__CONTEXT = eINSTANCE.getView_Context(); @@ -1632,7 +1697,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Automatic Context</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute VIEW__AUTOMATIC_CONTEXT = eINSTANCE.getView_AutomaticContext(); @@ -1641,7 +1706,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Datacontexts</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference VIEW__DATACONTEXTS = eINSTANCE.getView_Datacontexts(); @@ -1650,7 +1715,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.SectionImpl <em>Section</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.SectionImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getSection() * @generated @@ -1661,7 +1726,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Name</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute SECTION__NAME = eINSTANCE.getSection_Name(); @@ -1670,7 +1735,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Tab</b></em>' container reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference SECTION__TAB = eINSTANCE.getSection_Tab(); @@ -1679,7 +1744,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Section File</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute SECTION__SECTION_FILE = eINSTANCE.getSection_SectionFile(); @@ -1688,7 +1753,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Widget</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference SECTION__WIDGET = eINSTANCE.getSection_Widget(); @@ -1697,7 +1762,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.DataContextElementImpl <em>Data Context Element</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.DataContextElementImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getDataContextElement() * @generated @@ -1708,7 +1773,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Name</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute DATA_CONTEXT_ELEMENT__NAME = eINSTANCE.getDataContextElement_Name(); @@ -1717,7 +1782,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Properties</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference DATA_CONTEXT_ELEMENT__PROPERTIES = eINSTANCE.getDataContextElement_Properties(); @@ -1726,7 +1791,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Package</b></em>' container reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference DATA_CONTEXT_ELEMENT__PACKAGE = eINSTANCE.getDataContextElement_Package(); @@ -1735,7 +1800,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Supertypes</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference DATA_CONTEXT_ELEMENT__SUPERTYPES = eINSTANCE.getDataContextElement_Supertypes(); @@ -1744,7 +1809,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.PropertyImpl <em>Property</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.PropertyImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getProperty() * @generated @@ -1755,7 +1820,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Name</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute PROPERTY__NAME = eINSTANCE.getProperty_Name(); @@ -1764,7 +1829,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Label</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute PROPERTY__LABEL = eINSTANCE.getProperty_Label(); @@ -1773,7 +1838,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Type</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute PROPERTY__TYPE = eINSTANCE.getProperty_Type(); @@ -1782,7 +1847,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Context Element</b></em>' container reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference PROPERTY__CONTEXT_ELEMENT = eINSTANCE.getProperty_ContextElement(); @@ -1791,7 +1856,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Multiplicity</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute PROPERTY__MULTIPLICITY = eINSTANCE.getProperty_Multiplicity(); @@ -1800,16 +1865,34 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Description</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute PROPERTY__DESCRIPTION = eINSTANCE.getProperty_Description(); /** + * The meta object literal for the '<em><b>Redefined Properties</b></em>' reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference PROPERTY__REDEFINED_PROPERTIES = eINSTANCE.getProperty_RedefinedProperties(); + + /** + * The meta object literal for the '<em><b>Redefined By Properties</b></em>' reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference PROPERTY__REDEFINED_BY_PROPERTIES = eINSTANCE.getProperty_RedefinedByProperties(); + + /** * The meta object literal for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.UnknownPropertyImpl <em>Unknown Property</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.UnknownPropertyImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getUnknownProperty() * @generated @@ -1820,7 +1903,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.DataContextPackageImpl <em>Data Context Package</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.DataContextPackageImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getDataContextPackage() * @generated @@ -1831,7 +1914,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference DATA_CONTEXT_PACKAGE__ELEMENTS = eINSTANCE.getDataContextPackage_Elements(); @@ -1840,7 +1923,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.infra.properties.contexts.impl.DataContextRootImpl <em>Data Context Root</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.infra.properties.contexts.impl.DataContextRootImpl * @see org.eclipse.papyrus.infra.properties.contexts.impl.ContextsPackageImpl#getDataContextRoot() * @generated @@ -1851,7 +1934,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Label</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute DATA_CONTEXT_ROOT__LABEL = eINSTANCE.getDataContextRoot_Label(); @@ -1860,7 +1943,7 @@ public interface ContextsPackage extends EPackage { * The meta object literal for the '<em><b>Model Element Factory</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference DATA_CONTEXT_ROOT__MODEL_ELEMENT_FACTORY = eINSTANCE.getDataContextRoot_ModelElementFactory(); diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/Property.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/Property.java index 14ad569b4f7..f4ac4ffbfdc 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/Property.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/Property.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. + * Copyright (c) 2011, 2017 CEA LIST. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -8,9 +8,11 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Vincent Lorenzo - Bug 520271 *****************************************************************************/ package org.eclipse.papyrus.infra.properties.contexts; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.papyrus.infra.properties.environment.Type; @@ -29,6 +31,8 @@ import org.eclipse.papyrus.infra.properties.environment.Type; * <li>{@link org.eclipse.papyrus.infra.properties.contexts.Property#getContextElement <em>Context Element</em>}</li> * <li>{@link org.eclipse.papyrus.infra.properties.contexts.Property#getMultiplicity <em>Multiplicity</em>}</li> * <li>{@link org.eclipse.papyrus.infra.properties.contexts.Property#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.properties.contexts.Property#getRedefinedProperties <em>Redefined Properties</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.properties.contexts.Property#getRedefinedByProperties <em>Redefined By Properties</em>}</li> * </ul> * * @see org.eclipse.papyrus.infra.properties.contexts.ContextsPackage#getProperty() @@ -43,7 +47,7 @@ public interface Property extends EObject { * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) * @see org.eclipse.papyrus.infra.properties.contexts.ContextsPackage#getProperty_Name() @@ -56,7 +60,7 @@ public interface Property extends EObject { * Sets the value of the '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Name</em>' attribute. * @see #getName() @@ -71,7 +75,7 @@ public interface Property extends EObject { * If the meaning of the '<em>Label</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Label</em>' attribute. * @see #setLabel(String) * @see org.eclipse.papyrus.infra.properties.contexts.ContextsPackage#getProperty_Label() @@ -84,7 +88,7 @@ public interface Property extends EObject { * Sets the value of the '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getLabel <em>Label</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Label</em>' attribute. * @see #getLabel() @@ -100,7 +104,7 @@ public interface Property extends EObject { * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Type</em>' attribute. * @see org.eclipse.papyrus.infra.properties.environment.Type * @see #setType(Type) @@ -114,7 +118,7 @@ public interface Property extends EObject { * Sets the value of the '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getType <em>Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Type</em>' attribute. * @see org.eclipse.papyrus.infra.properties.environment.Type @@ -131,7 +135,7 @@ public interface Property extends EObject { * If the meaning of the '<em>Context Element</em>' container reference isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Context Element</em>' container reference. * @see #setContextElement(DataContextElement) * @see org.eclipse.papyrus.infra.properties.contexts.ContextsPackage#getProperty_ContextElement() @@ -145,7 +149,7 @@ public interface Property extends EObject { * Sets the value of the '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getContextElement <em>Context Element</em>}' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Context Element</em>' container reference. * @see #getContextElement() @@ -161,7 +165,7 @@ public interface Property extends EObject { * If the meaning of the '<em>Multiplicity</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Multiplicity</em>' attribute. * @see #setMultiplicity(int) * @see org.eclipse.papyrus.infra.properties.contexts.ContextsPackage#getProperty_Multiplicity() @@ -174,7 +178,7 @@ public interface Property extends EObject { * Sets the value of the '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getMultiplicity <em>Multiplicity</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Multiplicity</em>' attribute. * @see #getMultiplicity() @@ -189,7 +193,7 @@ public interface Property extends EObject { * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Description</em>' attribute. * @see #setDescription(String) * @see org.eclipse.papyrus.infra.properties.contexts.ContextsPackage#getProperty_Description() @@ -202,7 +206,7 @@ public interface Property extends EObject { * Sets the value of the '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getDescription <em>Description</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Description</em>' attribute. * @see #getDescription() @@ -210,4 +214,42 @@ public interface Property extends EObject { */ void setDescription(String value); + /** + * Returns the value of the '<em><b>Redefined Properties</b></em>' reference list. + * The list contents are of type {@link org.eclipse.papyrus.infra.properties.contexts.Property}. + * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getRedefinedByProperties <em>Redefined By Properties</em>}'. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Redefined Properties</em>' reference list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Redefined Properties</em>' reference list. + * @see org.eclipse.papyrus.infra.properties.contexts.ContextsPackage#getProperty_RedefinedProperties() + * @see org.eclipse.papyrus.infra.properties.contexts.Property#getRedefinedByProperties + * @model opposite="redefinedByProperties" + * @generated + */ + EList<Property> getRedefinedProperties(); + + /** + * Returns the value of the '<em><b>Redefined By Properties</b></em>' reference list. + * The list contents are of type {@link org.eclipse.papyrus.infra.properties.contexts.Property}. + * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.properties.contexts.Property#getRedefinedProperties <em>Redefined Properties</em>}'. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Redefined By Properties</em>' reference list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Redefined By Properties</em>' reference list. + * @see org.eclipse.papyrus.infra.properties.contexts.ContextsPackage#getProperty_RedefinedByProperties() + * @see org.eclipse.papyrus.infra.properties.contexts.Property#getRedefinedProperties + * @model opposite="redefinedProperties" derived="true" + * @generated + */ + EList<Property> getRedefinedByProperties(); + } // Property diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/impl/ContextsFactoryImpl.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/impl/ContextsFactoryImpl.java index 5bb176d0426..cf577bd354d 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/impl/ContextsFactoryImpl.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/impl/ContextsFactoryImpl.java @@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.papyrus.infra.properties.contexts.*; import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.infra.properties.contexts.ContextsFactory; import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage; diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/impl/ContextsPackageImpl.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/impl/ContextsPackageImpl.java index dec230f613b..91be6d9f10f 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/impl/ContextsPackageImpl.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/impl/ContextsPackageImpl.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2011, 2015, 2017 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -10,6 +10,7 @@ * CEA LIST - Initial API and implementation * Christian W. Damus - add prototype reference to Context (CDO) * Christian W. Damus - bug 482927 + * Vincent Lorenzo - Bug 520271 *****************************************************************************/ package org.eclipse.papyrus.infra.properties.contexts.impl; @@ -40,14 +41,14 @@ import org.eclipse.papyrus.infra.properties.ui.impl.UiPackageImpl; * <!-- begin-user-doc --> * An implementation of the model <b>Package</b>. * <!-- end-user-doc --> - * + * * @generated */ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass contextEClass = null; @@ -55,7 +56,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass tabEClass = null; @@ -63,7 +64,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass viewEClass = null; @@ -71,7 +72,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass sectionEClass = null; @@ -79,7 +80,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass dataContextElementEClass = null; @@ -87,7 +88,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass propertyEClass = null; @@ -95,7 +96,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass unknownPropertyEClass = null; @@ -103,7 +104,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass dataContextPackageEClass = null; @@ -111,7 +112,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass dataContextRootEClass = null; @@ -126,7 +127,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage * initialization of the package, or returns the registered package, * if one already exists. * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.papyrus.infra.properties.contexts.ContextsPackage#eNS_URI * @see #init() @@ -139,27 +140,28 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private static boolean isInited = false; /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * + * * <p> * This method is used to initialize {@link ContextsPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() * @generated */ public static ContextsPackage init() { - if (isInited) + if (isInited) { return (ContextsPackage) EPackage.Registry.INSTANCE.getEPackage(ContextsPackage.eNS_URI); + } // Obtain or create and register package ContextsPackageImpl theContextsPackage = (ContextsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ContextsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ContextsPackageImpl()); @@ -197,7 +199,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -208,7 +210,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -219,7 +221,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -230,7 +232,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -241,7 +243,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -252,7 +254,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -263,7 +265,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -274,7 +276,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -285,7 +287,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -296,7 +298,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -307,7 +309,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -318,7 +320,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -329,7 +331,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -340,7 +342,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -351,7 +353,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -362,7 +364,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -373,7 +375,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -384,7 +386,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -395,7 +397,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -406,7 +408,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -417,7 +419,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -428,7 +430,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -439,7 +441,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -450,7 +452,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -461,7 +463,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -472,7 +474,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -483,7 +485,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -494,7 +496,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -505,7 +507,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -516,7 +518,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -527,7 +529,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -538,7 +540,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -549,7 +551,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -560,7 +562,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -571,7 +573,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -582,7 +584,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -593,7 +595,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -604,7 +606,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -615,7 +617,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -626,7 +628,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -637,7 +639,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -648,7 +650,29 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * + * @generated + */ + @Override + public EReference getProperty_RedefinedProperties() { + return (EReference) propertyEClass.getEStructuralFeatures().get(6); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public EReference getProperty_RedefinedByProperties() { + return (EReference) propertyEClass.getEStructuralFeatures().get(7); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * * @generated */ @Override @@ -659,7 +683,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -670,7 +694,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -681,7 +705,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -692,7 +716,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -703,7 +727,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -714,7 +738,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -725,7 +749,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private boolean isCreated = false; @@ -735,12 +759,13 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage * guarded to have no affect on any invocation but its first. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ public void createPackageContents() { - if (isCreated) + if (isCreated) { return; + } isCreated = true; // Create classes and their features @@ -790,6 +815,8 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage createEReference(propertyEClass, PROPERTY__CONTEXT_ELEMENT); createEAttribute(propertyEClass, PROPERTY__MULTIPLICITY); createEAttribute(propertyEClass, PROPERTY__DESCRIPTION); + createEReference(propertyEClass, PROPERTY__REDEFINED_PROPERTIES); + createEReference(propertyEClass, PROPERTY__REDEFINED_BY_PROPERTIES); unknownPropertyEClass = createEClass(UNKNOWN_PROPERTY); @@ -804,7 +831,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private boolean isInitialized = false; @@ -814,12 +841,13 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage * method is guarded to have no affect on any invocation but its first. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ public void initializePackageContents() { - if (isInitialized) + if (isInitialized) { return; + } isInitialized = true; // Initialize package @@ -896,6 +924,10 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getProperty_Multiplicity(), ecorePackage.getEInt(), "multiplicity", "1", 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ initEAttribute(getProperty_Description(), ecorePackage.getEString(), "description", null, 0, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEReference(getProperty_RedefinedProperties(), this.getProperty(), this.getProperty_RedefinedByProperties(), "redefinedProperties", null, 0, -1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, //$NON-NLS-1$ + !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getProperty_RedefinedByProperties(), this.getProperty(), this.getProperty_RedefinedProperties(), "redefinedByProperties", null, 0, -1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, //$NON-NLS-1$ + !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(unknownPropertyEClass, UnknownProperty.class, "UnknownProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/impl/PropertyImpl.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/impl/PropertyImpl.java index 7a83a1d0fd4..266c9c273a9 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/impl/PropertyImpl.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/impl/PropertyImpl.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011, 2013 CEA LIST. + * Copyright (c) 2011, 2013, 2017 CEA LIST. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,16 +9,21 @@ * Contributors: * CEA LIST - Initial API and implementation * Christian W. Damus - add prototype reference to Context (CDO) + * Vincent Lorenzo - Bug 520271 *****************************************************************************/ package org.eclipse.papyrus.infra.properties.contexts.impl; +import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage; import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; import org.eclipse.papyrus.infra.properties.contexts.Property; @@ -38,6 +43,8 @@ import org.eclipse.papyrus.infra.properties.environment.Type; * <li>{@link org.eclipse.papyrus.infra.properties.contexts.impl.PropertyImpl#getContextElement <em>Context Element</em>}</li> * <li>{@link org.eclipse.papyrus.infra.properties.contexts.impl.PropertyImpl#getMultiplicity <em>Multiplicity</em>}</li> * <li>{@link org.eclipse.papyrus.infra.properties.contexts.impl.PropertyImpl#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.properties.contexts.impl.PropertyImpl#getRedefinedProperties <em>Redefined Properties</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.properties.contexts.impl.PropertyImpl#getRedefinedByProperties <em>Redefined By Properties</em>}</li> * </ul> * * @generated @@ -47,7 +54,7 @@ public class PropertyImpl extends EObjectImpl implements Property { * The default value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getName() * @generated * @ordered @@ -58,7 +65,7 @@ public class PropertyImpl extends EObjectImpl implements Property { * The cached value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getName() * @generated * @ordered @@ -69,7 +76,7 @@ public class PropertyImpl extends EObjectImpl implements Property { * The default value of the '{@link #getLabel() <em>Label</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getLabel() * @generated * @ordered @@ -80,7 +87,7 @@ public class PropertyImpl extends EObjectImpl implements Property { * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getLabel() * @generated * @ordered @@ -91,7 +98,7 @@ public class PropertyImpl extends EObjectImpl implements Property { * The default value of the '{@link #getType() <em>Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getType() * @generated * @ordered @@ -102,7 +109,7 @@ public class PropertyImpl extends EObjectImpl implements Property { * The cached value of the '{@link #getType() <em>Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getType() * @generated * @ordered @@ -113,7 +120,7 @@ public class PropertyImpl extends EObjectImpl implements Property { * The default value of the '{@link #getMultiplicity() <em>Multiplicity</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getMultiplicity() * @generated * @ordered @@ -124,7 +131,7 @@ public class PropertyImpl extends EObjectImpl implements Property { * The cached value of the '{@link #getMultiplicity() <em>Multiplicity</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getMultiplicity() * @generated * @ordered @@ -135,7 +142,7 @@ public class PropertyImpl extends EObjectImpl implements Property { * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getDescription() * @generated * @ordered @@ -146,7 +153,7 @@ public class PropertyImpl extends EObjectImpl implements Property { * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getDescription() * @generated * @ordered @@ -154,9 +161,31 @@ public class PropertyImpl extends EObjectImpl implements Property { protected String description = DESCRIPTION_EDEFAULT; /** + * The cached value of the '{@link #getRedefinedProperties() <em>Redefined Properties</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * + * @see #getRedefinedProperties() + * @generated + * @ordered + */ + protected EList<Property> redefinedProperties; + + /** + * The cached value of the '{@link #getRedefinedByProperties() <em>Redefined By Properties</em>}' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #getRedefinedByProperties() + * @generated + * @ordered + */ + protected EList<Property> redefinedByProperties; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * * @generated */ protected PropertyImpl() { @@ -166,7 +195,7 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -177,7 +206,7 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -188,21 +217,22 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override public void setName(String newName) { String oldName = name; name = newName; - if (eNotificationRequired()) + if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.SET, ContextsPackage.PROPERTY__NAME, oldName, name)); + } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -213,21 +243,22 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override public void setLabel(String newLabel) { String oldLabel = label; label = newLabel; - if (eNotificationRequired()) + if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.SET, ContextsPackage.PROPERTY__LABEL, oldLabel, label)); + } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -238,34 +269,36 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override public void setType(Type newType) { Type oldType = type; type = newType == null ? TYPE_EDEFAULT : newType; - if (eNotificationRequired()) + if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.SET, ContextsPackage.PROPERTY__TYPE, oldType, type)); + } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override public DataContextElement getContextElement() { - if (eContainerFeatureID() != ContextsPackage.PROPERTY__CONTEXT_ELEMENT) + if (eContainerFeatureID() != ContextsPackage.PROPERTY__CONTEXT_ELEMENT) { return null; + } return (DataContextElement) eInternalContainer(); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ public NotificationChain basicSetContextElement(DataContextElement newContextElement, NotificationChain msgs) { @@ -276,30 +309,35 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override public void setContextElement(DataContextElement newContextElement) { if (newContextElement != eInternalContainer() || (eContainerFeatureID() != ContextsPackage.PROPERTY__CONTEXT_ELEMENT && newContextElement != null)) { - if (EcoreUtil.isAncestor(this, newContextElement)) + if (EcoreUtil.isAncestor(this, newContextElement)) { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$ + } NotificationChain msgs = null; - if (eInternalContainer() != null) + if (eInternalContainer() != null) { msgs = eBasicRemoveFromContainer(msgs); - if (newContextElement != null) + } + if (newContextElement != null) { msgs = ((InternalEObject) newContextElement).eInverseAdd(this, ContextsPackage.DATA_CONTEXT_ELEMENT__PROPERTIES, DataContextElement.class, msgs); + } msgs = basicSetContextElement(newContextElement, msgs); - if (msgs != null) + if (msgs != null) { msgs.dispatch(); - } else if (eNotificationRequired()) + } + } else if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.SET, ContextsPackage.PROPERTY__CONTEXT_ELEMENT, newContextElement, newContextElement)); + } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -310,21 +348,22 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override public void setMultiplicity(int newMultiplicity) { int oldMultiplicity = multiplicity; multiplicity = newMultiplicity; - if (eNotificationRequired()) + if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.SET, ContextsPackage.PROPERTY__MULTIPLICITY, oldMultiplicity, multiplicity)); + } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -335,30 +374,65 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override public void setDescription(String newDescription) { String oldDescription = description; description = newDescription; - if (eNotificationRequired()) + if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.SET, ContextsPackage.PROPERTY__DESCRIPTION, oldDescription, description)); + } + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public EList<Property> getRedefinedProperties() { + if (redefinedProperties == null) { + redefinedProperties = new EObjectWithInverseResolvingEList.ManyInverse<>(Property.class, this, ContextsPackage.PROPERTY__REDEFINED_PROPERTIES, ContextsPackage.PROPERTY__REDEFINED_BY_PROPERTIES); + } + return redefinedProperties; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public EList<Property> getRedefinedByProperties() { + if (redefinedByProperties == null) { + redefinedByProperties = new EObjectWithInverseResolvingEList.ManyInverse<>(Property.class, this, ContextsPackage.PROPERTY__REDEFINED_BY_PROPERTIES, ContextsPackage.PROPERTY__REDEFINED_PROPERTIES); + } + return redefinedByProperties; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ + @SuppressWarnings("unchecked") @Override public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case ContextsPackage.PROPERTY__CONTEXT_ELEMENT: - if (eInternalContainer() != null) + if (eInternalContainer() != null) { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetContextElement((DataContextElement) otherEnd, msgs); + case ContextsPackage.PROPERTY__REDEFINED_PROPERTIES: + return ((InternalEList<InternalEObject>) (InternalEList<?>) getRedefinedProperties()).basicAdd(otherEnd, msgs); + case ContextsPackage.PROPERTY__REDEFINED_BY_PROPERTIES: + return ((InternalEList<InternalEObject>) (InternalEList<?>) getRedefinedByProperties()).basicAdd(otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); } @@ -366,7 +440,7 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -374,6 +448,10 @@ public class PropertyImpl extends EObjectImpl implements Property { switch (featureID) { case ContextsPackage.PROPERTY__CONTEXT_ELEMENT: return basicSetContextElement(null, msgs); + case ContextsPackage.PROPERTY__REDEFINED_PROPERTIES: + return ((InternalEList<?>) getRedefinedProperties()).basicRemove(otherEnd, msgs); + case ContextsPackage.PROPERTY__REDEFINED_BY_PROPERTIES: + return ((InternalEList<?>) getRedefinedByProperties()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -381,7 +459,7 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -396,7 +474,7 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -414,6 +492,10 @@ public class PropertyImpl extends EObjectImpl implements Property { return getMultiplicity(); case ContextsPackage.PROPERTY__DESCRIPTION: return getDescription(); + case ContextsPackage.PROPERTY__REDEFINED_PROPERTIES: + return getRedefinedProperties(); + case ContextsPackage.PROPERTY__REDEFINED_BY_PROPERTIES: + return getRedefinedByProperties(); } return super.eGet(featureID, resolve, coreType); } @@ -421,9 +503,10 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ + @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { @@ -445,6 +528,14 @@ public class PropertyImpl extends EObjectImpl implements Property { case ContextsPackage.PROPERTY__DESCRIPTION: setDescription((String) newValue); return; + case ContextsPackage.PROPERTY__REDEFINED_PROPERTIES: + getRedefinedProperties().clear(); + getRedefinedProperties().addAll((Collection<? extends Property>) newValue); + return; + case ContextsPackage.PROPERTY__REDEFINED_BY_PROPERTIES: + getRedefinedByProperties().clear(); + getRedefinedByProperties().addAll((Collection<? extends Property>) newValue); + return; } super.eSet(featureID, newValue); } @@ -452,7 +543,7 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -476,6 +567,12 @@ public class PropertyImpl extends EObjectImpl implements Property { case ContextsPackage.PROPERTY__DESCRIPTION: setDescription(DESCRIPTION_EDEFAULT); return; + case ContextsPackage.PROPERTY__REDEFINED_PROPERTIES: + getRedefinedProperties().clear(); + return; + case ContextsPackage.PROPERTY__REDEFINED_BY_PROPERTIES: + getRedefinedByProperties().clear(); + return; } super.eUnset(featureID); } @@ -483,7 +580,7 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -501,6 +598,10 @@ public class PropertyImpl extends EObjectImpl implements Property { return multiplicity != MULTIPLICITY_EDEFAULT; case ContextsPackage.PROPERTY__DESCRIPTION: return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); + case ContextsPackage.PROPERTY__REDEFINED_PROPERTIES: + return redefinedProperties != null && !redefinedProperties.isEmpty(); + case ContextsPackage.PROPERTY__REDEFINED_BY_PROPERTIES: + return redefinedByProperties != null && !redefinedByProperties.isEmpty(); } return super.eIsSet(featureID); } @@ -508,13 +609,14 @@ public class PropertyImpl extends EObjectImpl implements Property { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override public String toString() { - if (eIsProxy()) + if (eIsProxy()) { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); //$NON-NLS-1$ diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/util/ContextsAdapterFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/util/ContextsAdapterFactory.java index aa3c61e07f3..5adee3eb401 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/util/ContextsAdapterFactory.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/util/ContextsAdapterFactory.java @@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.EObject; import org.eclipse.papyrus.infra.constraints.DisplayUnit; -import org.eclipse.papyrus.infra.properties.contexts.*; import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage; import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/util/ContextsSwitch.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/util/ContextsSwitch.java index 681ba3601bc..e51af757d00 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/util/ContextsSwitch.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/contexts/util/ContextsSwitch.java @@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.util.Switch; import org.eclipse.papyrus.infra.constraints.DisplayUnit; -import org.eclipse.papyrus.infra.properties.contexts.*; import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage; import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/environment/impl/EnvironmentFactoryImpl.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/environment/impl/EnvironmentFactoryImpl.java index 22905fe09c0..2a10093e236 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/environment/impl/EnvironmentFactoryImpl.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/environment/impl/EnvironmentFactoryImpl.java @@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.papyrus.infra.properties.environment.*; import org.eclipse.papyrus.infra.properties.environment.CompositeWidgetType; import org.eclipse.papyrus.infra.properties.environment.Environment; import org.eclipse.papyrus.infra.properties.environment.EnvironmentFactory; diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/environment/util/EnvironmentAdapterFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/environment/util/EnvironmentAdapterFactory.java index ff9ff552d2b..ec8c0f1e677 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/environment/util/EnvironmentAdapterFactory.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/environment/util/EnvironmentAdapterFactory.java @@ -16,7 +16,6 @@ import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; import org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment; -import org.eclipse.papyrus.infra.properties.environment.*; import org.eclipse.papyrus.infra.properties.environment.CompositeWidgetType; import org.eclipse.papyrus.infra.properties.environment.Environment; import org.eclipse.papyrus.infra.properties.environment.EnvironmentPackage; diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/environment/util/EnvironmentSwitch.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/environment/util/EnvironmentSwitch.java index d48c56eee92..d9c20929c22 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/environment/util/EnvironmentSwitch.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/environment/util/EnvironmentSwitch.java @@ -15,7 +15,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.util.Switch; import org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment; -import org.eclipse.papyrus.infra.properties.environment.*; import org.eclipse.papyrus.infra.properties.environment.CompositeWidgetType; import org.eclipse.papyrus.infra.properties.environment.Environment; import org.eclipse.papyrus.infra.properties.environment.EnvironmentPackage; diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/ui/impl/UiFactoryImpl.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/ui/impl/UiFactoryImpl.java index 0368baec05e..5e8f465d808 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/ui/impl/UiFactoryImpl.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/ui/impl/UiFactoryImpl.java @@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.papyrus.infra.properties.ui.*; import org.eclipse.papyrus.infra.properties.ui.CompositeWidget; import org.eclipse.papyrus.infra.properties.ui.Element; import org.eclipse.papyrus.infra.properties.ui.Layout; diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/ui/util/UiAdapterFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/ui/util/UiAdapterFactory.java index 66639e9a005..77d08f68a4c 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/ui/util/UiAdapterFactory.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/ui/util/UiAdapterFactory.java @@ -15,7 +15,6 @@ import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; -import org.eclipse.papyrus.infra.properties.ui.*; import org.eclipse.papyrus.infra.properties.ui.CompositeWidget; import org.eclipse.papyrus.infra.properties.ui.Element; import org.eclipse.papyrus.infra.properties.ui.Layout; diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/ui/util/UiSwitch.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/ui/util/UiSwitch.java index 672afc05cba..040020dbb7c 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/ui/util/UiSwitch.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src-gen/org/eclipse/papyrus/infra/properties/ui/util/UiSwitch.java @@ -14,7 +14,6 @@ package org.eclipse.papyrus.infra.properties.ui.util; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.util.Switch; -import org.eclipse.papyrus.infra.properties.ui.*; import org.eclipse.papyrus.infra.properties.ui.CompositeWidget; import org.eclipse.papyrus.infra.properties.ui.Element; import org.eclipse.papyrus.infra.properties.ui.Layout; diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/META-INF/MANIFEST.MF index b3919b032c4..159df102564 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.eclipse.papyrus.infra.newchild.ui.Activator Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", - org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.newchild;bundle-version="[3.0.0,4.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy |