Menu
▾
▴
[ggc-cvs] SF.net SVN: ggc:[1455] trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump
|
From: <and...@us...> - 2016-12-26 14:02:07
|
Revision: 1455
http://sourceforge.net/p/ggc/code/1455
Author: andyrozman
Date: 2016-12-26 14:02:03 +0000 (Mon, 26 Dec 2016)
Log Message:
-----------
pump
- changing classes, because move of previous files was unsecucesfull and files were mishandeled.
Modified Paths:
--------------
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDailyStatistics.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDataHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDataReader.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntry.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryExt.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryInterface.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryProfile.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesHour.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesHourProcessor.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesTableModel.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpWriterValues.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BREData.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BREDataCollection.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BasalEstimationData.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/RatioData.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/cfg/PumpConfigurationDefinition.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpAdditionalDataType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpAlarms.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBasalType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBaseType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBolusType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpConfigurationGroup.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpConfigurationOld.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpDeviceValueType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpErrors.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpEventType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpReport.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/RatioType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/BasalDTO.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/BasalRatesDayDTO.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/BasalStatistics.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/BolusDTO.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/BolusWizardDTO.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/RatioDTO.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/dto/TemporaryBasalRateDTO.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/GraphViewBasalRateEstimator.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/GraphViewDailyPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/GraphViewProfileEditor.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/bre/BREGraphsAbstract.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/bre/GraphViewBasalRate.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/bre/GraphViewBasals.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/bre/GraphViewRatios.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/bre/Test.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/graph/v1/GraphV1DbRetrieverPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/profile/Profile.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/profile/ProfileSubEntry.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/profile/ProfileSubOther.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/profile/ProfileSubPattern.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/util/PumpAdditionalDataHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/util/PumpBasalManager.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/util/PumpBolusManager.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/writer/PumpValuesWriter.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/writer/PumpWriterDefInterface.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/db/GGCPumpDb.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/db/PumpData.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/db/PumpDataExtended.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/db/PumpProfile.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/PumpPluginDefinition.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/device/PumpDeviceDefinition.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/device/PumpDeviceHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/device/PumpProfileDefinition.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/device/PumpTBRDefinition.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/defs/report/PumpReportDefinition.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/AbstractBlueToothPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/AbstractPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/AbstractSerialPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/AbstractXmlPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/DummyPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/PumpDeviceInstanceWithHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/PumpInterface.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/PumpInterfaceV2.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/AccuChekCombo.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/AccuChekDTron.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/AccuChekPumpHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/AccuChekPumpReader.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/AccuChekSmartPixPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/AccuChekSpirit.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/accuchek/DisetronicDTron.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/AnimasIR1200Handler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/FRC_EZManager_v2.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/AnimasPumpDeviceReader.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/converter/AnimasBaseDataV2Converter.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/AnimasPumpDeviceData.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/BasalLogDay.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/BasalLogEntry.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/BasalProfile.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/BasalProfileEntry.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/BolusEntry.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/BolusExtEntry.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/data/dto/PumpSettings.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/handler/AnimasBaseDataV2Handler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/animas/impl/handler/AnimasPumpDataWriter.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/DanaDiabecare_II.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/DanaDiabecare_III_R.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/DanaDiabecare_IIS.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/DanaPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/DanaPumpHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/DanaPumpHandlerV2.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/PacketStreamReader.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/DanaDeviceReader.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/comm/DanaCommProtocolAbstract.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/comm/DanaCommProtocolNRSV1.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/comm/DanaCommProtocolV1.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/dana/impl/data/defs/DanaDataType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/deltec/DeltecCosmo1700.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/deltec/DeltecCosmo1800.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/deltec/DeltecPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/deltec/FRC_CoPilotXMLPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/FRC_InsuletOmnipod.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/InsuletHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/InsuletReader.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/converter/OmnipodConfigConverter.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/converter/OmnipodConverter.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/converter/OmnipodDataConverter.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/AbstractRecord.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/UnknownRecord.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/BasalProgramNames.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/ConfigRecord.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/EepromSettings.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/IbfVersion.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/LogDescription.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/LogDescriptions.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/LogHeader.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/ManufacturingData.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/PdmVersion.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/Profile.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/config/ProfileHeader.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/data/HistoryRecord.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/data/LogRecord.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/dto/data/PumpAlarmRecord.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/enums/AlarmType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/enums/BGFlags.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/enums/HistoryRecordType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/enums/LogType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/enums/OmnipodDataType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/data/enums/ProfileType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/insulet/util/InsuletUtil.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/MinimedPumpDeviceHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/PumpHistoryEntry.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/converter/Minimed511PumpDataConverter.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/converter/Minimed512PumpDataConverter.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/converter/Minimed515PumpDataConverter.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/converter/Minimed523PumpDataConverter.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/decoder/MinimedPumpHistoryDecoder.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/data/enums/PumpHistoryEntryType.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/file/FRC_MinimedCarelink.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/file/FRC_MinimedCarelinkConfig.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/file/MinimedCareLinkPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/file/MinimedCareLinkPumpData.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/file/MinimedCareLinkPumpProfile.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/old/MinimedSPM.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/old/MinimedSPMData.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/device/minimed/old/MinimedSPMPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/graph/PumpGraphContext.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/graph/PumpGraphDefintion.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/bre/BasalRateEstimator.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/bre/BasalRateEstimatorAlgorithm.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataAdditionalWizardOne.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataDialog.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataRowDialog.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataTableModel.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataTypeComponent.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/manual/PumpDataTypeComponent2.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeAlarmHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeBasalHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeBolusHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeComponentHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeComponentHandlerAbstract.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeErrorHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypeEventHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/PumpDataTypePenInjectionHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/pdtc/TemporaryBasalRateComponent.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/profile/ProfileEditor.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/profile/ProfileEntryDialog.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/profile/ProfileSelector.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/gui/profile/ProfileSelectorPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/PumpDevicesIds.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/PumpManager.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/company/AbstractPumpDeviceCompany.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/company/Deltec.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/company/GenericPumpDevice.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/company/Roche.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/manager/company/Sooil.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/plugin/BackupRestorePumpHandler.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/plugin/PumpPlugInServer.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/PrintPumpBasalCheckSheet.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/PrintPumpDataAbstract.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/PrintPumpDataBase.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/PrintPumpDataDailyTimeSheet.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/PrintPumpDataExt.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/report/PrintPumpDataProfiles.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/AbstractPumpTest.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/BasalManagerTest.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/DanaPumpTester.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/GUITest.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/MinimedConsoleTester.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/MinimedDecoderTester.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/PumpConsoleTester.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/TestAnimas.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/TestOmnipod.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/minimed/DecoderLoadData.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/minimed/MinimedBaseTest.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/minimed/MinimedCarelinkUSBTester.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/minimed/MinimedConsoleTester.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/test/minimed/MinimedDecoderTester.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/util/DataAccessPump.java
trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/util/GGCPumpICRunner.java
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDailyStatistics.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDailyStatistics.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDailyStatistics.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,10 +1,10 @@
-package main.java.ggc.pump.data;
+package ggc.pump.data;
import com.atech.misc.statistics.StatisticsCollection;
import ggc.core.data.defs.GlucoseUnitType;
-import main.java.ggc.pump.data.defs.PumpBaseType;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.data.defs.PumpBaseType;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDataHandler.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDataHandler.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDataHandler.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,8 +1,8 @@
-package main.java.ggc.pump.data;
+package ggc.pump.data;
import ggc.plugin.data.DeviceDataHandler;
import ggc.plugin.util.DataAccessPlugInBase;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDataReader.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDataReader.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpDataReader.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data;
+package ggc.pump.data;
import java.util.Hashtable;
@@ -7,8 +7,8 @@
import ggc.plugin.data.DeviceValuesEntryInterface;
import ggc.plugin.gui.OldDataReaderAbstract;
-import main.java.ggc.pump.db.GGCPumpDb;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.db.GGCPumpDb;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntry.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntry.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntry.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data;
+package ggc.pump.data;
import java.util.*;
@@ -19,8 +19,8 @@
import ggc.plugin.graph.data.GraphValuesCapable;
import ggc.plugin.output.OutputWriterType;
import ggc.plugin.util.DataAccessPlugInBase;
-import main.java.ggc.pump.data.defs.*;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.data.defs.*;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control Plug-in: Pump Tool (support for Pump
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryExt.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryExt.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryExt.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data;
+package ggc.pump.data;
import java.util.ArrayList;
@@ -19,8 +19,8 @@
import ggc.plugin.graph.data.GraphValuesCapable;
import ggc.plugin.output.OutputWriterType;
import ggc.plugin.util.DeviceValuesEntryUtil;
-import main.java.ggc.pump.data.defs.PumpAdditionalDataType;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.data.defs.PumpAdditionalDataType;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryInterface.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryInterface.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryInterface.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data;
+package ggc.pump.data;
import ggc.plugin.data.DeviceValuesEntryInterface;
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryProfile.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryProfile.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesEntryProfile.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data;
+package ggc.pump.data;
import java.util.ArrayList;
import java.util.Calendar;
@@ -18,8 +18,8 @@
import ggc.plugin.data.enums.DeviceEntryStatus;
import ggc.plugin.output.OutputWriterType;
import ggc.plugin.util.DeviceValuesEntryUtil;
-import main.java.ggc.pump.data.profile.ProfileSubEntry;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.data.profile.ProfileSubEntry;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesHour.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesHour.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesHour.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data;
+package ggc.pump.data;
import java.util.HashMap;
@@ -9,9 +9,9 @@
import com.atech.utils.data.ATechDate;
import com.atech.utils.data.ExceptionHandling;
-import main.java.ggc.pump.data.defs.PumpBaseType;
-import main.java.ggc.pump.data.defs.PumpBolusType;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.data.defs.PumpBaseType;
+import ggc.pump.data.defs.PumpBolusType;
+import ggc.pump.util.DataAccessPump;
public class PumpValuesHour
{
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesHourProcessor.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesHourProcessor.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesHourProcessor.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data;
+package ggc.pump.data;
import java.util.ArrayList;
import java.util.HashMap;
@@ -7,10 +7,10 @@
import org.apache.commons.lang.StringUtils;
import ggc.plugin.data.DeviceValuesEntry;
-import main.java.ggc.pump.data.defs.PumpAdditionalDataType;
-import main.java.ggc.pump.data.defs.PumpBaseType;
-import main.java.ggc.pump.data.defs.PumpDeviceValueType;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.data.defs.PumpAdditionalDataType;
+import ggc.pump.data.defs.PumpBaseType;
+import ggc.pump.data.defs.PumpDeviceValueType;
+import ggc.pump.util.DataAccessPump;
public class PumpValuesHourProcessor
{
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesTableModel.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesTableModel.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpValuesTableModel.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,8 +1,8 @@
-package main.java.ggc.pump.data;
+package ggc.pump.data;
import ggc.plugin.data.DeviceDataHandler;
import ggc.plugin.data.DeviceValuesTableModel;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control
@@ -40,7 +40,7 @@
* Constructor
*
* @param ddh
-
+
*/
public PumpValuesTableModel(DeviceDataHandler ddh, String source)
{
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpWriterValues.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpWriterValues.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/PumpWriterValues.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data;
+package ggc.pump.data;
import com.atech.utils.data.ATechDate;
import com.atech.utils.data.CodeEnumWithTranslation;
@@ -40,27 +40,32 @@
this(_object_type, _base_type, _sub_type, null, isNumericValue);
}
+
public PumpWriterValues(int _object_type, CodeEnumWithTranslation _base_type, int _sub_type, Boolean isNumericValue)
{
this(_object_type, _base_type.getCode(), _sub_type, null, isNumericValue);
}
+
public PumpWriterValues(int _object_type, CodeEnumWithTranslation _base_type, CodeEnumWithTranslation _sub_type,
- Boolean isNumericValue)
+ Boolean isNumericValue)
{
this(_object_type, _base_type.getCode(), _sub_type.getCode(), null, isNumericValue);
}
+
public PumpWriterValues(int _object_type, int _base_type, Boolean isNumericValue)
{
this(_object_type, _base_type, 0, null, isNumericValue);
}
+
public PumpWriterValues(int _object_type, CodeEnumWithTranslation _base_type, Boolean isNumericValue)
{
this(_object_type, _base_type.getCode(), 0, null, isNumericValue);
}
+
/**
* @param _object_type
* @param _base_type
@@ -68,7 +73,7 @@
* @param _value_template
*/
public PumpWriterValues(int _object_type, int _base_type, int _sub_type, String _value_template,
- Boolean isNumericValue)
+ Boolean isNumericValue)
{
super(_object_type, _base_type, _sub_type, _value_template, isNumericValue);
}
@@ -82,7 +87,7 @@
/**
* Pump Object: Base SubType
*/
- //public static final int OBJECT_BASE_SET_SUBTYPE = 4;
+ // public static final int OBJECT_BASE_SET_SUBTYPE = 4;
/**
* Pump Object: Extended
@@ -94,6 +99,7 @@
*/
public static final int OBJECT_PROFILE = 3;
+
/*
* public void writeObject(OutputWriter ow, String _value)
* {
@@ -126,7 +132,7 @@
pve.setSubType(stype);
pve.setDateTimeObject(dt);
- //System.out.println("PumpTempValues [" + pve.toString() + "]");
+ // System.out.println("PumpTempValues [" + pve.toString() + "]");
if (this.value_template == null)
{
@@ -139,15 +145,15 @@
return pve;
}
-// else if (this.object_type == PumpTempValues.OBJECT_BASE_SET_SUBTYPE)
-// {
-// PumpValuesEntry pve = new PumpValuesEntry();
-// pve.setBaseType(this.base_type);
-// pve.setSubType(Integer.parseInt(val));
-// pve.setDateTimeObject(dt);
-//
-// return pve;
-// }
+ // else if (this.object_type == PumpTempValues.OBJECT_BASE_SET_SUBTYPE)
+ // {
+ // PumpValuesEntry pve = new PumpValuesEntry();
+ // pve.setBaseType(this.base_type);
+ // pve.setSubType(Integer.parseInt(val));
+ // pve.setDateTimeObject(dt);
+ //
+ // return pve;
+ // }
else if (this.object_type == PumpWriterValues.OBJECT_EXT)
{
PumpValuesEntryExt pvex = new PumpValuesEntryExt();
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BREData.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BREData.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BREData.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data.bre;
+package ggc.pump.data.bre;
import com.atech.utils.data.ATechDate;
@@ -41,6 +41,7 @@
*/
public static final int BRE_DATA_BASAL_RATIO_GRAPH = 100;
+
/**
* Constructor
*
@@ -75,6 +76,7 @@
*/
public float value = 0.0f;
+
/**
* Are we in time range.
*
@@ -90,6 +92,7 @@
return false;
}
+
/**
* toString
*/
@@ -123,7 +126,7 @@
sb.append("</font></html>");
return sb.toString();
- // return atd.getTimeString() + " " +
+ // return atd.getTimeString() + " " +
// DataAccessPump.Decimal1Format.format(value);
}
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BREDataCollection.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BREDataCollection.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BREDataCollection.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data.bre;
+package ggc.pump.data.bre;
import java.util.ArrayList;
@@ -39,6 +39,7 @@
*/
ArrayList<BasalEstimationData> basal_estimation;
+
/**
* Instantiates a new bRE data collection.
*/
@@ -52,6 +53,7 @@
basal_estimation = new ArrayList<BasalEstimationData>();
}
+
/**
* Adds the BREData
*
@@ -86,6 +88,7 @@
}
+
/**
* Adds the BREData
*
@@ -99,6 +102,7 @@
add(type, data);
}
+
/**
* Adds the BREData
*
@@ -113,6 +117,7 @@
this.ratios.add(data);
}
+
/**
* Gets the data by type
*
@@ -138,6 +143,7 @@
}
+
/**
* Gets the ratios collection
*
@@ -160,6 +166,7 @@
}
+
/**
* Process ratios
*/
@@ -183,6 +190,7 @@
}
+
/**
* Process old basals
*/
@@ -207,6 +215,7 @@
}
+
/**
* Process new basals
*/
@@ -215,6 +224,7 @@
processBasals(this.basal_new);
}
+
/**
* Process basals
*
@@ -244,6 +254,7 @@
}
}
+
/**
* Sets the basal estimation data
*
@@ -254,6 +265,7 @@
this.basal_estimation = data;
}
+
/**
* Gets the basal estimation data
*
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BasalEstimationData.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BasalEstimationData.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/BasalEstimationData.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data.bre;
+package ggc.pump.data.bre;
// TODO: Auto-generated Javadoc
/**
@@ -22,6 +22,7 @@
*/
public double insulin_value;
+
/**
* toString
*/
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/RatioData.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/RatioData.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/bre/RatioData.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data.bre;
+package ggc.pump.data.bre;
import com.atech.utils.data.ATechDate;
@@ -36,6 +36,7 @@
*/
public float ratio_ch_bg = 0.0f;
+
/**
* Constructor
*
@@ -52,6 +53,7 @@
this.ratio_ch_bg = ratio_ch_bg;
}
+
/**
* toString
*/
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/cfg/PumpConfigurationDefinition.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/cfg/PumpConfigurationDefinition.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/cfg/PumpConfigurationDefinition.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,12 +1,12 @@
-package main.java.ggc.pump.data.cfg;
+package ggc.pump.data.cfg;
import java.util.List;
import com.atech.graphics.dialogs.selector.SelectableInterface;
import ggc.plugin.cfg.DeviceConfigurationDefinition;
-import main.java.ggc.pump.device.DummyPump;
-import main.java.ggc.pump.manager.PumpManager;
+import ggc.pump.device.DummyPump;
+import ggc.pump.manager.PumpManager;
/**
* Application: GGC - GNU Gluco Control
@@ -48,6 +48,7 @@
return "PUMP";
}
+
/**
* Only certain devices support manual time fix for application (meters do, other's don't).
*
@@ -58,6 +59,7 @@
return false;
}
+
/**
* Get path to Configuration file as string
*
@@ -68,6 +70,7 @@
return "../data/tools/PumpConfiguration.properties";
}
+
/**
* Returns Dummy object (needed for some actions)
*
@@ -78,6 +81,7 @@
return new DummyPump();
}
+
/**
* Returns list of all supported devices for plugin. Needed for device selection
*
@@ -85,9 +89,10 @@
*/
public List<SelectableInterface> getSupportedDevices()
{
- return PumpManager.getInstance().getSupportedDevicesForSelector(); //.getSupportedDevices();
+ return PumpManager.getInstance().getSupportedDevicesForSelector(); // .getSupportedDevices();
}
+
/**
* Returns prefix for help context
*
@@ -98,11 +103,12 @@
return "PumpTool_";
}
+
public Object getSpecificDeviceInstance(String company, String deviceName)
{
Object device = PumpManager.getInstance().getDeviceV2(company, deviceName);
- if (device==null)
+ if (device == null)
{
device = PumpManager.getInstance().getDeviceV1(company, deviceName);
}
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpAdditionalDataType.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpAdditionalDataType.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpAdditionalDataType.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data.defs;
+package ggc.pump.data.defs;
import java.util.ArrayList;
import java.util.HashMap;
@@ -8,8 +8,8 @@
import com.atech.utils.ATDataAccessAbstract;
import com.atech.utils.data.CodeEnumWithTranslation;
-import main.java.ggc.pump.data.PumpValuesEntryExt;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.data.PumpValuesEntryExt;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control
@@ -91,9 +91,9 @@
}
String[] addata_desc_lcl = { ic.getMessage("SELECT_ADDITIONAL_DATA"), ic.getMessage("ADD_DATA_ACTIVITY"),
- ic.getMessage("ADD_DATA_COMMENT"), ic.getMessage("ADD_DATA_BG"),
- ic.getMessage("ADD_DATA_URINE"), ic.getMessage("ADD_DATA_CH"),
- ic.getMessage("ADD_DATA_FOOD_DB"), ic.getMessage("ADD_DATA_FOOD_DESC"), };
+ ic.getMessage("ADD_DATA_COMMENT"), ic.getMessage("ADD_DATA_BG"),
+ ic.getMessage("ADD_DATA_URINE"), ic.getMessage("ADD_DATA_CH"),
+ ic.getMessage("ADD_DATA_FOOD_DB"), ic.getMessage("ADD_DATA_FOOD_DESC"), };
addata_desc = addata_desc_lcl;
}
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpAlarms.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpAlarms.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpAlarms.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data.defs;
+package ggc.pump.data.defs;
import java.util.Collection;
import java.util.HashMap;
@@ -8,7 +8,7 @@
import com.atech.utils.ATDataAccess;
import com.atech.utils.data.CodeEnumWithTranslation;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control Plug-in: Pump Tool (support for Pump
@@ -106,19 +106,19 @@
}
String[] alarm_desc_lcl = { ic.getMessage("SELECT_SUBTYPE"), //
- ic.getMessage("ALARM_CARTRIDGE_LOW"), //
- ic.getMessage("ALARM_BATTERY_LOW"), //
- ic.getMessage("ALARM_REPLACE_BATTERY"), //
- ic.getMessage("ALARM_REVIEW_DATETIME"), //
- ic.getMessage("ALARM_ALARM_CLOCK"),//
- ic.getMessage("ALARM_PUMP_TIMER"),//
- ic.getMessage("ALARM_TEMPORARY_BASAL_RATE_CANCELED"),//
- ic.getMessage("ALARM_TEMPORARY_BASAL_RATE_OVER"),//
- ic.getMessage("ALARM_BOLUS_CANCELED"),//
- ic.getMessage("ALARM_NO_DELIVERY"),//
- ic.getMessage("ALARM_EMPTY_CARTRIDGE"),//
- ic.getMessage("ALARM_AUTO_OFF"),//
- ic.getMessage("ALARM_CALL_SERVICE"),//
+ ic.getMessage("ALARM_CARTRIDGE_LOW"), //
+ ic.getMessage("ALARM_BATTERY_LOW"), //
+ ic.getMessage("ALARM_REPLACE_BATTERY"), //
+ ic.getMessage("ALARM_REVIEW_DATETIME"), //
+ ic.getMessage("ALARM_ALARM_CLOCK"), //
+ ic.getMessage("ALARM_PUMP_TIMER"), //
+ ic.getMessage("ALARM_TEMPORARY_BASAL_RATE_CANCELED"), //
+ ic.getMessage("ALARM_TEMPORARY_BASAL_RATE_OVER"), //
+ ic.getMessage("ALARM_BOLUS_CANCELED"), //
+ ic.getMessage("ALARM_NO_DELIVERY"), //
+ ic.getMessage("ALARM_EMPTY_CARTRIDGE"), //
+ ic.getMessage("ALARM_AUTO_OFF"), //
+ ic.getMessage("ALARM_CALL_SERVICE"),//
};
alarm_desc = alarm_desc_lcl;
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBasalType.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBasalType.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBasalType.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data.defs;
+package ggc.pump.data.defs;
import java.util.HashMap;
import java.util.Map;
@@ -7,7 +7,7 @@
import com.atech.utils.ATDataAccessAbstract;
import com.atech.utils.data.CodeEnumWithTranslation;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control
@@ -42,7 +42,8 @@
Value(1, "BASAL_VALUE"), //
Profile(2, "BASAL_PROFILE"), //
TemporaryBasalRate(3, "BASAL_TEMPORARY_BASAL_RATE"), //
- @Deprecated TemporaryBasalRateProfile(4, "BASAL_TEMPORARY_BASAL_RATE_PROFILE"), //
+ @Deprecated
+ TemporaryBasalRateProfile(4, "BASAL_TEMPORARY_BASAL_RATE_PROFILE"), //
PumpStatus(5, "BASAL_PUMP_STATUS"), //
TemporaryBasalRateEnded(6, "BASAL_TEMPORARY_BASAL_RATE_ENDED"), //
TemporaryBasalRateCanceled(7, "BASAL_TEMPORARY_BASAL_RATE_CANCELED"), //
@@ -67,7 +68,6 @@
static Map<String, CodeEnumWithTranslation> translationMapping = new HashMap<String, CodeEnumWithTranslation>();
static Map<Integer, PumpBasalType> codeMapping = new HashMap<Integer, PumpBasalType>();
-
static
{
I18nControlAbstract ic = DataAccessPump.getInstance().getI18nControlInstance();
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBaseType.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBaseType.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBaseType.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,11 +1,11 @@
-package main.java.ggc.pump.data.defs;
+package ggc.pump.data.defs;
import java.util.Hashtable;
import com.atech.i18n.I18nControlAbstract;
import com.atech.utils.data.CodeEnumWithTranslation;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control Plug-in: Pump Tool (support for Pump
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBolusType.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBolusType.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpBolusType.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data.defs;
+package ggc.pump.data.defs;
import java.util.HashMap;
@@ -6,7 +6,7 @@
import com.atech.utils.ATDataAccess;
import com.atech.utils.data.CodeEnumWithTranslation;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control
@@ -48,7 +48,6 @@
static HashMap<String, CodeEnumWithTranslation> translationMapping = new HashMap<String, CodeEnumWithTranslation>();
static HashMap<Integer, PumpBolusType> codeMapping = new HashMap<Integer, PumpBolusType>();
-
static
{
I18nControlAbstract ic = DataAccessPump.getInstance().getI18nControlInstance();
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpConfigurationGroup.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpConfigurationGroup.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpConfigurationGroup.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data.defs;
+package ggc.pump.data.defs;
import java.util.HashMap;
import java.util.Map;
@@ -7,7 +7,7 @@
import com.atech.utils.data.CodeEnumWithTranslation;
import ggc.plugin.data.enums.DeviceConfigurationGroup;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.util.DataAccessPump;
/**
* Created by andy on 27.02.15.
@@ -23,7 +23,7 @@
Bolus(5, "GROUP_BOLUS"), //
Sound(6, "GROUP_SOUND"), //
- Other(20, "GROUP_OTHER"), ; //
+ Other(20, "GROUP_OTHER"),; //
static Map<String, CodeEnumWithTranslation> translationMapping = new HashMap<String, CodeEnumWithTranslation>();
static Map<Integer, PumpConfigurationGroup> codeMapping = new HashMap<Integer, PumpConfigurationGroup>();
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpConfigurationOld.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpConfigurationOld.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpConfigurationOld.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,10 +1,10 @@
-package main.java.ggc.pump.data.defs;
+package ggc.pump.data.defs;
import java.util.Hashtable;
import com.atech.i18n.I18nControlAbstract;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control
@@ -42,21 +42,22 @@
* Errors Description
*/
private String[] errors_desc = { ic.getMessage("ERROR_UNKNOWN_ERROR"), ic.getMessage("ERROR_CARTRIDGE_EMPTY"),
- ic.getMessage("ERROR_BATTERY_DEPLETED"), ic.getMessage("ERROR_AUTOMATIC_OFF"),
- ic.getMessage("ERROR_NO_DELIVERY"), ic.getMessage("ERROR_END_OF_OPERATION"),
- ic.getMessage("ERROR_MECHANICAL_ERROR"), ic.getMessage("ERROR_ELECTRONIC_ERROR"),
- ic.getMessage("ERROR_POWER_INTERRUPT"), ic.getMessage("ERROR_CARTRIDGE_ERROR"),
- ic.getMessage("ERROR_SET_NOT_PRIMED"), ic.getMessage("ERROR_DATA_INTERRUPTED"),
- ic.getMessage("ERROR_LANGUAGE_ERROR"), ic.getMessage("ERROR_INSULIN_CHANGED"), };
+ ic.getMessage("ERROR_BATTERY_DEPLETED"), ic.getMessage("ERROR_AUTOMATIC_OFF"),
+ ic.getMessage("ERROR_NO_DELIVERY"), ic.getMessage("ERROR_END_OF_OPERATION"),
+ ic.getMessage("ERROR_MECHANICAL_ERROR"), ic.getMessage("ERROR_ELECTRONIC_ERROR"),
+ ic.getMessage("ERROR_POWER_INTERRUPT"), ic.getMessage("ERROR_CARTRIDGE_ERROR"),
+ ic.getMessage("ERROR_SET_NOT_PRIMED"), ic.getMessage("ERROR_DATA_INTERRUPTED"),
+ ic.getMessage("ERROR_LANGUAGE_ERROR"), ic.getMessage("ERROR_INSULIN_CHANGED"), };
private String[] errors_compdesc = { ic.getMessage("SELECT_SUBTYPE"), ic.getMessage("ERROR_CARTRIDGE_EMPTY"),
- ic.getMessage("ERROR_BATTERY_DEPLETED"), ic.getMessage("ERROR_AUTOMATIC_OFF"),
- ic.getMessage("ERROR_NO_DELIVERY"), ic.getMessage("ERROR_END_OF_OPERATION"),
- ic.getMessage("ERROR_MECHANICAL_ERROR"),
- ic.getMessage("ERROR_ELECTRONIC_ERROR"),
- ic.getMessage("ERROR_POWER_INTERRUPT"), ic.getMessage("ERROR_CARTRIDGE_ERROR"),
- ic.getMessage("ERROR_SET_NOT_PRIMED"), ic.getMessage("ERROR_DATA_INTERRUPTED"),
- ic.getMessage("ERROR_LANGUAGE_ERROR"), ic.getMessage("ERROR_INSULIN_CHANGED"), };
+ ic.getMessage("ERROR_BATTERY_DEPLETED"), ic.getMessage("ERROR_AUTOMATIC_OFF"),
+ ic.getMessage("ERROR_NO_DELIVERY"), ic.getMessage("ERROR_END_OF_OPERATION"),
+ ic.getMessage("ERROR_MECHANICAL_ERROR"),
+ ic.getMessage("ERROR_ELECTRONIC_ERROR"),
+ ic.getMessage("ERROR_POWER_INTERRUPT"), ic.getMessage("ERROR_CARTRIDGE_ERROR"),
+ ic.getMessage("ERROR_SET_NOT_PRIMED"), ic.getMessage("ERROR_DATA_INTERRUPTED"),
+ ic.getMessage("ERROR_LANGUAGE_ERROR"),
+ ic.getMessage("ERROR_INSULIN_CHANGED"), };
Hashtable<String, String> errors_mapping = new Hashtable<String, String>();
@@ -85,6 +86,7 @@
*/
public static final int PUMP_CONFIG_GROUP_OTHER = 5;
+
// public static final int PUMP_CONFIG_GROUP_GENERAL = 1;
// public static final int PUMP_CONFIG_GROUP_GENERAL = 1;
// public static final int PUMP_CONFIG_GROUP_GENERAL = 1;
@@ -110,6 +112,7 @@
this.errors_mapping.put(ic.getMessage("ERROR_INSULIN_CHANGED"), "14");
}
+
/**
* Get Type from Description
*
@@ -129,6 +132,7 @@
}
+
/**
* Get Descriptions (array)
*
@@ -139,6 +143,7 @@
return this.errors_compdesc;
}
+
/**
* Get Description by ID
*
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpDeviceValueType.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpDeviceValueType.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpDeviceValueType.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data.defs;
+package ggc.pump.data.defs;
import ggc.plugin.data.DeviceValueTypeInterface;
@@ -14,20 +14,24 @@
private String colorKey;
+
private PumpDeviceValueType()
{
}
+
private PumpDeviceValueType(String colorKey)
{
this.colorKey = colorKey;
}
+
public String getColorKey()
{
return colorKey;
}
+
public void setColorKey(String colorKey)
{
this.colorKey = colorKey;
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpErrors.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpErrors.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpErrors.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data.defs;
+package ggc.pump.data.defs;
import java.util.Collection;
import java.util.HashMap;
@@ -8,7 +8,7 @@
import com.atech.utils.ATDataAccessAbstract;
import com.atech.utils.data.CodeEnumWithTranslation;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control
@@ -83,19 +83,19 @@
}
String[] errors_desc_lcl = { ic.getMessage("SELECT_SUBTYPE"), //
- ic.getMessage("ERROR_CARTRIDGE_EMPTY"), //
- ic.getMessage("ERROR_BATTERY_DEPLETED"), //
- ic.getMessage("ERROR_AUTOMATIC_OFF"), //
- ic.getMessage("ERROR_NO_DELIVERY"), //
- ic.getMessage("ERROR_END_OF_OPERATION"), //
- ic.getMessage("ERROR_MECHANICAL_ERROR"), //
- ic.getMessage("ERROR_ELECTRONIC_ERROR"), //
- ic.getMessage("ERROR_POWER_INTERRUPT"), //
- ic.getMessage("ERROR_CARTRIDGE_ERROR"), //
- ic.getMessage("ERROR_SET_NOT_PRIMED"), //
- ic.getMessage("ERROR_DATA_INTERRUPTED"), //
- ic.getMessage("ERROR_LANGUAGE_ERROR"), //
- ic.getMessage("ERROR_INSULIN_CHANGED"), };
+ ic.getMessage("ERROR_CARTRIDGE_EMPTY"), //
+ ic.getMessage("ERROR_BATTERY_DEPLETED"), //
+ ic.getMessage("ERROR_AUTOMATIC_OFF"), //
+ ic.getMessage("ERROR_NO_DELIVERY"), //
+ ic.getMessage("ERROR_END_OF_OPERATION"), //
+ ic.getMessage("ERROR_MECHANICAL_ERROR"), //
+ ic.getMessage("ERROR_ELECTRONIC_ERROR"), //
+ ic.getMessage("ERROR_POWER_INTERRUPT"), //
+ ic.getMessage("ERROR_CARTRIDGE_ERROR"), //
+ ic.getMessage("ERROR_SET_NOT_PRIMED"), //
+ ic.getMessage("ERROR_DATA_INTERRUPTED"), //
+ ic.getMessage("ERROR_LANGUAGE_ERROR"), //
+ ic.getMessage("ERROR_INSULIN_CHANGED"), };
errors_desc = errors_desc_lcl;
}
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpEventType.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpEventType.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpEventType.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data.defs;
+package ggc.pump.data.defs;
import java.util.Collection;
import java.util.HashMap;
@@ -7,7 +7,7 @@
import com.atech.utils.ATDataAccessAbstract;
import com.atech.utils.data.CodeEnumWithTranslation;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control
@@ -92,7 +92,6 @@
static HashMap<String, CodeEnumWithTranslation> translationMapping = new HashMap<String, CodeEnumWithTranslation>();
static HashMap<Integer, PumpEventType> codeMapping = new HashMap<Integer, PumpEventType>();
-
static
{
I18nControlAbstract ic = DataAccessPump.getInstance().getI18nControlInstance();
@@ -111,15 +110,16 @@
ic.getMessage("EVENT_SET_TEMPORARY_BASAL_RATE_TYPE"),
ic.getMessage("EVENT_SET_BASAL_PATTERN"), ic.getMessage("EVENT_BASAL_RUN"),
- ic.getMessage("EVENT_BASAL_STOP"), ic.getMessage("EVENT_POWER_DOWN"), ic.getMessage("EVENT_POWER_UP"),
- ic.getMessage("EVENT_SELF_TEST"), ic.getMessage("EVENT_DOWNLOAD"),
- ic.getMessage("EVENT_DATETIME_SET"), ic.getMessage("EVENT_DATETIME_CORRECT"),
+ ic.getMessage("EVENT_BASAL_STOP"), ic.getMessage("EVENT_POWER_DOWN"),
+ ic.getMessage("EVENT_POWER_UP"), ic.getMessage("EVENT_SELF_TEST"),
+ ic.getMessage("EVENT_DOWNLOAD"), ic.getMessage("EVENT_DATETIME_SET"),
+ ic.getMessage("EVENT_DATETIME_CORRECT"),
- ic.getMessage("EVENT_SET_MAX_BASAL"), //
+ ic.getMessage("EVENT_SET_MAX_BASAL"), //
ic.getMessage("EVENT_SET_MAX_BOLUS"), //
ic.getMessage("EVENT_BATERRY_REMOVED"), //
- ic.getMessage("EVENT_BATERRY_REPLACED"), //
+ ic.getMessage("EVENT_BATERRY_REPLACED"), //
ic.getMessage("EVENT_BATERRY_LOW"), //
ic.getMessage("EVENT_BATERRY_LOW_DESC"), //
ic.getMessage("EVENT_BG_FROM_METER"), //
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpReport.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpReport.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/PumpReport.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,4 +1,4 @@
-package main.java.ggc.pump.data.defs;
+package ggc.pump.data.defs;
import java.util.HashMap;
@@ -6,7 +6,7 @@
import com.atech.utils.ATDataAccess;
import com.atech.utils.data.CodeEnumWithTranslation;
-import main.java.ggc.pump.util.DataAccessPump;
+import ggc.pump.util.DataAccessPump;
/**
* Application: GGC - GNU Gluco Control
@@ -65,10 +65,10 @@
}
String[] report_desc_lcl = { ic.getMessage("SELECT_SUBTYPE"), //
- ic.getMessage("REPORT_MISC"), //
- ic.getMessage("REPORT_BOLUS_TOTAL_DAY"), //
- ic.getMessage("REPORT_BASAL_TOTAL_DAY"), //
- ic.getMessage("REPORT_INSULIN_TOTAL_DAY"), };
+ ic.getMessage("REPORT_MISC"), //
+ ic.getMessage("REPORT_BOLUS_TOTAL_DAY"), //
+ ic.getMessage("REPORT_BASAL_TOTAL_DAY"), //
+ ic.getMessage("REPORT_INSULIN_TOTAL_DAY"), };
report_desc = report_desc_lcl;
}
Modified: trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/RatioType.java
===================================================================
--- trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/RatioType.java 2016-12-26 13:55:11 UTC (rev 1454)
+++ trunk/ggc-plugins/ggc-pump/src/main/java/ggc/pump/data/defs/RatioType.java 2016-12-26 14:02:03 UTC (rev 1455)
@@ -1,10 +1,10 @@
-package main.java.ggc.pump.data.defs;
...
[truncated message content] |
