Skip to content

Commit

Permalink
more linting
Browse files Browse the repository at this point in the history
  • Loading branch information
@pabender
pabender committed Jan 19, 2020
1 parent 9c85941 commit a6e6716
Show file tree
Hide file tree
Showing 12 changed files with 159 additions and 201 deletions.
2 changes: 1 addition & 1 deletion java/src/jmri/jmrit/logix/Engineer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,7 @@ public void doRamp() {
break;
}
speed = iter.previous().floatValue();
log.trace("next speed {}",iter.previous());
log.trace("next speed {}",speed);
if (_useIndex) {
if ( _warrant._idxCurrentOrder > _endBlockIdx) { // loco overran end block
speed = endSpeed;
Expand Down
65 changes: 25 additions & 40 deletions java/src/jmri/jmrit/logix/OBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
import java.awt.Color;
import java.awt.Font;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.*;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import jmri.InstanceManager;
import jmri.NamedBeanHandle;
Expand Down Expand Up @@ -51,24 +49,25 @@ public class OBlock extends jmri.Block implements java.beans.PropertyChangeListe

/*
* Block states.
* NamedBean.UNKNOWN = 0x01;
* Block.OCCUPIED = Sensor.ACTIVE = 0x02;
* Block.UNOCCUPIED = Sensor.INACTIVE= 0x04;
* NamedBean.INCONSISTENT = 0x08;
* NamedBean.UNKNOWN = 0x01
* Block.OCCUPIED = Sensor.ACTIVE = 0x02
* Block.UNOCCUPIED = Sensor.INACTIVE= 0x04
* NamedBean.INCONSISTENT = 0x08
* Add the following to the 4 sensor states.
* States are OR'ed to show combination. e.g. ALLOCATED | OCCUPIED = allocated block is occupied
*/
static final public int ALLOCATED = 0x10; // reserve the block for subsequent use by a train
static final public int RUNNING = 0x20; // Block that running train has reached
static final public int OUT_OF_SERVICE = 0x40; // Block that should not be used
public static final int ALLOCATED = 0x10; // reserve the block for subsequent use by a train
public static final int RUNNING = 0x20; // Block that running train has reached
public static final int OUT_OF_SERVICE = 0x40; // Block that should not be used
// UNDETECTED state bit now used for DARK blocks - 12/11/2016 -pwc
// static final public int DARK = 0x01; // Block has no Sensor, same as UNKNOWN
static final public int TRACK_ERROR = 0x80; // Block has Error
// static final public int DARK = 0x01; // Block has no Sensor, same as UNKNOWN
public static final int TRACK_ERROR = 0x80; // Block has Error

private static final HashMap<String, Integer> _statusMap = new HashMap<>();
private static final HashMap<String, String> _statusNameMap = new HashMap<>();

private static final Color DEFAULT_FILL_COLOR = new Color(200, 0, 200);
private static final String ALLOCATED_TO_WARRANT = "AllocatedToWarrant";

private static void loadStatusMap() {
_statusMap.put("unoccupied", UNOCCUPIED);
Expand Down Expand Up @@ -112,7 +111,7 @@ public static String getSystemStatusName(String str) {
}
return _statusNameMap.get(str);
}
private final ArrayList<Portal> _portals = new ArrayList<>(); // portals to this block
private List<Portal> _portals = new ArrayList<>(); // portals to this block

private Warrant _warrant; // when not null, block is allocated to this warrant
private String _pathName; // when not null, this is the allocated path
Expand Down Expand Up @@ -486,7 +485,7 @@ public String allocate(Warrant warrant) {
String msg = null;
if (_warrant != null) {
if (!warrant.equals(_warrant)) {
msg = Bundle.getMessage("AllocatedToWarrant",
msg = Bundle.getMessage(ALLOCATED_TO_WARRANT,
_warrant.getDisplayName(), getDisplayName(), _warrant.getTrainName());
} else {
return null;
Expand Down Expand Up @@ -528,7 +527,7 @@ public String allocate(String pathName) {
return null;
} else if (_warrant != null) {
// allocated to another warrant
return Bundle.getMessage("AllocatedToWarrant",
return Bundle.getMessage(ALLOCATED_TO_WARRANT,
_warrant.getDisplayName(), getDisplayName(), _warrant.getTrainName());
}
if ((_pathName != null) && !_pathName.equals(pathName)) {
Expand Down Expand Up @@ -567,7 +566,7 @@ public String deAllocate(Warrant warrant) {
sb.append("\". Warrant \"");
sb.append(warrant == null ? "null" : warrant.getDisplayName());
sb.append("\"cannot deallocate!");
log.error(sb.toString());
log.error("{}",sb);
return sb.toString();
}
}
Expand Down Expand Up @@ -653,7 +652,6 @@ public void addPortal(Portal portal) {
@SuppressFBWarnings(value = "BC_UNCONFIRMED_CAST_OF_RETURN_VALUE", justification = "OPath extends Path")
protected void removePortal(Portal portal) {
if (portal != null) {
//String name = portal.getName();
Iterator<Path> iter = getPaths().iterator();
while (iter.hasNext()) {
OPath path = (OPath) iter.next();
Expand All @@ -676,21 +674,14 @@ protected void removePortal(Portal portal) {
log.debug("removed Path \"{}\" from block {}", path.getName(), getDisplayName());
}
}
//_portals.remove(portal);
int oldSize = _portals.size();
for (int i = 0; i < _portals.size(); i++) {
if (portal.equals(_portals.get(i))) {
_portals.remove(i);
log.debug("removed portal \"{}\" from block {}", portal.getName(), getDisplayName());
i--;
}
}
_portals = _portals.stream().filter(p -> !Objects.equals(p,portal)).collect(Collectors.toList());
firePropertyChange("portalCount", oldSize, _portals.size());
}
}

public Portal getPortalByName(String name) {
// log.debug("getPortalByName: name= \"{}\".", name);
log.debug("getPortalByName: name= \"{}\".", name);
for (Portal po : _portals) {
if (po.getName().equals(name)) {
return po;
Expand Down Expand Up @@ -720,9 +711,7 @@ public void setLength(float len) {
float oldLen = getLengthMm();
if (oldLen > 0.0f) { // if new block, paths also have length 0
float ratio = getLengthMm() / oldLen;
getPaths().forEach((path) -> {
path.setLength(path.getLength() * ratio);
});
getPaths().forEach(path -> path.setLength(path.getLength() * ratio));
}
super.setLength(len);
}
Expand Down Expand Up @@ -816,7 +805,7 @@ public boolean removeOPath(OPath path) {
*/
protected String setPath(String pathName, Warrant warrant) {
if (_warrant != null && !_warrant.equals(warrant)) {
return Bundle.getMessage("AllocatedToWarrant",
return Bundle.getMessage(ALLOCATED_TO_WARRANT,
_warrant.getDisplayName(), getDisplayName(), _warrant.getTrainName());
}
pathName = pathName.trim();
Expand Down Expand Up @@ -852,8 +841,8 @@ protected String setPath(String pathName, Warrant warrant) {
* Call for Circuit Builder to make icon color changes for its GUI
*/
public void pseudoPropertyChange(String propName, Object old, Object n) {
// log.debug("pseudoPropertyChange: Block \"{}\" property \"{}\" new value= {}",
// getSystemName(), propName, n);
log.debug("pseudoPropertyChange: Block \"{}\" property \"{}\" new value= {}",
getSystemName(), propName, n);
firePropertyChange(propName, old, n);
}

Expand All @@ -869,9 +858,7 @@ public void goingInactive() {
setState((getState() & ~(UNKNOWN | OCCUPIED | INCONSISTENT | RUNNING)) | UNOCCUPIED);
setValue(null);
if (_warrant != null) {
ThreadingUtil.runOnLayout(() -> {
_warrant.goingInactive(this);
});
ThreadingUtil.runOnLayout(() -> _warrant.goingInactive(this));
}
}

Expand All @@ -886,9 +873,7 @@ public void goingActive() {
// preserve the non-sensor states when being OCCUPIED and remove non-OCCUPIED sensor states
setState((getState() & ~(UNKNOWN | UNOCCUPIED | INCONSISTENT)) | OCCUPIED);
if (_warrant != null) {
ThreadingUtil.runOnLayout(() -> {
_warrant.goingActive(this);
});
ThreadingUtil.runOnLayout(() -> _warrant.goingActive(this));
}
}

Expand Down Expand Up @@ -946,6 +931,6 @@ public String getBeanType() {
return Bundle.getMessage("BeanNameOBlock");
}

private final static Logger log = LoggerFactory.getLogger(OBlock.class);
private static final Logger log = LoggerFactory.getLogger(OBlock.class);

}
4 changes: 2 additions & 2 deletions java/src/jmri/jmrit/logix/OBlockManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ public OBlock getOBlock(@Nonnull String name) {
}

@Override
public OBlock provide(@Nonnull String name) throws IllegalArgumentException {
public OBlock provide(@Nonnull String name) {
return provideOBlock(name);
}

@Nonnull
public OBlock provideOBlock(@Nonnull String name) throws IllegalArgumentException {
public OBlock provideOBlock(@Nonnull String name) {
if (name.trim().length() == 0) {
throw new IllegalArgumentException("name \"" + name + "\" invalid");
}
Expand Down
8 changes: 4 additions & 4 deletions java/src/jmri/jmrit/logix/OPath.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package jmri.jmrit.logix;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -57,7 +56,7 @@ public OPath(Block owner, String name) {
* @param exit Portal where path exits
* @param settings array of turnout settings of the path
*/
public OPath(String name, OBlock owner, Portal entry, Portal exit, ArrayList<BeanSetting> settings) {
public OPath(String name, OBlock owner, Portal entry, Portal exit, List<BeanSetting> settings) {
super(owner, 0, 0);
_name = name;
_fromPortal = entry;
Expand Down Expand Up @@ -160,7 +159,7 @@ public void setTurnouts(int delay, boolean set, int lockState, boolean lock) {
_timer.start();
_timerActive = true;
} else {
log.warn("timer already active for delayed turnout action on path {}", toString());
log.warn("timer already active for delayed turnout action on path {}", this);
}
} else {
fireTurnouts(getSettings(), set, lockState, lock);
Expand Down Expand Up @@ -199,6 +198,7 @@ class TimeTurnout implements java.awt.event.ActionListener {
boolean lock;

public TimeTurnout() {
// no actions required to construct
}

void setList(List<BeanSetting> l) {
Expand Down Expand Up @@ -338,6 +338,6 @@ public boolean equals(Object obj) {
return true;
}

private final static Logger log = LoggerFactory.getLogger(OPath.class);
private static final Logger log = LoggerFactory.getLogger(OPath.class);

}
19 changes: 10 additions & 9 deletions java/src/jmri/jmrit/logix/OpSessionLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

class OpSessionLog {

private static final String OP_SESSION_LOG_ERROR = "Op session log error {}";
static BufferedWriter _outBuff;

private OpSessionLog() {
Expand Down Expand Up @@ -59,7 +60,7 @@ public static synchronized boolean makeLogFile(java.awt.Component parent) {
return true;
}

static private void writeHeader(String fileName) {
private static void writeHeader(String fileName) {
if (_outBuff==null) {
return;
}
Expand All @@ -75,11 +76,11 @@ static private void writeHeader(String fileName) {
_outBuff.newLine();
writeLn(Bundle.getMessage("startLog"));
} catch (IOException ioe) {
log.error("Op session log error " + ioe.getMessage());
log.error(OP_SESSION_LOG_ERROR,ioe.getMessage());
}
}

static synchronized public void writeLn(String text) {
public static synchronized void writeLn(String text) {
if (_outBuff==null) {
return;
}
Expand All @@ -89,22 +90,22 @@ static synchronized public void writeLn(String text) {
_outBuff.append(text);
_outBuff.newLine();
} catch (IOException ioe) {
log.error("Op session log error " + ioe.getMessage());
log.error(OP_SESSION_LOG_ERROR,ioe.getMessage());
}
}

static synchronized public void flush() {
public static synchronized void flush() {
if (_outBuff==null) {
return;
}
try {
_outBuff.flush();
} catch (IOException ioe) {
log.error("Op session log error " + ioe.getMessage());
log.error(OP_SESSION_LOG_ERROR,ioe.getMessage());
}
}

static synchronized public void close() {
public static synchronized void close() {
if (_outBuff==null) {
return;
}
Expand All @@ -113,9 +114,9 @@ static synchronized public void close() {
_outBuff.flush();
_outBuff.close();
} catch (IOException ioe) {
log.error("Op session log error " + ioe.getMessage());
log.error(OP_SESSION_LOG_ERROR,ioe.getMessage());
}
}

private final static Logger log = LoggerFactory.getLogger(OpSessionLog.class);
private static final Logger log = LoggerFactory.getLogger(OpSessionLog.class);
}
Loading

0 comments on commit a6e6716

Please sign in to comment.