Attachment #188642 for bug #300670

View | Details | Raw Unified | Return to bug 300670
Collapse All | Expand All

Lines 1-5 Link Here

(-)src/org/eclipse/wst/jsdt/core/tests/compiler/parser/SourceMethod.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 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 10-15 Link Here
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.wst.jsdt.core.tests.compiler.parser;	11	package org.eclipse.wst.jsdt.core.tests.compiler.parser;
12		12
		13	import org.eclipse.wst.jsdt.core.compiler.CharOperation;
13	import org.eclipse.wst.jsdt.internal.compiler.classfmt.ClassFileConstants;	14	import org.eclipse.wst.jsdt.internal.compiler.classfmt.ClassFileConstants;
14	import org.eclipse.wst.jsdt.internal.compiler.env.ISourceMethod;	15	import org.eclipse.wst.jsdt.internal.compiler.env.ISourceMethod;
15		16
Lines 169-175 Link Here
169	buffer.append("function ").append(selector).append("(");	170	buffer.append("function ").append(selector).append("(");
170	if (argumentTypeNames != null) {	171	if (argumentTypeNames != null) {
171	for (int i = 0, max = argumentTypeNames.length; i < max; i++) {	172	for (int i = 0, max = argumentTypeNames.length; i < max; i++) {
172	buffer.append(argumentTypeNames[i]).append(" ").append(	173	buffer.append(argumentTypeNames[i]!=null?argumentTypeNames[i]:CharOperation.NO_CHAR).append(" ").append(
173	argumentNames[i]).append(	174	argumentNames[i]).append(
174	", ");	175	", ");
175	}	176	}

Lines 1-5 Link Here

(-)src/org/eclipse/wst/jsdt/internal/corext/javadoc/JavaDocLocations.java (-12 / +27 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 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 43-58 Link Here
43	import org.eclipse.jface.preference.IPreferenceStore;	43	import org.eclipse.jface.preference.IPreferenceStore;
44	import org.eclipse.wst.jsdt.core.Flags;	44	import org.eclipse.wst.jsdt.core.Flags;
45	import org.eclipse.wst.jsdt.core.IClassFile;	45	import org.eclipse.wst.jsdt.core.IClassFile;
46	import org.eclipse.wst.jsdt.core.IIncludePathAttribute;
47	import org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer;
48	import org.eclipse.wst.jsdt.core.IIncludePathEntry;
49	import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
50	import org.eclipse.wst.jsdt.core.IField;	46	import org.eclipse.wst.jsdt.core.IField;
		47	import org.eclipse.wst.jsdt.core.IFunction;
51	import org.eclipse.wst.jsdt.core.IImportDeclaration;	48	import org.eclipse.wst.jsdt.core.IImportDeclaration;
		49	import org.eclipse.wst.jsdt.core.IIncludePathAttribute;
		50	import org.eclipse.wst.jsdt.core.IIncludePathEntry;
52	import org.eclipse.wst.jsdt.core.IJavaScriptElement;	51	import org.eclipse.wst.jsdt.core.IJavaScriptElement;
53	import org.eclipse.wst.jsdt.core.IJavaScriptProject;	52	import org.eclipse.wst.jsdt.core.IJavaScriptProject;
		53	import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
		54	import org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer;
54	import org.eclipse.wst.jsdt.core.IMember;	55	import org.eclipse.wst.jsdt.core.IMember;
55	import org.eclipse.wst.jsdt.core.IFunction;
56	import org.eclipse.wst.jsdt.core.IPackageFragment;	56	import org.eclipse.wst.jsdt.core.IPackageFragment;
57	import org.eclipse.wst.jsdt.core.IPackageFragmentRoot;	57	import org.eclipse.wst.jsdt.core.IPackageFragmentRoot;
58	import org.eclipse.wst.jsdt.core.IType;	58	import org.eclipse.wst.jsdt.core.IType;
Lines 77-82 Link Here
77		77
78	public class JavaDocLocations {	78	public class JavaDocLocations {
79		79
		80	/**
		81	* Type "name" for globals
		82	*/
		83	private static final String GLOBAL_JSDOC_TYPE = "_global_"; //$NON-NLS-1$
		84
		85	/**
		86	* Additional prefixes to the location, appended to the container's recorded location
		87	*/
		88	private static final String JSDOC_PREFIX_V2 = "symbols/"; //$NON-NLS-1$
		89
80	public static final String ARCHIVE_PREFIX= "jar:"; //$NON-NLS-1$	90	public static final String ARCHIVE_PREFIX= "jar:"; //$NON-NLS-1$
81	private static final String PREF_JAVADOCLOCATIONS= "org.eclipse.wst.jsdt.ui.javadoclocations"; //$NON-NLS-1$	91	private static final String PREF_JAVADOCLOCATIONS= "org.eclipse.wst.jsdt.ui.javadoclocations"; //$NON-NLS-1$
82	public static final String PREF_JAVADOCLOCATIONS_MIGRATED= "org.eclipse.wst.jsdt.ui.javadoclocations.migrated"; //$NON-NLS-1$	92	public static final String PREF_JAVADOCLOCATIONS_MIGRATED= "org.eclipse.wst.jsdt.ui.javadoclocations.migrated"; //$NON-NLS-1$
Lines 531-542 Link Here
531	}	541	}
532		542
533	private static void appendTypePath(IType type, StringBuffer buf) {	543	private static void appendTypePath(IType type, StringBuffer buf) {
534	IPackageFragment pack= type.getPackageFragment();	544	if (type != null) {
535	String packPath= pack.getElementName().replace('.', '/');	545	IPackageFragment pack = type.getPackageFragment();
536	String typePath= JavaModelUtil.getTypeQualifiedName(type);	546	String packPath = pack.getElementName().replace('.', '/');
537	buf.append(packPath);	547	String typePath = JavaModelUtil.getTypeQualifiedName(type);
538	buf.append('/');	548	buf.append(packPath);
539	buf.append(typePath);	549	buf.append('/');
		550	buf.append(typePath);
		551	}
		552	else {
		553	buf.append(GLOBAL_JSDOC_TYPE);
		554	}
540	buf.append(".html"); //$NON-NLS-1$	555	buf.append(".html"); //$NON-NLS-1$
541	}	556	}
542		557

Return to bug 300670