Skip to content

Commit

Permalink
Bug 568196 design EMF model user personal access structure
Browse files Browse the repository at this point in the history 
 - invite `FloatingLicenseAccess` structure to represent a user's
personal server configuration
 - fix multiplicity errors in `FloatingLicensePack` model


Signed-off-by: eparovyshnaya <[email protected]>
  • Loading branch information
@eparovyshnaya
eparovyshnaya committed Oct 24, 2020
1 parent ddb30ab commit d861eb5
Show file tree
Hide file tree
Showing 19 changed files with 1,797 additions and 78 deletions.
19 changes: 17 additions & 2 deletions bundles/org.eclipse.passage.lic.floating.ecore/model/floating.ecore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,16 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="UserGrant">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="user" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="authentication" eType="#//EvaluationInstructions"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="authentication" lowerBound="1"
eType="#//EvaluationInstructions"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FeatureGrant">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="feature" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="version" eType="#//VersionMatch"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="version" lowerBound="1"
eType="#//VersionMatch"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="valid" lowerBound="1" eType="#//ValidityPeriod"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="vivid" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="capacity" lowerBound="1"
Expand All @@ -69,4 +71,17 @@
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="rule" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FloatingLicenseAccess">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="user" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="server" lowerBound="1"
eType="#//FloatingServerConnection"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="originLicensePack" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FloatingServerConnection">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="ip" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="port" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="authentication" ordered="false"
unique="false" lowerBound="1" eType="#//EvaluationInstructions"/>
</eClassifiers>
</ecore:EPackage>
Binary file added ...rg.eclipse.passage.lic.floating.edit/icons/full/obj16/FloatingLicenseAccess.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...eclipse.passage.lic.floating.edit/icons/full/obj16/FloatingServerConnection.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
154 changes: 81 additions & 73 deletions bundles/org.eclipse.passage.lic.floating.edit/plugin.properties
View file
Original file line number Diff line number Diff line change
@@ -1,74 +1,82 @@
###############################################################################
# Copyright (c) 2020 ArSysOp and others
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
# https://www.eclipse.org/legal/epl-2.0/.
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# ArSysOp - initial API and implementation
###############################################################################

pluginName = Passage LIC Floating Licenses Edit Support
providerName=Eclipse Passage

Bundle-Copyright = Copyright (c) 2020 ArSysOp and others.\n\
\n\
This program and the accompanying materials are made\n\
available under the terms of the Eclipse Public License 2.0\n\
which is available at https://www.eclipse.org/legal/epl-2.0/\n\
\n\
SPDX-License-Identifier: EPL-2.0\n\
_UI_CreateChild_text = {0}
_UI_CreateChild_text2 = {1} {0}
_UI_CreateChild_text3 = {1}
_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_FloatingLicensePack_type = License Pack
_UI_LicenseRequisites_type = License Requisites
_UI_ProductRef_type = Product Ref
_UI_FloatingServer_type = Server
_UI_UserGrant_type = User Grant
_UI_FeatureGrant_type = Feature Grant
_UI_ValidityPeriod_type = Validity Period
_UI_ValidityPeriodClosed_type = Validity Period Closed
_UI_EvaluationInstructions_type = Evaluation Instructions
_UI_VersionMatch_type = Version Match
_UI_Unknown_type = Object
_UI_Unknown_datatype= Value
_UI_FloatingLicensePack_license_feature = License
_UI_FloatingLicensePack_host_feature = Host
_UI_FloatingLicensePack_users_feature = Users
_UI_FloatingLicensePack_features_feature = Features
_UI_LicenseRequisites_identifier_feature = Identifier
_UI_LicenseRequisites_issueDate_feature = Issue Date
_UI_LicenseRequisites_company_feature = Company
_UI_LicenseRequisites_plan_feature = Plan
_UI_LicenseRequisites_product_feature = Product
_UI_LicenseRequisites_valid_feature = Valid
_UI_ProductRef_product_feature = Product
_UI_ProductRef_version_feature = Version
_UI_FloatingServer_identifier_feature = Identifier
_UI_FloatingServer_authentication_feature = Authentication
_UI_UserGrant_user_feature = User
_UI_UserGrant_authentication_feature = Authentication
_UI_FeatureGrant_identifier_feature = Identifier
_UI_FeatureGrant_feature_feature = Feature
_UI_FeatureGrant_version_feature = Version
_UI_FeatureGrant_valid_feature = Valid
_UI_FeatureGrant_capacity_feature = Capacity
_UI_FeatureGrant_pack_feature = Pack
_UI_ValidityPeriodClosed_from_feature = From
_UI_ValidityPeriodClosed_until_feature = Until
_UI_EvaluationInstructions_type_feature = Type
_UI_EvaluationInstructions_expression_feature = Expression
_UI_VersionMatch_version_feature = Version
_UI_VersionMatch_rule_feature = Rule
_UI_Unknown_feature = Unspecified
###############################################################################
# Copyright (c) 2020 ArSysOp and others
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
# https://www.eclipse.org/legal/epl-2.0/.
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# ArSysOp - initial API and implementation
###############################################################################

_UI_CreateChild_text = {0}
_UI_FeatureGrant_vivid_feature = Vivid
pluginName = Passage LIC Floating Licenses Edit Support
providerName=Eclipse Passage

Bundle-Copyright = Copyright (c) 2020 ArSysOp and others.\n\
\n\
This program and the accompanying materials are made\n\
available under the terms of the Eclipse Public License 2.0\n\
which is available at https://www.eclipse.org/legal/epl-2.0/\n\
\n\
SPDX-License-Identifier: EPL-2.0\n\
_UI_CreateChild_text = {0}
_UI_CreateChild_text2 = {1} {0}
_UI_CreateChild_text3 = {1}
_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_FloatingLicensePack_type = License Pack
_UI_LicenseRequisites_type = License Requisites
_UI_ProductRef_type = Product Ref
_UI_FloatingServer_type = Server
_UI_UserGrant_type = User Grant
_UI_FeatureGrant_type = Feature Grant
_UI_ValidityPeriod_type = Validity Period
_UI_ValidityPeriodClosed_type = Validity Period Closed
_UI_EvaluationInstructions_type = Evaluation Instructions
_UI_VersionMatch_type = Version Match
_UI_Unknown_type = Object
_UI_Unknown_datatype= Value
_UI_FloatingLicensePack_license_feature = License
_UI_FloatingLicensePack_host_feature = Host
_UI_FloatingLicensePack_users_feature = Users
_UI_FloatingLicensePack_features_feature = Features
_UI_LicenseRequisites_identifier_feature = Identifier
_UI_LicenseRequisites_issueDate_feature = Issue Date
_UI_LicenseRequisites_company_feature = Company
_UI_LicenseRequisites_plan_feature = Plan
_UI_LicenseRequisites_product_feature = Product
_UI_LicenseRequisites_valid_feature = Valid
_UI_ProductRef_product_feature = Product
_UI_ProductRef_version_feature = Version
_UI_FloatingServer_identifier_feature = Identifier
_UI_FloatingServer_authentication_feature = Authentication
_UI_UserGrant_user_feature = User
_UI_UserGrant_authentication_feature = Authentication
_UI_FeatureGrant_identifier_feature = Identifier
_UI_FeatureGrant_feature_feature = Feature
_UI_FeatureGrant_version_feature = Version
_UI_FeatureGrant_valid_feature = Valid
_UI_FeatureGrant_capacity_feature = Capacity
_UI_FeatureGrant_pack_feature = Pack
_UI_ValidityPeriodClosed_from_feature = From
_UI_ValidityPeriodClosed_until_feature = Until
_UI_EvaluationInstructions_type_feature = Type
_UI_EvaluationInstructions_expression_feature = Expression
_UI_VersionMatch_version_feature = Version
_UI_VersionMatch_rule_feature = Rule
_UI_Unknown_feature = Unspecified

_UI_CreateChild_text = {0}
_UI_FeatureGrant_vivid_feature = Vivid
_UI_FloatingLicenseAccess_type = License Access
_UI_FloatingServerConnection_type = Server Connection
_UI_FloatingLicenseAccess_user_feature = User
_UI_FloatingLicenseAccess_server_feature = Server
_UI_FloatingLicenseAccess_originLicensePack_feature = Origin License Pack
_UI_FloatingServerConnection_ip_feature = Ip
_UI_FloatingServerConnection_port_feature = Port
_UI_FloatingServerConnection_authentication_feature = Authentication
Expand Down
50 changes: 50 additions & 0 deletions ...n/org/eclipse/passage/lic/floating/edit/providers/FloatingItemProviderAdapterFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,52 @@ public Adapter createVersionMatchAdapter() {
return versionMatchItemProvider;
}

/**
* This keeps track of the one adapter used for all {@link org.eclipse.passage.lic.floating.model.api.FloatingLicenseAccess} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected FloatingLicenseAccessItemProvider floatingLicenseAccessItemProvider;

/**
* This creates an adapter for a {@link org.eclipse.passage.lic.floating.model.api.FloatingLicenseAccess}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Adapter createFloatingLicenseAccessAdapter() {
if (floatingLicenseAccessItemProvider == null) {
floatingLicenseAccessItemProvider = new FloatingLicenseAccessItemProvider(this);
}

return floatingLicenseAccessItemProvider;
}

/**
* This keeps track of the one adapter used for all {@link org.eclipse.passage.lic.floating.model.api.FloatingServerConnection} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected FloatingServerConnectionItemProvider floatingServerConnectionItemProvider;

/**
* This creates an adapter for a {@link org.eclipse.passage.lic.floating.model.api.FloatingServerConnection}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Adapter createFloatingServerConnectionAdapter() {
if (floatingServerConnectionItemProvider == null) {
floatingServerConnectionItemProvider = new FloatingServerConnectionItemProvider(this);
}

return floatingServerConnectionItemProvider;
}

/**
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
Expand Down Expand Up @@ -410,6 +456,10 @@ public void dispose() {
evaluationInstructionsItemProvider.dispose();
if (versionMatchItemProvider != null)
versionMatchItemProvider.dispose();
if (floatingLicenseAccessItemProvider != null)
floatingLicenseAccessItemProvider.dispose();
if (floatingServerConnectionItemProvider != null)
floatingServerConnectionItemProvider.dispose();
}

}
Loading

0 comments on commit d861eb5

Please sign in to comment.