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

Bug 563759 - [Passage] revise API for LOC Licenses #228

Merged
merged 5 commits into from
May 31, 2020
Merged

Bug 563759 - [Passage] revise API for LOC Licenses #228

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b54be6f
Bug 563759 - [Passage] revise API for LOC Licenses
ruspl-afed May 31, 2020
51e73d6
Bug 563759 - [Passage] revise API for LOC Licenses
ruspl-afed May 31, 2020
1fa9a84
Bug 563759 - [Passage] revise API for LOC Licenses
ruspl-afed May 31, 2020
078626e
Merge branch 'master' into 563759
ruspl-afed May 31, 2020
e6a4647
Merge branch 'master' into 563759
ruspl-afed May 31, 2020
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: 2 additions & 0 deletions bundles/org.eclipse.passage.loc.dashboard.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0",
org.eclipse.passage.lic.e4.core;bundle-version="0.0.0",
org.eclipse.passage.lic.email;bundle-version="0.0.0",
org.eclipse.passage.lic.features.model;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0",
org.eclipse.passage.loc.api;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.loc.workbench;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.loc.workbench.emfforms;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.loc.features.ui;bundle-version="0.0.0",
org.eclipse.passage.loc.licenses.core;bundle-version="0.6.0",
org.eclipse.passage.loc.products.ui;bundle-version="0.0.0",
org.eclipse.passage.loc.users.ui;bundle-version="0.0.0",
org.eclipse.passage.loc.licenses.ui;bundle-version="0.0.0"
Expand Down
4 changes: 2 additions & 2 deletions ...clipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/DashboardUi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
import org.eclipse.passage.lic.emf.edit.EditingDomainRegistryAccess;
import org.eclipse.passage.lic.emf.edit.SelectionCommandAdvisor;
import org.eclipse.passage.lic.features.model.meta.FeaturesPackage;
import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage;
import org.eclipse.passage.lic.users.model.meta.UsersPackage;
import org.eclipse.passage.loc.features.ui.FeaturesUi;
import org.eclipse.passage.loc.licenses.core.Licenses;
import org.eclipse.passage.loc.licenses.ui.LicensesUi;
import org.eclipse.passage.loc.products.core.Products;
import org.eclipse.passage.loc.products.ui.ProductsUi;
Expand Down Expand Up @@ -89,7 +89,7 @@ public static String resolvePerspectiveId(String domain) {
return ProductsUi.PERSPECTIVE_MAIN;
case UsersPackage.eNAME:
return UsersUi.PERSPECTIVE_MAIN;
case Licenses.DOMAIN_NAME:
case LicensesPackage.eNAME:
return LicensesUi.PERSPECTIVE_MAIN;
default:
break;
Expand Down
5 changes: 2 additions & 3 deletions ...board.ui/src/org/eclipse/passage/loc/dashboard/ui/panel/DefaultDashboardPanelAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.eclipse.passage.lic.users.registry.UserRegistry;
import org.eclipse.passage.loc.dashboard.ui.DashboardUi;
import org.eclipse.passage.loc.internal.dashboard.ui.i18n.DashboardUiMessages;
import org.eclipse.passage.loc.licenses.core.Licenses;
import org.eclipse.passage.loc.products.core.Products;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
Expand Down Expand Up @@ -245,13 +244,13 @@ public void createLicenseInfo(Composite parent, LicenseRegistry licenseRegistry)
group.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create());
group.setLayout(GridLayoutFactory.swtDefaults().numColumns(4).create());
group.setText(DashboardUiMessages.DefaultDashboardPanelAdvisor_license_group);
createLinks(group, Licenses.DOMAIN_NAME);
createLinks(group, LicensesPackage.eNAME);
licensePlans = createLicensePlanBlock(group);
updateLicenseInfo(licenseRegistry);
}

protected DashboardPanelBlock createLicensePlanBlock(Composite parent) {
String domain = Licenses.DOMAIN_NAME;
String domain = LicensesPackage.eNAME;
String label = DashboardUiMessages.DefaultDashboardPanelAdvisor_license_plan_title;
EClass eClass = LicensesPackage.eINSTANCE.getLicensePlan();
String info = DashboardUiMessages.DefaultDashboardPanelAdvisor_license_plan_info;
Expand Down
1 change: 1 addition & 0 deletions bundles/org.eclipse.passage.loc.edit.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Require-Bundle: org.eclipse.jface;bundle-version="0.0.0",
org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0",
org.eclipse.e4.ui.workbench;bundle-version="0.0.0",
org.eclipse.passage.lic.emf;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="0.5.100",
org.eclipse.passage.loc.features.core;bundle-version="0.0.0",
org.eclipse.passage.loc.products.core;bundle-version="0.0.0",
org.eclipse.passage.loc.users.core;bundle-version="0.0.0",
Expand Down
3 changes: 1 addition & 2 deletions ....passage.loc.edit.ui/src/org/eclipse/passage/loc/edit/ui/DomainRegistryLabelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.eclipse.passage.lic.users.model.meta.UsersPackage;
import org.eclipse.passage.lic.users.registry.UserRegistry;
import org.eclipse.passage.loc.internal.edit.ui.i18n.EditUiMessages;
import org.eclipse.passage.loc.licenses.core.Licenses;
import org.eclipse.passage.loc.products.core.Products;
import org.eclipse.swt.graphics.Image;

Expand Down Expand Up @@ -82,7 +81,7 @@ private Image getImageByUri(URI uri) {
if (lastSegment.contains(UsersPackage.eNAME)) {
return LicensingImages.getImage(UsersPackage.eINSTANCE.getUserOrigin().getName());
}
if (lastSegment.contains(Licenses.DOMAIN_NAME)) {
if (lastSegment.contains(LicensesPackage.eNAME)) {
return LicensingImages.getImage(LicensesPackage.eINSTANCE.getLicensePlan().getName());
}
return null;
Expand Down
5 changes: 3 additions & 2 deletions ...loc.edit.ui/src/org/eclipse/passage/loc/edit/ui/handlers/DomainRegistryCreateHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
import org.eclipse.e4.core.di.annotations.Execute;
import org.eclipse.e4.ui.services.IServiceConstants;
import org.eclipse.passage.lic.features.model.meta.FeaturesPackage;
import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage;
import org.eclipse.passage.lic.users.model.meta.UsersPackage;
import org.eclipse.passage.lic.users.model.meta.UsersPackage;
import org.eclipse.passage.loc.licenses.core.Licenses;
import org.eclipse.passage.loc.products.core.Products;
import org.eclipse.passage.loc.workbench.LocWokbench;

Expand Down Expand Up @@ -48,7 +49,7 @@ public void execute(@Named(IServiceConstants.ACTIVE_SHELL) IEclipseContext conte
domain = UsersPackage.eNAME;
break;
case REGISTRY_RESOURCE_CREATE_LICENSE:
domain = Licenses.DOMAIN_NAME;
domain = LicensesPackage.eNAME;
break;
default:
}
Expand Down
9 changes: 4 additions & 5 deletions bundles/org.eclipse.passage.loc.licenses.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.passage.loc.licenses.core
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.passage.loc.licenses.core
Bundle-Version: 0.5.100.qualifier
Bundle-Version: 0.6.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-Copyright: %Bundle-Copyright
Expand All @@ -11,12 +11,11 @@ Require-Bundle: org.eclipse.osgi;bundle-version="0.0.0",
org.eclipse.osgi.services;bundle-version="0.0.0",
org.eclipse.passage.lic.equinox;bundle-version="0.0.0",
org.eclipse.passage.lic.emf;bundle-version="0.0.0",
org.eclipse.passage.lic.users.model;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.lic.users.model;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0",
org.eclipse.passage.lic.email;bundle-version="0.0.0",
org.eclipse.passage.loc.api;bundle-version="0.0.0"
Export-Package: org.eclipse.passage.loc.internal.licenses.core;x-friends:="org.eclipse.passage.loc.dashboard.ui",
org.eclipse.passage.loc.internal.licenses.core.i18n;x-internal:=true,
org.eclipse.passage.loc.licenses.core
org.eclipse.passage.loc.internal.licenses.core.i18n;x-internal:=true
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/*.xml
4 changes: 2 additions & 2 deletions ...e.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/EmailTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import org.eclipse.passage.lic.email.Mailing;
import org.eclipse.passage.lic.licenses.LicenseGrantDescriptor;
import org.eclipse.passage.lic.licenses.LicensePackDescriptor;
import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage;
import org.eclipse.passage.loc.internal.licenses.core.i18n.LicensesCoreMessages;
import org.eclipse.passage.loc.licenses.core.Licenses;

public class EmailTemplate {

Expand Down Expand Up @@ -92,7 +92,7 @@ public String mailTo(LicensePackDescriptor licensePack) {

public File createEmlFile(String from, LicensePackDescriptor licensePack, LicensingResult result)
throws IOException {
Optional<File> license = Optional.ofNullable(result.getAttachment(Licenses.DOMAIN_NAME))//
Optional<File> license = Optional.ofNullable(result.getAttachment(LicensesPackage.eNAME))//
.filter(String.class::isInstance)//
.map(String.class::cast)//
.filter(s -> !s.isEmpty())//
Expand Down
7 changes: 3 additions & 4 deletions ...censes.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseDomainRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,13 @@
import org.eclipse.passage.lic.licenses.registry.LicenseRegistry;
import org.eclipse.passage.lic.licenses.registry.LicenseRegistryEvents;
import org.eclipse.passage.loc.internal.licenses.core.i18n.LicensesCoreMessages;
import org.eclipse.passage.loc.licenses.core.Licenses;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;

@Component(property = { EditingDomainRegistryAccess.PROPERTY_DOMAIN_NAME + '=' + Licenses.DOMAIN_NAME,
EditingDomainRegistryAccess.PROPERTY_FILE_EXTENSION + '=' + Licenses.FILE_EXTENSION_XMI })
@Component(property = { EditingDomainRegistryAccess.PROPERTY_DOMAIN_NAME + '=' + LicensesPackage.eNAME,
EditingDomainRegistryAccess.PROPERTY_FILE_EXTENSION + '=' + "licenses_xmi" })
public class LicenseDomainRegistry extends BaseDomainRegistry<LicensePlanDescriptor>
implements LicenseRegistry, EditingDomainRegistry<LicensePlanDescriptor> {

Expand Down Expand Up @@ -84,7 +83,7 @@ public void deactivate(Map<String, Object> properties) {

@Override
public String getFileExtension() {
return Licenses.FILE_EXTENSION_XMI;
return "licenses_xmi"; //$NON-NLS-1$
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...s.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseOperatorServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.eclipse.passage.lic.licenses.model.api.LicenseGrant;
import org.eclipse.passage.lic.licenses.model.api.LicensePack;
import org.eclipse.passage.lic.licenses.model.meta.LicensesFactory;
import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage;
import org.eclipse.passage.lic.licenses.registry.LicenseRegistry;
import org.eclipse.passage.lic.products.ProductVersionDescriptor;
import org.eclipse.passage.lic.products.registry.ProductRegistry;
Expand All @@ -64,7 +65,6 @@
import org.eclipse.passage.loc.api.OperatorLicenseService;
import org.eclipse.passage.loc.api.OperatorProductService;
import org.eclipse.passage.loc.internal.licenses.core.i18n.LicensesCoreMessages;
import org.eclipse.passage.loc.licenses.core.Licenses;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
Expand Down Expand Up @@ -273,7 +273,7 @@ public LicensingResult issueLicensePack(LicensingRequest request, LicensePackDes
eventAdmin.postEvent(OperatorLicenseEvents.encodedIssued(licenseOut));
String format = LicensesCoreMessages.LicenseOperatorServiceImpl_export_success;
String message = String.format(format, licenseOut);
attachments.put(Licenses.DOMAIN_NAME, licenseOut);
attachments.put(LicensesPackage.eNAME, licenseOut);
return LicensingResults.createOK(message, pluginId, attachments);
} catch (Exception e) {
return LicensingResults.createError(LicensesCoreMessages.LicenseOperatorServiceImpl_export_error, pluginId,
Expand Down
3 changes: 1 addition & 2 deletions ...e/src/org/eclipse/passage/loc/internal/licenses/core/LicensesSelectionCommandAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@
import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage;
import org.eclipse.passage.lic.licenses.registry.LicenseRegistry;
import org.eclipse.passage.loc.internal.licenses.core.i18n.LicensesCoreMessages;
import org.eclipse.passage.loc.licenses.core.Licenses;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;

@Component(property = { EditingDomainRegistryAccess.PROPERTY_DOMAIN_NAME + '=' + Licenses.DOMAIN_NAME })
@Component(property = { EditingDomainRegistryAccess.PROPERTY_DOMAIN_NAME + '=' + LicensesPackage.eNAME })
public class LicensesSelectionCommandAdvisor implements SelectionCommandAdvisor {

private LicenseRegistry licenseRegistry;
Expand Down
20 changes: 0 additions & 20 deletions ...eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/licenses/core/Licenses.java
View file
Open in desktop

This file was deleted.

34 changes: 17 additions & 17 deletions bundles/org.eclipse.passage.loc.licenses.emfforms/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,37 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Copyright: %Bundle-Copyright
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: javax.inject;bundle-version="0.0.0",
org.eclipse.osgi.services;bundle-version="0.0.0",
org.eclipse.equinox.common;bundle-version="0.0.0",
org.eclipse.core.databinding;bundle-version="0.0.0",
org.eclipse.jface.databinding;bundle-version="0.0.0",
org.eclipse.emf.databinding;bundle-version="0.0.0",
org.eclipse.e4.core.contexts;bundle-version="0.0.0",
org.eclipse.e4.core.di;bundle-version="0.0.0",
org.eclipse.e4.ui.di;bundle-version="0.0.0",
org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0",
org.eclipse.emfforms.core.services;bundle-version="0.0.0",
org.eclipse.emfforms.swt.core;bundle-version="0.0.0",
org.eclipse.emfforms.swt.core.di;bundle-version="0.0.0",
org.eclipse.emfforms.swt.treemasterdetail;bundle-version="0.0.0",
org.eclipse.emf.ecp.view.core.swt;bundle-version="0.0.0",
org.eclipse.emf.databinding;bundle-version="0.0.0",
org.eclipse.emf.ecp.edit;bundle-version="0.0.0",
org.eclipse.emf.ecp.edit.swt;bundle-version="0.0.0",
org.eclipse.emf.ecp.ui.view;bundle-version="0.0.0",
org.eclipse.emf.ecp.view.context;bundle-version="0.0.0",
org.eclipse.emf.ecp.view.core.swt;bundle-version="0.0.0",
org.eclipse.emf.ecp.view.model;bundle-version="0.0.0",
org.eclipse.emf.ecp.view.model.common;bundle-version="0.0.0",
org.eclipse.emf.ecp.view.template.model;bundle-version="0.0.0",
org.eclipse.emf.ecp.edit;bundle-version="0.0.0",
org.eclipse.emf.ecp.edit.swt;bundle-version="0.0.0",
org.eclipse.emf.ecp.ui.view;bundle-version="0.0.0",
org.eclipse.emfforms.core.services;bundle-version="0.0.0",
org.eclipse.emfforms.swt.core;bundle-version="0.0.0",
org.eclipse.emfforms.swt.core.di;bundle-version="0.0.0",
org.eclipse.emfforms.swt.treemasterdetail;bundle-version="0.0.0",
org.eclipse.equinox.common;bundle-version="0.0.0",
org.eclipse.jface.databinding;bundle-version="0.0.0",
org.eclipse.osgi.services;bundle-version="0.0.0",
org.eclipse.passage.lic.emf;bundle-version="0.0.0",
org.eclipse.passage.lic.features.model;bundle-version="0.0.0",
org.eclipse.passage.lic.products.model;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0",
org.eclipse.passage.loc.workbench.emfforms;bundle-version="0.0.0",
org.eclipse.passage.lic.products.model;bundle-version="0.0.0",
org.eclipse.passage.loc.features.emfforms;bundle-version="0.0.0",
org.eclipse.passage.loc.licenses.ui;bundle-version="0.0.0",
org.eclipse.passage.loc.products.emfforms;bundle-version="0.0.0",
org.eclipse.passage.loc.licenses.ui;bundle-version="0.0.0"
org.eclipse.passage.loc.workbench.emfforms;bundle-version="0.0.0"
Service-Component: OSGI-INF/*.xml
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.passage.loc.licenses.emfforms.parts,
org.eclipse.passage.loc.licenses.emfforms.renderers
Export-Package: org.eclipse.passage.loc.licenses.emfforms.parts;x-internal:=true,
org.eclipse.passage.loc.licenses.emfforms.renderers;x-internal:=true

18 changes: 9 additions & 9 deletions bundles/org.eclipse.passage.loc.licenses.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ Bundle-Copyright: %Bundle-Copyright
Bundle-SymbolicName: org.eclipse.passage.loc.licenses.ui;singleton:=true
Bundle-Version: 0.6.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.jface;bundle-version="0.0.0",
org.eclipse.core.runtime;bundle-version="0.0.0",
Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
org.eclipse.e4.core.contexts;bundle-version="0.0.0",
org.eclipse.e4.core.di;bundle-version="0.0.0",
org.eclipse.e4.core.di.annotations;bundle-version="0.0.0",
org.eclipse.e4.core.contexts;bundle-version="0.0.0",
org.eclipse.e4.core.services;bundle-version="0.0.0",
org.eclipse.e4.ui.di;bundle-version="0.0.0",
org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0",
org.eclipse.e4.ui.services;bundle-version="0.0.0",
org.eclipse.e4.ui.workbench;bundle-version="0.0.0",
org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0",
org.eclipse.passage.lic.equinox;bundle-version="0.0.0",
org.eclipse.jface;bundle-version="0.0.0",
org.eclipse.passage.lic.emf;bundle-version="0.0.0",
org.eclipse.passage.lic.equinox;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0",
org.eclipse.passage.loc.api;bundle-version="0.0.0",
org.eclipse.passage.loc.licenses.core;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.loc.products.ui;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.loc.users.ui;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.loc.licenses.core;bundle-version="0.0.0",
org.eclipse.passage.loc.products.ui;bundle-version="0.0.0",
org.eclipse.passage.loc.users.ui;bundle-version="0.0.0",
org.eclipse.passage.loc.workbench;bundle-version="0.0.0"
Import-Package: javax.inject;version="1.0.0"
Export-Package: org.eclipse.passage.loc.internal.licenses.ui;x-friends:="org.eclipse.passage.loc.dashboard.ui",
org.eclipse.passage.loc.internal.licenses.ui.i18n;x-internal:=true,
org.eclipse.passage.loc.licenses.ui
org.eclipse.passage.loc.licenses.ui;x-friends:="org.eclipse.passage.loc.dashboard.ui"
Bundle-ActivationPolicy: lazy
3 changes: 1 addition & 2 deletions ...e.loc.licenses.ui/src/org/eclipse/passage/loc/internal/licenses/ui/SelectLicensePlan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.eclipse.passage.loc.internal.workbench.SelectRequest;
import org.eclipse.passage.loc.internal.workbench.SupplySelectRequest;
import org.eclipse.passage.loc.jface.dialogs.Appearance;
import org.eclipse.passage.loc.licenses.core.Licenses;

/**
* Creates {@link SelectRequest} for {@link LicensePlanDescriptor} from the
Expand Down Expand Up @@ -56,7 +55,7 @@ private Appearance appearance() {
}

private String domain() {
return Licenses.DOMAIN_NAME;
return LicensesPackage.eNAME;
}

}
4 changes: 2 additions & 2 deletions ...i/src/org/eclipse/passage/loc/internal/licenses/ui/handlers/CreateLicensePlanHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@

import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.core.di.annotations.Execute;
import org.eclipse.passage.loc.licenses.core.Licenses;
import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage;
import org.eclipse.passage.loc.licenses.ui.LicensesUi;
import org.eclipse.passage.loc.workbench.LocWokbench;

public class CreateLicensePlanHandler {

@Execute
public void execute(IEclipseContext context) {
String domain = Licenses.DOMAIN_NAME;
String domain = LicensesPackage.eNAME;
String perspectiveId = LicensesUi.PERSPECTIVE_MAIN;
LocWokbench.createDomainResource(context, domain, perspectiveId);
}
Expand Down
4 changes: 2 additions & 2 deletions ....ui/src/org/eclipse/passage/loc/internal/licenses/ui/handlers/OpenLicensePlanHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@

import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.core.di.annotations.Execute;
import org.eclipse.passage.loc.licenses.core.Licenses;
import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage;
import org.eclipse.passage.loc.licenses.ui.LicensesUi;
import org.eclipse.passage.loc.workbench.LocWokbench;

public class OpenLicensePlanHandler {

@Execute
public void execute(IEclipseContext eclipseContext) {
String domain = Licenses.DOMAIN_NAME;
String domain = LicensesPackage.eNAME;
String perspectiveId = LicensesUi.PERSPECTIVE_MAIN;
LocWokbench.loadDomainResource(eclipseContext, domain, perspectiveId);
}
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.passage.loc.licenses.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.passage.loc.licenses.feature"
label="%featureName"
version="0.6.0.qualifier"
version="0.7.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down