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

572623 redesign license containment #713

Merged
merged 14 commits into from
Apr 7, 2021
Merged

572623 redesign license containment #713

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4fe5381
Bug 572623 redesign license containment
eparovyshnaya Apr 6, 2021
739ec9d
Bug 572623 redesign license containment
eparovyshnaya Apr 6, 2021
85c52db
Bug 572623 redesign license containment
eparovyshnaya Apr 6, 2021
a326832
Bug 572623 redesign license containment
eparovyshnaya Apr 6, 2021
51eb259
Bug 572623 redesign license containment
eparovyshnaya Apr 6, 2021
e4e2141
Bug 572623 redesign license containment
eparovyshnaya Apr 6, 2021
0fd43bc
Bug 572623 redesign license containment
eparovyshnaya Apr 6, 2021
d230c3d
Bug 572623 redesign license containment
eparovyshnaya Apr 6, 2021
4964370
Bug 572623 redesign license containment
eparovyshnaya Apr 7, 2021
369f974
Bug 572623 redesign license containment
eparovyshnaya Apr 7, 2021
ce07f7d
Bug 572623 redesign license containment
eparovyshnaya Apr 7, 2021
333baf6
Bug 572623 redesign license containment
eparovyshnaya Apr 7, 2021
f6288d9
Bug 572623 redesign license containment
eparovyshnaya Apr 7, 2021
19f7f86
Bug 572623 redesign license containment
eparovyshnaya Apr 7, 2021
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
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?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="licenses" nsURI="http://www.eclipse.org/passage/lic/licenses/1.0.0"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="licenses" nsURI="http://www.eclipse.org/passage/lic/licenses/1.1.0"
nsPrefix="org.eclipse.passage.lic">
<eClassifiers xsi:type="ecore:EClass" name="LicensePlanDescriptor" instanceClassName="org.eclipse.passage.lic.licenses.LicensePlanDescriptor"
abstract="true" interface="true"/>
Expand Down
171 changes: 171 additions & 0 deletions bundles/org.eclipse.passage.lic.licenses.edit/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.passage.lic.licenses.edit" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter id="929038356">
<message_arguments>
<message_argument value="1.0.201"/>
<message_argument value="org.eclipse.passage.lic.licenses.model"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.api.LicenseGrant">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.api.LicenseGrant"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.api.LicensePack">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.api.LicensePack"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.api.LicensePlan">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.api.LicensePlan"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.api.LicensePlanFeature">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.api.LicensePlanFeature"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.impl.LicenseGrantImpl">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicenseGrantImpl"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.impl.LicensePackImpl">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensePackImpl"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.impl.LicensePlanFeatureImpl">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensePlanFeatureImpl"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.impl.LicensesFactoryImpl">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensesFactoryImpl"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.meta.LicensesFactory">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.meta.LicensesFactory"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.meta.LicensesPackage">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.meta.LicensesPackage"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.util.LicensesAdapterFactory">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.util.LicensesAdapterFactory"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.util.LicensesSwitch">
<filter id="305426566">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.model.util.LicensesSwitch"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
</message_arguments>
</filter>
</resource>
<resource path="src-gen/org/eclipse/passage/lic/licenses/edit/LicensesEditPlugin.java" type="org.eclipse.passage.lic.licenses.edit.LicensesEditPlugin">
<filter id="305365105">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.edit.LicensesEditPlugin"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.201"/>
</message_arguments>
</filter>
</resource>
<resource path="src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicenseGrantItemProvider.java" type="org.eclipse.passage.lic.licenses.edit.providers.LicenseGrantItemProvider">
<filter id="305365105">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.edit.providers.LicenseGrantItemProvider"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.201"/>
</message_arguments>
</filter>
</resource>
<resource path="src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePackItemProvider.java" type="org.eclipse.passage.lic.licenses.edit.providers.LicensePackItemProvider">
<filter id="305365105">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.edit.providers.LicensePackItemProvider"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.201"/>
</message_arguments>
</filter>
</resource>
<resource path="src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePlanFeatureItemProvider.java" type="org.eclipse.passage.lic.licenses.edit.providers.LicensePlanFeatureItemProvider">
<filter id="305365105">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.edit.providers.LicensePlanFeatureItemProvider"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.201"/>
</message_arguments>
</filter>
</resource>
<resource path="src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePlanItemProvider.java" type="org.eclipse.passage.lic.licenses.edit.providers.LicensePlanItemProvider">
<filter id="305365105">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.edit.providers.LicensePlanItemProvider"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.201"/>
</message_arguments>
</filter>
</resource>
<resource path="src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensesItemProviderAdapterFactory.java" type="org.eclipse.passage.lic.licenses.edit.providers.LicensesItemProviderAdapterFactory">
<filter id="305365105">
<message_arguments>
<message_argument value="org.eclipse.passage.lic.licenses.edit.providers.LicensesItemProviderAdapterFactory"/>
<message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.201"/>
</message_arguments>
</filter>
</resource>
</component>
8 changes: 4 additions & 4 deletions bundles/org.eclipse.passage.lic.licenses.edit/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.passage.lic.licenses.edit
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.passage.lic.licenses.edit;singleton:=true
Bundle-Version: 1.0.200.qualifier
Bundle-Version: 1.0.201.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Copyright: %Bundle-Copyright
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=greedy;resolution:=optional,
org.eclipse.passage.lic.licenses.model;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.passage.lic.licenses.model;bundle-version="1.1.0";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="0.0.0";visibility:=reexport
Import-Package: org.osgi.framework
Export-Package: org.eclipse.passage.lic.licenses.edit,
org.eclipse.passage.lic.licenses.edit.providers
Export-Package: org.eclipse.passage.lic.licenses.edit;x-internal:=true,
org.eclipse.passage.lic.licenses.edit.providers;x-internal:=true
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.passage.lic.licenses.edit.LicensesEditPlugin$Implementation$Activator
Bundle-ActivationPolicy: lazy
57 changes: 56 additions & 1 deletion bundles/org.eclipse.passage.lic.licenses.edit/plugin.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
pluginName = Passage LIC Licenses Edit Support
providerName=Eclipse Passage

Bundle-Copyright = Copyright (c) 2018, 2020 ArSysOp and others.\n\
Bundle-Copyright = Copyright (c) 2018, 2021 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\
Expand Down Expand Up @@ -74,3 +74,58 @@ _UI_LicensePlanFeature_matchRule_feature = Match Rule
_UI_LicensePlanFeature_licensePlan_feature = License Plan
_UI_LicensePlan_text_pattern={1} ({0})
_UI_LicensePlanFeature_text_pattern={0} ({1})
_UI_FloatingLicensePack_type = Floating License Pack
_UI_LicenseRequisites_type = License Requisites
_UI_ProductRef_type = Product Ref
_UI_FloatingServer_type = Floating 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_FloatingLicenseAccess_type = Floating License Access
_UI_FloatingServerConnection_type = Floating Server Connection
_UI_GrantAcqisition_type = Grant Acqisition
_UI_LicensePlan_personal_feature = Personal
_UI_LicensePlan_floating_feature = Floating
_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_vivid_feature = Vivid
_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_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
_UI_GrantAcqisition_identifier_feature = Identifier
_UI_GrantAcqisition_feature_feature = Feature
_UI_GrantAcqisition_grant_feature = Grant
_UI_GrantAcqisition_user_feature = User
_UI_GrantAcqisition_created_feature = Created
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.licenses.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 licenses. -->
<factory
uri="http://www.eclipse.org/passage/lic/licenses/1.0.0"
uri="http://www.eclipse.org/passage/lic/licenses/1.1.0"
class="org.eclipse.passage.lic.licenses.edit.providers.LicensesItemProviderAdapterFactory"
supportedTypes=
"org.eclipse.emf.edit.provider.IEditingDomainItemProvider
Expand Down
Loading