Attachment 165534 Details for Bug 309787 – Fix

[patch] Fix

patch.txt (text/plain), 5.45 KB, created by Dani Megert

on 2010-04-21 03:38:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2010-04-21 03:38:01 EDT

Size: 5.45 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/core/ToolFactory.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ToolFactory.java,v
>retrieving revision 1.80
>diff -u -r1.80 ToolFactory.java
>--- model/org/eclipse/jdt/core/ToolFactory.java	1 Mar 2010 17:09:32 -0000	1.80
>+++ model/org/eclipse/jdt/core/ToolFactory.java	21 Apr 2010 07:34:42 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 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
>@@ -86,7 +86,7 @@
> 	 * @return an instance of a code formatter
> 	 * @see ICodeFormatter
> 	 * @see ToolFactory#createDefaultCodeFormatter(Map)
>-	 * @deprecated Use {@link #createCodeFormatter(Map)} instead. Extension point is discontinued
>+	 * @deprecated The extension point has been deprecated, use {@link #createCodeFormatter(Map)} instead.
> 	 */
> 	public static ICodeFormatter createCodeFormatter(){
> 
>@@ -344,9 +344,7 @@
> 	}
> 
> 	/**
>-	 * Create an instance of the built-in code formatter. A code formatter implementation can be contributed via the
>-	 * extension point "org.eclipse.jdt.core.codeFormatter". If unable to find a registered extension, the factory will
>-	 * default to using the default code formatter.
>+	 * Create an instance of the default code formatter.
> 	 *
> 	 * @param options - the options map to use for formatting with the default code formatter. Recognized options
> 	 * 	are documented on <code>JavaCore#getDefaultOptions()</code>. If set to <code>null</code>, then use
>@@ -355,7 +353,7 @@
> 	 * @see ICodeFormatter
> 	 * @see ToolFactory#createCodeFormatter()
> 	 * @see JavaCore#getOptions()
>-	 * @deprecated Use {@link #createCodeFormatter(Map)} instead
>+	 * @deprecated Use {@link #createCodeFormatter(Map)} instead but note the different options
> 	 */
> 	public static ICodeFormatter createDefaultCodeFormatter(Map options){
> 		if (options == null) options = JavaCore.getOptions();
>Index: schema/codeFormatter.exsd
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/schema/codeFormatter.exsd,v
>retrieving revision 1.5
>diff -u -r1.5 codeFormatter.exsd
>--- schema/codeFormatter.exsd	23 Feb 2005 16:32:17 -0000	1.5
>+++ schema/codeFormatter.exsd	21 Apr 2010 07:34:42 -0000
>@@ -1,6 +1,6 @@
> <?xml version='1.0' encoding='UTF-8'?>
> 
>-<schema targetNamespace="org.eclipse.jdt.core">
>+<schema targetNamespace="org.eclipse.jdt.core" xmlns="http://www.w3.org/2001/XMLSchema">
> <annotation>
>       <appInfo>
>          <meta.schema plugin="org.eclipse.jdt.core" id="codeFormatter" name="Code Formatters"/>
>@@ -11,6 +11,11 @@
>    </annotation>
> 
>    <element name="extension">
>+      <annotation>
>+         <appInfo>
>+            <meta.element deprecated="true" />
>+         </appInfo>
>+      </annotation>
>       <complexType>
>          <sequence>
>             <element ref="codeFormatter" minOccurs="0" maxOccurs="unbounded"/>
>@@ -68,44 +73,28 @@
>          <meta.section type="examples"/>
>       </appInfo>
>       <documentation>
>-         Example of an implementation of &lt;code&gt;ICodeFormatter&lt;/code&gt;:  &lt;pre&gt;                                                                       
>-&lt;extension point=&quot;org.eclipse.jdt.core.codeFormatter&quot;&gt;            
>-   &lt;codeFormatter                                                                                              
>-      class=&quot;com.example.MyCodeFormatter&quot;/&gt;                           
>-&lt;/extension&gt;
>+         Example of an implementation of &lt;code&gt;ICodeFormatter&lt;/code&gt;:  &lt;pre&gt;                                                                       
>+&lt;extension point=&quot;org.eclipse.jdt.core.codeFormatter&quot;&gt;            
>+   &lt;codeFormatter                                                                                              
>+      class=&quot;com.example.MyCodeFormatter&quot;/&gt;                           
>+&lt;/extension&gt;
> &lt;/pre&gt;
>       </documentation>
>    </annotation>
> 
>-   <annotation>
>-      <appInfo>
>-         <meta.section type="apiInfo"/>
>-      </appInfo>
>-      <documentation>
>-         
>-      </documentation>
>-   </annotation>
> 
>-   <annotation>
>-      <appInfo>
>-         <meta.section type="implementation"/>
>-      </appInfo>
>-      <documentation>
>-         
>-      </documentation>
>-   </annotation>
> 
>    <annotation>
>       <appInfo>
>          <meta.section type="copyright"/>
>       </appInfo>
>       <documentation>
>-         Copyright (c) 2000, 2004 IBM Corporation and others.&lt;br&gt;
>+         Copyright (c) 2000, 2010 IBM Corporation and others.&lt;br&gt;
> 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 &lt;a
> href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
>-     </documentation>
>+      </documentation>
>    </annotation>
> 
> </schema>

Actions: View | Diff

Attachments on bug 309787: 165534