diff options
| author | Marc Khouzam | 2010-02-17 17:15:44 +0000 |
|---|---|---|
| committer | Marc Khouzam | 2010-02-17 17:15:44 +0000 |
| commit | d14a132fbb5bdb001c9c978351cf8fe7823c9305 (patch) | |
| tree | 29879913f907e528518998d54f103220210a04fe | |
| parent | 509c8ecb8d25fa8f13eb922e70ccbb2f0c4dfb1f (diff) | |
| download | org.eclipse.cdt-d14a132fbb5bdb001c9c978351cf8fe7823c9305.tar.gz org.eclipse.cdt-d14a132fbb5bdb001c9c978351cf8fe7823c9305.tar.xz org.eclipse.cdt-d14a132fbb5bdb001c9c978351cf8fe7823c9305.zip | |
[299300] Respect ordering of detail formats
2 files changed, 12 insertions, 15 deletions
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java index 12747366dae..842e6caafa6 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java @@ -12,8 +12,6 @@ package org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.numberformat.detail; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -326,18 +324,17 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper StringBuffer finalResult = new StringBuffer(); finalResult.append(NAME).append(getData().get(IElementPropertiesProvider.PROP_NAME)).append(CRLF); - List<String> formatsList = new ArrayList<String>(Arrays.asList(formats)); - Collections.sort(formatsList); - - for (int i = 0; i < formatsList.size(); i++) { - String formatId = formatsList.get(i); - finalResult.append(SPACES); - finalResult.append( FormattedValueVMUtil.getFormatLabel(formatId) ); - finalResult.append(FORMAT_SEPARATOR); - finalResult.append( getData().get(FormattedValueVMUtil.getPropertyForFormatId(formatId)) ); - if ( i < formatsList.size() + 1 ) { - finalResult.append(CRLF); - } + if (formats != null) { + for (int i = 0; i < formats.length; i++) { + String formatId = formats[i]; + finalResult.append(SPACES); + finalResult.append( FormattedValueVMUtil.getFormatLabel(formatId) ); + finalResult.append(FORMAT_SEPARATOR); + finalResult.append( getData().get(FormattedValueVMUtil.getPropertyForFormatId(formatId)) ); + if ( i < formats.length + 1 ) { + finalResult.append(CRLF); + } + } } detailComputed(null, finalResult.toString()); } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/messages.properties b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/messages.properties index 41f56d9d587..3527a1e5d4a 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/messages.properties +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/messages.properties @@ -15,7 +15,7 @@ FormattedValueVMUtil_Hex_format__label=Hex FormattedValueVMUtil_Octal_format__label=Octal FormattedValueVMUtil_Binary_format__label=Binary FormattedValueVMUtil_String_format__label=String -FormattedValueVMUtil_Other_format__format_text=Other ({0}) +FormattedValueVMUtil_Other_format__format_text={0} NumberFormatContribution_EmptyFormatsList_label=Number formats not available |