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 572735 - [Passage] PDE templates utilize more info for requirement #725

Merged
merged 2 commits into from
Apr 9, 2021
Merged

Bug 572735 - [Passage] PDE templates utilize more info for requirement #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2634832
Bug 572735 - [Passage] PDE templates utilize more info for requirement
ruspl-afed Apr 9, 2021
65444c5
Bug 572735 - [Passage] PDE templates utilize more info for requirement
ruspl-afed Apr 9, 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
3 changes: 3 additions & 0 deletions bundles/org.eclipse.passage.ldc.pde.ui.templates/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ Bundle-SymbolicName: org.eclipse.passage.ldc.pde.ui.templates;singleton:=true
Bundle-Version: 0.6.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Export-Package: org.eclipse.passage.ldc.internal.pde.ui.templates;x-internal:=true,
org.eclipse.passage.ldc.internal.pde.ui.templates.e3;x-internal:=true,
org.eclipse.passage.ldc.internal.pde.ui.templates.e4;x-internal:=true,
org.eclipse.passage.ldc.internal.pde.ui.templates.fullfeather;x-internal:=true,
org.eclipse.passage.ldc.internal.pde.ui.templates.i18n;x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
org.eclipse.core.resources;bundle-version="0.0.0",
Expand Down
6 changes: 3 additions & 3 deletions bundles/org.eclipse.passage.ldc.pde.ui.templates/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<extension
point="org.eclipse.pde.ui.pluginContent">
<wizard
class="org.eclipse.passage.ldc.internal.pde.ui.templates.LicensedE3ProductContentWizard"
class="org.eclipse.passage.ldc.internal.pde.ui.templates.e3.LicensedE3ProductContentWizard"
icon="platform:/plugin/org.eclipse.passage.lic.jface/$nl$/icons/obj16/passage.png"
id="org.eclipse.passage.ldc.pde.ui.pluginContent.rcp3"
java="true"
Expand All @@ -30,7 +30,7 @@
</description>
</wizard>
<wizard
class="org.eclipse.passage.ldc.internal.pde.ui.templates.LicensedE4ProductContentWizard"
class="org.eclipse.passage.ldc.internal.pde.ui.templates.e4.LicensedE4ProductContentWizard"
icon="platform:/plugin/org.eclipse.passage.lic.jface/$nl$/icons/obj16/passage.png"
id="org.eclipse.passage.ldc.pde.ui.pluginContent.rcp4"
java="true"
Expand All @@ -44,7 +44,7 @@
</description>
</wizard>
<wizard
class="org.eclipse.passage.ldc.internal.pde.ui.templates.LicensedE4FullFeatherProductContentWizard"
class="org.eclipse.passage.ldc.internal.pde.ui.templates.fullfeather.LicensedE4FullFeatherProductContentWizard"
icon="platform:/plugin/org.eclipse.passage.lic.jface/$nl$/icons/obj16/passage.png"
id="org.eclipse.passage.ldc.pde.ui.fullFeatherPassageProduct.rcp4"
java="true"
Expand Down
10 changes: 9 additions & 1 deletion ...es/src/org/eclipse/passage/ldc/internal/pde/ui/templates/BaseLicensedTemplateSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019, 2020 ArSysOp
* Copyright (c) 2019, 2021 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -192,4 +192,12 @@ protected List<String> getRCP4Dependencies() {
"org.apache.logging.log4j"); //$NON-NLS-1$
}

protected Requirement createProductRequirement(String product) {
ruspl-afed marked this conversation as resolved.
Show resolved Hide resolved
return new DefaultProductRequirement(() -> product, //
() -> getManifestHeader("Bundle-Name"), // //$NON-NLS-1$
() -> getManifestHeader("Bundle-Version"), // //$NON-NLS-1$
() -> getManifestHeader("Bundle-Vendor")// //$NON-NLS-1$
).get();
}

}
21 changes: 13 additions & 8 deletions ...ates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/DefaultProductRequirement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020 ArSysOp
* Copyright (c) 2020, 2021 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -22,22 +22,27 @@
@SuppressWarnings("restriction")
final class DefaultProductRequirement implements Supplier<Requirement> {

private final String product;
private final String version;
private final Supplier<String> product;
private final Supplier<String> version;
private final Supplier<String> name;
private final Supplier<String> provider;

DefaultProductRequirement(String product, String version) {
DefaultProductRequirement(Supplier<String> product, Supplier<String> name, Supplier<String> version,
Supplier<String> provider) {
this.product = product;
this.version = version;
this.name = name;
this.provider = provider;
}

@Override
public Requirement get() {
return new BaseRequirement(//
new BaseFeature(//
product, //
version, //
product, //
"Eclipse Passage Template"), //$NON-NLS-1$
product.get(), //
version.get(), //
name.get(), //
provider.get()), //
new RestrictionLevel.Warning(), //
this);
}
Expand Down
3 changes: 2 additions & 1 deletion ....pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/HelpContexts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019, 2020 ArSysOp
* Copyright (c) 2019, 2021 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -12,6 +12,7 @@
*******************************************************************************/
package org.eclipse.passage.ldc.internal.pde.ui.templates;

//FIXME: AF: we need to split this class
public class HelpContexts {

public static final String PREFIX = "org.eclipse.passage.ldc.doc.user"; //$NON-NLS-1$
Expand Down
4 changes: 2 additions & 2 deletions ...lates/LicensedE3ProductContentWizard.java → ...es/e3/LicensedE3ProductContentWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019, 2020 ArSysOp
* Copyright (c) 2019, 2021 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -10,7 +10,7 @@
* Contributors:
* ArSysOp - initial API and implementation
*******************************************************************************/
package org.eclipse.passage.ldc.internal.pde.ui.templates;
package org.eclipse.passage.ldc.internal.pde.ui.templates.e3;

import org.eclipse.pde.ui.templates.ITemplateSection;
import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
Expand Down
8 changes: 5 additions & 3 deletions ...tes/LicensedE3ProductTemplateSection.java → .../e3/LicensedE3ProductTemplateSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019, 2020 ArSysOp
* Copyright (c) 2019, 2021 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -10,7 +10,7 @@
* Contributors:
* ArSysOp - initial API and implementation
*******************************************************************************/
package org.eclipse.passage.ldc.internal.pde.ui.templates;
package org.eclipse.passage.ldc.internal.pde.ui.templates.e3;

import java.util.Arrays;
import java.util.List;
Expand All @@ -19,6 +19,8 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.passage.ldc.internal.pde.ui.templates.BaseLicensedTemplateSection;
import org.eclipse.passage.ldc.internal.pde.ui.templates.HelpContexts;
import org.eclipse.passage.ldc.internal.pde.ui.templates.i18n.PdeUiTemplatesMessages;
import org.eclipse.passage.lic.internal.api.requirements.Requirement;
import org.eclipse.pde.core.plugin.IPluginBase;
Expand Down Expand Up @@ -90,7 +92,7 @@ protected void updateModel(IProgressMonitor monitor) throws CoreException {

@Override
protected List<Requirement> requirements(String product) {
return Arrays.asList(new DefaultProductRequirement(product, getManifestHeader("Bundle-Version")).get()); //$NON-NLS-1$
return Arrays.asList(createProductRequirement(product));
}

private void createPerspectiveExtension() throws CoreException {
Expand Down
4 changes: 2 additions & 2 deletions ...lates/LicensedE4ProductContentWizard.java → ...es/e4/LicensedE4ProductContentWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019, 2020 ArSysOp
* Copyright (c) 2019, 2021 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -10,7 +10,7 @@
* Contributors:
* ArSysOp - initial API and implementation
*******************************************************************************/
package org.eclipse.passage.ldc.internal.pde.ui.templates;
package org.eclipse.passage.ldc.internal.pde.ui.templates.e4;

import org.eclipse.pde.ui.templates.ITemplateSection;
import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
Expand Down
8 changes: 5 additions & 3 deletions ...tes/LicensedE4ProductTemplateSection.java → .../e4/LicensedE4ProductTemplateSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019, 2020 ArSysOp
* Copyright (c) 2019, 2021 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -10,7 +10,7 @@
* Contributors:
* ArSysOp - initial API and implementation
*******************************************************************************/
package org.eclipse.passage.ldc.internal.pde.ui.templates;
package org.eclipse.passage.ldc.internal.pde.ui.templates.e4;

import java.util.Arrays;
import java.util.List;
Expand All @@ -19,6 +19,8 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.passage.ldc.internal.pde.ui.templates.BaseLicensedTemplateSection;
import org.eclipse.passage.ldc.internal.pde.ui.templates.HelpContexts;
import org.eclipse.passage.ldc.internal.pde.ui.templates.i18n.PdeUiTemplatesMessages;
import org.eclipse.passage.lic.internal.api.requirements.Requirement;
import org.eclipse.pde.core.plugin.IPluginBase;
Expand Down Expand Up @@ -85,7 +87,7 @@ protected void updateModel(IProgressMonitor monitor) throws CoreException {

@Override
protected List<Requirement> requirements(String product) {
return Arrays.asList(new DefaultProductRequirement(product, getManifestHeader("Bundle-Version")).get()); //$NON-NLS-1$
return Arrays.asList(createProductRequirement(product));
}

private void createProductExtension() throws CoreException {
Expand Down
4 changes: 2 additions & 2 deletions ...sedE4FullFeatherProductContentWizard.java → ...sedE4FullFeatherProductContentWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020 ArSysOp
* Copyright (c) 2020, 2021 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -10,7 +10,7 @@
* Contributors:
* ArSysOp - initial API and implementation
*******************************************************************************/
package org.eclipse.passage.ldc.internal.pde.ui.templates;
package org.eclipse.passage.ldc.internal.pde.ui.templates.fullfeather;

import org.eclipse.pde.ui.templates.ITemplateSection;
import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
Expand Down
9 changes: 5 additions & 4 deletions ...dE4FullFeatherProductTemplateSection.java → ...dE4FullFeatherProductTemplateSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020 ArSysOp
* Copyright (c) 2020, 2021 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -10,7 +10,7 @@
* Contributors:
* ArSysOp - initial API and implementation
*******************************************************************************/
package org.eclipse.passage.ldc.internal.pde.ui.templates;
package org.eclipse.passage.ldc.internal.pde.ui.templates.fullfeather;

import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -20,7 +20,8 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.passage.ldc.internal.pde.ui.templates.fullfeather.AntimagicShieldFeatureLicRequirement;
import org.eclipse.passage.ldc.internal.pde.ui.templates.BaseLicensedTemplateSection;
import org.eclipse.passage.ldc.internal.pde.ui.templates.HelpContexts;
import org.eclipse.passage.ldc.internal.pde.ui.templates.i18n.PdeUiTemplatesMessages;
import org.eclipse.passage.lic.internal.api.requirements.Requirement;
import org.eclipse.pde.core.plugin.IPluginBase;
Expand Down Expand Up @@ -78,7 +79,7 @@ protected void updateModel(IProgressMonitor monitor) throws CoreException {
@Override
protected List<Requirement> requirements(String product) {
return Arrays.asList(//
new DefaultProductRequirement(product, getManifestHeader("Bundle-Version")).get(), //$NON-NLS-1$
createProductRequirement(product), //
new AntimagicShieldFeatureLicRequirement().get());
}

Expand Down