Skip to content

Commit

Permalink
clean up unused lines
Browse files Browse the repository at this point in the history
  • Loading branch information
@silverailscolo
silverailscolo committed Oct 16, 2020
1 parent 4a2bc6f commit 8ddd155
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 55 deletions.
67 changes: 14 additions & 53 deletions java/src/jmri/jmrit/display/switchboardEditor/BeanSwitch.java
View file
Expand Up @@ -126,7 +126,6 @@ public BeanSwitch(int index, NamedBean bean, String switchName, int shapeChoice,
// attach shape specific code to this beanSwitch
switch (_shape) {
case 1: // slider shape
log.debug("create Slider");
beanIcon.addMouseListener(new MouseAdapter() { // handled by JPanel
@Override
public void mouseClicked(MouseEvent me) {
Expand All @@ -135,19 +134,15 @@ public void mouseClicked(MouseEvent me) {

@Override
public void mouseReleased(MouseEvent me) { // for Windows
_editor.setBoardToolTip(null); // ends tooltip if displayed
if (me.isPopupTrigger()) {
// display the popup:
showPopUp(me);
showPopUp(me); // display the popup
}
}

@Override
public void mousePressed(MouseEvent me) { // for macOS, Linux
_editor.setBoardToolTip(null); // ends tooltip if displayed
if (me.isPopupTrigger()) {
// display the popup:
showPopUp(me);
showPopUp(me); // display the popup
}
}
});
Expand All @@ -165,7 +160,6 @@ public void mousePressed(MouseEvent me) { // for macOS, Linux
this.add(beanIcon);
break;
case 2: // Maerklin style keyboard
log.debug("create Key");
beanKey.addMouseListener(new MouseAdapter() { // handled by JPanel
@Override
public void mouseClicked(MouseEvent me) {
Expand All @@ -174,19 +168,15 @@ public void mouseClicked(MouseEvent me) {

@Override
public void mouseReleased(MouseEvent me) { // for Windows
_editor.setBoardToolTip(null); // ends tooltip if displayed
if (me.isPopupTrigger()) {
// display the popup:
showPopUp(me);
showPopUp(me); // display the popup
}
}

@Override
public void mousePressed(MouseEvent me) { // for macOS, Linux
_editor.setBoardToolTip(null); // ends tooltip if displayed
if (me.isPopupTrigger()) {
// display the popup:
showPopUp(me);
showPopUp(me); // display the popup
}
}
});
Expand All @@ -205,7 +195,6 @@ public void mousePressed(MouseEvent me) { // for macOS, Linux
this.add(beanKey);
break;
case 3: // turnout/sensor/light Icon (selecting image by letter in switch name/label)
log.debug("create Symbols");
beanSymbol.addMouseListener(new MouseAdapter() { // handled by JPanel
@Override
public void mouseClicked(MouseEvent me) {
Expand All @@ -214,19 +203,15 @@ public void mouseClicked(MouseEvent me) {

@Override
public void mouseReleased(MouseEvent me) { // for Windows
_editor.setBoardToolTip(null); // ends tooltip if displayed
if (me.isPopupTrigger()) {
// display the popup:
showPopUp(me);
showPopUp(me); // display the popup
}
}

@Override
public void mousePressed(MouseEvent me) { // for macOS, Linux
_editor.setBoardToolTip(null); // ends tooltip if displayed
if (me.isPopupTrigger()) {
// display the popup:
showPopUp(me);
showPopUp(me); // display the popup
}
}
});
Expand Down Expand Up @@ -256,7 +241,6 @@ public void mousePressed(MouseEvent me) { // for macOS, Linux
break;
case 0: // 0 = "Button" shape
default:
log.debug("create Button");
beanButton.addMouseListener(new MouseAdapter() { // handled by JPanel
@Override
public void mouseClicked(MouseEvent me) {
Expand All @@ -265,19 +249,15 @@ public void mouseClicked(MouseEvent me) {

@Override
public void mouseReleased(MouseEvent me) { // for Windows
_editor.setBoardToolTip(null); // ends tooltip if displayed
if (me.isPopupTrigger()) {
// display the popup:
showPopUp(me);
showPopUp(me); // display the popup
}
}

@Override
public void mousePressed(MouseEvent me) { // for macOS, Linux
_editor.setBoardToolTip(null); // ends tooltip if displayed
if (me.isPopupTrigger()) {
// display the popup:
showPopUp(me);
showPopUp(me); // display the popup
}
}
});
Expand Down Expand Up @@ -305,6 +285,7 @@ public void componentResized(ComponentEvent e) {
this.add(beanButton);
break;
}

// connect to object or dim switch
if (bean == null) {
if (!_editor.hideUnconnected()) {
Expand All @@ -314,13 +295,13 @@ public void componentResized(ComponentEvent e) {
case 0:
beanButton.setEnabled(false);
break;
// case 1:
case 1:
// beanIcon.setOpacity(dim);
// break;
// case 2:
case 2:
// beanKey.setOpacity(dim);
// break;
// case 3:
case 3:
default:
// beanSymbol.setOpacity(dim);
}
Expand Down Expand Up @@ -630,26 +611,6 @@ public void propertyChange(java.beans.PropertyChangeEvent e) {
}
}

public void mousePressed(MouseEvent e) {
_editor.setBoardToolTip(null); // ends tooltip if displayed
if (e.isPopupTrigger()) {
// display the popup on Mac/Linux:
showPopUp(e);
}
}

public void mouseReleased(MouseEvent e) {
_editor.setBoardToolTip(null); // ends tooltip if displayed
if (e.isPopupTrigger() || e.isMetaDown() || e.isAltDown()) {
// display the popup on Windows:
showPopUp(e);
}
}

public void mouseExited(MouseEvent e) {
//super.mouseExited(e);
}

void cleanup() {
if (namedBean != null) {
getTurnout().removePropertyChangeListener(this);
Expand Down Expand Up @@ -685,8 +646,8 @@ public void setMomentary(boolean m) {
* (un)connected bean. Derived from
* {@link jmri.jmrit.display.switchboardEditor.SwitchboardEditor#showPopUp(Positionable, MouseEvent)}
*
* @param e unused.
* @return true when pop up displayed.
* @param e unused
* @return true when pop up displayed
*/
public boolean showPopUp(MouseEvent e) {
if (switchPopup != null) {
Expand Down
4 changes: 2 additions & 2 deletions java/src/jmri/jmrit/display/switchboardEditor/SwitchboardEditor.java
View file
Expand Up @@ -321,8 +321,8 @@ public void stateChanged(ChangeEvent e) {
// set scrollbar initial state
setScroll(SCROLL_NONE);
scrollNone.setSelected(true);
super.setDefaultToolTip(new ToolTip(null, 0, 0, new Font("Serif", Font.PLAIN, 12),
Color.black, new Color(255, 250, 210), Color.black));
// super.setDefaultToolTip(new ToolTip(null, 0, 0, new Font("Serif", Font.PLAIN, 12),
// Color.black, new Color(255, 250, 210), Color.black)); // TODO remove if not missed
// register the resulting panel for later configuration
ConfigureManager cm = InstanceManager.getNullableDefault(jmri.ConfigureManager.class);
if (cm != null) {
Expand Down

0 comments on commit 8ddd155

Please sign in to comment.