trackeditor: fix pits check

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8581 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 7afdcb5cacf124bc69da64f1091724d032b3483d
Former-commit-id: f8ed678b8008277f47a489b1d599570ab0871dc1
This commit is contained in:
iobyte 2022-10-14 13:11:14 +00:00
parent 9aae0391d2
commit 361aeab7de

View file

@ -98,34 +98,34 @@ public class CheckDialog extends JDialog
if (pits == null) if (pits == null)
return; return;
boolean noSegments = pits.getEntry() == null && pits.getStart() == null && pits.getEnd() == null boolean noSegments = !hasText(pits.getEntry()) && !hasText(pits.getStart()) && !hasText(pits.getEnd())
&& pits.getExit() == null; && !hasText(pits.getExit());
if (!noSegments) if (!noSegments)
{ {
SegmentVector segments = editorFrame.getTrackData().getSegments(); SegmentVector segments = editorFrame.getTrackData().getSegments();
if (pits.getEntry() == null) if (!hasText(pits.getEntry()))
textArea.append("Missing pit entry\n"); textArea.append("Missing pit entry\n");
else if (segments.getSegmentFromName(pits.getEntry()) == null) else if (segments.getSegmentFromName(pits.getEntry()) == null)
textArea.append("Invalid pit entry: " + pits.getEntry() + "\n"); textArea.append("Invalid pit entry: " + pits.getEntry() + "\n");
if (pits.getStart() == null) if (!hasText(pits.getStart()))
textArea.append("Missing pit start\n"); textArea.append("Missing pit start\n");
else if (segments.getSegmentFromName(pits.getStart()) == null) else if (segments.getSegmentFromName(pits.getStart()) == null)
textArea.append("Invalid pit start: " + pits.getStart() + "\n"); textArea.append("Invalid pit start: " + pits.getStart() + "\n");
if (pits.getEnd() == null) if (!hasText(pits.getEnd()))
textArea.append("Missing pit end\n"); textArea.append("Missing pit end\n");
else if (segments.getSegmentFromName(pits.getEnd()) == null) else if (segments.getSegmentFromName(pits.getEnd()) == null)
textArea.append("Invalid pit end: " + pits.getEnd() + "\n"); textArea.append("Invalid pit end: " + pits.getEnd() + "\n");
if (pits.getExit() == null) if (!hasText(pits.getExit()))
textArea.append("Missing pit exit\n"); textArea.append("Missing pit exit\n");
else if (segments.getSegmentFromName(pits.getExit()) == null) else if (segments.getSegmentFromName(pits.getExit()) == null)
textArea.append("Invalid pit exit: " + pits.getExit() + "\n"); textArea.append("Invalid pit exit: " + pits.getExit() + "\n");
if (pits.getSide() == null) if (!hasText(pits.getSide()))
textArea.append("Missing pit side\n"); textArea.append("Missing pit side\n");
else if (!(pits.getSide().equals("left") || pits.getSide().equals("right"))) else if (!(pits.getSide().equals("left") || pits.getSide().equals("right")))
textArea.append("Invalid pit side: " + pits.getSide() + "\n"); textArea.append("Invalid pit side: " + pits.getSide() + "\n");