Skip to content
Snippets Groups Projects
Commit 16f9bed2 authored by Florian Lambers's avatar Florian Lambers
Browse files

Merge branch 'master' of https://git.fh-muenster.de/fe/fe-pda-testing-tool

parents 074ab925 6d154dbd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/change/ChangeService.java
+ 2
− 69
View file @ 16f9bed2
......@@ -99,70 +99,7 @@ public Flow[][] compareFlows(List<Flow> newFlows, List<Flow> oldFlows) {
//Vergleich der Bezeichnungen (Label) von neuem und altem Flow Element
if(labelNew.getLabel().equals(labelOld.getLabel())){
// //Casten des vorherigen Nachbarn des neuen Flows
// if(newFlowElements.get(currentNewFlowElement-2).getRef() instanceof StartFlowElement) {
// StartFlowElement NewNeighbourBefore = (StartFlowElement) newFlowElements.get(currentNewFlowElement-2).getRef();
// }else if (newFlowElements.get(currentNewFlowElement-2).getRef() instanceof EndFlowElement) {
// EndFlowElement NewNeighbourBefore = (EndFlowElement) newFlowElements.get(currentNewFlowElement-2).getRef();
// }else if (newFlowElements.get(currentNewFlowElement-2).getRef() instanceof GatewayFlowElement) {
// GatewayFlowElement NewNeighbourBefore = (GatewayFlowElement) newFlowElements.get(currentNewFlowElement-2).getRef();
// }else if (newFlowElements.get(currentNewFlowElement-2).getRef() instanceof GatewayFlowElement) {
// GatewayFlowElement NewNeighbourBefore = (GatewayFlowElement) newFlowElements.get(currentNewFlowElement-2).getRef();
// } else {
// ManualTaskFlowElement NewNeighbourBefore = (ManualTaskFlowElement) newFlowElements.get(currentNewFlowElement-2).getRef();
// }
//
// //Casten des nachfolgenden Nachbarn des neuen Flows
// if(newFlowElements.get(currentNewFlowElement+2).getRef() instanceof StartFlowElement) {
// StartFlowElement NewNeighbourAfter = (StartFlowElement) newFlowElements.get(currentNewFlowElement+2).getRef();
// }else if (newFlowElements.get(currentNewFlowElement+2).getRef() instanceof EndFlowElement) {
// EndFlowElement NewNeighbourAfter = (EndFlowElement) newFlowElements.get(currentNewFlowElement+2).getRef();
// }else if (newFlowElements.get(currentNewFlowElement+2).getRef() instanceof GatewayFlowElement) {
// GatewayFlowElement NewNeighbourAfter = (GatewayFlowElement) newFlowElements.get(currentNewFlowElement+2).getRef();
// }else if (newFlowElements.get(currentNewFlowElement+2).getRef() instanceof GatewayFlowElement) {
// GatewayFlowElement NewNeighbourAfter = (GatewayFlowElement) newFlowElements.get(currentNewFlowElement+2).getRef();
// } else {
// ManualTaskFlowElement NewNeighbourAfter = (ManualTaskFlowElement) newFlowElements.get(currentNewFlowElement+2).getRef();
// }
//
// //Casten des vorherigen Nachbarn des alten Flows
// if(newFlowElements.get(currentOldFlowElement-2).getRef() instanceof StartFlowElement) {
// StartFlowElement OldNeighbourBefore = (StartFlowElement) newFlowElements.get(currentOldFlowElement-2).getRef();
// }else if (newFlowElements.get(currentOldFlowElement-2).getRef() instanceof EndFlowElement) {
// EndFlowElement OldNeighbourBefore = (EndFlowElement) newFlowElements.get(currentOldFlowElement-2).getRef();
// }else if (newFlowElements.get(currentOldFlowElement-2).getRef() instanceof GatewayFlowElement) {
// GatewayFlowElement OldNeighbourBefore = (GatewayFlowElement) newFlowElements.get(currentOldFlowElement-2).getRef();
// }else if (newFlowElements.get(currentOldFlowElement-2).getRef() instanceof GatewayFlowElement) {
// GatewayFlowElement OldNeighbourBefore = (GatewayFlowElement) newFlowElements.get(currentOldFlowElement-2).getRef();
// } else {
// ManualTaskFlowElement OldNeighbourBefore = (ManualTaskFlowElement) newFlowElements.get(currentOldFlowElement-2).getRef();
// }
//
// UserTaskFlowElement OldNeighbourBefore = (UserTaskFlowElement) oldFlowElements.get(currentOldFlowElement-2).getRef();
// UserTaskFlowElement OldNeighbourAfter = (UserTaskFlowElement) oldFlowElements.get(currentOldFlowElement+2).getRef();
//
// System.out.println("nachbar vorher" + NewNeighbourBefore.getName());
//Vergleich von vorherigem Nachbarn von Flow neu mit vorherigem von Flow alt; Vergleich von nachfolgendem Nachbarn
// try {
// //try probiert Vergleich mit Label, catch dann mit der ID
// if(NewNeighbourBefore.getLabel().equals(OldNeighbourBefore.getLabel())) {
//
// try {
// if(NewNeighbourAfter.getLabel().equals(OldNeighbourAfter.getLabel())) {
// sameNeighbours = true;
// System.out.println("same neighbours im inneren try");
// }
//
// } catch (Exception e) {
// if(newFlowElements.get(currentNewFlowElement+2).getRef().getName().equals(oldFlowElements.get(currentOldFlowElement+2).getRef().getName())) {
// sameNeighbours = true;
// System.out.println("same neighbours im inneren catch");
//
// }
// }
// }
//
// } catch (Exception e) {
if(newFlowElements.get(currentNewFlowElement-2).getRef().getName().equals(oldFlowElements.get(currentOldFlowElement-2).getRef().getName()) &&
newFlowElements.get(currentNewFlowElement+2).getRef().getName().equals(oldFlowElements.get(currentOldFlowElement+2).getRef().getName())) {
......@@ -172,11 +109,7 @@ public Flow[][] compareFlows(List<Flow> newFlows, List<Flow> oldFlows) {
}
// if(sameNeighbours) {
// similarities++;
// checkedElements.add(newFlowElement.getRef().getName());
// }
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment