Skip to content

multiple code improvements: squid:S2293, squid:UnusedPrivateMethod, squid:S00122, squid:S1192 #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
georgekankava wants to merge 1 commit into
base: master
Choose a base branch
from
Open

multiple code improvements: squid:S2293, squid:UnusedPrivateMethod, squid:S00122, squid:S1192 #416

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions src/main/java/nodebox/client/devicehandler/OSCDeviceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class OSCDeviceHandler implements DeviceHandler {
private OscP5 oscP5;
private int oscPort;
private boolean syncWithTimeline;
private Map<String, List<Object>> oscMessages = new HashMap<String, List<Object>>();
private Map<String, List<Object>> oscMessages = new HashMap<>();
private boolean paused;

public OSCDeviceHandler(String name) {
Expand Down Expand Up @@ -62,15 +62,13 @@ public Map<String, List<Object>> getOscMessages() {
return oscMessages;
}

private static int randomOSCPort() {
return 1024 + (int) Math.round(Math.random() * 10000);
}

@Override
public void start() {
if (oscP5 != null)
stop();
if (oscPort == -1) return;
if (oscPort == -1) {
return;
}
oscMessages.clear();
oscP5 = new OscP5(new Object(), oscPort);
oscP5.addListener(new OscEventListener() {
Expand Down Expand Up @@ -120,6 +118,9 @@ public AbstractDeviceControl createControl() {

private class OSCDeviceControl extends AbstractDeviceControl {

private static final String RESUME = "Resume";
private static final String PAUSE = "Pause";
private static final String START = "Start";
private JLabel deviceNameLabel;
private JTextField portNumberField;
private JCheckBox syncWithTimelineCheck;
Expand Down Expand Up @@ -167,9 +168,9 @@ public void itemStateChanged(ItemEvent itemEvent) {
startButton = new JButton();

if (isRunning()) {
startButton.setText(isPaused() ? "Start" : "Pause");
startButton.setText(isPaused() ? START : PAUSE);
} else {
startButton.setText("Start");
startButton.setText(START);
}
startButton.addActionListener(new ActionListener() {
@Override
Expand Down Expand Up @@ -216,25 +217,25 @@ public void actionPerformed(ActionEvent actionEvent) {
private void startOSC() {
start();
if (isRunning())
startButton.setText(isRunning() ? "Pause" : "Start");
startButton.setText(isRunning() ? PAUSE : START);
stopButton.setEnabled(oscP5 != null);
}

private void resumeOSC() {
resume();
startButton.setText(isRunning() ? "Pause" : "Start");
startButton.setText(isRunning() ? PAUSE : START);
stopButton.setEnabled(true);
}

private void pauseOSC() {
pause();
startButton.setText(isRunning() ? "Resume" : "Start");
startButton.setText(isRunning() ? RESUME : START);
stopButton.setEnabled(true);
}

private void stopOSC() {
stop();
startButton.setText("Start");
startButton.setText(START);
stopButton.setEnabled(false);
}

Expand Down