Attachment 89116 Details for Bug 215224 – patch to fix inconsistent line endings plus support for xml files

[patch] patch to fix inconsistent line endings plus support for xml files

AdvancedFixCopyright_line-endings_plus-xml.patch (text/plain), 12.50 KB, created by Gunnar Wagenknecht

on 2008-02-07 05:24:54 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Gunnar Wagenknecht

Created: 2008-02-07 05:24:54 EST

Size: 12.50 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.releng.tools
>Index: src/org/eclipse/releng/tools/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/messages.properties,v
>retrieving revision 1.11
>diff -u -r1.11 messages.properties
>--- src/org/eclipse/releng/tools/messages.properties	2 Nov 2007 20:34:06 -0000	1.11
>+++ src/org/eclipse/releng/tools/messages.properties	7 Feb 2008 10:24:12 -0000
>@@ -77,6 +77,7 @@
> CopyrightPreferencePage.6=Default year must be a positive number
> CopyrightPreferencePage.7=Default revision year:
> CopyrightPreferencePage.8=Always use default revision year instead of CVS lookup
>+CopyrightPreferencePage.9=Skip over XML files
> BuildNotesPage.2=Update Build Notes File
> BuildNotesPage.3=Build Notes File:
> BuildNotesPage.5=Invalid file extension.
>Index: src/org/eclipse/releng/tools/AdvancedCopyrightComment.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedCopyrightComment.java,v
>retrieving revision 1.2
>diff -u -r1.2 AdvancedCopyrightComment.java
>--- src/org/eclipse/releng/tools/AdvancedCopyrightComment.java	24 Aug 2006 15:24:34 -0000	1.2
>+++ src/org/eclipse/releng/tools/AdvancedCopyrightComment.java	7 Feb 2008 10:24:12 -0000
>@@ -26,6 +26,7 @@
>     public static final int UNKNOWN_COMMENT = -1;
>     public static final int JAVA_COMMENT = 1;
>     public static final int PROPERTIES_COMMENT = 2;
>+    public static final int XML_COMMENT = 3;
> 
>     private int commentStyle = 0;
>     private int creationYear = -1;
>@@ -59,40 +60,49 @@
>     }
> 
>     private static String getLinePrefix(int commentStyle) {
>-        switch(commentStyle) {
>-        case JAVA_COMMENT:
>-            return " * ";  //$NON-NLS-1$
>-        case PROPERTIES_COMMENT:
>-            return "# "; //$NON-NLS-1$
>-        default:
>-            return null;
>-        }
>+        switch (commentStyle) {
>+			case JAVA_COMMENT:
>+				return " * "; //$NON-NLS-1$
>+			case PROPERTIES_COMMENT:
>+				return "# "; //$NON-NLS-1$
>+			case XML_COMMENT:
>+				return "    "; //$NON-NLS-1$
>+			default:
>+				return null;
>+		}
> 	}
> 
> 	private void writeCommentStart(PrintWriter writer) {
>-	    switch(commentStyle) {
>-	    case JAVA_COMMENT:
>-			writer.println("/*******************************************************************************"); //$NON-NLS-1$
>-			break;
>-	    case PROPERTIES_COMMENT:
>-		    writer.println("###############################################################################"); //$NON-NLS-1$
>-		    break;
>-	    }
>+	    switch (commentStyle) {
>+			case JAVA_COMMENT:
>+				writer.println("/*******************************************************************************"); //$NON-NLS-1$
>+				break;
>+			case PROPERTIES_COMMENT:
>+				writer.println("###############################################################################"); //$NON-NLS-1$
>+				break;
>+			case XML_COMMENT:
>+				writer.println(""); //$NON-NLS-1$
>+				break;
>+		}
> 	}
> 	
> 	/**
> 	 * Get the copyright tool preference store
>+	 * 
> 	 * @return
> 	 */
>     private static IPreferenceStore getPreferenceStore() {
>@@ -181,7 +191,7 @@
> 				// just write out the line
> 				if (NEW_LINE.equals(currentLine)) {
> 					// handle empty lines
>-					writer.print(linePrefix + currentLine);
>+					writer.println(linePrefix);
> 				} else {
> 					writer.println(linePrefix + currentLine);
> 				}
>Index: src/org/eclipse/releng/tools/AdvancedFixCopyrightAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedFixCopyrightAction.java,v
>retrieving revision 1.5
>diff -u -r1.5 AdvancedFixCopyrightAction.java
>--- src/org/eclipse/releng/tools/AdvancedFixCopyrightAction.java	10 Apr 2007 15:54:52 -0000	1.5
>+++ src/org/eclipse/releng/tools/AdvancedFixCopyrightAction.java	7 Feb 2008 10:24:12 -0000
>@@ -312,6 +312,13 @@
>         	}
>         	fileType = AdvancedCopyrightComment.PROPERTIES_COMMENT;
>             aSourceFile = new PropertiesFile(file);
>+        } else if (extension.equals("xml")) { //$NON-NLS-1$
>+        	// if stop processing if ignoring xml files
>+        	if (RelEngPlugin.getDefault().getPreferenceStore().getBoolean(RelEngCopyrightConstants.IGNORE_XML_KEY)) {
>+        		return;
>+        	}
>+        	fileType = AdvancedCopyrightComment.XML_COMMENT;
>+            aSourceFile = new XmlFile(file);
>         } else
>             return;
> 
>Index: src/org/eclipse/releng/tools/preferences/RelEngCopyrightConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/RelEngCopyrightConstants.java,v
>retrieving revision 1.1
>diff -u -r1.1 RelEngCopyrightConstants.java
>--- src/org/eclipse/releng/tools/preferences/RelEngCopyrightConstants.java	1 Dec 2005 20:47:50 -0000	1.1
>+++ src/org/eclipse/releng/tools/preferences/RelEngCopyrightConstants.java	7 Feb 2008 10:24:12 -0000
>@@ -22,4 +22,5 @@
> //	public final static String FIX_UP_EXISTING_KEY = "org.eclipse.releng.tools.fixUpExisting"; //$NON-NLS-1$
> 	public final static String REPLACE_ALL_EXISTING_KEY = "org.eclipse.releng.tools.replaceAllExisting"; //$NON-NLS-1$
> 	public final static String IGNORE_PROPERTIES_KEY = "org.eclipse.releng.tools.ignoreProperties"; //$NON-NLS-1$
>+	public final static String IGNORE_XML_KEY = "org.eclipse.releng.tools.ignoreXml"; //$NON-NLS-1$
> }
>Index: src/org/eclipse/releng/tools/preferences/RelEngPreferenceInitializer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/RelEngPreferenceInitializer.java,v
>retrieving revision 1.4
>diff -u -r1.4 RelEngPreferenceInitializer.java
>--- src/org/eclipse/releng/tools/preferences/RelEngPreferenceInitializer.java	10 Apr 2007 15:52:00 -0000	1.4
>+++ src/org/eclipse/releng/tools/preferences/RelEngPreferenceInitializer.java	7 Feb 2008 10:24:12 -0000
>@@ -34,6 +34,7 @@
> //        store.setDefault(RelEngCopyrightConstants.FIX_UP_EXISTING_KEY, false);
>         store.setDefault(RelEngCopyrightConstants.REPLACE_ALL_EXISTING_KEY, false);
>         store.setDefault(RelEngCopyrightConstants.IGNORE_PROPERTIES_KEY, false);
>+        store.setDefault(RelEngCopyrightConstants.IGNORE_XML_KEY, false);
> 	}
> 
> }
>Index: src/org/eclipse/releng/tools/preferences/CopyrightPreferencePage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/CopyrightPreferencePage.java,v
>retrieving revision 1.3
>diff -u -r1.3 CopyrightPreferencePage.java
>--- src/org/eclipse/releng/tools/preferences/CopyrightPreferencePage.java	13 Apr 2007 12:47:23 -0000	1.3
>+++ src/org/eclipse/releng/tools/preferences/CopyrightPreferencePage.java	7 Feb 2008 10:24:12 -0000
>@@ -52,6 +52,7 @@
> 	// disable fix up existing copyright till it works better
> //	private Button fFixExisting;
> 	private Button fIgnoreProperties;
>+	private Button fIgnoreXml;
> 	
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
>@@ -125,6 +126,13 @@
> 		data.horizontalSpan = 2;
> 		fIgnoreProperties.setLayoutData(data);
> 		
>+		// ignore xml files
>+		fIgnoreXml = new Button(fComposite, SWT.CHECK);
>+		fIgnoreXml.setText(Messages.getString("CopyrightPreferencePage.9")); //$NON-NLS-1$
>+		data = new GridData();
>+		data.horizontalSpan = 2;
>+		fIgnoreXml.setLayoutData(data);
>+
> 		KeyListener listener1 = new KeyAdapter() {
> 			/* (non-Javadoc)
> 			 * @see org.eclipse.swt.events.KeyAdapter#keyReleased(org.eclipse.swt.events.KeyEvent)
>@@ -240,7 +248,8 @@
> 		fReplaceAllExisting.setSelection(store.getBoolean(RelEngCopyrightConstants.REPLACE_ALL_EXISTING_KEY));
> 		// disable fix up existing copyright till it works better
> //		handleReplaceAllEnabled(fReplaceAllExisting.getSelection(), store.getBoolean(RelEngCopyrightConstants.FIX_UP_EXISTING_KEY));
>-		fIgnoreProperties.setSelection(store.getBoolean(RelEngCopyrightConstants.IGNORE_PROPERTIES_KEY));		
>+		fIgnoreProperties.setSelection(store.getBoolean(RelEngCopyrightConstants.IGNORE_PROPERTIES_KEY));
>+		fIgnoreXml.setSelection(store.getBoolean(RelEngCopyrightConstants.IGNORE_XML_KEY));
> 	}
> 	
> 	/**
>@@ -312,6 +321,7 @@
> 		// disable fix up existing copyright till it works better
> //		handleReplaceAllEnabled(fReplaceAllExisting.getSelection(), getPreferenceStore().getDefaultBoolean(RelEngCopyrightConstants.FIX_UP_EXISTING_KEY));
> 		fIgnoreProperties.setSelection(getPreferenceStore().getDefaultBoolean(RelEngCopyrightConstants.IGNORE_PROPERTIES_KEY));
>+		fIgnoreXml.setSelection(getPreferenceStore().getDefaultBoolean(RelEngCopyrightConstants.IGNORE_XML_KEY));
> 		
> 		super.performDefaults();
> 	}
>@@ -330,6 +340,7 @@
> 		// disable fix up existing copyright till it works better
> //		store.setValue(RelEngCopyrightConstants.FIX_UP_EXISTING_KEY, fFixExisting.getSelection());
> 		store.setValue(RelEngCopyrightConstants.IGNORE_PROPERTIES_KEY, fIgnoreProperties.getSelection());
>+		store.setValue(RelEngCopyrightConstants.IGNORE_XML_KEY, fIgnoreXml.getSelection());
> 		
> 		RelEngPlugin.getDefault().savePluginPreferences();
> 		
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/plugin.xml,v
>retrieving revision 1.11
>diff -u -r1.11 plugin.xml
>--- plugin.xml	2 Nov 2007 20:34:06 -0000	1.11
>+++ plugin.xml	7 Feb 2008 10:24:12 -0000
>@@ -89,8 +89,9 @@
>          </action>
>       </objectContribution>
>       <objectContribution
>-            objectClass="org.eclipse.core.resources.IResource"
>-            id="org.eclipse.releng.internal.tools.AdvancedCopyrightContribution">
>+            adaptable="true"
>+            id="org.eclipse.releng.internal.tools.AdvancedCopyrightContribution"
>+            objectClass="org.eclipse.core.resources.IResource">
>          <action
>                label="Advanced Fix Copyrights"
>                class="org.eclipse.releng.tools.AdvancedFixCopyrightAction"
>Index: src/org/eclipse/releng/tools/XmlFile.java
>===================================================================
>RCS file: src/org/eclipse/releng/tools/XmlFile.java
>diff -N src/org/eclipse/releng/tools/XmlFile.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/releng/tools/XmlFile.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,46 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 Gunnar Wagenknecht 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:
>+ *     Gunnar Wagenknecht - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.releng.tools;
>+
>+import org.eclipse.core.resources.IFile;
>+
>+/**
>+ * XML File
>+ */
>+public class XmlFile extends SourceFile {
>+
>+	/**
>+	 * Creates a new instance
>+	 * @param file
>+	 */
>+	public XmlFile(IFile file) {
>+		super(file);
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see Test.popup.actions.SourceFile#getCommentStart()
>+	 */
>+	public String getCommentStart() {
>+		return "";
>+	}
>+
>+}

Flags:

daniel_megert: review-

Actions: View | Diff

Attachments on bug 215224: 86834 | 89116 | 216562