diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioFrm.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioFrm.java index 86e0e6a..a9ee491 100755 --- a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioFrm.java +++ b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioFrm.java @@ -33,41 +33,41 @@ public class AudioFrm extends BaseFrm implements ActionListener private static AudioFrm instance = null; - private Z8 z8; - private JTCSys jtcSys; - private Thread emuThread; + private final Z8 z8; + private final JTCSys jtcSys; + private final Thread emuThread; private javax.swing.filechooser.FileFilter readFileFilter; private javax.swing.filechooser.FileFilter writeFileFilter; private File curFile; private File lastFile; private AudioFormat audioFmt; private AudioIO audioIO; - private JRadioButton btnSoundOut; - private JRadioButton btnDataOut; - private JRadioButton btnDataIn; - private JRadioButton btnFileOut; - private JRadioButton btnFileIn; - private JRadioButton btnFileLastIn; - private JLabel labelSampleRate; - private JComboBox comboSampleRate; - private JLabel labelSpeed; - private JSpinner spinnerSpeed; - private JLabel labelThreshold; - private JSlider sliderThreshold; - private JLabel labelChannel; - private JRadioButton btnChannel0; - private JRadioButton btnChannel1; - private JCheckBox btnMonitorPlay; - private JLabel labelFileName; - private JTextField fldFileName; - private JLabel labelFormat; - private JTextField fldFormat; - private JLabel labelProgress; - private JProgressBar progressBar; - private JButton btnEnable; - private JButton btnDisable; - private JButton btnHelp; - private JButton btnClose; + private final JRadioButton btnSoundOut; + private final JRadioButton btnDataOut; + private final JRadioButton btnDataIn; + private final JRadioButton btnFileOut; + private final JRadioButton btnFileIn; + private final JRadioButton btnFileLastIn; + private final JLabel labelSampleRate; + private final JComboBox comboSampleRate; + private final JLabel labelSpeed; + private final JSpinner spinnerSpeed; + private final JLabel labelThreshold; + private final JSlider sliderThreshold; + private final JLabel labelChannel; + private final JRadioButton btnChannel0; + private final JRadioButton btnChannel1; + private final JCheckBox btnMonitorPlay; + private final JLabel labelFileName; + private final JTextField fldFileName; + private final JLabel labelFormat; + private final JTextField fldFormat; + private final JLabel labelProgress; + private final JProgressBar progressBar; + private final JButton btnEnable; + private final JButton btnDisable; + private final JButton btnHelp; + private final JButton btnClose; public void doQuit() @@ -300,12 +300,12 @@ private AudioFrm( Z8 z8, JTCSys jtcSys, Thread emuThread ) this.labelSampleRate = new JLabel( audioFrmResourceBundle.getString("label.sampleRate") ); panelOpt.add( this.labelSampleRate, gbcOpt ); - this.comboSampleRate = new JComboBox(); + this.comboSampleRate = new JComboBox(); this.comboSampleRate.setEditable( false ); this.comboSampleRate.addItem( "Standard" ); - for( int i = 0; i < this.sampleRates.length; i++ ) { - this.comboSampleRate.addItem( String.valueOf( this.sampleRates[ i ] ) ); - } + for (int sampleRate : sampleRates) { + this.comboSampleRate.addItem(String.valueOf(sampleRate)); + } gbcOpt.gridwidth = GridBagConstraints.REMAINDER; gbcOpt.gridx++; panelOpt.add( this.comboSampleRate, gbcOpt ); @@ -321,7 +321,7 @@ private AudioFrm( Z8 z8, JTCSys jtcSys, Thread emuThread ) "org.sqar.virtualjtc.jtcemu.audio.speed_adjustment.percent" ); this.spinnerSpeed = new JSpinner( new SpinnerNumberModel( - pValue != null ? pValue.intValue() : 0, + pValue != null ? pValue : 0, -20, 20, 1 ) ); @@ -340,7 +340,7 @@ private AudioFrm( Z8 z8, JTCSys jtcSys, Thread emuThread ) JSlider.HORIZONTAL, 0, 100, - pValue != null ? pValue.intValue() : 50 ); + pValue != null ? pValue : 50 ); this.sliderThreshold.setMajorTickSpacing( 50 ); this.sliderThreshold.setMinorTickSpacing( 10 ); this.sliderThreshold.setPaintLabels( true ); @@ -481,20 +481,20 @@ private static javax.swing.filechooser.FileFilter createFileFilter( if( fmts != null ) { if( fmts.length > 0 ) { Collection suffixes = new ArrayList( fmts.length ); - for( int i = 0; i < fmts.length; i++ ) { - String suffix = fmts[ i ].getExtension(); - if( suffix != null ) { - if( suffix.length() > 0 ) - suffixes.add( suffix ); + for (AudioFileFormat.Type fmt : fmts) { + String suffix = fmt.getExtension(); + if (suffix != null) { + if (!suffix.isEmpty()) + suffixes.add(suffix); + } } - } if( !suffixes.isEmpty() ) { try { rv = new FileNameExtensionFilter( text, - suffixes.toArray( new String[ suffixes.size() ] ) ); + suffixes.toArray(new String[0]) ); } - catch( ArrayStoreException ex ) {} + catch( ArrayStoreException ignored) {} } } } @@ -705,8 +705,7 @@ private AudioFileFormat.Type getAudioFileType( File file ) } String fileName = file.getName(); - if( fileName != null ) { - fileName = fileName.toUpperCase( Locale.ENGLISH ); + fileName = fileName.toUpperCase(Locale.ENGLISH); for( AudioFileFormat.Type fileType : types ) { String ext = fileType.getExtension(); if( ext != null ) { @@ -718,9 +717,8 @@ private AudioFileFormat.Type getAudioFileType( File file ) return fileType; } } - } - StringBuilder buf = new StringBuilder( 64 ); + StringBuilder buf = new StringBuilder( 64 ); buf.append( audioFrmResourceBundle.getString("error.getAudioFileType.fileFormatNotSupported.message") ); if( !types.isEmpty() ) { buf.append( audioFrmResourceBundle.getString("error.getAudioFileType.fileFormatNotSupported.possibleExtensions") ); @@ -772,8 +770,8 @@ public static String getAudioFormatText( AudioFormat fmt ) private int getSampleRate() { int i = this.comboSampleRate.getSelectedIndex() - 1; // 0: automatisch - return ((i >= 0) && (i < this.sampleRates.length)) ? - this.sampleRates[ i ] : 0; + return ((i >= 0) && (i < sampleRates.length)) ? + sampleRates[ i ] : 0; } @@ -835,7 +833,7 @@ private void setEmuThreadPriority( int priority ) try { this.emuThread.setPriority( priority ); } - catch( Exception ex ) {} + catch( Exception ignored) {} } diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioIn.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioIn.java index d0dc535..d63821f 100755 --- a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioIn.java +++ b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioIn.java @@ -266,7 +266,7 @@ else if( v > this.maxValue ) { * Anzahl der verstrichenen Taktzyklen auf den Wert * des letzten gelesenen Samples korrigieren */ - this.lastCycles += (nSamples * this.cyclesPerFrame); + this.lastCycles += ((long) nSamples * this.cyclesPerFrame); } } } diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioInFile.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioInFile.java index 106cd6c..35ad4fd 100755 --- a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioInFile.java +++ b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioInFile.java @@ -24,9 +24,9 @@ public class AudioInFile extends AudioIn private static final Locale locale = Locale.getDefault(); private static final ResourceBundle audioInFileResourceBundle = ResourceBundle.getBundle("AudioInFile", locale); - private AudioFrm audioFrm; - private File file; - private boolean monitorPlay; + private final AudioFrm audioFrm; + private final File file; + private final boolean monitorPlay; private AudioInputStream in; private byte[] frameBuf; private long frameCount; @@ -113,7 +113,8 @@ public AudioFormat startAudio( this.errorText = audioInFileResourceBundle.getString("error.startAudio.unknownError.errorText") + ex.getMessage(); } if( (this.in != null) || (fmt != null) ) { - this.frameBuf = new byte[ fmt.getFrameSize() ]; + assert fmt != null; + this.frameBuf = new byte[ fmt.getFrameSize() ]; this.cyclesPerFrame = Math.round( (float) cyclesPerSecond / fmt.getFrameRate() ); this.thresholdValue = thresholdValue; @@ -142,7 +143,7 @@ public void stopAudio() try { in.close(); } - catch( Exception ex ) {} + catch( Exception ignored) {} } } } diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioInLine.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioInLine.java index a750124..5e0abcb 100755 --- a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioInLine.java +++ b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioInLine.java @@ -16,7 +16,7 @@ public class AudioInLine extends AudioIn { - private static int[] sampleRates = { 44100, 32000, 22050 }; + private static final int[] sampleRates = { 44100, 32000, 22050 }; private TargetDataLine dataLine; private byte[] frameBuf; diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOut.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOut.java index 5124bbf..9c20f1a 100755 --- a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOut.java +++ b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOut.java @@ -105,7 +105,7 @@ public void writePhase( boolean phase ) * Anzahl der verstrichenen Taktzyklen auf den Wert * des letzten ausgegebenen Samples korrigieren */ - this.lastCycles += (nSamples * this.cyclesPerFrame); + this.lastCycles += ((long) nSamples * this.cyclesPerFrame); this.lastPhaseSamples = nSamples; } } diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOutFile.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOutFile.java index 2fda4dd..3170263 100755 --- a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOutFile.java +++ b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOutFile.java @@ -26,12 +26,12 @@ public class AudioOutFile extends AudioOut private static final Locale locale = Locale.getDefault(); private static final ResourceBundle audioOutFileResourceBundle = ResourceBundle.getBundle("AudioOutFile", locale); - private AudioFrm audioFrm; - private File file; - private AudioFileFormat.Type fileType; - private boolean monitorPlay; - private AudioFormat audioFmt; - private AudioDataQueue queue; + private final AudioFrm audioFrm; + private final File file; + private final AudioFileFormat.Type fileType; + private final boolean monitorPlay; + private AudioFormat audioFmt; + private AudioDataQueue queue; public AudioOutFile( @@ -109,8 +109,9 @@ public void stopAudio() { closeMonitorLine(); - AudioDataQueue queue = this.queue; - this.enabled = false; + AudioDataQueue queue; + queue = this.queue; + this.enabled = false; this.errorText = queue.getErrorText(); if( (this.errorText == null) && (queue.getTotalSampleCount() > 0) ) { try { diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOutLine.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOutLine.java index 205b6ac..46cb74a 100755 --- a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOutLine.java +++ b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOutLine.java @@ -17,13 +17,13 @@ public class AudioOutLine extends AudioOut { - private static int[] sampleRatesSound = { 22050, 16000, 8000 }; - private static int[] sampleRatesData = { 44100, 32000, 22050 }; + private static final int[] sampleRatesSound = { 22050, 16000, 8000 }; + private static final int[] sampleRatesData = { 44100, 32000, 22050 }; - private boolean forDataTransfer; - private SourceDataLine dataLine; - private byte[] audioDataBuf; - private int audioDataPos; + private final boolean forDataTransfer; + private SourceDataLine dataLine; + private byte[] audioDataBuf; + private int audioDataPos; public AudioOutLine(Z8 z8, JTCSys jtcSys, boolean forDataTransfer ) diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/DataLineCloser.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/DataLineCloser.java index 40df84e..ac456ce 100755 --- a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/DataLineCloser.java +++ b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/DataLineCloser.java @@ -31,7 +31,7 @@ public static void closeDataLine( DataLine dataLine ) try { thread.join( 1000 ); } - catch( InterruptedException ex ) {} + catch( InterruptedException ignored) {} } } } @@ -46,17 +46,17 @@ public void run() try { this.dataLine.flush(); } - catch( Exception ex ) {} + catch( Exception ignored) {} try { this.dataLine.stop(); } - catch( Exception ex ) {} + catch( Exception ignored) {} try { this.dataLine.close(); } - catch( Exception ex ) {} + catch( Exception ignored) {} this.dataLine = null; } diff --git a/src/main/java/org/sqar/virtualjtc/z8/Z8Breakpoint.java b/src/main/java/org/sqar/virtualjtc/z8/Z8Breakpoint.java index fd555f5..bc7e360 100755 --- a/src/main/java/org/sqar/virtualjtc/z8/Z8Breakpoint.java +++ b/src/main/java/org/sqar/virtualjtc/z8/Z8Breakpoint.java @@ -11,9 +11,9 @@ public class Z8Breakpoint implements Comparable { - private int addr; - private boolean enabled; - private String text; + private final int addr; + private boolean enabled; + private String text; public Z8Breakpoint( int addr ) diff --git a/src/main/java/org/sqar/virtualjtc/z8/Z8Reassembler.java b/src/main/java/org/sqar/virtualjtc/z8/Z8Reassembler.java index 38f7863..2cd837c 100755 --- a/src/main/java/org/sqar/virtualjtc/z8/Z8Reassembler.java +++ b/src/main/java/org/sqar/virtualjtc/z8/Z8Reassembler.java @@ -18,11 +18,11 @@ public class Z8Reassembler "P01M", "IPR", "IRQ", "IMR", "FLAGS", "RP", "SPH", "SPL" }; - private Z8Memory memory; - private StringBuilder buf; - private int addr; - private String lastInstName; - private String[] lastInstArgs; + private final Z8Memory memory; + private StringBuilder buf; + private int addr; + private String lastInstName; + private String[] lastInstArgs; public Z8Reassembler( Z8Memory memory ) @@ -203,24 +203,23 @@ private void reassNextInst( boolean includeAddr ) begPos = this.buf.length(); this.buf.append( this.lastInstName ); if( this.lastInstArgs != null ) { - for( int i = 0; i < this.lastInstArgs.length; i++ ) { - String arg = this.lastInstArgs[ i ]; - if( arg != null ) { - if( begPos >= 0 ) { - n = begPos + 8 - this.buf.length(); - if( n < 1 ) { - n = 1; + for (String arg : this.lastInstArgs) { + if (arg != null) { + if (begPos >= 0) { + n = begPos + 8 - this.buf.length(); + if (n < 1) { + n = 1; + } + for (int k = 0; k < n; k++) { + this.buf.append((char) '\u0020'); + } + begPos = -1; + } else { + this.buf.append(", "); + } + this.buf.append(arg); } - for( int k = 0; k < n; k++ ) { - this.buf.append( (char) '\u0020' ); - } - begPos = -1; - } else { - this.buf.append( ", " ); - } - this.buf.append( arg ); } - } } }