From 077e74b1368ce7abc224c7bf64042cd34eb4c4bb Mon Sep 17 00:00:00 2001 From: Tamino Dauth Date: Tue, 2 Apr 2019 13:58:51 +0200 Subject: [PATCH] Simplify getElementByRetestId #24 --- .../api/neo4j/ActionConverter.scala | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/scala/de/retest/guistatemachine/api/neo4j/ActionConverter.scala b/src/main/scala/de/retest/guistatemachine/api/neo4j/ActionConverter.scala index e430873..3fc9b20 100644 --- a/src/main/scala/de/retest/guistatemachine/api/neo4j/ActionConverter.scala +++ b/src/main/scala/de/retest/guistatemachine/api/neo4j/ActionConverter.scala @@ -4,6 +4,7 @@ import de.retest.recheck.ui.descriptors.{Element, SutState} import de.retest.surili.commons.actions._ import org.neo4j.ogm.typeconversion.AttributeConverter +import scala.collection.JavaConverters._ import scala.xml._ /** @@ -91,20 +92,17 @@ class ActionConverter(val sutState: Option[SutState]) extends AttributeConverter } private def getElementByRetestId(retestId: String, sutState: SutState): Option[Element] = { - val elements = scala.collection.mutable.Set[Element]() - val iterator = sutState.getRootElements.iterator() + val elements = asScalaBuffer(sutState.getRootElements).toBuffer[Element] + val iterator = elements.iterator var result: Option[Element] = None while (iterator.hasNext && result.isEmpty) { val element = iterator.next() result = if (element.getRetestId == retestId) { Some(element) - } else { None } - - val nestedIterator = element.getContainedElements.iterator() - - while (nestedIterator.hasNext) { - elements += nestedIterator.next() + } else { + elements ++= asScalaBuffer(element.getContainedElements) + None } }