From 61470db33b0edfef6da53885b758f21dbaf9b2e6 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Fri, 3 Sep 2021 15:39:39 +0300 Subject: [PATCH] Bug 574980 Passage interface implementations should also be published publish LicensedAction and LicensedRunnableUI Signed-off-by: eparovyshnaya --- bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF | 4 ++-- .../lic/{internal => }/jface/actions/LicensedAction.java | 5 ++++- .../lic/{internal => }/jface/actions/LicensedRunnableUI.java | 5 ++++- .../ui/handlers/DashboardIssueFloatingLicenseHandler.java | 2 +- .../dashboard/ui/handlers/DashboardIssueLicenseHandler.java | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) rename bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/{internal => }/jface/actions/LicensedAction.java (93%) rename bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/{internal => }/jface/actions/LicensedRunnableUI.java (95%) diff --git a/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF index dc43153fb..7dca2aba4 100644 --- a/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF @@ -14,10 +14,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.base;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.equinox;bundle-version="0.4.0", org.apache.logging.log4j;bundle-version="2.8.2" -Export-Package: org.eclipse.passage.lic.internal.jface.actions;x-internal:=true, - org.eclipse.passage.lic.internal.jface.dialogs.licensing;x-friends:="org.eclipse.passage.lic.e4.ui,org.eclipse.passage.loc.dashboard.ui,org.eclipse.passage.loc.licenses.ui", +Export-Package: org.eclipse.passage.lic.internal.jface.dialogs.licensing;x-friends:="org.eclipse.passage.lic.e4.ui,org.eclipse.passage.loc.dashboard.ui,org.eclipse.passage.loc.licenses.ui", org.eclipse.passage.lic.internal.jface.i18n;x-internal:=true, org.eclipse.passage.lic.jface;x-friends:="org.eclipse.passage.loc.workbench", + org.eclipse.passage.lic.jface.actions, org.eclipse.passage.lic.jface.resource; x-friends:="org.eclipse.passage.loc.dashboard.ui, org.eclipse.passage.loc.workbench, diff --git a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/actions/LicensedAction.java b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/actions/LicensedAction.java similarity index 93% rename from bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/actions/LicensedAction.java rename to bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/actions/LicensedAction.java index 3f523a719..f9eaf7544 100644 --- a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/actions/LicensedAction.java +++ b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/actions/LicensedAction.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.jface.actions; +package org.eclipse.passage.lic.jface.actions; import org.eclipse.jface.action.Action; import org.eclipse.swt.widgets.Display; @@ -18,6 +18,9 @@ public abstract class LicensedAction extends Action { + /** + * @since 2.1 + */ protected abstract void doAction(); @Override diff --git a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/actions/LicensedRunnableUI.java b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/actions/LicensedRunnableUI.java similarity index 95% rename from bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/actions/LicensedRunnableUI.java rename to bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/actions/LicensedRunnableUI.java index 4a0e53e4f..07a526d94 100644 --- a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/actions/LicensedRunnableUI.java +++ b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/actions/LicensedRunnableUI.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.jface.actions; +package org.eclipse.passage.lic.jface.actions; import java.util.function.Consumer; import java.util.function.Supplier; @@ -22,6 +22,9 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; +/** + * @since 2.1 + */ public final class LicensedRunnableUI extends LicensedRunnable { private final Supplier shell; diff --git a/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/handlers/DashboardIssueFloatingLicenseHandler.java b/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/handlers/DashboardIssueFloatingLicenseHandler.java index 1b4f3f950..c7b5ebe6c 100644 --- a/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/handlers/DashboardIssueFloatingLicenseHandler.java +++ b/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/handlers/DashboardIssueFloatingLicenseHandler.java @@ -21,7 +21,7 @@ import org.eclipse.e4.ui.services.IServiceConstants; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.passage.lic.internal.jface.actions.LicensedRunnableUI; +import org.eclipse.passage.lic.jface.actions.LicensedRunnableUI; import org.eclipse.passage.lic.jface.resource.LicensingImages; import org.eclipse.passage.lic.licenses.LicensePlanDescriptor; import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage; diff --git a/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/handlers/DashboardIssueLicenseHandler.java b/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/handlers/DashboardIssueLicenseHandler.java index 935c3fcbd..6f58949cd 100644 --- a/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/handlers/DashboardIssueLicenseHandler.java +++ b/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/handlers/DashboardIssueLicenseHandler.java @@ -20,7 +20,7 @@ import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.services.IServiceConstants; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.passage.lic.internal.jface.actions.LicensedRunnableUI; +import org.eclipse.passage.lic.jface.actions.LicensedRunnableUI; import org.eclipse.passage.lic.jface.resource.LicensingImages; import org.eclipse.passage.lic.licenses.LicensePlanDescriptor; import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage;