Added support to add sources in the Feature Editor

Author: nburnwal09

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/FeatureErrorReporter.java

@@ -40,7 +40,7 @@ public class FeatureErrorReporter extends ManifestErrorReporter {
 
 	static HashSet<String> attrs = new HashSet<>();
 
-	static String[] attrNames = {"id", "version", "label", "provider-name", "image", "os", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+	static String[] attrNames = { "id", "version", "include-sources", "label", "provider-name", "image", "os", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
 			"ws", "arch", "nl", "colocation-affinity", "primary", "exclusive", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
 			"plugin", "application", "license-feature", "license-feature-version"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/feature/Feature.java

@@ -58,6 +58,7 @@ public class Feature extends VersionableObject implements IFeature {
 	private String fCopyright;
 	private String fLicenseFeatureID;
 	private String fLicenseFeatureVersion;
+	private boolean fSources;
 
 	@Override
 	public void addPlugins(IFeaturePlugin[] newPlugins) throws CoreException {
@@ -213,6 +214,7 @@ protected void parse(Node node) {
 		fApplication = getNodeAttribute(node, "application"); //$NON-NLS-1$
 		fPrimary = getBooleanAttribute(node, "primary"); //$NON-NLS-1$
 		fExclusive = getBooleanAttribute(node, "exclusive"); //$NON-NLS-1$
+		fSources = getBooleanAttribute(node, "include-sources"); //$NON-NLS-1$
 		NodeList children = node.getChildNodes();
 		fValid = true;
 
@@ -570,6 +572,9 @@ public void restoreProperty(String name, Object oldValue, Object newValue) throw
 		case P_IMAGE:
 			setImageName((String) newValue);
 			break;
+		case P_SOURCES:
+			setIncludingSources(newValue != null ? ((Boolean) newValue).booleanValue() : false);
+			break;
 		default:
 			super.restoreProperty(name, oldValue, newValue);
 			break;
@@ -581,6 +586,7 @@ public void reset() {
 		super.reset();
 		fData.clear();
 		fPlugins.clear();
+		fSources = false;
 		fImports.clear();
 		fChildren.clear();
 		fUrl = null;
@@ -654,6 +660,7 @@ public void write(String indent, PrintWriter writer) {
 		writeIfDefined(indenta, writer, "id", getId()); //$NON-NLS-1$
 		writeIfDefined(indenta, writer, "label", getWritableString(getLabel())); //$NON-NLS-1$
 		writeIfDefined(indenta, writer, "version", getVersion()); //$NON-NLS-1$
+		writeIfDefined(indenta, writer, "include-sources", String.valueOf(isIncludingSources())); //$NON-NLS-1$ )
 		writeIfDefined(indenta, writer, "provider-name", //$NON-NLS-1$
 				getWritableString(fProviderName));
 		writeIfDefined(indenta, writer, "plugin", //$NON-NLS-1$
@@ -772,4 +779,16 @@ public String toString() {
 		return getId() + " (" + getVersion() + ")"; //$NON-NLS-1$//$NON-NLS-2$
 	}
 
+	@Override
+	public boolean isIncludingSources() {
+		return fSources;
+	}
+
+	@Override
+	public void setIncludingSources(boolean b) {
+		Object oldValue = fSources;
+		this.fSources = b;
+		firePropertyChanged(this, "include-sources", oldValue, b); //$NON-NLS-1$
+	}
+
 }

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ifeature/IFeature.java

@@ -63,6 +63,8 @@ public interface IFeature extends IFeatureObject, IVersionable, IEnvironment {
 	public static final int INFO_DESCRIPTION = 0;
 	public static final int INFO_COPYRIGHT = 1;
 	public static final int INFO_LICENSE = 2;
+	
+	public static final String P_SOURCES = "false"; //$NON-NLS-1$
 
 	static final String[] INFO_TAGS = {"description", "copyright", "license"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
@@ -257,6 +259,10 @@ public interface IFeature extends IFeatureObject, IVersionable, IEnvironment {
 	void setApplication(String value) throws CoreException;
 
 	boolean isValid();
+	
+	public boolean isIncludingSources();
+	
+	void setIncludingSources(boolean b);
 
 	public void swap(IFeatureChild feature1, IFeatureChild feature2);
 }

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java

@@ -2229,6 +2229,8 @@ public class PDEUIMessages extends NLS {
 	public static String FeatureSection_addRequired;
 	public static String FeatureSection_toggleRoot;
 
+	public static String FeatureSpecSection_addSources0;
+
 	public static String ImportPackageSection_desc;
 	public static String ImportPackageSection_descFragment;
 	public static String ExportPackageSection_desc;

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureSpecSection.java

@@ -42,12 +42,16 @@
 import org.eclipse.pde.internal.ui.parts.FormEntry;
 import org.eclipse.pde.internal.ui.util.SWTUtil;
 import org.eclipse.pde.internal.ui.wizards.plugin.NewPluginProjectWizard;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.dnd.RTFTransfer;
 import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.dnd.TransferData;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -75,6 +79,8 @@ public class FeatureSpecSection extends PDESection {
 
 	private boolean fPatch = false;
 
+	private Button fSourcesCheckbox;
+
 	public FeatureSpecSection(FeatureFormPage page, Composite parent) {
 		super(page, parent, Section.DESCRIPTION);
 		getSection().setText(PDEUIMessages.FeatureEditor_SpecSection_title);
@@ -380,6 +386,18 @@ public void textValueChanged(FormEntry text) {
 			}
 		});
 
+		fSourcesCheckbox = toolkit.createButton(container, PDEUIMessages.FeatureSpecSection_addSources0, SWT.CHECK);
+		fSourcesCheckbox.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		fSourcesCheckbox.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				boolean isSelected = fSourcesCheckbox.getSelection();
+				IFeatureModel model = (IFeatureModel) getPage().getModel();
+				IFeature feature = model.getFeature();
+				feature.setIncludingSources(isSelected);
+			}
+		});
+
 		GridData gd = (GridData) fIdText.getText().getLayoutData();
 		gd.widthHint = 150;
 
@@ -495,6 +513,7 @@ private void setIfDefined(FormEntry formText, String value) {
 		}
 	}
 
+
 	@Override
 	public void refresh() {
 		IFeatureModel model = (IFeatureModel) getPage().getModel();
@@ -503,6 +522,7 @@ public void refresh() {
 		setIfDefined(fTitleText, feature.getLabel());
 		getPage().getManagedForm().getForm().setText(model.getResourceString(feature.getLabel()));
 		setIfDefined(fVersionText, feature.getVersion());
+		fSourcesCheckbox.setSelection(feature.isIncludingSources());
 		setIfDefined(fProviderText, feature.getProviderName());
 		setIfDefined(fPluginText, feature.getPlugin());
 		if (isPatch()) {

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties

@@ -1255,6 +1255,7 @@ FeatureImportWizard_messages_updating = Updating...
 FeatureImportWizard_title = Import Features
 FeatureSection_addRequired=Add Required
 FeatureSection_toggleRoot=Toggle Install Mode
+FeatureSpecSection_addSources0=Add sources automatically
 FeatureImportWizard_noToAll = No to A&ll
 FeatureImportWizard_messages_noFeatures = No features found. Ensure that the chosen directory contains 'features' folder.
 FeatureImportWizard_messages_title = Feature Import

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/AbstractCreateFeatureOperation.java

@@ -171,6 +171,7 @@ protected IFile createFeature() throws CoreException {
 		feature.setLabel(fFeatureData.name);
 		feature.setId(fFeatureData.id);
 		feature.setVersion(fFeatureData.version);
+		feature.setIncludingSources(false);
 		feature.setProviderName(fFeatureData.provider);
 		if (fFeatureData.hasCustomHandler()) {
 			feature.setInstallHandler(model.getFactory().createInstallHandler());