core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java
equal
deleted
inserted
replaced
95 devicesType = DevicesLoader.loadDevices(devicesFile.toURL()); |
95 devicesType = DevicesLoader.loadDevices(devicesFile.toURL()); |
96 EList devices = devicesType.getDevice(); |
96 EList devices = devicesType.getDevice(); |
97 for (Iterator iter = devices.iterator(); iter.hasNext();) { |
97 for (Iterator iter = devices.iterator(); iter.hasNext();) { |
98 SymbianSDK sdk = new SymbianSDK((DeviceType) iter.next()); |
98 SymbianSDK sdk = new SymbianSDK((DeviceType) iter.next()); |
99 sdk.addSupportedFeature(ISymbianSDKFeatures.IS_FROM_DEVICES_XML); |
99 sdk.addSupportedFeature(ISymbianSDKFeatures.IS_FROM_DEVICES_XML); |
|
100 if (isInSDKList(sdk)) { |
|
101 continue; |
|
102 } |
100 sdkList.add(sdk); |
103 sdkList.add(sdk); |
101 } |
104 } |
102 } |
105 } |
103 } catch (Exception e) { |
106 } catch (Exception e) { |
104 logError("Failed to scan devices.xml", e); |
107 logError("Failed to scan devices.xml", e); |
482 } else { |
485 } else { |
483 return false; |
486 return false; |
484 } |
487 } |
485 } |
488 } |
486 |
489 |
487 private boolean isInSDKList(ISymbianSDK sdk) { |
490 @Override |
|
491 protected boolean isInSDKList(ISymbianSDK sdk) { |
488 for (ISymbianSDK entry : sdkList) { |
492 for (ISymbianSDK entry : sdkList) { |
489 if (entry.getEPOCROOT().equalsIgnoreCase(sdk.getEPOCROOT())) { |
493 if (entry.getEPOCROOT().equalsIgnoreCase(sdk.getEPOCROOT())) { |
490 return true; |
494 return true; |
491 } |
495 } |
492 } |
496 } |