Attachment #86053 for bug #214156

Lines 9-15 Link Here

(-)src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java (-2 / +2 lines)
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brock Janiczak <brockj@tpg.com.au> - bug 169373	10	* Brock Janiczak <brockj@tpg.com.au> - bug 169373
11	* Gary Duprex <Gary.Duprex@aspectstools.com> - bug 150225	11	* Gary Duprex <Gary.Duprex@aspectstools.com> - bug 150225
12	* Bartosz Michalik <bartosz.michalik@gmail.com> - bug 209432	12	* Bartosz Michalik <bartosz.michalik@gmail.com> - bug 209432, 214156
13	*******************************************************************************/	13	*******************************************************************************/
14	package org.eclipse.pde.internal.core.builders;	14	package org.eclipse.pde.internal.core.builders;
15		15
Lines 945-951 Link Here
945	if (header != null) {	945	if (header != null) {
946	IHeader activator = getHeader(Constants.BUNDLE_ACTIVATOR);	946	IHeader activator = getHeader(Constants.BUNDLE_ACTIVATOR);
947	if (activator == null && "true".equals(header.getValue())) { //$NON-NLS-1$	947	if (activator == null && "true".equals(header.getValue())) { //$NON-NLS-1$
948	report(PDECoreMessages.BundleErrorReporter_lazyStart_missingActivator, header.getLineNumber() + 1, CompilerFlags.WARNING, PDEMarkerFactory.M_DIRECTIVE_HAS_NO_EFFECT, PDEMarkerFactory.CAT_OTHER);	948	report(PDECoreMessages.BundleErrorReporter_lazyStart_missingActivator, header.getLineNumber() + 1, CompilerFlags.WARNING, PDEMarkerFactory.M_LAZYLOADING_HAS_NO_EFFECT, PDEMarkerFactory.CAT_OTHER);
949	}	949	}
950	if (TargetPlatformHelper.getTargetVersion() < 3.2 && severity != CompilerFlags.IGNORE) {	950	if (TargetPlatformHelper.getTargetVersion() < 3.2 && severity != CompilerFlags.IGNORE) {
951	report(PDECoreMessages.BundleErrorReporter_lazyStart_unsupported, header.getLineNumber() + 1, severity, PDEMarkerFactory.NO_RESOLUTION, PDEMarkerFactory.CAT_OTHER);	951	report(PDECoreMessages.BundleErrorReporter_lazyStart_unsupported, header.getLineNumber() + 1, severity, PDEMarkerFactory.NO_RESOLUTION, PDEMarkerFactory.CAT_OTHER);




import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.search.IJavaSearchConstants;
import org.eclipse.jdt.ui.IJavaElementSearchConstants;
import org.eclipse.pde.core.IModelChangedEvent;
import org.eclipse.pde.core.plugin.IPlugin;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.internal.core.ICoreConstants;

import org.eclipse.ui.forms.widgets.TableWrapData;

public class PluginGeneralInfoSection extends GeneralInfoSection {

	private FormEntry fClassEntry;
	private Button fLazyStart;
	private TypeFieldAssistDisposer fTypeFieldAssistDisposer;

		}
	}
	
	public void modelChanged(IModelChangedEvent e) {
		super.modelChanged(e);
		if (e.getChangeType() == IModelChangedEvent.CHANGE
				&& ICoreConstants.ECLIPSE_LAZYSTART.equals(e
						.getChangedProperty())) {
			fLazyStart.setSelection("true".equals(e.getNewValue()));
		}
	}
	
}

Lines 2493-2498 Link Here

(-)src/org/eclipse/pde/internal/ui/PDEUIMessages.java (+4 lines)
2493		2493
2494	public static String LauncherUtils_title;	2494	public static String LauncherUtils_title;
2495		2495
		2496	public static String LazyLoadingResolution_remove;
		2497
		2498	public static String LazyLoadingResolution_disable;
		2499
2496	public static String EditorPreferencePage_link;	2500	public static String EditorPreferencePage_link;
2497		2501
2498	public static String ManifestSyntaxColorTab_keys;	2502	public static String ManifestSyntaxColorTab_keys;

Lines 1946-1951 Link Here

(-)src/org/eclipse/pde/internal/ui/pderesources.properties (+2 lines)
1946	LauncherSection_launcherName=Launcher Name:	1946	LauncherSection_launcherName=Launcher Name:
1947	LauncherSection_dialogTitle=Image Selection	1947	LauncherSection_dialogTitle=Image Selection
1948	LauncherSection_dialogMessage=Select an image:	1948	LauncherSection_dialogMessage=Select an image:
		1949	LazyLoadingResolution_remove=Remove Eclipse-LazyStart header
		1950	LazyLoadingResolution_disable=Set Eclipse-LazyStart to false
1949	ProductDefinitonWizardPage_applicationDefinition=<form><p>An Eclipse product must be associated with an <a href="applications">application</a>, the default entry point for the product when it is running.</p></form>	1951	ProductDefinitonWizardPage_applicationDefinition=<form><p>An Eclipse product must be associated with an <a href="applications">application</a>, the default entry point for the product when it is running.</p></form>
1950	ArgumentsSection_title=Launching Arguments	1952	ArgumentsSection_title=Launching Arguments
1951	ArgumentsSection_editorTitle=Arguments	1953	ArgumentsSection_editorTitle=Arguments

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java (-1 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2007 IBM Corporation and others.	2	* Copyright (c) 2005, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 8-13 Link Here
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Gary Duprex <Gary.Duprex@aspectstools.com> - bug 150225	10	* Gary Duprex <Gary.Duprex@aspectstools.com> - bug 150225
		11	* Bartosz Michalik <bartosz.michalik@gmail.com> - bug 214156
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.pde.internal.ui.correction;	13	package org.eclipse.pde.internal.ui.correction;
13		14
Lines 96-101 Link Here
96	return new IMarkerResolution[] { new AddDefaultExecutionEnvironmentResolution(AbstractPDEMarkerResolution.CREATE_TYPE, marker.getAttribute("ee_id", null)) }; //$NON-NLS-1$	97	return new IMarkerResolution[] { new AddDefaultExecutionEnvironmentResolution(AbstractPDEMarkerResolution.CREATE_TYPE, marker.getAttribute("ee_id", null)) }; //$NON-NLS-1$
97	case PDEMarkerFactory.M_MISSING_BUNDLE_CLASSPATH_ENTRY:	98	case PDEMarkerFactory.M_MISSING_BUNDLE_CLASSPATH_ENTRY:
98	return new IMarkerResolution[] {new AddBundleClassPathMarkerResolution(AbstractPDEMarkerResolution.CREATE_TYPE, marker.getAttribute("entry", null))}; //$NON-NLS-1$	99	return new IMarkerResolution[] {new AddBundleClassPathMarkerResolution(AbstractPDEMarkerResolution.CREATE_TYPE, marker.getAttribute("entry", null))}; //$NON-NLS-1$
		100	case PDEMarkerFactory.M_LAZYLOADING_HAS_NO_EFFECT:
		101	return new IMarkerResolution[] {new DisableLazyLoadingDirectiveResolution(AbstractPDEMarkerResolution.RENAME_TYPE),
		102	new DisableLazyLoadingDirectiveResolution(AbstractPDEMarkerResolution.REMOVE_TYPE)};
99	}	103	}
100	return NO_RESOLUTIONS;	104	return NO_RESOLUTIONS;
101	}	105	}




/*******************************************************************************
 * Copyright (c) 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Bartosz Michalik <bartosz.michalik@gmail.com> - bug 214156
 *******************************************************************************/
package org.eclipse.pde.internal.ui.correction;

import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.ibundle.IManifestHeader;
import org.eclipse.pde.internal.core.text.bundle.BundleModel;
import org.eclipse.pde.internal.ui.PDEUIMessages;

public class DisableLazyLoadingDirectiveResolution extends
		AbstractManifestMarkerResolution {

	private boolean fRemove;

	public DisableLazyLoadingDirectiveResolution(int type) {
		super(type);
		fRemove = (type == AbstractPDEMarkerResolution.REMOVE_TYPE);
	}

	protected void createChange(BundleModel model) {
		 IManifestHeader activation = model.getBundle().getManifestHeader(ICoreConstants.ECLIPSE_LAZYSTART);
		 if(fRemove) activation.setValue(null);
		 else activation.setValue("false"); //$NON-NLS-1$
	}

	public String getLabel() {
		return fRemove ? PDEUIMessages.LazyLoadingResolution_remove : PDEUIMessages.LazyLoadingResolution_disable;
	}

}

Return to bug 214156

Lines 16-21 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/plugin/PluginGeneralInfoSection.java (-1 / +10 lines)
16	import org.eclipse.core.runtime.CoreException;	16	import org.eclipse.core.runtime.CoreException;
17	import org.eclipse.jdt.core.search.IJavaSearchConstants;	17	import org.eclipse.jdt.core.search.IJavaSearchConstants;
18	import org.eclipse.jdt.ui.IJavaElementSearchConstants;	18	import org.eclipse.jdt.ui.IJavaElementSearchConstants;
		19	import org.eclipse.pde.core.IModelChangedEvent;
19	import org.eclipse.pde.core.plugin.IPlugin;	20	import org.eclipse.pde.core.plugin.IPlugin;
20	import org.eclipse.pde.core.plugin.IPluginModelBase;	21	import org.eclipse.pde.core.plugin.IPluginModelBase;
21	import org.eclipse.pde.internal.core.ICoreConstants;	22	import org.eclipse.pde.internal.core.ICoreConstants;
Lines 45-51 Link Here
45	import org.eclipse.ui.forms.widgets.TableWrapData;	46	import org.eclipse.ui.forms.widgets.TableWrapData;
46		47
47	public class PluginGeneralInfoSection extends GeneralInfoSection {	48	public class PluginGeneralInfoSection extends GeneralInfoSection {
48
49	private FormEntry fClassEntry;	49	private FormEntry fClassEntry;
50	private Button fLazyStart;	50	private Button fLazyStart;
51	private TypeFieldAssistDisposer fTypeFieldAssistDisposer;	51	private TypeFieldAssistDisposer fTypeFieldAssistDisposer;
Lines 215-218 Link Here
215	}	215	}
216	}	216	}
217		217
		218	public void modelChanged(IModelChangedEvent e) {
		219	super.modelChanged(e);
		220	if (e.getChangeType() == IModelChangedEvent.CHANGE
		221	&& ICoreConstants.ECLIPSE_LAZYSTART.equals(e
		222	.getChangedProperty())) {
		223	fLazyStart.setSelection("true".equals(e.getNewValue()));
		224	}
		225	}
		226
218	}	227	}

Added Link Here

(-)src/org/eclipse/pde/internal/ui/correction/DisableLazyLoadingDirectiveResolution.java (+39 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	* Bartosz Michalik <bartosz.michalik@gmail.com> - bug 214156
11	*******************************************************************************/
12	package org.eclipse.pde.internal.ui.correction;
13
14	import org.eclipse.pde.internal.core.ICoreConstants;
15	import org.eclipse.pde.internal.core.ibundle.IManifestHeader;
16	import org.eclipse.pde.internal.core.text.bundle.BundleModel;
17	import org.eclipse.pde.internal.ui.PDEUIMessages;
18
19	public class DisableLazyLoadingDirectiveResolution extends
20	AbstractManifestMarkerResolution {
21
22	private boolean fRemove;
23
24	public DisableLazyLoadingDirectiveResolution(int type) {
25	super(type);
26	fRemove = (type == AbstractPDEMarkerResolution.REMOVE_TYPE);
27	}
28
29	protected void createChange(BundleModel model) {
30	IManifestHeader activation = model.getBundle().getManifestHeader(ICoreConstants.ECLIPSE_LAZYSTART);
31	if(fRemove) activation.setValue(null);
32	else activation.setValue("false"); //$NON-NLS-1$
33	}
34
35	public String getLabel() {
36	return fRemove ? PDEUIMessages.LazyLoadingResolution_remove : PDEUIMessages.LazyLoadingResolution_disable;
37	}
38
39	}