build fix

IOOI-SqAR · Dec 31, 2023 · 9bcdeb1 · 9bcdeb1
1 parent d9b4872
commit 9bcdeb1
Show file tree

Hide file tree

Showing 29 changed files with 54 additions and 31 deletions.
diff --git a/jtcemu-src-2.1.iml b/jtcemu-src-2.1.iml
@@ -4,7 +4,8 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/etc" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/Main.java b/src/main/java/org/sqar/virtualjtc/jtcemu/Main.java
@@ -131,7 +131,7 @@ public static void main( String[] args )
                 }
                 catch( IOException ex ) {
                   String msg = ex.getMessage();
-                  Main.showError(
+                  showError(
                         topFrm,
                         String.format( mainResourceBundle.getString("error.loadROMs.formatstring"), addr, msg != null ? msg : "" ) );
                 }

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioFrm.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioFrm.java
@@ -16,6 +16,7 @@
 import javax.sound.sampled.*;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
+
 import org.sqar.virtualjtc.jtcemu.Main;
 import org.sqar.virtualjtc.jtcemu.base.*;
 import org.sqar.virtualjtc.z8.Z8;

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioIO.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioIO.java
@@ -10,12 +10,13 @@
 package org.sqar.virtualjtc.jtcemu.audio;
 
 import javax.sound.sampled.*;
+
 import org.sqar.virtualjtc.z8.Z8;
 
 
 public abstract class AudioIO
 {
-  protected Z8      z8;
+  protected Z8 z8;
   protected boolean firstCall;
   protected boolean progressEnabled;
   protected boolean lastPhase;

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioIn.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioIn.java
@@ -10,6 +10,7 @@
 package org.sqar.virtualjtc.jtcemu.audio;
 
 import javax.sound.sampled.*;
+
 import org.sqar.virtualjtc.z8.Z8;
 
 

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioInLine.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioInLine.java
@@ -10,6 +10,7 @@
 package org.sqar.virtualjtc.jtcemu.audio;
 
 import javax.sound.sampled.*;
+
 import org.sqar.virtualjtc.z8.Z8;
 
 

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOut.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOut.java
@@ -11,8 +11,8 @@
 
 package org.sqar.virtualjtc.jtcemu.audio;
 
-import org.sqar.virtualjtc.jtcemu.base.JTCSys;
 import org.sqar.virtualjtc.z8.Z8;
+import org.sqar.virtualjtc.jtcemu.base.JTCSys;
 
 
 public abstract class AudioOut extends AudioIO
@@ -30,7 +30,7 @@ public abstract class AudioOut extends AudioIO
   private boolean firstPhaseChange;
 
 
-  protected AudioOut( Z8 z8, JTCSys jtcSys )
+  protected AudioOut(Z8 z8, JTCSys jtcSys )
   {
     super( z8 );
     this.jtcSys           = jtcSys;

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOutFile.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOutFile.java
@@ -16,6 +16,7 @@
 import java.util.ResourceBundle;
 
 import javax.sound.sampled.*;
+
 import org.sqar.virtualjtc.jtcemu.base.JTCSys;
 import org.sqar.virtualjtc.z8.Z8;
 
@@ -34,8 +35,8 @@ public class AudioOutFile extends AudioOut
 
 
   public AudioOutFile(
-                Z8                   z8,
-                JTCSys               jtcSys,
+                Z8 z8,
+                JTCSys jtcSys,
                 AudioFrm             audioFrm,
                 File                 file,
                 AudioFileFormat.Type fileType,

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOutLine.java b/src/main/java/org/sqar/virtualjtc/jtcemu/audio/AudioOutLine.java
@@ -10,8 +10,9 @@
 package org.sqar.virtualjtc.jtcemu.audio;
 
 import javax.sound.sampled.*;
-import org.sqar.virtualjtc.jtcemu.base.JTCSys;
+
 import org.sqar.virtualjtc.z8.Z8;
+import org.sqar.virtualjtc.jtcemu.base.JTCSys;
 
 
 public class AudioOutLine extends AudioOut
@@ -25,7 +26,7 @@ public class AudioOutLine extends AudioOut
   private int            audioDataPos;
 
 
-  public AudioOutLine( Z8 z8, JTCSys jtcSys, boolean forDataTransfer )
+  public AudioOutLine(Z8 z8, JTCSys jtcSys, boolean forDataTransfer )
   {
     super( z8, jtcSys );
     this.forDataTransfer = forDataTransfer;

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/base/AbstractTextFrm.java b/src/main/java/org/sqar/virtualjtc/jtcemu/base/AbstractTextFrm.java
@@ -21,6 +21,7 @@
 import javax.print.attribute.standard.*;
 import javax.swing.JTextArea;
 import javax.swing.text.*;
+
 import org.sqar.virtualjtc.jtcemu.Main;
 
 

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/base/BaseDlg.java b/src/main/java/org/sqar/virtualjtc/jtcemu/base/BaseDlg.java
@@ -11,6 +11,7 @@
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.JDialog;
+
 import org.sqar.virtualjtc.jtcemu.Main;
 
 

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/base/BaseFrm.java b/src/main/java/org/sqar/virtualjtc/jtcemu/base/BaseFrm.java
@@ -10,6 +10,7 @@
 
 import java.awt.event.*;
 import javax.swing.JFrame;
+
 import org.sqar.virtualjtc.jtcemu.Main;
 
 

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/base/FileDlg.java b/src/main/java/org/sqar/virtualjtc/jtcemu/base/FileDlg.java
@@ -18,6 +18,7 @@
 
 import javax.swing.*;
 import javax.swing.filechooser.FileFilter;
+
 import org.sqar.virtualjtc.jtcemu.Main;
 
 

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/base/GUIUtil.java b/src/main/java/org/sqar/virtualjtc/jtcemu/base/GUIUtil.java
@@ -19,6 +19,7 @@
 import java.util.*;
 import javax.swing.*;
 import javax.swing.filechooser.*;
+
 import org.sqar.virtualjtc.jtcemu.Main;
 
 

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/base/HelpFrm.java b/src/main/java/org/sqar/virtualjtc/jtcemu/base/HelpFrm.java
@@ -19,6 +19,7 @@
 import javax.print.attribute.standard.*;
 import javax.swing.*;
 import javax.swing.event.*;
+
 import org.sqar.virtualjtc.jtcemu.Main;
 
 
@@ -410,7 +411,7 @@ private void doScrollTo( Double viewPos )
   private static void openInternal( String page )
   {
     if( instance != null ) {
-      instance.setState( Frame.NORMAL );
+      instance.setState(NORMAL);
       instance.toFront();
     } else {
       instance = new HelpFrm();

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/base/KeyboardFrm.java b/src/main/java/org/sqar/virtualjtc/jtcemu/base/KeyboardFrm.java
@@ -162,7 +162,7 @@ public void keyStatusChanged( KeyFld keyFld, boolean state )
   public static void open( TopFrm topFrm, JTCSys jtcSys )
   {
     if( instance != null ) {
-      instance.setState( Frame.NORMAL );
+      instance.setState(NORMAL);
       instance.toFront();
     } else {
       instance = new KeyboardFrm( topFrm, jtcSys );

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/base/LoadDlg.java b/src/main/java/org/sqar/virtualjtc/jtcemu/base/LoadDlg.java
@@ -16,6 +16,7 @@
 import java.util.ResourceBundle;
 
 import javax.swing.*;
+
 import org.sqar.virtualjtc.jtcemu.Main;
 import org.sqar.virtualjtc.z8.Z8Memory;
 
@@ -28,7 +29,7 @@ public class LoadDlg extends BaseDlg implements ActionListener
   private static final String textBegAddr = loadDlgResourceBundle.getString("text.begAddr");
   private static final String textEndAddr = loadDlgResourceBundle.getString("text.EndAddr");
 
-  private Z8Memory     memory;
+  private Z8Memory memory;
   private byte[]       fileBytes;
   private int          fileLen;
   private File         file;

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/base/PrintOptionsDlg.java b/src/main/java/org/sqar/virtualjtc/jtcemu/base/PrintOptionsDlg.java
@@ -15,6 +15,7 @@
 import java.util.ResourceBundle;
 
 import javax.swing.*;
+
 import org.sqar.virtualjtc.jtcemu.Main;
 
 

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/base/SaveDlg.java b/src/main/java/org/sqar/virtualjtc/jtcemu/base/SaveDlg.java
@@ -16,6 +16,7 @@
 import java.util.ResourceBundle;
 
 import javax.swing.*;
+
 import org.sqar.virtualjtc.jtcemu.Main;
 import org.sqar.virtualjtc.z8.Z8Memory;
 
@@ -29,7 +30,7 @@ public class SaveDlg extends BaseDlg implements ActionListener
   private static final String textEndAddr     = saveDlgResourceBundle.getString("text.endAddr");
   private static final String textFileBegAddr = saveDlgResourceBundle.getString("text.fileBegAddr");
 
-  private Z8Memory     memory;
+  private Z8Memory memory;
   private JTextField   fldBegAddr;
   private JTextField   fldEndAddr;
   private JTextField   fldFileBegAddr;

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/base/SettingsFrm.java b/src/main/java/org/sqar/virtualjtc/jtcemu/base/SettingsFrm.java
@@ -82,7 +82,7 @@ public static void close()
   public static void open( TopFrm topFrm, JTCSys jtcSys )
   {
     if( instance != null ) {
-      instance.setState( Frame.NORMAL );
+      instance.setState(NORMAL);
       instance.toFront();
     } else {
       instance = new SettingsFrm( topFrm, jtcSys );
@@ -842,7 +842,7 @@ else if( (this.btnES23.isSelected() || this.btnES40.isSelected())
       }
 
       // zum Schluss (nach JTCSys!) andere Fenster informieren
-      Frame[] frames = Frame.getFrames();
+      Frame[] frames = getFrames();
       if( frames != null ) {
         for( int i = 0; i < frames.length; i++ ) {
           Frame frm = frames[ i ];
@@ -890,7 +890,7 @@ private void doSave()
   {
     Properties props = Main.getProperties();
     if( (props != null) && (this.propsFile != null) ) {
-      Frame[] frames = Frame.getFrames();
+      Frame[] frames = getFrames();
       if( frames != null ) {
         for( int i = 0; i < frames.length; i++ ) {
           Frame  f = frames[ i ];
@@ -1150,7 +1150,7 @@ private JTCSys.OSType applySys( Properties props )
 
   private void informLAFChanged()
   {
-    Frame[] frames = Frame.getFrames();
+    Frame[] frames = getFrames();
     if( frames != null ) {
       for( int i = 0; i< frames.length; i++ ) {
         Frame frm = frames[ i ];

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/tools/DebugFrm.java b/src/main/java/org/sqar/virtualjtc/jtcemu/tools/DebugFrm.java
@@ -16,10 +16,11 @@
 
 import javax.swing.*;
 import javax.swing.event.*;
-import org.sqar.virtualjtc.jtcemu.base.*;
+
 import org.sqar.virtualjtc.jtcemu.Main;
+import org.sqar.virtualjtc.jtcemu.base.*;
 import org.sqar.virtualjtc.z8.*;
-import org.sqar.virtualjtc.z8.Z8.RunMode;
+import org.sqar.virtualjtc.z8.Z8;
 
 
 public class DebugFrm extends BaseFrm
@@ -125,7 +126,7 @@ public static boolean close()
   public static void open( Z8 z8 )
   {
     if( instance != null ) {
-      instance.setState( Frame.NORMAL );
+      instance.setState(NORMAL);
       instance.toFront();
     } else {
       instance = new DebugFrm( z8 );
@@ -1097,7 +1098,7 @@ private void toggleAutoStep(boolean selected)
         @Override
         public void run()
         {
-          final RunMode runMode = DebugFrm.this.z8.getRunMode();
+          final Z8.RunMode runMode = DebugFrm.this.z8.getRunMode();
 
           // only fire if we aren't currently running
           if (!Z8.RunMode.RUNNING.equals(runMode)) {

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/tools/FindAndReplaceDlg.java b/src/main/java/org/sqar/virtualjtc/jtcemu/tools/FindAndReplaceDlg.java
@@ -15,8 +15,9 @@
 import java.util.ResourceBundle;
 import java.util.regex.*;
 import javax.swing.*;
-import org.sqar.virtualjtc.jtcemu.base.*;
+
 import org.sqar.virtualjtc.jtcemu.Main;
+import org.sqar.virtualjtc.jtcemu.base.*;
 
 
 public class FindAndReplaceDlg extends BaseDlg implements ActionListener

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/tools/InstructionTracer.java b/src/main/java/org/sqar/virtualjtc/jtcemu/tools/InstructionTracer.java
@@ -14,11 +14,11 @@
 
 public class InstructionTracer implements Z8PCListener
 {
-  private Appendable    appendable;
+  private LineAppendable appendable;
   private Z8Reassembler z8Reass;
 
 
-  public InstructionTracer(Z8 z8, Appendable appendable)
+  public InstructionTracer(Z8 z8, LineAppendable appendable)
   {
     this.z8Reass    = new Z8Reassembler( z8.getMemory() );
     this.appendable = appendable;

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/tools/InstructionTracerFrm.java b/src/main/java/org/sqar/virtualjtc/jtcemu/tools/InstructionTracerFrm.java
@@ -18,15 +18,16 @@
 import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.text.JTextComponent;
-import org.sqar.virtualjtc.jtcemu.base.*;
+
 import org.sqar.virtualjtc.jtcemu.Main;
+import org.sqar.virtualjtc.jtcemu.base.*;
 import org.sqar.virtualjtc.z8.*;
 
 
 public class InstructionTracerFrm extends AbstractTextFrm implements
                                                 ActionListener,
-                                                CaretListener, 
-                                                Appendable
+                                                CaretListener,
+        LineAppendable
 {
   private static final Locale locale = Locale.getDefault();
   private static final ResourceBundle instructionTracerFrmResourceBundle = ResourceBundle.getBundle("InstructionTracerFrm", locale);

diff --git a/...r/virtualjtc/jtcemu/tools/Appendable.java → ...rtualjtc/jtcemu/tools/LineAppendable.java b/...r/virtualjtc/jtcemu/tools/Appendable.java → ...rtualjtc/jtcemu/tools/LineAppendable.java
@@ -8,7 +8,7 @@
 
 package org.sqar.virtualjtc.jtcemu.tools;
 
-public interface Appendable
+public interface LineAppendable
 {
   void appendLine(String line);
 }
diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/tools/ReassFrm.java b/src/main/java/org/sqar/virtualjtc/jtcemu/tools/ReassFrm.java
@@ -19,8 +19,9 @@
 import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.text.JTextComponent;
-import org.sqar.virtualjtc.jtcemu.base.*;
+
 import org.sqar.virtualjtc.jtcemu.Main;
+import org.sqar.virtualjtc.jtcemu.base.*;
 import org.sqar.virtualjtc.z8.*;
 
 

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/tools/TextEditFrm.java b/src/main/java/org/sqar/virtualjtc/jtcemu/tools/TextEditFrm.java
@@ -22,8 +22,9 @@
 import javax.swing.event.*;
 import javax.swing.text.*;
 import javax.swing.undo.UndoManager;
-import org.sqar.virtualjtc.jtcemu.base.*;
+
 import org.sqar.virtualjtc.jtcemu.Main;
+import org.sqar.virtualjtc.jtcemu.base.*;
 
 
 public class TextEditFrm extends AbstractTextFrm
@@ -133,7 +134,7 @@ else if( value.equals( options[ 1 ] ) ) {
   public static void open( JTCSys jtcSys )
   {
     if( instance != null ) {
-      instance.setState( Frame.NORMAL );
+      instance.setState(NORMAL);
       instance.toFront();
     } else {
       instance = new TextEditFrm( jtcSys );

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/tools/hexedit/AbstractHexCharFrm.java b/src/main/java/org/sqar/virtualjtc/jtcemu/tools/hexedit/AbstractHexCharFrm.java
@@ -19,6 +19,7 @@
 import javax.print.attribute.PrintRequestAttributeSet;
 import javax.print.attribute.standard.*;
 import javax.swing.*;
+
 import org.sqar.virtualjtc.jtcemu.Main;
 import org.sqar.virtualjtc.jtcemu.base.BaseFrm;
 

diff --git a/src/main/java/org/sqar/virtualjtc/jtcemu/tools/hexedit/HexEditFrm.java b/src/main/java/org/sqar/virtualjtc/jtcemu/tools/hexedit/HexEditFrm.java
@@ -18,6 +18,7 @@
 
 import javax.naming.SizeLimitExceededException;
 import javax.swing.*;
+
 import org.sqar.virtualjtc.jtcemu.Main;
 import org.sqar.virtualjtc.jtcemu.base.*;