Attachment 216560 Details for Bug 381165 – Fix

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

[patch] Fix

eclipse.platform.releng.patch (text/plain), 5.22 KB, created by Dani Megert

on 2012-05-31 06:58:19 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2012-05-31 06:58:19 EDT

Size: 5.22 KB

patch

obsolete

>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 9e115bc..59f4594 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
>@@ -59,8 +59,9 @@
> 	            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 eefa5a1..4803712 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 @@
>  * 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 e3fd0c6..5589367 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.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 @@
> 		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 @@
> 		// 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 @@
> 		// 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 @@
> 		// 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();

Actions: View | Diff

Attachments on bug 381165: 216560