Fixed bug 381165: [relengtool] Disable 'Skip over XML files' preferencev20120625-085244I20120625-2200

3 files changed, 26 insertions, 14 deletions

diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/SourceFile.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/SourceFile.java
index f5c6f750..035bad61 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/SourceFile.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/SourceFile.java
@@ -64,8 +64,9 @@ public abstract class SourceFile {
 	            return new BatFile(file);
 			} else if (extension.equals("js")) { //$NON-NLS-1$
 	            return new JavaScriptFile(file);
-//			} else if (extension.equals("xml")) { //$NON-NLS-1$
-//	            return new XmlFile(file);
+			} else if (extension.equals("xml")) { //$NON-NLS-1$
+				if (XmlFile.BUGS_FIXED)
+					return new XmlFile(file);
 			}
         }
 		return null;
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/XmlFile.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/XmlFile.java
index eefa5a1f..4803712d 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/XmlFile.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/XmlFile.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Gunnar Wagenknecht and others.
+ * Copyright (c) 2008, 2012 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
@@ -22,6 +22,9 @@ import org.eclipse.jface.text.IDocument;
  * XML File
  */
 public class XmlFile extends SourceFile {
+	
+	// See https://bugs.eclipse.org/381147
+	public static final boolean BUGS_FIXED= false; 
 
 	public XmlFile(IFile file) {
 		super(file);
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/CopyrightPreferencePage.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/CopyrightPreferencePage.java
index e3fd0c6f..5589367b 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/CopyrightPreferencePage.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/CopyrightPreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
+ * Copyright (c) 2004, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@ import org.osgi.service.prefs.BackingStoreException;
 
 import org.eclipse.releng.tools.Messages;
 import org.eclipse.releng.tools.RelEngPlugin;
+import org.eclipse.releng.tools.XmlFile;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
@@ -134,13 +135,15 @@ public class CopyrightPreferencePage extends PreferencePage implements IWorkbenc
 		data = new GridData();
 		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);
+
+		if (XmlFile.BUGS_FIXED) {
+			// 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)
@@ -258,7 +261,8 @@ public class CopyrightPreferencePage extends PreferencePage implements IWorkbenc
 		// 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));
-		fIgnoreXml.setSelection(store.getBoolean(RelEngCopyrightConstants.IGNORE_XML_KEY));
+		if (XmlFile.BUGS_FIXED)
+			fIgnoreXml.setSelection(store.getBoolean(RelEngCopyrightConstants.IGNORE_XML_KEY));
 	}
 	
 	/**
@@ -330,7 +334,9 @@ public class CopyrightPreferencePage extends PreferencePage implements IWorkbenc
 		// 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));
+		
+		if (XmlFile.BUGS_FIXED)
+			fIgnoreXml.setSelection(getPreferenceStore().getDefaultBoolean(RelEngCopyrightConstants.IGNORE_XML_KEY));
 		
 		super.performDefaults();
 	}
@@ -349,7 +355,9 @@ public class CopyrightPreferencePage extends PreferencePage implements IWorkbenc
 		// 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());
+		
+		if (XmlFile.BUGS_FIXED)
+			store.setValue(RelEngCopyrightConstants.IGNORE_XML_KEY, fIgnoreXml.getSelection());
 		
 		try {
 			InstanceScope.INSTANCE.getNode(RelEngPlugin.ID).flush();