Attachment #216560 for bug #381165

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

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

Lines 59-66 Link Here

(-)a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/SourceFile.java (-2 / +3 lines)
59	return new BatFile(file);	59	return new BatFile(file);
60	} else if (extension.equals("js")) { //$NON-NLS-1$	60	} else if (extension.equals("js")) { //$NON-NLS-1$
61	return new JavaScriptFile(file);	61	return new JavaScriptFile(file);
62	// } else if (extension.equals("xml")) { //$NON-NLS-1$	62	} else if (extension.equals("xml")) { //$NON-NLS-1$
63	// return new XmlFile(file);	63	if (XmlFile.BUGS_FIXED)
		64	return new XmlFile(file);
64	}	65	}
65	}	66	}
66	return null;	67	return null;

Lines 1-5 Link Here

(-)a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/XmlFile.java (-1 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008, 2010 Gunnar Wagenknecht and others.	2	* Copyright (c) 2008, 2012 Gunnar Wagenknecht 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 22-27 Link Here
22	* XML File	22	* XML File
23	*/	23	*/
24	public class XmlFile extends SourceFile {	24	public class XmlFile extends SourceFile {
		25
		26	// See https://bugs.eclipse.org/381147
		27	public static final boolean BUGS_FIXED= false;
25		28
26	public XmlFile(IFile file) {	29	public XmlFile(IFile file) {
27	super(file);	30	super(file);

Lines 1-5 Link Here

(-)a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/CopyrightPreferencePage.java (-11 / +19 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004 IBM Corporation and others.	2	* Copyright (c) 2004, 2012 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 Common Public License v1.0	4	* are made available under the terms of the Common Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 14-19 Link Here
14		14
15	import org.eclipse.releng.tools.Messages;	15	import org.eclipse.releng.tools.Messages;
16	import org.eclipse.releng.tools.RelEngPlugin;	16	import org.eclipse.releng.tools.RelEngPlugin;
		17	import org.eclipse.releng.tools.XmlFile;
17		18
18	import org.eclipse.swt.SWT;	19	import org.eclipse.swt.SWT;
19	import org.eclipse.swt.events.KeyAdapter;	20	import org.eclipse.swt.events.KeyAdapter;
Lines 134-146 Link Here
134	data = new GridData();	135	data = new GridData();
135	data.horizontalSpan = 2;	136	data.horizontalSpan = 2;
136	fIgnoreProperties.setLayoutData(data);	137	fIgnoreProperties.setLayoutData(data);
137		138
138	// ignore xml files	139	if (XmlFile.BUGS_FIXED) {
139	fIgnoreXml = new Button(fComposite, SWT.CHECK);	140	// ignore xml files
140	fIgnoreXml.setText(Messages.getString("CopyrightPreferencePage.9")); //$NON-NLS-1$	141	fIgnoreXml = new Button(fComposite, SWT.CHECK);
141	data = new GridData();	142	fIgnoreXml.setText(Messages.getString("CopyrightPreferencePage.9")); //$NON-NLS-1$
142	data.horizontalSpan = 2;	143	data = new GridData();
143	fIgnoreXml.setLayoutData(data);	144	data.horizontalSpan = 2;
		145	fIgnoreXml.setLayoutData(data);
		146	}
144		147
145	KeyListener listener1 = new KeyAdapter() {	148	KeyListener listener1 = new KeyAdapter() {
146	/* (non-Javadoc)	149	/* (non-Javadoc)
Lines 258-264 Link Here
258	// disable fix up existing copyright till it works better	261	// disable fix up existing copyright till it works better
259	// handleReplaceAllEnabled(fReplaceAllExisting.getSelection(), store.getBoolean(RelEngCopyrightConstants.FIX_UP_EXISTING_KEY));	262	// handleReplaceAllEnabled(fReplaceAllExisting.getSelection(), store.getBoolean(RelEngCopyrightConstants.FIX_UP_EXISTING_KEY));
260	fIgnoreProperties.setSelection(store.getBoolean(RelEngCopyrightConstants.IGNORE_PROPERTIES_KEY));	263	fIgnoreProperties.setSelection(store.getBoolean(RelEngCopyrightConstants.IGNORE_PROPERTIES_KEY));
261	fIgnoreXml.setSelection(store.getBoolean(RelEngCopyrightConstants.IGNORE_XML_KEY));	264	if (XmlFile.BUGS_FIXED)
		265	fIgnoreXml.setSelection(store.getBoolean(RelEngCopyrightConstants.IGNORE_XML_KEY));
262	}	266	}
263		267
264	/**	268	/**
Lines 330-336 Link Here
330	// disable fix up existing copyright till it works better	334	// disable fix up existing copyright till it works better
331	// handleReplaceAllEnabled(fReplaceAllExisting.getSelection(), getPreferenceStore().getDefaultBoolean(RelEngCopyrightConstants.FIX_UP_EXISTING_KEY));	335	// handleReplaceAllEnabled(fReplaceAllExisting.getSelection(), getPreferenceStore().getDefaultBoolean(RelEngCopyrightConstants.FIX_UP_EXISTING_KEY));
332	fIgnoreProperties.setSelection(getPreferenceStore().getDefaultBoolean(RelEngCopyrightConstants.IGNORE_PROPERTIES_KEY));	336	fIgnoreProperties.setSelection(getPreferenceStore().getDefaultBoolean(RelEngCopyrightConstants.IGNORE_PROPERTIES_KEY));
333	fIgnoreXml.setSelection(getPreferenceStore().getDefaultBoolean(RelEngCopyrightConstants.IGNORE_XML_KEY));	337
		338	if (XmlFile.BUGS_FIXED)
		339	fIgnoreXml.setSelection(getPreferenceStore().getDefaultBoolean(RelEngCopyrightConstants.IGNORE_XML_KEY));
334		340
335	super.performDefaults();	341	super.performDefaults();
336	}	342	}
Lines 349-355 Link Here
349	// disable fix up existing copyright till it works better	355	// disable fix up existing copyright till it works better
350	// store.setValue(RelEngCopyrightConstants.FIX_UP_EXISTING_KEY, fFixExisting.getSelection());	356	// store.setValue(RelEngCopyrightConstants.FIX_UP_EXISTING_KEY, fFixExisting.getSelection());
351	store.setValue(RelEngCopyrightConstants.IGNORE_PROPERTIES_KEY, fIgnoreProperties.getSelection());	357	store.setValue(RelEngCopyrightConstants.IGNORE_PROPERTIES_KEY, fIgnoreProperties.getSelection());
352	store.setValue(RelEngCopyrightConstants.IGNORE_XML_KEY, fIgnoreXml.getSelection());	358
		359	if (XmlFile.BUGS_FIXED)
		360	store.setValue(RelEngCopyrightConstants.IGNORE_XML_KEY, fIgnoreXml.getSelection());
353		361
354	try {	362	try {
355	InstanceScope.INSTANCE.getNode(RelEngPlugin.ID).flush();	363	InstanceScope.INSTANCE.getNode(RelEngPlugin.ID).flush();

Return to bug 381165