Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#1346] Remove RO descriptors layer #1354

Merged
merged 2 commits into from
Apr 30, 2024
Merged

[#1346] Remove RO descriptors layer #1354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4eaab3
[#1346] Remove RO descriptors layer
ruspl-afed Apr 30, 2024
2297c62
[#1346] Remove RO descriptors layer
ruspl-afed Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...agreements.edit/src-gen/org/eclipse/passage/lic/agreements/edit/AgreementsEditPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2021 ArSysOp
* Copyright (c) 2018, 2024 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -13,9 +13,7 @@
package org.eclipse.passage.lic.agreements.edit;

import org.eclipse.emf.common.EMFPlugin;

import org.eclipse.emf.common.util.ResourceLocator;

import org.osgi.framework.BundleActivator;

/**
Expand Down
5 changes: 3 additions & 2 deletions ...src-gen/org/eclipse/passage/lic/agreements/edit/providers/AgreementGroupItemProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2021 ArSysOp
* Copyright (c) 2018, 2024 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -142,7 +142,8 @@ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object objec
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// Check the type of the specified child object and return the proper feature to
// use for
// adding (see {@link AddCommand}) it as a child.

return super.getChildFeature(object, child);
Expand Down
2 changes: 1 addition & 1 deletion ...edit/src-gen/org/eclipse/passage/lic/agreements/edit/providers/AgreementItemProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2021 ArSysOp
* Copyright (c) 2018, 2024 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down
3 changes: 1 addition & 2 deletions ...g/eclipse/passage/lic/agreements/edit/providers/AgreementsItemProviderAdapterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2021 ArSysOp
* Copyright (c) 2018, 2024 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -18,7 +18,6 @@
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;

import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
Expand Down
14 changes: 4 additions & 10 deletions bundles/org.eclipse.passage.lic.features.ecore/model/features.ecore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="features" nsURI="http://www.eclipse.org/passage/lic/features/2.0.0"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="features" nsURI="http://www.eclipse.org/passage/lic/features/3.0.0"
nsPrefix="features">
<eClassifiers xsi:type="ecore:EClass" name="FeatureSetDescriptor" instanceClassName="org.eclipse.passage.lic.features.FeatureSetDescriptor"
abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="FeatureDescriptor" instanceClassName="org.eclipse.passage.lic.features.FeatureDescriptor"
abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="FeatureVersionDescriptor" instanceClassName="org.eclipse.passage.lic.features.FeatureVersionDescriptor"
abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="FeatureSet" eSuperTypes="#//FeatureSetDescriptor">
<eClassifiers xsi:type="ecore:EClass" name="FeatureSet">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="features" upperBound="-1"
eType="#//Feature" containment="true" eOpposite="#//Feature/featureSet"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Feature" eSuperTypes="#//FeatureDescriptor">
<eClassifiers xsi:type="ecore:EClass" name="Feature">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="provider" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
Expand All @@ -27,7 +21,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="featureVersions" upperBound="-1"
eType="#//FeatureVersion" containment="true" eOpposite="#//FeatureVersion/feature"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FeatureVersion" eSuperTypes="#//FeatureVersionDescriptor">
<eClassifiers xsi:type="ecore:EClass" name="FeatureVersion">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
Expand Down
13 changes: 5 additions & 8 deletions bundles/org.eclipse.passage.lic.features.edit/plugin.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ _UI_CreateChild_tooltip = Create New {0} Under {1} Feature
_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
_UI_PropertyDescriptor_description = The {0} of the {1}
_UI_FeatureSetDescriptor_type = Feature Set Descriptor
_UI_FeatureDescriptor_type = Feature Descriptor
_UI_FeatureVersionDescriptor_type = Feature Version Descriptor
_UI_FeatureSet_type = Feature Set
_UI_FeatureSet_type = Feature Set
_UI_Feature_type = Feature
_UI_FeatureVersion_type = Feature Version
_UI_Unknown_type = Object
Expand All @@ -46,12 +43,12 @@ _UI_Feature_name_feature = Name
_UI_Feature_description_feature = Description
_UI_Feature_featureSet_feature = Feature Set
_UI_Feature_featureVersions_feature = Feature Versions
_UI_Feature_provider_feature = Provider
_UI_FeatureVersion_agreements_feature = Agreements
_UI_FeatureVersion_version_feature = Version
_UI_FeatureVersion_feature_feature = Feature
_UI_FeatureVersion_news_feature = News
_UI_Unknown_feature = Unspecified
_UI_Feature_text_pattern = {1} ({0})
_UI_Unknown_feature = Unspecified
_UI_Feature_text_pattern = {1} ({0})
_UI_FeatureSet_text_pattern = {1} ({0})
_UI_FeatureVersion_text_pattern = {0} {1}
_UI_Feature_provider_feature = Provider
_UI_FeatureVersion_agreements_feature = Agreements
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.features.edit/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
<!-- @generated features -->
<factory
uri="http://www.eclipse.org/passage/lic/features/2.0.0"
uri="http://www.eclipse.org/passage/lic/features/3.0.0"
class="org.eclipse.passage.lic.features.edit.providers.FeaturesItemProviderAdapterFactory"
supportedTypes=
"org.eclipse.emf.edit.provider.IEditingDomainItemProvider
Expand Down
2 changes: 1 addition & 1 deletion ...e.lic.features.edit/src-gen/org/eclipse/passage/lic/features/edit/FeaturesEditPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2020 ArSysOp
* Copyright (c) 2018, 2024 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down
5 changes: 3 additions & 2 deletions ...res.edit/src-gen/org/eclipse/passage/lic/features/edit/providers/FeatureItemProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2020 ArSysOp
* Copyright (c) 2018, 2024 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -166,7 +166,8 @@ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object objec
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// Check the type of the specified child object and return the proper feature to
// use for
// adding (see {@link AddCommand}) it as a child.

return super.getChildFeature(object, child);
Expand Down
5 changes: 3 additions & 2 deletions ....edit/src-gen/org/eclipse/passage/lic/features/edit/providers/FeatureSetItemProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2020 ArSysOp
* Copyright (c) 2018, 2024 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -150,7 +150,8 @@ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object objec
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// Check the type of the specified child object and return the proper feature to
// use for
// adding (see {@link AddCommand}) it as a child.

return super.getChildFeature(object, child);
Expand Down
2 changes: 1 addition & 1 deletion ...t/src-gen/org/eclipse/passage/lic/features/edit/providers/FeatureVersionItemProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2020 ArSysOp
* Copyright (c) 2018, 2024 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion ...n/org/eclipse/passage/lic/features/edit/providers/FeaturesItemProviderAdapterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2020 ArSysOp
* Copyright (c) 2018, 2024 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down
5 changes: 1 addition & 4 deletions bundles/org.eclipse.passage.lic.features.model/model/features.genmodel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
editorPluginClass="org.eclipse.passage.lic.features.editor.FeaturesEditorPlugin"
nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
codeFormatting="true" testSuiteClass="org.eclipse.passage.lic.features.model.tests.FeaturesAllTests"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="17.0" copyrightFields="false"
editPluginID="org.eclipse.passage.lic.features.edit" editorPluginID="org.eclipse.passage.lic.features.editor"
language="" operationReflection="true" runtimePlatform="RCP" importOrganizing="true"
cleanup="true" oSGiCompatible="true">
Expand All @@ -18,9 +18,6 @@
classPackageSuffix="model.impl" utilityPackageSuffix="model.util" providerPackageSuffix="edit.providers"
presentationPackageSuffix="editor" testsPackageSuffix="model.tests" literalsInterface="false"
ecorePackage="../../org.eclipse.passage.lic.features.ecore/model/features.ecore#/">
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.features.ecore/model/features.ecore#//FeatureSetDescriptor"/>
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.features.ecore/model/features.ecore#//FeatureDescriptor"/>
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.features.ecore/model/features.ecore#//FeatureVersionDescriptor"/>
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.features.ecore/model/features.ecore#//FeatureSet">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.features.ecore/model/features.ecore#//FeatureSet/identifier"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.features.ecore/model/features.ecore#//FeatureSet/name"/>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.features.model/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<!-- @generated features -->
<package
uri="http://www.eclipse.org/passage/lic/features/2.0.0"
uri="http://www.eclipse.org/passage/lic/features/3.0.0"
class="org.eclipse.passage.lic.features.model.meta.FeaturesPackage"
genModel="model/features.genmodel"/>
</extension>
Expand Down
15 changes: 3 additions & 12 deletions ...assage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/Feature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2021 ArSysOp
* Copyright (c) 2018, 2024 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -13,11 +13,8 @@
package org.eclipse.passage.lic.features.model.api;

import org.eclipse.emf.common.util.EList;

import org.eclipse.emf.ecore.EObject;

import org.eclipse.passage.lic.features.FeatureDescriptor;

/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Feature</b></em>'.
Expand All @@ -36,10 +33,10 @@
* </ul>
*
* @see org.eclipse.passage.lic.features.model.meta.FeaturesPackage#getFeature()
* @model superTypes="org.eclipse.passage.lic.features.model.api.FeatureDescriptor"
* @model
* @generated
*/
public interface Feature extends EObject, FeatureDescriptor {
public interface Feature extends EObject {
/**
* Returns the value of the '<em><b>Identifier</b></em>' attribute.
* <!-- begin-user-doc -->
Expand All @@ -50,7 +47,6 @@ public interface Feature extends EObject, FeatureDescriptor {
* @model required="true"
* @generated
*/
@Override
String getIdentifier();

/**
Expand All @@ -73,7 +69,6 @@ public interface Feature extends EObject, FeatureDescriptor {
* @model
* @generated
*/
@Override
String getProvider();

/**
Expand All @@ -96,7 +91,6 @@ public interface Feature extends EObject, FeatureDescriptor {
* @model
* @generated
*/
@Override
String getName();

/**
Expand All @@ -119,7 +113,6 @@ public interface Feature extends EObject, FeatureDescriptor {
* @model
* @generated
*/
@Override
String getDescription();

/**
Expand All @@ -144,7 +137,6 @@ public interface Feature extends EObject, FeatureDescriptor {
* @model opposite="features" required="true" transient="false"
* @generated
*/
@Override
FeatureSet getFeatureSet();

/**
Expand All @@ -169,7 +161,6 @@ public interface Feature extends EObject, FeatureDescriptor {
* @model opposite="feature" containment="true"
* @generated
*/
@Override
EList<FeatureVersion> getFeatureVersions();

} // Feature
13 changes: 3 additions & 10 deletions ...age.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/FeatureSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2021 ArSysOp
* Copyright (c) 2018, 2024 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -13,11 +13,8 @@
package org.eclipse.passage.lic.features.model.api;

import org.eclipse.emf.common.util.EList;

import org.eclipse.emf.ecore.EObject;

import org.eclipse.passage.lic.features.FeatureSetDescriptor;

/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Feature Set</b></em>'.
Expand All @@ -34,10 +31,10 @@
* </ul>
*
* @see org.eclipse.passage.lic.features.model.meta.FeaturesPackage#getFeatureSet()
* @model superTypes="org.eclipse.passage.lic.features.model.api.FeatureSetDescriptor"
* @model
* @generated
*/
public interface FeatureSet extends EObject, FeatureSetDescriptor {
public interface FeatureSet extends EObject {
/**
* Returns the value of the '<em><b>Identifier</b></em>' attribute.
* <!-- begin-user-doc -->
Expand All @@ -48,7 +45,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor {
* @model required="true"
* @generated
*/
@Override
String getIdentifier();

/**
Expand All @@ -71,7 +67,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor {
* @model
* @generated
*/
@Override
String getName();

/**
Expand All @@ -94,7 +89,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor {
* @model
* @generated
*/
@Override
String getDescription();

/**
Expand All @@ -119,7 +113,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor {
* @model opposite="featureSet" containment="true"
* @generated
*/
@Override
EList<Feature> getFeatures();

} // FeatureSet
Loading
Loading