From 307c7a2f08e303420b4ac69ff7c94c19cea03696 Mon Sep 17 00:00:00 2001 From: eparovyshnaya Date: Tue, 29 Nov 2022 20:43:51 +0300 Subject: [PATCH] Operator: allow to edit feature grants for on license issuing #1173 make grands editable --- .../ui/wizards/IssueLicensePackPage.java | 15 ++++++++++----- .../viewmodels/FeatureGrant.view | 2 +- .../viewmodels/PersonalFeatureGrant.view | 8 ++++---- .../viewmodels/PersonalLicensePack.view | 2 +- .../viewmodels/VersionMatch.view | 2 +- .../loc/workbench/emfforms/parts/DetailsView.java | 8 +++++--- 6 files changed, 22 insertions(+), 15 deletions(-) diff --git a/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/IssueLicensePackPage.java b/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/IssueLicensePackPage.java index e6f5ab5f4..3532258e2 100644 --- a/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/IssueLicensePackPage.java +++ b/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/IssueLicensePackPage.java @@ -47,7 +47,6 @@ class IssueLicensePackPage extends TwoPhaseWizardPage { private final Supplier data; private final ErrorMessages validate; private PersonalLicensePack license; - private VViewModelProperties properties; private Composite base; protected IssueLicensePackPage(String name, Supplier data, IEclipseContext context) { @@ -109,9 +108,6 @@ public void createControl(Composite parent) { base = new Composite(composite, SWT.NONE); base.setLayout(new GridLayout(1, false)); base.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1)); - properties = VViewFactory.eINSTANCE.createViewModelLoadingProperties(); - properties.addInheritableProperty(EMFFormsSWTConstants.USE_ON_MODIFY_DATABINDING_KEY, - EMFFormsSWTConstants.USE_ON_MODIFY_DATABINDING_VALUE); buildPage(); Dialog.applyDialogFont(composite); } @@ -129,14 +125,23 @@ private void buildPage() { control.dispose(); } try { - ECPSWTViewRenderer.INSTANCE.render(base, license, properties); + ECPSWTViewRenderer.INSTANCE.render(base, license, properties()); base.layout(); } catch (ECPRendererException e) { + e.printStackTrace(); } } setPageComplete(validatePage()); } + private VViewModelProperties properties() { + VViewModelProperties properties = VViewFactory.eINSTANCE.createViewModelLoadingProperties(); + properties.addInheritableProperty(EMFFormsSWTConstants.USE_ON_MODIFY_DATABINDING_KEY, + EMFFormsSWTConstants.USE_ON_MODIFY_DATABINDING_VALUE); + // properties.addNonInheritableProperty("viewpoint", "wizard"); + return properties; + } + protected boolean validatePage() { Optional errors = validate.apply(license); setErrorMessage(errors.orElse(null));// framework requires null diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FeatureGrant.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FeatureGrant.view index 7ac86f654..60f99e665 100644 --- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FeatureGrant.view +++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FeatureGrant.view @@ -1,5 +1,5 @@ - + diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalFeatureGrant.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalFeatureGrant.view index 8cdfdd9fa..1b8a83ef0 100644 --- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalFeatureGrant.view +++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalFeatureGrant.view @@ -1,9 +1,9 @@ - + - + @@ -16,14 +16,14 @@ - + - + diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalLicensePack.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalLicensePack.view index 6860e6f0b..3337b0b18 100644 --- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalLicensePack.view +++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalLicensePack.view @@ -1,5 +1,5 @@ - + diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/VersionMatch.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/VersionMatch.view index 898a527e4..23f7fdfa4 100644 --- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/VersionMatch.view +++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/VersionMatch.view @@ -6,7 +6,7 @@ - + diff --git a/bundles/org.eclipse.passage.loc.workbench.emfforms/src/org/eclipse/passage/loc/workbench/emfforms/parts/DetailsView.java b/bundles/org.eclipse.passage.loc.workbench.emfforms/src/org/eclipse/passage/loc/workbench/emfforms/parts/DetailsView.java index 6269cea3f..4b2355802 100644 --- a/bundles/org.eclipse.passage.loc.workbench.emfforms/src/org/eclipse/passage/loc/workbench/emfforms/parts/DetailsView.java +++ b/bundles/org.eclipse.passage.loc.workbench.emfforms/src/org/eclipse/passage/loc/workbench/emfforms/parts/DetailsView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2021 ArSysOp + * Copyright (c) 2018, 2022 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -197,8 +197,10 @@ protected TreeMasterDetailComposite createTreeMasterDetail(final Composite compo ChildrenDescriptorCollector childrenDescriptorCollector = createChildrenDescriptorCollector(); MenuProvider menuProvider = createMenuProvider(childrenDescriptorCollector, createElementCallback); final TreeMasterDetailComposite treeMasterDetail = TreeMasterDetailSWTFactory - .fillDefaults(composite, SWT.NONE, editorInput).customizeCildCreation(createElementCallback) - .customizeMenu(menuProvider).create(); + .fillDefaults(composite, SWT.NONE, editorInput) // + .customizeCildCreation(createElementCallback) // + .customizeMenu(menuProvider)// + .create(); return treeMasterDetail; }