# HG changeset patch # User Ed Swartz # Date 1259959585 21600 # Node ID 1bb6b7462d648c50f32083d12267f1a978c85011 # Parent 4a8b1092f0a4cddcb2ec4edb1db62613be3f0b53 Make sure dynamic platforms are reported in alphabetical order to appease tests (and be consistent between Windows and Unix) diff -r 4a8b1092f0a4 -r 1bb6b7462d64 core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SBVCatalogTest.java --- a/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SBVCatalogTest.java Fri Dec 04 14:38:14 2009 -0600 +++ b/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SBVCatalogTest.java Fri Dec 04 14:46:25 2009 -0600 @@ -148,17 +148,4 @@ } - - /** - * @param built - * @param string - * @return - */ - private boolean findPlatform(ISBVPlatform[] platforms, String string) { - for (ISBVPlatform platform : platforms) - if (platform.getName().equalsIgnoreCase(string)) - return true; - return false; - } - } diff -r 4a8b1092f0a4 -r 1bb6b7462d64 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/BSFCatalog.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/BSFCatalog.java Fri Dec 04 14:38:14 2009 -0600 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/BSFCatalog.java Fri Dec 04 14:46:25 2009 -0600 @@ -49,6 +49,9 @@ return; } + // sort by alphabetical order + Arrays.sort(bsfFiles); + // gather the individual BSF platforms for (File bsfFile : bsfFiles) { IPath bsfPath = new Path(bsfFile.getAbsolutePath()); diff -r 4a8b1092f0a4 -r 1bb6b7462d64 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBVCatalog.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBVCatalog.java Fri Dec 04 14:38:14 2009 -0600 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBVCatalog.java Fri Dec 04 14:46:25 2009 -0600 @@ -16,6 +16,7 @@ import java.io.FilenameFilter; import java.text.MessageFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.eclipse.core.runtime.IPath; @@ -50,6 +51,9 @@ return; } + // sort alphabetically + Arrays.sort(sbvFiles); + // gather the individual SBV platforms for (File sbvFile : sbvFiles) { IPath sbvPath = new Path(sbvFile.getAbsolutePath());