mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 13:25:45 +02:00
Code Issues Wiki Activity

Fix duplicate encodings UTF-8 and UTF8

Browse source
This commit is contained in:
Anton Leherbauer 2015-07-15 16:41:45 +02:00
parent e40082b64a
commit dd006914b5
1 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java
View file

@ -15,10 +15,12 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set;
import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
@ -520,25 +522,19 @@ public abstract class AbstractExtendedConfigurationPanel extends AbstractConfigu
if (encodingCombo != null) { if (encodingCombo != null) {
List<String> encodings = new ArrayList<String>(); List<String> encodings = new ArrayList<String>();
// Some hard-coded encodings // Default encoding
encodings.add("Default (ISO-8859-1)"); //$NON-NLS-1$ encodings.add("Default (ISO-8859-1)"); //$NON-NLS-1$
encodings.add("UTF-8"); //$NON-NLS-1$
// The currently selected IDE encoding from the preferences // The currently selected IDE encoding from the preferences
String ideEncoding = getResourceEncoding(); String ideEncoding = getResourceEncoding();
if (ideEncoding != null && !encodings.contains(ideEncoding)) encodings.add(ideEncoding);
// The default Eclipse Workbench encoding (configured in the preferences) // The default Eclipse Workbench encoding (configured in the preferences)
String eclipseEncoding = WorkbenchEncoding.getWorkbenchDefaultEncoding(); String eclipseEncoding = WorkbenchEncoding.getWorkbenchDefaultEncoding();
if (eclipseEncoding != null && !encodings.contains(eclipseEncoding)) encodings.add(eclipseEncoding);
// The default host (Java VM) encoding // The default host (Java VM) encoding
// String hostEncoding = Charset.defaultCharset().name();
// Note: We do not use Charset.defaultCharset().displayName() here as it returns the bit
// unusual name "windows-1252" on Windows. As there is no access to the "historical" addEncodings(encodings, "UTF-8", ideEncoding, eclipseEncoding, hostEncoding); //$NON-NLS-1$
// name "Cp1252" stored in MS1252.class, stick to the older way of retrieving an encoding.
String hostEncoding = new java.io.InputStreamReader(new java.io.ByteArrayInputStream(new byte[0])).getEncoding();
if (!encodings.contains(hostEncoding)) encodings.add(hostEncoding);
// The "Other..." encoding // The "Other..." encoding
encodings.add(Messages.AbstractConfigurationPanel_encoding_custom); encodings.add(Messages.AbstractConfigurationPanel_encoding_custom);
@ -550,6 +546,29 @@ public abstract class AbstractExtendedConfigurationPanel extends AbstractConfigu
} }
} }
/**
* Add given encoding names to the list. Duplicates are filtered out by comparing aliases.
*/
private void addEncodings(List<String> encodings, String... toadd) {
Set<String> aliases = new HashSet<String>();
for (String name : toadd) {
if (name == null)
continue;
try {
Charset cs = Charset.forName(name);
if (aliases.containsAll(cs.aliases()))
continue;
if (aliases.contains(name.toLowerCase()))
continue;
aliases.addAll(cs.aliases());
aliases.add(name.toLowerCase());
encodings.add(name);
} catch (Exception e) {
// skip
}
}
}
/** /**
* Get the current value of the encoding preference. If the value is not set * Get the current value of the encoding preference. If the value is not set
* return <code>null</code>. * return <code>null</code>.