Skip to content

Commit

Permalink
HitPointType now top-level enum
Browse files Browse the repository at this point in the history
  • Loading branch information
@bobjacobsen
bobjacobsen committed Apr 26, 2020
1 parent 2521c2b commit ab9454e
Show file tree
Hide file tree
Showing 31 changed files with 1,523 additions and 1,486 deletions.
40 changes: 21 additions & 19 deletions java/src/jmri/Section.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nonnull;

import jmri.implementation.AbstractNamedBean;
import jmri.jmrit.display.layoutEditor.ConnectivityUtil;
import jmri.jmrit.display.layoutEditor.HitPointType;
import jmri.jmrit.display.layoutEditor.LayoutBlock;
import jmri.jmrit.display.layoutEditor.LayoutBlockManager;
import jmri.jmrit.display.layoutEditor.LayoutEditor;
Expand Down Expand Up @@ -957,15 +959,15 @@ private int getDirectionStandardTurnout(LayoutTurnout t, ConnectivityUtil cUtil)
// using Entry Points directly will lead to a problem, try following track - first from A following B
int dir = EntryPoint.UNKNOWN;
Block tBlock = null;
TrackNode tn = new TrackNode(t, LayoutEditor.HitPointType.TURNOUT_A, (TrackSegment) t.getConnectA(),
TrackNode tn = new TrackNode(t, HitPointType.TURNOUT_A, (TrackSegment) t.getConnectA(),
false, Turnout.CLOSED);
while ((tBlock == null) && (tn != null) && (!tn.reachedEndOfTrack())) {
tn = cUtil.getNextNode(tn, 0);
tBlock = cUtil.getExitBlockForTrackNode(tn, exBlock);
}
if (tBlock == null) {
// try from A following C
tn = new TrackNode(t, LayoutEditor.HitPointType.TURNOUT_A, (TrackSegment) t.getConnectA(),
tn = new TrackNode(t, HitPointType.TURNOUT_A, (TrackSegment) t.getConnectA(),
false, Turnout.THROWN);
while ((tBlock == null) && (tn != null) && (!tn.reachedEndOfTrack())) {
tn = cUtil.getNextNode(tn, 0);
Expand All @@ -984,7 +986,7 @@ private int getDirectionStandardTurnout(LayoutTurnout t, ConnectivityUtil cUtil)
if (dir == EntryPoint.UNKNOWN) {
// try from B following A
tBlock = null;
tn = new TrackNode(t, LayoutEditor.HitPointType.TURNOUT_B, (TrackSegment) t.getConnectB(),
tn = new TrackNode(t, HitPointType.TURNOUT_B, (TrackSegment) t.getConnectB(),
false, Turnout.CLOSED);
while ((tBlock == null) && (tn != null && (!tn.reachedEndOfTrack()))) {
tn = cUtil.getNextNode(tn, 0);
Expand Down Expand Up @@ -1113,7 +1115,7 @@ private int getDirectionXoverTurnout(LayoutTurnout t, ConnectivityUtil cUtil) {
// set direction by tracking from a or b
int dir = EntryPoint.UNKNOWN;
Block tBlock = null;
TrackNode tn = new TrackNode(t, LayoutEditor.HitPointType.TURNOUT_A, (TrackSegment) t.getConnectA(),
TrackNode tn = new TrackNode(t, HitPointType.TURNOUT_A, (TrackSegment) t.getConnectA(),
false, Turnout.CLOSED);
while ((tBlock == null) && (tn != null) && (!tn.reachedEndOfTrack())) {
tn = cUtil.getNextNode(tn, 0);
Expand All @@ -1128,7 +1130,7 @@ private int getDirectionXoverTurnout(LayoutTurnout t, ConnectivityUtil cUtil) {
}
}
} else { // no tBlock found on leg A
tn = new TrackNode(t, LayoutEditor.HitPointType.TURNOUT_B, (TrackSegment) t.getConnectB(),
tn = new TrackNode(t, HitPointType.TURNOUT_B, (TrackSegment) t.getConnectB(),
false, Turnout.CLOSED);
while ((tBlock == null) && (tn != null) && (!tn.reachedEndOfTrack())) {
tn = cUtil.getNextNode(tn, 0);
Expand Down Expand Up @@ -1195,7 +1197,7 @@ private int getDirectionXoverTurnout(LayoutTurnout t, ConnectivityUtil cUtil) {
// set direction by tracking from c or d
int dir = EntryPoint.UNKNOWN;
Block tBlock = null;
TrackNode tn = new TrackNode(t, LayoutEditor.HitPointType.TURNOUT_D, (TrackSegment) t.getConnectD(),
TrackNode tn = new TrackNode(t, HitPointType.TURNOUT_D, (TrackSegment) t.getConnectD(),
false, Turnout.CLOSED);
while ((tBlock == null) && (tn != null) && (!tn.reachedEndOfTrack())) {
tn = cUtil.getNextNode(tn, 0);
Expand All @@ -1210,7 +1212,7 @@ private int getDirectionXoverTurnout(LayoutTurnout t, ConnectivityUtil cUtil) {
}
}
} else {
tn = new TrackNode(t, LayoutEditor.HitPointType.TURNOUT_C, (TrackSegment) t.getConnectC(),
tn = new TrackNode(t, HitPointType.TURNOUT_C, (TrackSegment) t.getConnectC(),
false, Turnout.CLOSED);
while ((tBlock == null) && (tn != null) && (!tn.reachedEndOfTrack())) {
tn = cUtil.getNextNode(tn, 0);
Expand Down Expand Up @@ -1308,7 +1310,7 @@ private int getDirectionSlip(LayoutTurnout t, ConnectivityUtil cUtil) {
// set direction by tracking from a or b
int dir = EntryPoint.UNKNOWN;
Block tBlock = null;
TrackNode tn = new TrackNode(t, LayoutEditor.HitPointType.SLIP_A, (TrackSegment) t.getConnectA(),
TrackNode tn = new TrackNode(t, HitPointType.SLIP_A, (TrackSegment) t.getConnectA(),
false, LayoutTurnout.STATE_AC);
while ((tBlock == null) && (tn != null) && (!tn.reachedEndOfTrack())) {
tn = cUtil.getNextNode(tn, 0);
Expand All @@ -1323,7 +1325,7 @@ private int getDirectionSlip(LayoutTurnout t, ConnectivityUtil cUtil) {
}
}
} else {
tn = new TrackNode(t, LayoutEditor.HitPointType.SLIP_C, (TrackSegment) t.getConnectC(),
tn = new TrackNode(t, HitPointType.SLIP_C, (TrackSegment) t.getConnectC(),
false, LayoutTurnout.STATE_AC);
while ((tBlock == null) && (tn != null) && (!tn.reachedEndOfTrack())) {
tn = cUtil.getNextNode(tn, 0);
Expand Down Expand Up @@ -1381,7 +1383,7 @@ private int getDirectionSlip(LayoutTurnout t, ConnectivityUtil cUtil) {
// set direction by tracking from c or d
int dir = EntryPoint.UNKNOWN;
Block tBlock = null;
TrackNode tn = new TrackNode(t, LayoutEditor.HitPointType.SLIP_D, (TrackSegment) t.getConnectD(),
TrackNode tn = new TrackNode(t, HitPointType.SLIP_D, (TrackSegment) t.getConnectD(),
false, LayoutTurnout.STATE_BD);
while ((tBlock == null) && (tn != null) && (!tn.reachedEndOfTrack())) {
tn = cUtil.getNextNode(tn, 0);
Expand All @@ -1396,7 +1398,7 @@ private int getDirectionSlip(LayoutTurnout t, ConnectivityUtil cUtil) {
}
}
} else {
tn = new TrackNode(t, LayoutEditor.HitPointType.TURNOUT_B, (TrackSegment) t.getConnectB(),
tn = new TrackNode(t, HitPointType.TURNOUT_B, (TrackSegment) t.getConnectB(),
false, LayoutTurnout.STATE_BD);
while ((tBlock == null) && (tn != null) && (!tn.reachedEndOfTrack())) {
tn = cUtil.getNextNode(tn, 0);
Expand Down Expand Up @@ -1728,9 +1730,9 @@ public int placeDirectionSensors(LayoutEditor panel) {
// have a signaled AC level crossing internal to this block
if ((x.getSignalAName() != null) && (!x.getSignalAName().equals(""))) {
// there is a signal at A in the level crossing
TrackNode tn = new TrackNode(x, LayoutEditor.HitPointType.LEVEL_XING_A,
TrackNode tn = new TrackNode(x, HitPointType.LEVEL_XING_A,
(TrackSegment) x.getConnectA(), false, 0);
TrackNode altNode = new TrackNode(x, LayoutEditor.HitPointType.LEVEL_XING_C,
TrackNode altNode = new TrackNode(x, HitPointType.LEVEL_XING_C,
(TrackSegment) x.getConnectC(), false, 0);
SignalHead sh = InstanceManager.getDefault(jmri.SignalHeadManager.class).getSignalHead(
x.getSignalAName());
Expand All @@ -1740,9 +1742,9 @@ public int placeDirectionSensors(LayoutEditor panel) {
}
if ((x.getSignalCName() != null) && (!x.getSignalCName().equals(""))) {
// there is a signal at C in the level crossing
TrackNode tn = new TrackNode(x, LayoutEditor.HitPointType.LEVEL_XING_C,
TrackNode tn = new TrackNode(x, HitPointType.LEVEL_XING_C,
(TrackSegment) x.getConnectC(), false, 0);
TrackNode altNode = new TrackNode(x, LayoutEditor.HitPointType.LEVEL_XING_A,
TrackNode altNode = new TrackNode(x, HitPointType.LEVEL_XING_A,
(TrackSegment) x.getConnectA(), false, 0);
SignalHead sh = InstanceManager.getDefault(jmri.SignalHeadManager.class).getSignalHead(
x.getSignalCName());
Expand Down Expand Up @@ -1787,9 +1789,9 @@ public int placeDirectionSensors(LayoutEditor panel) {
// have a signaled BD level crossing internal to this block
if ((x.getSignalBName() != null) && (!x.getSignalBName().equals(""))) {
// there is a signal at B in the level crossing
TrackNode tn = new TrackNode(x, LayoutEditor.HitPointType.LEVEL_XING_B,
TrackNode tn = new TrackNode(x, HitPointType.LEVEL_XING_B,
(TrackSegment) x.getConnectB(), false, 0);
TrackNode altNode = new TrackNode(x, LayoutEditor.HitPointType.LEVEL_XING_D,
TrackNode altNode = new TrackNode(x, HitPointType.LEVEL_XING_D,
(TrackSegment) x.getConnectD(), false, 0);
SignalHead sh = InstanceManager.getDefault(jmri.SignalHeadManager.class).getSignalHead(
x.getSignalBName());
Expand All @@ -1799,9 +1801,9 @@ public int placeDirectionSensors(LayoutEditor panel) {
}
if ((x.getSignalDName() != null) && (!x.getSignalDName().equals(""))) {
// there is a signal at C in the level crossing
TrackNode tn = new TrackNode(x, LayoutEditor.HitPointType.LEVEL_XING_D,
TrackNode tn = new TrackNode(x, HitPointType.LEVEL_XING_D,
(TrackSegment) x.getConnectD(), false, 0);
TrackNode altNode = new TrackNode(x, LayoutEditor.HitPointType.LEVEL_XING_B,
TrackNode altNode = new TrackNode(x, HitPointType.LEVEL_XING_B,
(TrackSegment) x.getConnectB(), false, 0);
SignalHead sh = InstanceManager.getDefault(jmri.SignalHeadManager.class).getSignalHead(
x.getSignalDName());
Expand Down
Loading

0 comments on commit ab9454e

Please sign in to comment.