Attachment 165850 Details for Bug 155015 – head keeps changing.

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] head keeps changing.

encodings5.patch (text/plain), 33.05 KB, created by Darin Wright

on 2010-04-22 16:40:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2010-04-22 16:40:00 EDT

Size: 33.05 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.core
>Index: src/org/eclipse/pde/internal/core/PreferenceInitializer.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PreferenceInitializer.java,v
>retrieving revision 1.20
>diff -u -r1.20 PreferenceInitializer.java
>--- src/org/eclipse/pde/internal/core/PreferenceInitializer.java	22 Apr 2010 13:10:16 -0000	1.20
>+++ src/org/eclipse/pde/internal/core/PreferenceInitializer.java	22 Apr 2010 20:39:18 -0000
>@@ -71,6 +71,7 @@
> 		prefs.putInt(CompilerFlags.P_BUILD_BIN_INCLUDES, CompilerFlags.WARNING);
> 		prefs.putInt(CompilerFlags.P_BUILD_JAVA_COMPLIANCE, CompilerFlags.WARNING);
> 		prefs.putInt(CompilerFlags.P_BUILD_JAVA_COMPILER, CompilerFlags.IGNORE);
>+		prefs.putInt(CompilerFlags.P_BUILD_ENCODINGS, CompilerFlags.WARNING);
> 
> 		prefs.putInt(CompilerFlags.P_INCOMPATIBLE_ENV, CompilerFlags.WARNING);
> 		prefs.putInt(CompilerFlags.P_MISSING_EXPORT_PKGS, CompilerFlags.IGNORE);
>Index: src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java,v
>retrieving revision 1.59
>diff -u -r1.59 BuildErrorReporter.java
>--- src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java	22 Apr 2010 19:44:33 -0000	1.59
>+++ src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java	22 Apr 2010 20:39:18 -0000
>@@ -114,6 +114,7 @@
> 	protected int fMissingOutputLibSeverity;
> 	protected int fSrcLibSeverity;
> 	protected int fOututLibSeverity;
>+	protected int fEncodingSeverity;
> 
> 	public BuildErrorReporter(IFile buildFile) {
> 		super(buildFile);
>@@ -126,6 +127,7 @@
> 		fJavaCompilerSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_BUILD_JAVA_COMPILER);
> 		fSrcInclSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_BUILD_SRC_INCLUDES);
> 		fBinInclSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_BUILD_BIN_INCLUDES);
>+		fEncodingSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_BUILD_ENCODINGS);
> 	}
> 
> 	public void validate(IProgressMonitor monitor) {
>@@ -228,7 +230,7 @@
> 				IClasspathEntry[] cpes = jp.getRawClasspath();
> 				validateMissingLibraries(sourceEntryKeys, cpes);
> 				validateSourceEntries(sourceEntries, cpes);
>-				SourceEntryErrorReporter srcEntryErrReporter = new SourceEntryErrorReporter(fFile);
>+				SourceEntryErrorReporter srcEntryErrReporter = new SourceEntryErrorReporter(fFile, build);
> 				srcEntryErrReporter.initialize(sourceEntries, outputEntries, cpes, fProject);
> 				srcEntryErrReporter.validate();
> 				ArrayList problems = srcEntryErrReporter.getProblemList();
>@@ -246,27 +248,8 @@
> 		validateBinIncludes(binIncludes);
> 		validateExecutionEnvironment(javacSource, javacTarget, jreCompilationProfile, javacWarnings, javacErrors, getSourceLibraries(sourceEntries));
> 		validateJavaCompilerSettings(javaProjectWarnings);
>-		//validateDefaultEncoding(sourceEntries, encodingEntries);
> 	}
> 
>-//	private void validateDefaultEncoding(ArrayList sourceEntries, Map encodingEntries) {
>-//		String defaultEncoding = System.getProperty("file.encoding"); //$NON-NLS-1$
>-//		for (int i = 0; i < sourceEntries.size(); i++) {
>-//			try {
>-//				String name = ((IBuildEntry) sourceEntries.get(i)).getName();
>-//				String library = name.substring(name.indexOf('.') + 1, name.length());
>-//				String encoding = fProject.getDefaultCharset(false);
>-//				String encodingId = PROPERTY_JAVAC_DEFAULT_ENCODING_PREFIX + library;
>-//				String libraryEncoding = (String) encodingEntries.get(encodingId);
>-//				if (encoding != null && !defaultEncoding.equalsIgnoreCase(encoding) && libraryEncoding == null) {
>-//					prepareError(encodingId, encoding, NLS.bind(PDECoreMessages.BuildErrorReporter_defaultEncodingMissing, new Object[] {defaultEncoding, encoding}), PDEMarkerFactory.B_ADDDITION, PDEMarkerFactory.CAT_OTHER);
>-//				}
>-//			} catch (CoreException e) {
>-//				PDECore.logException(e);
>-//			}
>-//		}
>-//	}
>-
> 	/**
> 	 * Given a list of source library entries, returns the list of library names.
> 	 * 
>Index: src/org/eclipse/pde/internal/core/builders/CompilerFlags.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/CompilerFlags.java,v
>retrieving revision 1.18
>diff -u -r1.18 CompilerFlags.java
>--- src/org/eclipse/pde/internal/core/builders/CompilerFlags.java	21 Apr 2010 21:48:50 -0000	1.18
>+++ src/org/eclipse/pde/internal/core/builders/CompilerFlags.java	22 Apr 2010 20:39:18 -0000
>@@ -61,6 +61,7 @@
> 	public static final String P_BUILD_BIN_INCLUDES = "compilers.p.build.bin.includes"; //$NON-NLS-1$
> 	public static final String P_BUILD_JAVA_COMPLIANCE = "compilers.p.build.java.compliance"; //$NON-NLS-1$
> 	public static final String P_BUILD_JAVA_COMPILER = "compilers.p.build.java.compiler"; //$NON-NLS-1$
>+	public static final String P_BUILD_ENCODINGS = "compilers.p.build.encodings"; //$NON-NLS-1$
> 	public static final String P_INCOMPATIBLE_ENV = "compilers.incompatible-environment"; //$NON-NLS-1$
> 	public static final String P_MISSING_EXPORT_PKGS = "compilers.p.missing-packages"; //$NON-NLS-1$
> 	public static final String P_DEPRECATED = "compilers.p.deprecated"; //$NON-NLS-1$
>Index: src/org/eclipse/pde/internal/core/builders/SourceEntryErrorReporter.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SourceEntryErrorReporter.java,v
>retrieving revision 1.9
>diff -u -r1.9 SourceEntryErrorReporter.java
>--- src/org/eclipse/pde/internal/core/builders/SourceEntryErrorReporter.java	30 Mar 2010 18:54:17 -0000	1.9
>+++ src/org/eclipse/pde/internal/core/builders/SourceEntryErrorReporter.java	22 Apr 2010 20:39:18 -0000
>@@ -11,18 +11,21 @@
> package org.eclipse.pde.internal.core.builders;
> 
> import java.util.*;
>+import java.util.Map.Entry;
> import org.eclipse.core.resources.*;
>-import org.eclipse.core.runtime.IPath;
>-import org.eclipse.core.runtime.Path;
>+import org.eclipse.core.runtime.*;
> import org.eclipse.jdt.core.*;
> import org.eclipse.osgi.util.NLS;
>+import org.eclipse.pde.core.build.IBuild;
> import org.eclipse.pde.core.build.IBuildEntry;
> import org.eclipse.pde.internal.core.PDECoreMessages;
>+import org.eclipse.pde.internal.core.project.PDEProject;
> 
> public class SourceEntryErrorReporter extends BuildErrorReporter {
> 
>-	public SourceEntryErrorReporter(IFile file) {
>+	public SourceEntryErrorReporter(IFile file, IBuild model) {
> 		super(file);
>+		fBuild = model;
> 	}
> 
> 	class ProjectFolder {
>@@ -131,8 +134,146 @@
> 
> 	}
> 
>+	/**
>+	 * Represents a default or custom encoding property for a resource
>+	 * within a library.
>+	 */
>+	class EncodingEntry {
>+
>+		private String fEncoding;
>+		private IResource fResource;
>+
>+		/**
>+		 * Constructs an encoding entry for the given resource.
>+		 * 
>+		 * @param resource resource
>+		 * @param encoding the encoding identifier
>+		 */
>+		EncodingEntry(IResource resource, String encoding) {
>+			fEncoding = encoding;
>+			fResource = resource;
>+		}
>+
>+		/**
>+		 * Returns the explicit encoding for this entry.
>+		 * 
>+		 * @return explicit encoding
>+		 */
>+		public String getEncoding() {
>+			return fEncoding;
>+		}
>+
>+		/**
>+		 * Returns the resource this encoding is associated with.
>+		 * 
>+		 * @return associated resource 
>+		 */
>+		public IResource getResource() {
>+			return fResource;
>+		}
>+
>+		/* (non-Javadoc)
>+		 * @see java.lang.Object#toString()
>+		 */
>+		public String toString() {
>+			return getValue();
>+		}
>+
>+		/* (non-Javadoc)
>+		 * @see java.lang.Object#equals(java.lang.Object)
>+		 */
>+		public boolean equals(Object obj) {
>+			if (obj instanceof EncodingEntry) {
>+				EncodingEntry other = (EncodingEntry) obj;
>+				return other.fEncoding.equals(fEncoding) && other.fResource.equals(fResource);
>+			}
>+			return false;
>+		}
>+
>+		/* (non-Javadoc)
>+		 * @see java.lang.Object#hashCode()
>+		 */
>+		public int hashCode() {
>+			return fEncoding.hashCode() + fResource.hashCode();
>+		}
>+
>+		/**
>+		 * Returns the generated value of this entry for the build.properties file.
>+		 * 
>+		 * @return value to enter into build.properties
>+		 */
>+		String getValue() {
>+			StringBuffer buf = new StringBuffer();
>+			IContainer root = PDEProject.getBundleRoot(fResource.getProject());
>+			buf.append(fResource.getFullPath().makeRelativeTo(root.getFullPath()).makeAbsolute());
>+			buf.append('[');
>+			buf.append(fEncoding);
>+			buf.append(']');
>+			return buf.toString();
>+		}
>+
>+	}
>+
>+	/**
>+	 * Visits a source folder gathering encodings.
>+	 */
>+	class Visitor implements IResourceVisitor {
>+
>+		String[] fLibs = null;
>+
>+		Visitor(SourceFolder folder) {
>+			ArrayList list = folder.getLibs();
>+			fLibs = (String[]) list.toArray(new String[list.size()]);
>+		}
>+
>+		/* (non-Javadoc)
>+		 * @see org.eclipse.core.resources.IResourceVisitor#visit(org.eclipse.core.resources.IResource)
>+		 */
>+		public boolean visit(IResource resource) throws CoreException {
>+			String encoding = null;
>+			switch (resource.getType()) {
>+				case IResource.FOLDER :
>+					encoding = ((IFolder) resource).getDefaultCharset(false);
>+					break;
>+				case IResource.FILE :
>+					IFile file = (IFile) resource;
>+					// only worry about .java files
>+					if (file.getFileExtension().equals("java")) { //$NON-NLS-1$
>+						encoding = file.getCharset(false);
>+					}
>+					break;
>+			}
>+			if (encoding != null) {
>+				EncodingEntry entry = new EncodingEntry(resource, encoding);
>+				for (int i = 0; i < fLibs.length; i++) {
>+					String lib = fLibs[i];
>+					List encodings = (List) fCustomEncodings.get(lib);
>+					if (encodings == null) {
>+						encodings = new ArrayList();
>+						fCustomEncodings.put(lib, encodings);
>+					}
>+					encodings.add(entry);
>+				}
>+			}
>+			return true;
>+		}
>+
>+	}
>+
> 	private HashMap fSourceFolderMap = new HashMap(4);
> 	private HashMap fOutputFolderMap = new HashMap(4);
>+	private IBuild fBuild = null;
>+
>+	/**
>+	 * Maps library name to default encoding for that library (or not present if there is no
>+	 * explicit default encoding specified). 
>+	 */
>+	Map fDefaultLibraryEncodings = new HashMap();
>+
>+	/**
>+	 * Maps library name to custom {@link EncodingEntry}'s for this library.
>+	 */
>+	Map fCustomEncodings = new HashMap();
> 
> 	public void initialize(ArrayList sourceEntries, ArrayList outputEntries, IClasspathEntry[] cpes, IProject project) {
> 
>@@ -297,6 +438,7 @@
> 			}
> 		}
> 
>+		List toValidate = new ArrayList(); // list of source folders to perform encoding validation on
> 		for (Iterator iterator = fSourceFolderMap.keySet().iterator(); iterator.hasNext();) {
> 			IPath sourcePath = (IPath) iterator.next();
> 			SourceFolder sourceFolder = (SourceFolder) fSourceFolderMap.get(sourcePath);
>@@ -339,6 +481,8 @@
> 					String message = NLS.bind(PDECoreMessages.SourceEntryErrorReporter_DupeSourceFolder, sourcePath.toString(), PROPERTY_SOURCE_PREFIX + sourceFolder.getDupeLibName());
> 					prepareError(PROPERTY_SOURCE_PREFIX + sourceFolder.getDupeLibName(), sourceFolder.getToken(), message, PDEMarkerFactory.NO_RESOLUTION, fSrcLibSeverity, PDEMarkerFactory.CAT_OTHER);
> 				}
>+
>+				toValidate.add(sourceFolder);
> 			}
> 		}
> 
>@@ -348,6 +492,184 @@
> 			String message = NLS.bind(PDECoreMessages.SourceEntryErrorReporter_MissingOutputEntry, errorEntry.get(errorEntry.fSsrcFolders), PROPERTY_OUTPUT_PREFIX + libName);
> 			prepareError(PROPERTY_OUTPUT_PREFIX + libName, errorEntry.get(errorEntry.fOutputFolders), message, PDEMarkerFactory.B_ADDITION, fMissingOutputLibSeverity, PDEMarkerFactory.CAT_OTHER);
> 		}
>+
>+		// validate workspace encodings with those specified in build.properties
>+
>+		// build map of expected encodings
>+		Iterator iterator = toValidate.iterator();
>+		while (iterator.hasNext()) {
>+			SourceFolder sourceFolder = (SourceFolder) iterator.next();
>+			IPath sourcePath = sourceFolder.getPath();
>+			IFolder folder = fProject.getFolder(sourcePath);
>+			try {
>+				ArrayList list = sourceFolder.getLibs();
>+				String[] libs = (String[]) list.toArray(new String[list.size()]);
>+				String encoding = getExplicitEncoding(folder);
>+				if (encoding != null) {
>+					for (int i = 0; i < libs.length; i++) {
>+						fDefaultLibraryEncodings.put(libs[i], encoding);
>+					}
>+				}
>+				folder.accept(new Visitor(sourceFolder));
>+			} catch (CoreException e) {
>+				// TODO:
>+			}
>+
>+		}
>+
>+		// Compare to encodings specified in build.properties (if any)
>+		IBuildEntry[] entries = fBuild.getBuildEntries();
>+		for (int i = 0; i < entries.length; i++) {
>+			IBuildEntry entry = entries[i];
>+			String name = entry.getName();
>+			if (name.startsWith(PROPERTY_JAVAC_DEFAULT_ENCODING_PREFIX)) {
>+				String lib = name.substring(PROPERTY_JAVAC_DEFAULT_ENCODING_PREFIX.length());
>+				String[] tokens = entry.getTokens();
>+				if (tokens.length > 0) {
>+					if (tokens.length == 1) {
>+						// compare
>+						String specified = tokens[0];
>+						String expected = (String) fDefaultLibraryEncodings.remove(lib);
>+						if (expected != null) {
>+							if (!specified.equals(expected)) {
>+								prepareError(name, specified, NLS.bind("Workspace encoding {0} does not match specified encoding {1}", new String[] {expected, specified}), PDEMarkerFactory.NO_RESOLUTION, fEncodingSeverity, PDEMarkerFactory.CAT_OTHER);
>+							}
>+						} else {
>+							// encoding is specified, but workspace does not specify one
>+							prepareError(name, null, NLS.bind("Workspace encoding unspecified for library \"{0}\"", lib), PDEMarkerFactory.B_REMOVAL, fEncodingSeverity, PDEMarkerFactory.CAT_OTHER);
>+						}
>+					} else {
>+						// syntax error
>+						prepareError(name, null, "Syntax error: only one default encoding can be specified", PDEMarkerFactory.NO_RESOLUTION, fEncodingSeverity, PDEMarkerFactory.CAT_OTHER);
>+					}
>+				}
>+			} else if (name.startsWith(PROPERTY_JAVAC_CUSTOM_ENCODINGS_PREFIX)) {
>+				boolean error = false;
>+				String message = null;
>+				String errorToken = null;
>+				IContainer bundleRoot = PDEProject.getBundleRoot(fProject);
>+				String lib = name.substring(PROPERTY_JAVAC_CUSTOM_ENCODINGS_PREFIX.length());
>+				String[] tokens = entry.getTokens();
>+				if (tokens.length > 0) {
>+					List encodings = new ArrayList();
>+					for (int j = 0; j < tokens.length; j++) {
>+						String special = tokens[j];
>+						int index = special.indexOf('[');
>+						if (index >= 0 && special.endsWith("]")) { //$NON-NLS-1$
>+							String path = special.substring(0, index);
>+							String encoding = special.substring(index + 1, special.length() - 1);
>+							IResource member = bundleRoot.findMember(path);
>+							if (member == null) {
>+								// error - missing resource
>+								error = true;
>+								errorToken = special;
>+								message = NLS.bind("Resource does not exist: {0}", path);
>+								break;
>+							}
>+							encodings.add(new EncodingEntry(member, encoding));
>+						} else {
>+							// syntax error - invalid
>+							message = "Syntax error: expecting '<path>[encoding]'";
>+							errorToken = special;
>+							error = true;
>+							break;
>+						}
>+					}
>+					if (error) {
>+						prepareError(name, errorToken, message, PDEMarkerFactory.NO_RESOLUTION, fEncodingSeverity, PDEMarkerFactory.CAT_OTHER);
>+					} else {
>+						// compare with workspace encodings
>+						List workspace = (List) fCustomEncodings.remove(lib);
>+						if (workspace == null) {
>+							prepareError(name, null, NLS.bind("Custom workspace encodings unspecified for library \"{0}\"", lib), PDEMarkerFactory.B_REMOVAL, fEncodingSeverity, PDEMarkerFactory.CAT_OTHER);
>+						} else {
>+							Map map = new HashMap();
>+							Iterator iter = workspace.iterator();
>+							while (iter.hasNext()) {
>+								EncodingEntry ee = (EncodingEntry) iter.next();
>+								map.put(ee.getResource(), ee.getEncoding());
>+							}
>+							iter = encodings.iterator();
>+							while (iter.hasNext()) {
>+								EncodingEntry ee = (EncodingEntry) iter.next();
>+								String specified = ee.getEncoding();
>+								String expected = (String) map.remove(ee.getResource());
>+								if (expected == null) {
>+									prepareError(name, ee.getValue(), NLS.bind("Workspace encoding unspecified for \"{0}\"", ee.getResource().getProjectRelativePath().toString()), PDEMarkerFactory.B_REMOVAL, fEncodingSeverity, PDEMarkerFactory.CAT_OTHER);
>+								} else {
>+									if (!specified.equals(expected)) {
>+										prepareError(name, ee.getValue(), NLS.bind("Workspace encoding {0} for \"{1}\" does not match specified encoding {2}", new String[] {expected, ee.getResource().getProjectRelativePath().toString(), specified}), PDEMarkerFactory.NO_RESOLUTION, fEncodingSeverity, PDEMarkerFactory.CAT_OTHER);
>+									}
>+								}
>+							}
>+							// anything left in the workspace map?
>+							if (!map.isEmpty()) {
>+								iter = map.entrySet().iterator();
>+								while (iter.hasNext()) {
>+									Entry en = (Entry) iter.next();
>+									IResource res = (IResource) en.getKey();
>+									String expected = (String) en.getValue();
>+									EncodingEntry missing = new EncodingEntry(res, expected);
>+									String m = NLS.bind("Missing encoding {0} for {1}", new String[] {expected, res.getProjectRelativePath().toString()});
>+									prepareError(name, missing.getValue(), m, PDEMarkerFactory.B_ADDITION, fEncodingSeverity, PDEMarkerFactory.CAT_OTHER);
>+								}
>+							}
>+						}
>+					}
>+				}
>+
>+			}
>+		}
>+
>+		// check for unspecified default encodings
>+		Iterator iter = fDefaultLibraryEncodings.entrySet().iterator();
>+		while (iter.hasNext()) {
>+			Entry entry = (Entry) iter.next();
>+			String lib = (String) entry.getKey();
>+			String expected = (String) entry.getValue();
>+			prepareError(PROPERTY_JAVAC_DEFAULT_ENCODING_PREFIX + lib, expected, NLS.bind("Missing defalt encoding {0} for library \"{1}\"", new String[] {expected, lib}), PDEMarkerFactory.B_ADDITION, fEncodingSeverity, PDEMarkerFactory.CAT_OTHER);
>+		}
>+
>+		// check for unspecified custom encodings
>+		iter = fCustomEncodings.entrySet().iterator();
>+		while (iter.hasNext()) {
>+			Entry entry = (Entry) iter.next();
>+			String lib = (String) entry.getKey();
>+			List encodings = (List) entry.getValue();
>+			Iterator iterator2 = encodings.iterator();
>+			while (iterator2.hasNext()) {
>+				EncodingEntry encoding = (EncodingEntry) iterator2.next();
>+				String m = NLS.bind("Missing encoding {0} for {1}", new String[] {encoding.getEncoding(), encoding.getResource().getProjectRelativePath().toString()});
>+				prepareError(PROPERTY_JAVAC_CUSTOM_ENCODINGS_PREFIX + lib, encoding.getValue(), m, PDEMarkerFactory.B_ADDITION, fEncodingSeverity, PDEMarkerFactory.CAT_OTHER);
>+			}
>+		}
>+	}
>+
>+	/**
>+	 * Returns any explicit encoding set on the given container or one of its parents
>+	 * up to and including its project.
>+	 * 
>+	 * @param container container
>+	 * @return any explicit encoding or <code>null</code> if none
>+	 * @throws CoreException
>+	 */
>+	private String getExplicitEncoding(IContainer container) throws CoreException {
>+		String encoding = container.getDefaultCharset(false);
>+		if (encoding == null) {
>+			IContainer parent = container.getParent();
>+			if (parent != null) {
>+				switch (parent.getType()) {
>+					case IResource.FOLDER :
>+						return getExplicitEncoding(parent);
>+					case IResource.PROJECT :
>+						return getExplicitEncoding(parent);
>+					default :
>+						// don't consider workspace encoding
>+						return null;
>+				}
>+			}
>+		}
>+		return encoding;
> 	}
> 
> 	private String join(ProjectFolder[] folders) {
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java,v
>retrieving revision 1.15
>diff -u -r1.15 JavaAttributeWizardPage.java
>--- src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java	26 Jan 2009 17:40:33 -0000	1.15
>+++ src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java	22 Apr 2010 20:39:19 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 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
>@@ -162,18 +162,19 @@
> 			}
> 			//			superclass and interface
> 			if (attInfo == null) {
>+				initialValues.interfaceName = "org.osgi.framework.BundleActivator"; //$NON-NLS-1$
>+				initialValues.interfaceType = findTypeForName(initialValues.interfaceName);
> 				IEclipsePreferences prefs = new ProjectScope(project).getNode(PDECore.PLUGIN_ID);
> 				if (prefs != null && !prefs.getBoolean(ICoreConstants.EXTENSIONS_PROPERTY, true)) {
>-					initialValues.interfaceName = "org.osgi.framework.BundleActivator"; //$NON-NLS-1$
>-					initialValues.interfaceType = findTypeForName(initialValues.interfaceName);
> 					return;
> 				}
>-				initialValues.superClassName = "org.eclipse.core.runtime.Plugin"; //$NON-NLS-1$
> 				if (model != null) {
> 					IPluginImport[] imports = model.getPluginBase().getImports();
> 					for (int i = 0; i < imports.length; i++) {
> 						if (imports[i].getId().equals("org.eclipse.ui")) { //$NON-NLS-1$
> 							initialValues.superClassName = "org.eclipse.ui.plugin.AbstractUIPlugin"; //$NON-NLS-1$
>+							initialValues.interfaceName = null;
>+							initialValues.interfaceType = null;
> 							break;
> 						}
> 					}
>Index: src/org/eclipse/pde/internal/ui/preferences/PDECompilersConfigurationBlock.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PDECompilersConfigurationBlock.java,v
>retrieving revision 1.16
>diff -u -r1.16 PDECompilersConfigurationBlock.java
>--- src/org/eclipse/pde/internal/ui/preferences/PDECompilersConfigurationBlock.java	22 Apr 2010 00:31:15 -0000	1.16
>+++ src/org/eclipse/pde/internal/ui/preferences/PDECompilersConfigurationBlock.java	22 Apr 2010 20:39:19 -0000
>@@ -11,8 +11,6 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ui.preferences;
> 
>-import org.eclipse.pde.internal.ui.PDEUIMessages;
>-
> import com.ibm.icu.text.MessageFormat;
> import java.util.*;
> import java.util.List;
>@@ -215,6 +213,7 @@
> 	private static final Key KEY_P_BUILD_BIN_INCLUDES = getPDEPrefKey(CompilerFlags.P_BUILD_BIN_INCLUDES);
> 	private static final Key KEY_P_BUILD_JAVA_COMPLIANCE = getPDEPrefKey(CompilerFlags.P_BUILD_JAVA_COMPLIANCE);
> 	private static final Key KEY_P_BUILD_JAVA_COMPILER = getPDEPrefKey(CompilerFlags.P_BUILD_JAVA_COMPILER);
>+	private static final Key KEY_P_BUILD_ENCODINGS = getPDEPrefKey(CompilerFlags.P_BUILD_ENCODINGS);
> 	private static final Key KEY_P_BUILD = getPDEPrefKey(CompilerFlags.P_BUILD);
> 
> 	// versioning
>@@ -228,7 +227,7 @@
> 
> 	private static String[] SEVERITIES = {PDEUIMessages.PDECompilersConfigurationBlock_error, PDEUIMessages.PDECompilersConfigurationBlock_warning, PDEUIMessages.PDECompilersConfigurationBlock_ignore};
> 
>-	private static Key[] fgAllKeys = {KEY_F_UNRESOLVED_FEATURES, KEY_F_UNRESOLVED_PLUGINS, KEY_P_BUILD, KEY_P_BUILD_MISSING_OUTPUT, KEY_P_BUILD_SOURCE_LIBRARY, KEY_P_BUILD_OUTPUT_LIBRARY, KEY_P_BUILD_SRC_INCLUDES, KEY_P_BUILD_BIN_INCLUDES, KEY_P_BUILD_JAVA_COMPLIANCE, KEY_P_BUILD_JAVA_COMPILER, KEY_P_INTERNAL, KEY_P_DEPRECATED, KEY_P_DISCOURAGED_CLASS, KEY_P_INCOMPATIBLE_ENV, KEY_P_MISSING_EXPORT_PKGS, KEY_P_NO_REQUIRED_ATT, KEY_P_NOT_EXTERNALIZED, KEY_P_UNKNOWN_ATTRIBUTE, KEY_P_UNKNOWN_CLASS, KEY_P_UNKNOWN_ELEMENT, KEY_P_UNKNOWN_IDENTIFIER, KEY_P_UNKNOWN_RESOURCE, KEY_P_UNRESOLVED_EX_POINTS, KEY_P_UNRESOLVED_IMPORTS, KEY_P_VERSION_EXP_PKG, KEY_P_VERSION_IMP_PKG, KEY_P_VERSION_REQ_BUNDLE, KEY_S_CREATE_DOCS, KEY_S_DOC_FOLDER, KEY_S_OPEN_TAGS};
>+	private static Key[] fgAllKeys = {KEY_F_UNRESOLVED_FEATURES, KEY_F_UNRESOLVED_PLUGINS, KEY_P_BUILD, KEY_P_BUILD_MISSING_OUTPUT, KEY_P_BUILD_SOURCE_LIBRARY, KEY_P_BUILD_OUTPUT_LIBRARY, KEY_P_BUILD_SRC_INCLUDES, KEY_P_BUILD_BIN_INCLUDES, KEY_P_BUILD_JAVA_COMPLIANCE, KEY_P_BUILD_JAVA_COMPILER, KEY_P_BUILD_ENCODINGS, KEY_P_INTERNAL, KEY_P_DEPRECATED, KEY_P_DISCOURAGED_CLASS, KEY_P_INCOMPATIBLE_ENV, KEY_P_MISSING_EXPORT_PKGS, KEY_P_NO_REQUIRED_ATT, KEY_P_NOT_EXTERNALIZED, KEY_P_UNKNOWN_ATTRIBUTE, KEY_P_UNKNOWN_CLASS, KEY_P_UNKNOWN_ELEMENT, KEY_P_UNKNOWN_IDENTIFIER, KEY_P_UNKNOWN_RESOURCE, KEY_P_UNRESOLVED_EX_POINTS, KEY_P_UNRESOLVED_IMPORTS, KEY_P_VERSION_EXP_PKG, KEY_P_VERSION_IMP_PKG, KEY_P_VERSION_REQ_BUNDLE, KEY_S_CREATE_DOCS, KEY_S_DOC_FOLDER, KEY_S_OPEN_TAGS};
> 
> 	/**
> 	 * Constant representing the {@link IDialogSettings} section for this block
>@@ -521,7 +520,7 @@
> 				initializeComboControls(client, new String[] {PDEUIMessages.compilers_p_no_required_att, PDEUIMessages.CompilersConfigurationTab_incompatEnv, PDEUIMessages.compilers_p_exported_pkgs}, new Key[] {KEY_P_NO_REQUIRED_ATT, KEY_P_INCOMPATIBLE_ENV, KEY_P_MISSING_EXPORT_PKGS}, CompilerFlags.PLUGIN_FLAGS);
> 				//build.properties
> 				client = createExpansibleComposite(sbody, PDEUIMessages.PDECompilersConfigurationBlock_build);
>-				initializeComboControls(client, new String[] {PDEUIMessages.PDECompilersConfigurationBlock_1, PDEUIMessages.PDECompilersConfigurationBlock_2, PDEUIMessages.PDECompilersConfigurationBlock_0, PDEUIMessages.PDECompilersConfigurationBlock_3, PDEUIMessages.PDECompilersConfigurationBlock_4, PDEUIMessages.PDECompilersConfigurationBlock_5, PDEUIMessages.PDECompilersConfigurationBlock_6, PDEUIMessages.CompilersConfigurationTab_buildPropertiesErrors}, new Key[] {KEY_P_BUILD_SOURCE_LIBRARY, KEY_P_BUILD_OUTPUT_LIBRARY, KEY_P_BUILD_MISSING_OUTPUT, KEY_P_BUILD_BIN_INCLUDES, KEY_P_BUILD_SRC_INCLUDES, KEY_P_BUILD_JAVA_COMPLIANCE, KEY_P_BUILD_JAVA_COMPILER, KEY_P_BUILD}, CompilerFlags.PLUGIN_FLAGS);
>+				initializeComboControls(client, new String[] {PDEUIMessages.PDECompilersConfigurationBlock_1, PDEUIMessages.PDECompilersConfigurationBlock_2, PDEUIMessages.PDECompilersConfigurationBlock_0, PDEUIMessages.PDECompilersConfigurationBlock_3, PDEUIMessages.PDECompilersConfigurationBlock_4, PDEUIMessages.PDECompilersConfigurationBlock_5, PDEUIMessages.PDECompilersConfigurationBlock_6, "Missing or incorrect file encodings", PDEUIMessages.CompilersConfigurationTab_buildPropertiesErrors}, new Key[] {KEY_P_BUILD_SOURCE_LIBRARY, KEY_P_BUILD_OUTPUT_LIBRARY, KEY_P_BUILD_MISSING_OUTPUT, KEY_P_BUILD_BIN_INCLUDES, KEY_P_BUILD_SRC_INCLUDES, KEY_P_BUILD_JAVA_COMPLIANCE, KEY_P_BUILD_JAVA_COMPILER, KEY_P_BUILD_ENCODINGS, KEY_P_BUILD}, CompilerFlags.PLUGIN_FLAGS);
> 				// Versioning
> 				client = createExpansibleComposite(sbody, PDEUIMessages.PDECompilersConfigurationBlock_versioning);
> 				initializeComboControls(client, new String[] {PDEUIMessages.compilers_p_missing_require_bundle, PDEUIMessages.compilers_p_missing_exp_pkg, PDEUIMessages.compilers_p_missing_imp_pkg}, new Key[] {KEY_P_VERSION_REQ_BUNDLE, KEY_P_VERSION_EXP_PKG, KEY_P_VERSION_IMP_PKG}, CompilerFlags.PLUGIN_FLAGS);
>Index: src/org/eclipse/pde/internal/ui/wizards/plugin/PluginClassCodeGenerator.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginClassCodeGenerator.java,v
>retrieving revision 1.36
>diff -u -r1.36 PluginClassCodeGenerator.java
>--- src/org/eclipse/pde/internal/ui/wizards/plugin/PluginClassCodeGenerator.java	29 Jul 2009 07:57:21 -0000	1.36
>+++ src/org/eclipse/pde/internal/ui/wizards/plugin/PluginClassCodeGenerator.java	22 Apr 2010 20:39:19 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 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
>@@ -20,6 +20,7 @@
> import org.eclipse.pde.internal.build.IPDEBuildConstants;
> import org.eclipse.pde.internal.core.util.CoreUtility;
> import org.eclipse.pde.ui.templates.PluginReference;
>+
> public class PluginClassCodeGenerator {
> 	private PluginFieldData fPluginData;
> 	private IProject fProject;
>@@ -77,23 +78,23 @@
> 				writer.println("import org.eclipse.jface.resource.ImageDescriptor;"); //$NON-NLS-1$
> 			writer.println("import org.eclipse.ui.plugin.AbstractUIPlugin;"); //$NON-NLS-1$
> 		} else {
>-			writer.println("import org.eclipse.core.runtime.Plugin;"); //$NON-NLS-1$
>+			writer.println("import org.osgi.framework.BundleActivator;"); //$NON-NLS-1$
> 		}
> 		writer.println("import org.osgi.framework.BundleContext;"); //$NON-NLS-1$
> 		writer.println();
> 		writer.println("/**"); //$NON-NLS-1$
>-		writer.println(" * The activator class controls the plug-in life cycle"); //$NON-NLS-1$
>+		writer.println(" * The activator class controls the bundle life cycle"); //$NON-NLS-1$
> 		writer.println(" */"); //$NON-NLS-1$
> 		if (fPluginData.isUIPlugin())
> 			writer.println("public class " + className + " extends AbstractUIPlugin {"); //$NON-NLS-1$ //$NON-NLS-2$
> 		else
>-			writer.println("public class " + className + " extends Plugin {"); //$NON-NLS-1$ //$NON-NLS-2$
>+			writer.println("public class " + className + " implements BundleActivator {"); //$NON-NLS-1$ //$NON-NLS-2$
> 		writer.println();
>-		writer.println("\t// The plug-in ID"); //$NON-NLS-1$
>-		writer.println("\tpublic static final String PLUGIN_ID = \"" + fPluginData.getId() + "\"; //$NON-NLS-1$"); //$NON-NLS-1$ //$NON-NLS-2$
>+		writer.println("\t// The bundle ID"); //$NON-NLS-1$
>+		writer.println("\tpublic static final String BUNDLE_ID = \"" + fPluginData.getId() + "\"; //$NON-NLS-1$"); //$NON-NLS-1$ //$NON-NLS-2$
> 		writer.println();
> 		writer.println("\t// The shared instance"); //$NON-NLS-1$
>-		writer.println("\tprivate static " + className + " plugin;"); //$NON-NLS-1$ //$NON-NLS-2$
>+		writer.println("\tprivate static " + className + " activator;"); //$NON-NLS-1$ //$NON-NLS-2$
> 		writer.println("\t"); //$NON-NLS-1$
> 		writer.println("\t/**"); //$NON-NLS-1$
> 		writer.println("\t * The constructor"); //$NON-NLS-1$
>@@ -110,8 +111,9 @@
> 			writer.println("\t * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)"); //$NON-NLS-1$
> 		writer.println("\t */"); //$NON-NLS-1$
> 		writer.println("\tpublic void start(BundleContext context) throws Exception {"); //$NON-NLS-1$
>-		writer.println("\t\tsuper.start(context);"); //$NON-NLS-1$
>-		writer.println("\t\tplugin = this;"); //$NON-NLS-1$
>+		if (fPluginData.isUIPlugin())
>+			writer.println("\t\tsuper.start(context);"); //$NON-NLS-1$
>+		writer.println("\t\tactivator = this;"); //$NON-NLS-1$
> 		writer.println("\t}"); //$NON-NLS-1$
> 		writer.println();
> 
>@@ -123,8 +125,9 @@
> 			writer.println("\t * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)"); //$NON-NLS-1$
> 		writer.println("\t */"); //$NON-NLS-1$
> 		writer.println("\tpublic void stop(BundleContext context) throws Exception {"); //$NON-NLS-1$
>-		writer.println("\t\tplugin = null;"); //$NON-NLS-1$
>-		writer.println("\t\tsuper.stop(context);"); //$NON-NLS-1$
>+		writer.println("\t\tactivator = null;"); //$NON-NLS-1$
>+		if (fPluginData.isUIPlugin())
>+			writer.println("\t\tsuper.stop(context);"); //$NON-NLS-1$
> 		writer.println("\t}"); //$NON-NLS-1$
> 		writer.println();
> 
>@@ -134,19 +137,19 @@
> 		writer.println("\t * @return the shared instance"); //$NON-NLS-1$
> 		writer.println("\t */"); //$NON-NLS-1$
> 		writer.println("\tpublic static " + className + " getDefault() {"); //$NON-NLS-1$ //$NON-NLS-2$
>-		writer.println("\t\treturn plugin;"); //$NON-NLS-1$
>+		writer.println("\t\treturn activator;"); //$NON-NLS-1$
> 		writer.println("\t}"); //$NON-NLS-1$
> 		writer.println();
> 		if (fPluginData.isUIPlugin() && fGenerateTemplate) {
> 			writer.println("\t/**"); //$NON-NLS-1$
> 			writer.println("\t * Returns an image descriptor for the image file at the given"); //$NON-NLS-1$
>-			writer.println("\t * plug-in relative path"); //$NON-NLS-1$
>+			writer.println("\t * bundle relative path"); //$NON-NLS-1$
> 			writer.println("\t *"); //$NON-NLS-1$
> 			writer.println("\t * @param path the path"); //$NON-NLS-1$
> 			writer.println("\t * @return the image descriptor"); //$NON-NLS-1$
> 			writer.println("\t */"); //$NON-NLS-1$
> 			writer.println("\tpublic static ImageDescriptor getImageDescriptor(String path) {"); //$NON-NLS-1$
>-			writer.println("\t\treturn imageDescriptorFromPlugin(PLUGIN_ID, path);"); //$NON-NLS-1$ 
>+			writer.println("\t\treturn imageDescriptorFromPlugin(BUNDLE_ID, path);"); //$NON-NLS-1$ 
> 			writer.println("\t}"); //$NON-NLS-1$
> 		}
> 		writer.println("}"); //$NON-NLS-1$

Actions: View | Diff

Attachments on bug 155015: 121890 | 165625 | 165674 | 165764 | 165850 | 165959