Closedown

This commit is contained in:
boccioli_m
2017-08-31 16:39:40 +02:00
parent 01376d35cf
commit 6c48e4885e

View File

@@ -2487,14 +2487,25 @@ public class TestingList extends Panel {
HashMap deviceParams = buildParametersMap(getConfigItem("parameters", sDevicePath));
HashMap testParams = buildParametersMap(getConfigItem("parameters", sTestPath));
HashMap params;
Iterator it = deviceParams.entrySet().iterator();
if(deviceParams.isEmpty()){
return testParams;
}
Iterator itD = deviceParams.entrySet().iterator();
Iterator itT = testParams.entrySet().iterator();
System.out.println("deviceParams: " + deviceParams.size());
while (it.hasNext()) {
Map.Entry pair = (Map.Entry)it.next();
System.out.println(pair.getKey() + " = " + pair.getValue());
while (itD.hasNext()) {
Map.Entry pairD = (Map.Entry)itD.next();
System.out.println(pairD.getKey() + " = " + pairD.getValue());
while (itT.hasNext()) {
Map.Entry pairT = (Map.Entry)itT.next();
if(pairT.getKey() == pairD.getKey()){
System.out.println("test: " + pairT.getKey() + " = " + pairT.getValue());
System.out.println("device: " + pairD.getKey() + " = " + pairD.getValue());
}
}
//it.remove(); // avoids a ConcurrentModificationException
}
it = testParams.entrySet().iterator();
Iterator it = testParams.entrySet().iterator();
System.out.println("testParams: " + testParams.size());
while (it.hasNext()) {
Map.Entry pair = (Map.Entry)it.next();