Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
remove instance() deprecated in 4.9.5
  • Loading branch information
bobjacobsen committed May 25, 2019
1 parent e6fbcfa commit b90849b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 32 deletions.
15 changes: 0 additions & 15 deletions java/src/jmri/jmrix/easydcc/EasyDccTurnoutManager.java
Expand Up @@ -117,21 +117,6 @@ public String getEntryToolTip() {
return entryToolTip;
}

/**
* @deprecated JMRI Since 4.9.5 instance() shouldn't be used, convert to JMRI multi-system support structure
*/
@Deprecated
static public EasyDccTurnoutManager instance() {
log.warn("deprecated instance() call for EasyDccTurnoutManager");
return null;
}

/**
* @deprecated JMRI Since 4.9.5 instance() shouldn't be used, convert to JMRI multi-system support structure
*/
@Deprecated
static EasyDccTurnoutManager _instance = null;

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

}
Expand Up @@ -45,15 +45,6 @@ public boolean status() {
// private control members
private boolean opened = false;

/**
* @deprecated JMRI Since 4.9.5 instance() shouldn't be used, convert to JMRI multi-system support structure
*/
@Deprecated
static public NetworkDriverAdapter instance() {
log.error("Unexpected call to instance()");
return null;
}

Socket socket;

public Vector<String> getPortNames() {
Expand Down
Expand Up @@ -158,14 +158,6 @@ public String[] validBaudRates() {
private boolean opened = false;
InputStream serialStream = null;

/**
* @deprecated JMRI Since 4.9.5 instance() shouldn't be used, convert to JMRI multi-system support structure
*/
@Deprecated
static public SerialDriverAdapter instance() {
return null;
}

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

}

0 comments on commit b90849b

Please sign in to comment.