diff --git a/src/main/java/a8k/service/appeventbus/AppEventBusService.java b/src/main/java/a8k/baseservice/appeventbus/AppEventBusService.java similarity index 100% rename from src/main/java/a8k/service/appeventbus/AppEventBusService.java rename to src/main/java/a8k/baseservice/appeventbus/AppEventBusService.java diff --git a/src/main/java/a8k/service/appeventbus/AppEventListener.java b/src/main/java/a8k/baseservice/appeventbus/AppEventListener.java similarity index 100% rename from src/main/java/a8k/service/appeventbus/AppEventListener.java rename to src/main/java/a8k/baseservice/appeventbus/AppEventListener.java diff --git a/src/main/java/a8k/service/appeventbus/appevent/A8kCanBusOnConnectEvent.java b/src/main/java/a8k/baseservice/appeventbus/appevent/A8kCanBusOnConnectEvent.java similarity index 100% rename from src/main/java/a8k/service/appeventbus/appevent/A8kCanBusOnConnectEvent.java rename to src/main/java/a8k/baseservice/appeventbus/appevent/A8kCanBusOnConnectEvent.java diff --git a/src/main/java/a8k/service/appeventbus/appevent/A8kHardwareReport.java b/src/main/java/a8k/baseservice/appeventbus/appevent/A8kHardwareReport.java similarity index 100% rename from src/main/java/a8k/service/appeventbus/appevent/A8kHardwareReport.java rename to src/main/java/a8k/baseservice/appeventbus/appevent/A8kHardwareReport.java diff --git a/src/main/java/a8k/service/appeventbus/appevent/A8kStateChangeEvent.java b/src/main/java/a8k/baseservice/appeventbus/appevent/A8kStateChangeEvent.java similarity index 100% rename from src/main/java/a8k/service/appeventbus/appevent/A8kStateChangeEvent.java rename to src/main/java/a8k/baseservice/appeventbus/appevent/A8kStateChangeEvent.java diff --git a/src/main/java/a8k/service/appeventbus/appevent/AppEvent.java b/src/main/java/a8k/baseservice/appeventbus/appevent/AppEvent.java similarity index 100% rename from src/main/java/a8k/service/appeventbus/appevent/AppEvent.java rename to src/main/java/a8k/baseservice/appeventbus/appevent/AppEvent.java diff --git a/src/main/java/a8k/service/appeventbus/appevent/AppStepNotifyEvent.java b/src/main/java/a8k/baseservice/appeventbus/appevent/AppStepNotifyEvent.java similarity index 100% rename from src/main/java/a8k/service/appeventbus/appevent/AppStepNotifyEvent.java rename to src/main/java/a8k/baseservice/appeventbus/appevent/AppStepNotifyEvent.java diff --git a/src/main/java/a8k/service/appeventbus/appevent/AppWarningNotifyEvent.java b/src/main/java/a8k/baseservice/appeventbus/appevent/AppWarningNotifyEvent.java similarity index 100% rename from src/main/java/a8k/service/appeventbus/appevent/AppWarningNotifyEvent.java rename to src/main/java/a8k/baseservice/appeventbus/appevent/AppWarningNotifyEvent.java diff --git a/src/main/java/a8k/service/appeventbus/appevent/NewAppIDCardDetectEvent.java b/src/main/java/a8k/baseservice/appeventbus/appevent/NewAppIDCardDetectEvent.java similarity index 94% rename from src/main/java/a8k/service/appeventbus/appevent/NewAppIDCardDetectEvent.java rename to src/main/java/a8k/baseservice/appeventbus/appevent/NewAppIDCardDetectEvent.java index f9a7ad8..217e1c4 100644 --- a/src/main/java/a8k/service/appeventbus/appevent/NewAppIDCardDetectEvent.java +++ b/src/main/java/a8k/baseservice/appeventbus/appevent/NewAppIDCardDetectEvent.java @@ -1,6 +1,6 @@ package a8k.service.appeventbus.appevent; -import a8k.db.ProjectInfo; +import a8k.dbservice.ProjectInfo; public class NewAppIDCardDetectEvent extends AppEvent { Boolean newIdCardInfo; diff --git a/src/main/java/a8k/db/AppSetting.java b/src/main/java/a8k/dbservice/AppSetting.java similarity index 100% rename from src/main/java/a8k/db/AppSetting.java rename to src/main/java/a8k/dbservice/AppSetting.java diff --git a/src/main/java/a8k/db/AppUser.java b/src/main/java/a8k/dbservice/AppUser.java similarity index 100% rename from src/main/java/a8k/db/AppUser.java rename to src/main/java/a8k/dbservice/AppUser.java diff --git a/src/main/java/a8k/db/DBTableVersion.java b/src/main/java/a8k/dbservice/DBTableVersion.java similarity index 100% rename from src/main/java/a8k/db/DBTableVersion.java rename to src/main/java/a8k/dbservice/DBTableVersion.java diff --git a/src/main/java/a8k/db/HardwareServiceSetting.java b/src/main/java/a8k/dbservice/HardwareServiceSetting.java similarity index 100% rename from src/main/java/a8k/db/HardwareServiceSetting.java rename to src/main/java/a8k/dbservice/HardwareServiceSetting.java diff --git a/src/main/java/a8k/db/LanguageDictIterm.java b/src/main/java/a8k/dbservice/LanguageDictIterm.java similarity index 100% rename from src/main/java/a8k/db/LanguageDictIterm.java rename to src/main/java/a8k/dbservice/LanguageDictIterm.java diff --git a/src/main/java/a8k/db/MdbOption.java b/src/main/java/a8k/dbservice/MdbOption.java similarity index 100% rename from src/main/java/a8k/db/MdbOption.java rename to src/main/java/a8k/dbservice/MdbOption.java diff --git a/src/main/java/a8k/db/ProjectColor.java b/src/main/java/a8k/dbservice/ProjectColor.java similarity index 100% rename from src/main/java/a8k/db/ProjectColor.java rename to src/main/java/a8k/dbservice/ProjectColor.java diff --git a/src/main/java/a8k/db/ProjectInfo.java b/src/main/java/a8k/dbservice/ProjectInfo.java similarity index 100% rename from src/main/java/a8k/db/ProjectInfo.java rename to src/main/java/a8k/dbservice/ProjectInfo.java diff --git a/src/main/java/a8k/service/hardware/canbus/A8kCanBusService.java b/src/main/java/a8k/hardware/A8kCanBusService.java similarity index 98% rename from src/main/java/a8k/service/hardware/canbus/A8kCanBusService.java rename to src/main/java/a8k/hardware/A8kCanBusService.java index 8aaf518..080801e 100644 --- a/src/main/java/a8k/service/hardware/canbus/A8kCanBusService.java +++ b/src/main/java/a8k/hardware/A8kCanBusService.java @@ -1,16 +1,16 @@ package a8k.service.hardware.canbus; -import a8k.service.appeventbus.appevent.A8kCanBusOnConnectEvent; -import a8k.appbase.OptScanDirection; -import a8k.appbase.PlateInfo; +import a8k.baseservice.appeventbus.appevent.A8kCanBusOnConnectEvent; +import a8k.type.OptScanDirection; +import a8k.type.PlateInfo; import a8k.service.hardware.canbus.custom_param_mgr.A8kModCustomParamMgr; import a8k.service.hardware.canbus.data.PipetteSampleData; import a8k.service.hardware.canbus.protocol.*; import a8k.service.hardware.canbus.protocol.MId; -import a8k.appbase.HardwareException; -import a8k.appbase.cfg.Pos2d; -import a8k.service.appeventbus.appevent.A8kHardwareReport; -import a8k.service.appeventbus.AppEventBusService; +import a8k.type.HardwareException; +import a8k.type.cfg.Pos2d; +import a8k.baseservice.appeventbus.appevent.A8kHardwareReport; +import a8k.baseservice.appeventbus.AppEventBusService; import a8k.utils.ByteArray; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/hardware/canbus/A8kModParamInitializer.java b/src/main/java/a8k/hardware/A8kModParamInitializer.java similarity index 95% rename from src/main/java/a8k/service/hardware/canbus/A8kModParamInitializer.java rename to src/main/java/a8k/hardware/A8kModParamInitializer.java index 33a12da..c286669 100644 --- a/src/main/java/a8k/service/hardware/canbus/A8kModParamInitializer.java +++ b/src/main/java/a8k/hardware/A8kModParamInitializer.java @@ -1,10 +1,10 @@ package a8k.service.hardware.canbus; -import a8k.service.appeventbus.AppEventBusService; -import a8k.service.appeventbus.appevent.A8kCanBusOnConnectEvent; -import a8k.service.appeventbus.appevent.AppEvent; -import a8k.service.appeventbus.AppEventListener; -import a8k.appbase.HardwareException; +import a8k.baseservice.appeventbus.AppEventBusService; +import a8k.baseservice.appeventbus.appevent.A8kCanBusOnConnectEvent; +import a8k.baseservice.appeventbus.appevent.AppEvent; +import a8k.baseservice.appeventbus.AppEventListener; +import a8k.type.HardwareException; import a8k.service.hardware.canbus.custom_param_mgr.ModCustomParamId; import a8k.service.hardware.canbus.custom_param_mgr.A8kModCustomParamMgr; import a8k.service.hardware.canbus.protocol.MId; diff --git a/src/main/java/a8k/service/hardware/canbus/custom_param_mgr/A8kModCustomParam.java b/src/main/java/a8k/hardware/custom_param_mgr/A8kModCustomParam.java similarity index 100% rename from src/main/java/a8k/service/hardware/canbus/custom_param_mgr/A8kModCustomParam.java rename to src/main/java/a8k/hardware/custom_param_mgr/A8kModCustomParam.java diff --git a/src/main/java/a8k/service/hardware/canbus/custom_param_mgr/A8kModCustomParamMgr.java b/src/main/java/a8k/hardware/custom_param_mgr/A8kModCustomParamMgr.java similarity index 100% rename from src/main/java/a8k/service/hardware/canbus/custom_param_mgr/A8kModCustomParamMgr.java rename to src/main/java/a8k/hardware/custom_param_mgr/A8kModCustomParamMgr.java diff --git a/src/main/java/a8k/service/hardware/canbus/custom_param_mgr/ModCustomParamId.java b/src/main/java/a8k/hardware/custom_param_mgr/ModCustomParamId.java similarity index 100% rename from src/main/java/a8k/service/hardware/canbus/custom_param_mgr/ModCustomParamId.java rename to src/main/java/a8k/hardware/custom_param_mgr/ModCustomParamId.java diff --git a/src/main/java/a8k/service/hardware/canbus/data/PipetteSampleData.java b/src/main/java/a8k/hardware/type/PipetteSampleData.java similarity index 100% rename from src/main/java/a8k/service/hardware/canbus/data/PipetteSampleData.java rename to src/main/java/a8k/hardware/type/PipetteSampleData.java diff --git a/src/main/java/a8k/appbase/A8kScanCurve.java b/src/main/java/a8k/type/A8kScanCurve.java similarity index 100% rename from src/main/java/a8k/appbase/A8kScanCurve.java rename to src/main/java/a8k/type/A8kScanCurve.java diff --git a/src/main/java/a8k/appbase/ConsumableGroup.java b/src/main/java/a8k/type/ConsumableGroup.java similarity index 100% rename from src/main/java/a8k/appbase/ConsumableGroup.java rename to src/main/java/a8k/type/ConsumableGroup.java diff --git a/src/main/java/a8k/appbase/HardwareException.java b/src/main/java/a8k/type/HardwareException.java similarity index 100% rename from src/main/java/a8k/appbase/HardwareException.java rename to src/main/java/a8k/type/HardwareException.java diff --git a/src/main/java/a8k/appbase/IncubatorPos.java b/src/main/java/a8k/type/IncubatorPos.java similarity index 100% rename from src/main/java/a8k/appbase/IncubatorPos.java rename to src/main/java/a8k/type/IncubatorPos.java diff --git a/src/main/java/a8k/appbase/OptScanDirection.java b/src/main/java/a8k/type/OptScanDirection.java similarity index 100% rename from src/main/java/a8k/appbase/OptScanDirection.java rename to src/main/java/a8k/type/OptScanDirection.java diff --git a/src/main/java/a8k/appbase/PlateInfo.java b/src/main/java/a8k/type/PlateInfo.java similarity index 100% rename from src/main/java/a8k/appbase/PlateInfo.java rename to src/main/java/a8k/type/PlateInfo.java diff --git a/src/main/java/a8k/appbase/ProjectInfoSimple.java b/src/main/java/a8k/type/ProjectInfoSimple.java similarity index 100% rename from src/main/java/a8k/appbase/ProjectInfoSimple.java rename to src/main/java/a8k/type/ProjectInfoSimple.java diff --git a/src/main/java/a8k/appbase/SampleTubeState.java b/src/main/java/a8k/type/SampleTubeState.java similarity index 100% rename from src/main/java/a8k/appbase/SampleTubeState.java rename to src/main/java/a8k/type/SampleTubeState.java diff --git a/src/main/java/a8k/appbase/TargetPosMeasureDirection.java b/src/main/java/a8k/type/TargetPosMeasureDirection.java similarity index 100% rename from src/main/java/a8k/appbase/TargetPosMeasureDirection.java rename to src/main/java/a8k/type/TargetPosMeasureDirection.java diff --git a/src/main/java/a8k/service/hardware/canbus/protocol/A8kEcode.java b/src/main/java/a8k/type/a8kcanprotocol/A8kEcode.java similarity index 100% rename from src/main/java/a8k/service/hardware/canbus/protocol/A8kEcode.java rename to src/main/java/a8k/type/a8kcanprotocol/A8kEcode.java diff --git a/src/main/java/a8k/service/hardware/canbus/protocol/A8kPacket.java b/src/main/java/a8k/type/a8kcanprotocol/A8kPacket.java similarity index 100% rename from src/main/java/a8k/service/hardware/canbus/protocol/A8kPacket.java rename to src/main/java/a8k/type/a8kcanprotocol/A8kPacket.java diff --git a/src/main/java/a8k/service/hardware/canbus/protocol/CmdId.java b/src/main/java/a8k/type/a8kcanprotocol/CmdId.java similarity index 100% rename from src/main/java/a8k/service/hardware/canbus/protocol/CmdId.java rename to src/main/java/a8k/type/a8kcanprotocol/CmdId.java diff --git a/src/main/java/a8k/service/hardware/canbus/protocol/IOId.java b/src/main/java/a8k/type/a8kcanprotocol/IOId.java similarity index 100% rename from src/main/java/a8k/service/hardware/canbus/protocol/IOId.java rename to src/main/java/a8k/type/a8kcanprotocol/IOId.java diff --git a/src/main/java/a8k/service/hardware/canbus/protocol/MId.java b/src/main/java/a8k/type/a8kcanprotocol/MId.java similarity index 100% rename from src/main/java/a8k/service/hardware/canbus/protocol/MId.java rename to src/main/java/a8k/type/a8kcanprotocol/MId.java diff --git a/src/main/java/a8k/service/hardware/canbus/protocol/ModuleStatus.java b/src/main/java/a8k/type/a8kcanprotocol/ModuleStatus.java similarity index 100% rename from src/main/java/a8k/service/hardware/canbus/protocol/ModuleStatus.java rename to src/main/java/a8k/type/a8kcanprotocol/ModuleStatus.java diff --git a/src/main/java/a8k/service/hardware/canbus/protocol/ModuleType.java b/src/main/java/a8k/type/a8kcanprotocol/ModuleType.java similarity index 100% rename from src/main/java/a8k/service/hardware/canbus/protocol/ModuleType.java rename to src/main/java/a8k/type/a8kcanprotocol/ModuleType.java diff --git a/src/main/java/a8k/service/hardware/canbus/protocol/RegIndex.java b/src/main/java/a8k/type/a8kcanprotocol/RegIndex.java similarity index 100% rename from src/main/java/a8k/service/hardware/canbus/protocol/RegIndex.java rename to src/main/java/a8k/type/a8kcanprotocol/RegIndex.java diff --git a/src/main/java/a8k/appbase/appret/AppRet.java b/src/main/java/a8k/type/appret/AppRet.java similarity index 100% rename from src/main/java/a8k/appbase/appret/AppRet.java rename to src/main/java/a8k/type/appret/AppRet.java diff --git a/src/main/java/a8k/appbase/appret/AppRetType.java b/src/main/java/a8k/type/appret/AppRetType.java similarity index 100% rename from src/main/java/a8k/appbase/appret/AppRetType.java rename to src/main/java/a8k/type/appret/AppRetType.java diff --git a/src/main/java/a8k/appbase/cfg/BottleGroupsPosInfo.java b/src/main/java/a8k/type/cfg/BottleGroupsPosInfo.java similarity index 100% rename from src/main/java/a8k/appbase/cfg/BottleGroupsPosInfo.java rename to src/main/java/a8k/type/cfg/BottleGroupsPosInfo.java diff --git a/src/main/java/a8k/appbase/cfg/BottlesPosInfo.java b/src/main/java/a8k/type/cfg/BottlesPosInfo.java similarity index 100% rename from src/main/java/a8k/appbase/cfg/BottlesPosInfo.java rename to src/main/java/a8k/type/cfg/BottlesPosInfo.java diff --git a/src/main/java/a8k/appbase/cfg/HbotLimitArea.java b/src/main/java/a8k/type/cfg/HbotLimitArea.java similarity index 100% rename from src/main/java/a8k/appbase/cfg/HbotLimitArea.java rename to src/main/java/a8k/type/cfg/HbotLimitArea.java diff --git a/src/main/java/a8k/appbase/cfg/KeyValType.java b/src/main/java/a8k/type/cfg/KeyValType.java similarity index 100% rename from src/main/java/a8k/appbase/cfg/KeyValType.java rename to src/main/java/a8k/type/cfg/KeyValType.java diff --git a/src/main/java/a8k/appbase/cfg/LargeBottleBufferPos.java b/src/main/java/a8k/type/cfg/LargeBottleBufferPos.java similarity index 100% rename from src/main/java/a8k/appbase/cfg/LargeBottleBufferPos.java rename to src/main/java/a8k/type/cfg/LargeBottleBufferPos.java diff --git a/src/main/java/a8k/appbase/cfg/PipetteCfg.java b/src/main/java/a8k/type/cfg/PipetteCfg.java similarity index 100% rename from src/main/java/a8k/appbase/cfg/PipetteCfg.java rename to src/main/java/a8k/type/cfg/PipetteCfg.java diff --git a/src/main/java/a8k/appbase/cfg/Plates2dCodeScanPos.java b/src/main/java/a8k/type/cfg/Plates2dCodeScanPos.java similarity index 100% rename from src/main/java/a8k/appbase/cfg/Plates2dCodeScanPos.java rename to src/main/java/a8k/type/cfg/Plates2dCodeScanPos.java diff --git a/src/main/java/a8k/appbase/cfg/Pos2d.java b/src/main/java/a8k/type/cfg/Pos2d.java similarity index 100% rename from src/main/java/a8k/appbase/cfg/Pos2d.java rename to src/main/java/a8k/type/cfg/Pos2d.java diff --git a/src/main/java/a8k/appbase/cfg/Pos3d.java b/src/main/java/a8k/type/cfg/Pos3d.java similarity index 100% rename from src/main/java/a8k/appbase/cfg/Pos3d.java rename to src/main/java/a8k/type/cfg/Pos3d.java diff --git a/src/main/java/a8k/appbase/cfg/SampleZPosInfo.java b/src/main/java/a8k/type/cfg/SampleZPosInfo.java similarity index 100% rename from src/main/java/a8k/appbase/cfg/SampleZPosInfo.java rename to src/main/java/a8k/type/cfg/SampleZPosInfo.java diff --git a/src/main/java/a8k/appbase/cfg/TipPickUpPosInfo.java b/src/main/java/a8k/type/cfg/TipPickUpPosInfo.java similarity index 100% rename from src/main/java/a8k/appbase/cfg/TipPickUpPosInfo.java rename to src/main/java/a8k/type/cfg/TipPickUpPosInfo.java diff --git a/src/main/java/a8k/appbase/cfg/TubeSamplePos.java b/src/main/java/a8k/type/cfg/TubeSamplePos.java similarity index 100% rename from src/main/java/a8k/appbase/cfg/TubeSamplePos.java rename to src/main/java/a8k/type/cfg/TubeSamplePos.java diff --git a/src/main/java/a8k/appbase/ecode/AppRetEcodeInfo.java b/src/main/java/a8k/type/ecode/AppRetEcodeInfo.java similarity index 100% rename from src/main/java/a8k/appbase/ecode/AppRetEcodeInfo.java rename to src/main/java/a8k/type/ecode/AppRetEcodeInfo.java diff --git a/src/main/java/a8k/appbase/sampleinfo/SampleInfo.java b/src/main/java/a8k/type/sampleinfo/SampleInfo.java similarity index 100% rename from src/main/java/a8k/appbase/sampleinfo/SampleInfo.java rename to src/main/java/a8k/type/sampleinfo/SampleInfo.java diff --git a/src/main/java/a8k/appbase/type/A8kTubeType.java b/src/main/java/a8k/type/type/A8kTubeType.java similarity index 100% rename from src/main/java/a8k/appbase/type/A8kTubeType.java rename to src/main/java/a8k/type/type/A8kTubeType.java diff --git a/src/main/java/a8k/appbase/type/BloodType.java b/src/main/java/a8k/type/type/BloodType.java similarity index 100% rename from src/main/java/a8k/appbase/type/BloodType.java rename to src/main/java/a8k/type/type/BloodType.java diff --git a/src/main/java/a8k/algo/opt_algo/A8kOptAlgo.java b/src/main/java/a8k/utils/opt_algo/A8kOptAlgo.java similarity index 100% rename from src/main/java/a8k/algo/opt_algo/A8kOptAlgo.java rename to src/main/java/a8k/utils/opt_algo/A8kOptAlgo.java