Jelajahi Sumber

refactoring emulator classes

Wilfried Klaas 6 tahun lalu
induk
melakukan
5cd991ea45

+ 9 - 2
src/main/java/de/mcs/tools/sps/emulator/emulator/AbstractEmulator.java

@@ -1,11 +1,18 @@
 /**
  * 
  */
-package de.mcs.tools.sps;
+package de.mcs.tools.sps.emulator.emulator;
 
 import java.util.List;
 
-import de.mcs.tools.sps.exceptions.WrongProgramSizeException;
+import de.mcs.tools.sps.emulator.EmulatorInput;
+import de.mcs.tools.sps.emulator.EmulatorInternals;
+import de.mcs.tools.sps.emulator.EmulatorOutput;
+import de.mcs.tools.sps.emulator.SPSCommand;
+import de.mcs.tools.sps.emulator.SPSCommandData;
+import de.mcs.tools.sps.emulator.SPSEmulator;
+import de.mcs.tools.sps.emulator.TOutputCallback;
+import de.mcs.tools.sps.emulator.exceptions.WrongProgramSizeException;
 
 /**
  * @author w.klaas

+ 10 - 10
src/main/java/de/mcs/tools/sps/emulator/emulator/holtek/HoltekEmulator.java

@@ -1,20 +1,20 @@
 /**
  * 
  */
-package de.mcs.tools.sps.holtek;
+package de.mcs.tools.sps.emulator.emulator.holtek;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import de.mcs.tools.sps.AbstractEmulator;
-import de.mcs.tools.sps.EmulatorInput;
-import de.mcs.tools.sps.EmulatorInternals;
-import de.mcs.tools.sps.EmulatorOutput;
-import de.mcs.tools.sps.SPSCommand;
-import de.mcs.tools.sps.SPSCommandData;
-import de.mcs.tools.sps.SPSCommandDataImpl;
-import de.mcs.tools.sps.SPSCommandImpl;
-import de.mcs.tools.sps.SPSEmulator;
+import de.mcs.tools.sps.emulator.EmulatorInput;
+import de.mcs.tools.sps.emulator.EmulatorInternals;
+import de.mcs.tools.sps.emulator.EmulatorOutput;
+import de.mcs.tools.sps.emulator.SPSCommand;
+import de.mcs.tools.sps.emulator.SPSCommandData;
+import de.mcs.tools.sps.emulator.SPSCommandDataImpl;
+import de.mcs.tools.sps.emulator.SPSCommandImpl;
+import de.mcs.tools.sps.emulator.SPSEmulator;
+import de.mcs.tools.sps.emulator.emulator.AbstractEmulator;
 
 /**
  * @author w.klaas

+ 2 - 2
src/main/java/de/mcs/tools/sps/emulator/emulator/holtek/HoltekEmulatorInput.java

@@ -1,9 +1,9 @@
 /**
  * 
  */
-package de.mcs.tools.sps.holtek;
+package de.mcs.tools.sps.emulator.emulator.holtek;
 
-import de.mcs.tools.sps.EmulatorInput;
+import de.mcs.tools.sps.emulator.EmulatorInput;
 
 /**
  * @author w.klaas

+ 3 - 3
src/main/java/de/mcs/tools/sps/emulator/emulator/holtek/HoltekEmulatorInternals.java

@@ -1,9 +1,9 @@
 /**
  * 
  */
-package de.mcs.tools.sps.holtek;
+package de.mcs.tools.sps.emulator.emulator.holtek;
 
-import de.mcs.tools.sps.EmulatorInternals;
+import de.mcs.tools.sps.emulator.EmulatorInternals;
 
 /**
  * @author w.klaas
@@ -19,7 +19,7 @@ public class HoltekEmulatorInternals implements EmulatorInternals {
   int a, b, c, d;
   int page;
   long delay;
-  int rtrAddress;
+  public int rtrAddress;
 
   @Override
   public void reset() {

+ 2 - 2
src/main/java/de/mcs/tools/sps/emulator/emulator/holtek/HoltekEmulatorOutput.java

@@ -1,9 +1,9 @@
 /**
  * 
  */
-package de.mcs.tools.sps.holtek;
+package de.mcs.tools.sps.emulator.emulator.holtek;
 
-import de.mcs.tools.sps.EmulatorOutput;
+import de.mcs.tools.sps.emulator.EmulatorOutput;
 
 /**
  * @author w.klaas

+ 5 - 5
src/main/java/de/mcs/tools/sps/emulator/emulator/holtek/SPSCommandDataJumpDown.java

@@ -1,12 +1,12 @@
 /**
  * 
  */
-package de.mcs.tools.sps.holtek;
+package de.mcs.tools.sps.emulator.emulator.holtek;
 
-import de.mcs.tools.sps.EmulatorInput;
-import de.mcs.tools.sps.EmulatorInternals;
-import de.mcs.tools.sps.EmulatorOutput;
-import de.mcs.tools.sps.SPSCommandDataImpl;
+import de.mcs.tools.sps.emulator.EmulatorInput;
+import de.mcs.tools.sps.emulator.EmulatorInternals;
+import de.mcs.tools.sps.emulator.EmulatorOutput;
+import de.mcs.tools.sps.emulator.SPSCommandDataImpl;
 
 /**
  * @author w.klaas

+ 5 - 5
src/main/java/de/mcs/tools/sps/emulator/emulator/holtek/SPSCommandDataNOP.java

@@ -1,12 +1,12 @@
 /**
  * 
  */
-package de.mcs.tools.sps.holtek;
+package de.mcs.tools.sps.emulator.emulator.holtek;
 
-import de.mcs.tools.sps.EmulatorInput;
-import de.mcs.tools.sps.EmulatorInternals;
-import de.mcs.tools.sps.EmulatorOutput;
-import de.mcs.tools.sps.SPSCommandDataImpl;
+import de.mcs.tools.sps.emulator.EmulatorInput;
+import de.mcs.tools.sps.emulator.EmulatorInternals;
+import de.mcs.tools.sps.emulator.EmulatorOutput;
+import de.mcs.tools.sps.emulator.SPSCommandDataImpl;
 
 /**
  * @author w.klaas

+ 5 - 5
src/main/java/de/mcs/tools/sps/emulator/emulator/holtek/SPSCommandDataWait.java

@@ -1,12 +1,12 @@
 /**
  * 
  */
-package de.mcs.tools.sps.holtek;
+package de.mcs.tools.sps.emulator.emulator.holtek;
 
-import de.mcs.tools.sps.EmulatorInput;
-import de.mcs.tools.sps.EmulatorInternals;
-import de.mcs.tools.sps.EmulatorOutput;
-import de.mcs.tools.sps.SPSCommandDataImpl;
+import de.mcs.tools.sps.emulator.EmulatorInput;
+import de.mcs.tools.sps.emulator.EmulatorInternals;
+import de.mcs.tools.sps.emulator.EmulatorOutput;
+import de.mcs.tools.sps.emulator.SPSCommandDataImpl;
 
 /**
  * @author w.klaas

+ 1 - 1
src/main/java/de/mcs/tools/sps/emulator/emulator/holtek/package-info.java

@@ -5,4 +5,4 @@
  * @author w.klaas
  *
  */
-package de.mcs.tools.sps.holtek;
+package de.mcs.tools.sps.emulator.emulator.holtek;

+ 1 - 1
src/main/java/de/mcs/tools/sps/emulator/exceptions/WrongProgramSizeException.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package de.mcs.tools.sps.exceptions;
+package de.mcs.tools.sps.emulator.exceptions;
 
 /**
  * @author w.klaas

+ 1 - 1
src/main/java/de/mcs/tools/sps/emulator/exceptions/package-info.java

@@ -5,4 +5,4 @@
  * @author w.klaas
  *
  */
-package de.mcs.tools.sps.exceptions;
+package de.mcs.tools.sps.emulator.exceptions;

+ 20 - 2
src/main/java/de/mcs/tools/sps/emulator/package-info.java

@@ -1,8 +1,26 @@
 /**
+ * MCS Media Computer Software
+ * Copyright 2018 by Wilfried Klaas
+ * Project: SPSEmulator
+ * File: package-info.java
+ * EMail: W.Klaas@gmx.de
+ * Created: 25.11.2018 wklaa_000
  * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 /**
- * @author w.klaas
+ * @author wklaa_000
  *
  */
-package de.mcs.tools.sps;
+package de.mcs.tools.sps.emulator;