From a41571eb9afec68e94466ccafab9fe1640ccfcc1 Mon Sep 17 00:00:00 2001 From: sh123 Date: Thu, 30 Jun 2022 00:15:03 +0300 Subject: [PATCH] Refactoring --- .../main/java/com/radio/codec2talkie/audio/AudioProcessor.java | 2 +- .../src/main/java/com/radio/codec2talkie/protocol/Aprs.java | 2 +- .../main/java/com/radio/codec2talkie/protocol/AudioCodec2.java | 2 +- .../com/radio/codec2talkie/protocol/AudioFrameAggregator.java | 2 +- .../src/main/java/com/radio/codec2talkie/protocol/Ax25.java | 2 +- .../src/main/java/com/radio/codec2talkie/protocol/Callback.java | 2 +- .../src/main/java/com/radio/codec2talkie/protocol/Recorder.java | 2 +- .../main/java/com/radio/codec2talkie/protocol/Scrambler.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/audio/AudioProcessor.java b/codec2talkie/src/main/java/com/radio/codec2talkie/audio/AudioProcessor.java index 703f152..ee3f1d0 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/audio/AudioProcessor.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/audio/AudioProcessor.java @@ -210,7 +210,7 @@ public class AudioProcessor extends Thread { private final Callback _protocolReceiveCallback = new Callback() { @Override - protected void onReceivePosition(String src, String dst, double latitude, double longitude, double altitude, float bearing, String comment) { + protected void onReceivePosition(String src, double latitude, double longitude, double altitude, float bearing, String comment) { throw new UnsupportedOperationException(); } diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Aprs.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Aprs.java index 57e6d9d..89bd654 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Aprs.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Aprs.java @@ -55,7 +55,7 @@ public class Aprs implements Protocol { public boolean receive(Callback callback) throws IOException { return _childProtocol.receive(new Callback() { @Override - protected void onReceivePosition(String src, String dst, double latitude, double longitude, double altitude, float bearing, String comment) { + protected void onReceivePosition(String src, double latitude, double longitude, double altitude, float bearing, String comment) { throw new UnsupportedOperationException(); } diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioCodec2.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioCodec2.java index 4560565..cbe8c9e 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioCodec2.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioCodec2.java @@ -59,7 +59,7 @@ public class AudioCodec2 implements Protocol { public boolean receive(Callback callback) throws IOException { return _childProtocol.receive(new Callback() { @Override - protected void onReceivePosition(String src, String dst, double latitude, double longitude, double altitude, float bearing, String comment) { + protected void onReceivePosition(String src, double latitude, double longitude, double altitude, float bearing, String comment) { throw new UnsupportedOperationException(); } diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioFrameAggregator.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioFrameAggregator.java index b35fbb1..aa31279 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioFrameAggregator.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioFrameAggregator.java @@ -81,7 +81,7 @@ public class AudioFrameAggregator implements Protocol { public boolean receive(Callback callback) throws IOException { return _childProtocol.receive(new Callback() { @Override - protected void onReceivePosition(String src, String dst, double latitude, double longitude, double altitude, float bearing, String comment) { + protected void onReceivePosition(String src, double latitude, double longitude, double altitude, float bearing, String comment) { throw new UnsupportedOperationException(); } diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Ax25.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Ax25.java index 73e6760..d23ec09 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Ax25.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Ax25.java @@ -71,7 +71,7 @@ public class Ax25 implements Protocol { public boolean receive(Callback callback) throws IOException { return _childProtocol.receive(new Callback() { @Override - protected void onReceivePosition(String src, String dst, double latitude, double longitude, double altitude, float bearing, String comment) { + protected void onReceivePosition(String src, double latitude, double longitude, double altitude, float bearing, String comment) { throw new UnsupportedOperationException(); } diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Callback.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Callback.java index ecb1f0f..5f69657 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Callback.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Callback.java @@ -1,7 +1,7 @@ package com.radio.codec2talkie.protocol; public abstract class Callback { - abstract protected void onReceivePosition(String src, String dst, double latitude, double longitude, double altitude, float bearing, String comment); + abstract protected void onReceivePosition(String src, double latitude, double longitude, double altitude, float bearing, String comment); abstract protected void onReceivePcmAudio(String src, String dst, int codec, short[] pcmFrame); abstract protected void onReceiveCompressedAudio(String src, String dst, int codec, byte[] frame); abstract protected void onReceiveData(String src, String dst, byte[] data); diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Recorder.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Recorder.java index 3de0fb4..9a01626 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Recorder.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Recorder.java @@ -68,7 +68,7 @@ public class Recorder implements Protocol { public boolean receive(Callback callback) throws IOException { return _childProtocol.receive(new Callback() { @Override - protected void onReceivePosition(String src, String dst, double latitude, double longitude, double altitude, float bearing, String comment) { + protected void onReceivePosition(String src, double latitude, double longitude, double altitude, float bearing, String comment) { throw new UnsupportedOperationException(); } diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Scrambler.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Scrambler.java index 12285c7..6ff4bf4 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Scrambler.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Scrambler.java @@ -71,7 +71,7 @@ public class Scrambler implements Protocol { public boolean receive(Callback callback) throws IOException { return _childProtocol.receive(new Callback() { @Override - protected void onReceivePosition(String src, String dst, double latitude, double longitude, double altitude, float bearing, String comment) { + protected void onReceivePosition(String src, double latitude, double longitude, double altitude, float bearing, String comment) { throw new UnsupportedOperationException(); }