Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfekorb.btc2017-10-23 06:02:44 -0400
committerfekorb.btc2017-10-23 06:02:44 -0400
commitc9ed740655442d2fcbfa854a649a8ea1e2abe6f1 (patch)
tree9311df54a646b40b3847e649bdbc206b22e0e566
parent36bb67c92a5cae465acdcdc98e618c893ad5785a (diff)
downloadorg.eclipse.openk-platform.openk-repo-c9ed740655442d2fcbfa854a649a8ea1e2abe6f1.tar.gz
org.eclipse.openk-platform.openk-repo-c9ed740655442d2fcbfa854a649a8ea1e2abe6f1.tar.xz
org.eclipse.openk-platform.openk-repo-c9ed740655442d2fcbfa854a649a8ea1e2abe6f1.zip
CIM-Cache version 1 milestone 4 (preview 002)
-rw-r--r--cim-cache/org.eclipse.openk.build/build-codeconventions/src/main/resources/checkstyle/checkstyle-main.xml67
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/Cim17v07.java4
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Assets/AcceptanceTest.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Assets/LifecycleDate.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/ElectronicAddress.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/Priority.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/Status.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/StreetAddress.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/StreetDetail.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/TelephoneNumber.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/TownDetail.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/InfIEC61968/InfCommon/Ratio.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/LoadControl/RemoteConnectDisconnectInfo.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/ControlledAppliance.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/EndDeviceCapability.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/EndDeviceTiming.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/RationalNumber.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/ReadingInterharmonic.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Operations/ServicePointOutageSummary.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/AccountMovement.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/AccountingUnit.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/BankAccountDetail.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/Due.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/LineDetail.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/Forecast.java48
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/IntervalSchedule.java45
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/Schedule.java48
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/DateInterval.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/DateTimeInterval.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/IntegerQuantity.java58
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/MonthDayInterval.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/StringQuantity.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/TimeInterval.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Faults/FaultImpedance.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Generation/Production/Classification.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Meas/Measurement.java8
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfICCP/IPAddressType.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfICCP/ISOAPAddressing.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfPowerSystemProjects/PowerSystemProjectLifecycle.java2
-rw-r--r--cim-cache/org.eclipse.openk.cim.profile.openkonsequenz/src/main/java/org/eclipse/openk/cim/profile/openkonsequenz/OpenKonsequenz.java73
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/AbstractContext.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/IContext.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/IVersion.java3
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/Version.java11
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/array/ArrayDefaults.java31
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/array/ArrayUtilities.java2408
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/AlreadyExistingItemException.java2
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/CollectionDefaults.java31
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/CollectionUtilities.java501
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/MissingItemException.java76
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/Command.java6
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandController.java34
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandExecution.java27
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandExecutionId.java2
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandType.java13
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/ICommandExecutor.java7
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/CimModelDefinition.java60
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/CimVersion.java20
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/ICimCompound.java (renamed from cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/NonRotatingEnergy.java)20
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/ICimDatatype.java24
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/ICimRevision.java1
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/AbstractRdf1_1PayloadReader.java114
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/CimMessageDefaults.java1
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/ErrorCreatingUriException.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/FailedToWriteMessageException.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/RdfPayloadReader.java98
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/RdfPayloadWriter.java7
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/XmlPayloadReader.java8
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/XmlPayloadWriter.java2
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/converter/ValueDecoder.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/CsvFileReader.java122
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/CsvReader.java204
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/ErrorReadingCsvException.java75
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/ErrorWritingCsvException.java75
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/xml/rdf/AbstractRdf1_1Reader.java694
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/xml/rdf/AbstractRdf1_1Writer.java11
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/xml/rdf/RdfDefaults.java3
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/date/DateDefaults.java9
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/date/DateUtilities.java3
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/date/ITimer.java6
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/io/FileEvent.java6
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/io/FileNotFoundException.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/io/FileSystemWatcher.java6
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/io/FileSystemWatcherIOException.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/io/IODefaults.java3
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/io/IOUtilities.java7
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/io/IndentedWriter.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/key/IKeyOwner.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/key/Key.java304
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/key/sourcesystem/IUniqueIdProvider.java36
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/key/sourcesystem/OriginalKey.java (renamed from cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/key/sourcesystem/Key.java)28
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/key/sourcesystem/OriginalKeyType.java (renamed from cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/key/sourcesystem/KeyType.java)16
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/key/sourcesystem/UniqueIdProvider.java61
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/messaging/AbstractException.java11
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/messaging/AbstractIOException.java11
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/messaging/AbstractMessage.java7
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/messaging/AbstractRuntimeException.java11
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/messaging/ILogger.java12
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/messaging/Logger.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/messaging/LoggerFactory.java2
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/messaging/NotificationDelegate.java7
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/messaging/messages/FailedToCreateException.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/mock/dataexchange/cim/CimEntityMock.java26
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/mock/messaging/LoggerMock.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/model/AbstractModelDefinition.java125
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/model/IModelDefinition.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/model/IModelTreeWalkerVisitor.java24
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/model/ModelTreeWalker.java211
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/net/NetUtilities.java8
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/net/UrlDefaults.java1
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/net/UrlQueryParameter.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/net/UrlQueryString.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/number/NumberUtilities.java3
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/string/StringDefaults.java16
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/string/StringSplitter.java20
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/string/StringUtilities.java3
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/string/UuidSplitter.java14
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/system/UnimplementedMethodException.java116
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/system/type/EntityCounter.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/system/type/ICloneable.java33
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/system/type/IUnmodifiable.java23
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/system/type/TypeDefaults.java3
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/system/type/TypeInformationProvider.java5
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/system/type/TypeUtilities.java30
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/test/IUnitTest.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/AbstractBuilder.java72
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/IBuilder.java (renamed from cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/model/IBuilder.java)12
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/ValueDefaults.java52
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/ValueOutOfRangeException.java15
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/ValueUtilities.java785
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/NoParameters.java3
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/ParameterUtilities.java14
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/AbstractParameterDefinition.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/BooleanParameterDefinition.java6
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/ByteParameterDefinition.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/CharacterParameterDefinition.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/DateParameterDefinition.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/DoubleParameterDefinition.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/EnumParameterDefinition.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/FileParameterDefinition.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/FloatParameterDefinition.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/IParameterDefinition.java6
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/IntegerParameterDefinition.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/ListParameterDefinition.java8
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/LocalDateTimeParameterDefinition.java2
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/LongParameterDefinition.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/ShortParameterDefinition.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/StringParameterDefinition.java5
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/UUIDParameterDefinition.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/items/AbstractItemDecoder.java6
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/items/IItemDecoder.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/items/StringItemDecoder.java3
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/definitions/items/UUIDItemDecoder.java3
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/exceptions/AbstractParameterException.java8
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/exceptions/AbstractParameterRuntimeException.java10
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/exceptions/InvalidParametersException.java4
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/exceptions/MissingParameterException.java10
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/exceptions/ParameterValueOutOfRangeException.java14
-rw-r--r--cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/value/parameter/exceptions/UnexpectedParameterException.java71
-rw-r--r--cim-cache/org.eclipse.openk.common/src/test/java/org/eclipse/openk/common/dataexchange/cim/message/ACLineSegment.java6
-rw-r--r--cim-cache/org.eclipse.openk.common/src/test/java/org/eclipse/openk/common/dataexchange/cim/message/BaseVoltage.java34
-rw-r--r--cim-cache/org.eclipse.openk.common/src/test/java/org/eclipse/openk/common/dataexchange/cim/message/CimMessageWriterTest.java5
-rw-r--r--cim-cache/org.eclipse.openk.common/src/test/java/org/eclipse/openk/common/dataexchange/cim/message/IdentifiedObject.java3
-rw-r--r--cim-cache/org.eclipse.openk.common/src/test/java/org/eclipse/openk/common/dataexchange/cim/message/Voltage.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/pom.xml26
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/StaticTopologyDefaults.java28
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/AcLineSegments_2_Xml_Importer.java77
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/BaseVoltages_2_Xml_Importer.java77
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/Bays_2_Xml_Importer.java78
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/Breakers_2_Xml_Importer.java77
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/BusbarSections_2_Xml_Importer.java77
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/Disconnectors_2_Xml_Importer.java77
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/EarthFaultCompensators_2_Xml_Importer.java78
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/EnergyConsumers_2_Xml_Importer.java77
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/EnergySources_2_Xml_Importer.java77
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/GeographicalRegions_2_Xml_Importer.java78
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/GroundingImpedances_2_Xml_Importer.java78
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/Grounds_2_Xml_Importer.java78
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/Junctions_2_Xml_Importer.java77
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/LineTypes_2_Xml_Importer.java78
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/Lines_2_Xml_Importer.java10
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/LoadBreakSwitches_2_Xml_Importer.java77
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/PetersenCoils_2_Xml_Importer.java78
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/Plants_2_Xml_Importer.java78
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/PowerTransformers_2_Xml_Importer.java77
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/SubGeographicalRegions_2_Xml_Importer.java78
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/SubstationTypes_2_Xml_Importer.java78
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/Substations_2_Xml_Importer.java77
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/Switches_2_Xml_Importer.java77
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/TopologyId_2_Xml_Importer.java78
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/importer/VoltageLevels_2_Xml_Importer.java77
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/Abstract_Cim17v07_StaticTopology2_Mapper.java302
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/AcLineSegments_1_Cim17v07_StaticTopology2_Mapper.java136
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/BaseVoltages_1_Cim17v07_StaticTopology2_Mapper.java95
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/Bays_1_Cim17v07_StaticTopology2_Mapper.java97
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/Breakers_1_Cim17v07_StaticTopology2_Mapper.java97
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/BusbarSections_1_Cim17v07_StaticTopology2_Mapper.java96
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/Disconnectors_1_Cim17v07_StaticTopology2_Mapper.java97
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/EarthFaultCompensators_1_Cim17v07_StaticTopology2_Mapper.java100
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/EnergyConsumers_1_Cim17v07_StaticTopology2_Mapper.java96
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/EnergySources_1_Cim17v07_StaticTopology2_Mapper.java96
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/GeographicalRegions_1_Cim17v07_StaticTopology2_Mapper.java93
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/GroundingImpedances_1_Cim17v07_StaticTopology2_Mapper.java102
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/Grounds_1_Cim17v07_StaticTopology2_Mapper.java97
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/Junctions_1_Cim17v07_StaticTopology2_Mapper.java95
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/LineTypes_1_Cim17v07_StaticTopology2_Mapper.java91
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/Lines_1_Cim17v07_StaticTopology2_Mapper.java97
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/LoadBreakSwitches_1_Cim17v07_StaticTopology2_Mapper.java96
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/PetersenCoils_1_Cim17v07_StaticTopology2_Mapper.java106
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/Plants_1_Cim17v07_StaticTopology2_Mapper.java92
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/PowerTransformers_1_Cim17v07_StaticTopology2_Mapper.java135
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/SubGeographicalRegions_1_Cim17v07_StaticTopology2_Mapper.java97
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/SubstationTypes_1_Cim17v07_StaticTopology2_Mapper.java93
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/Substation_1_Cim17v07_StaticTopology2_Mapper.java140
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/Switches_1_Cim17v07_StaticTopology2_Mapper.java99
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/TopologyId_1_Cim17v07_StaticTopology2_Mapper.java93
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/adapter/src/main/java/org/eclipse/openk/domain/statictopology/adapter/dataexchange/mapper/cim17v07/VoltageLevels_1_Cim17v07_StaticTopology2_Mapper.java102
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/AcLineSegments_3_Xml_Rest_Client.java62
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/BaseVoltages_3_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/Bays_2_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/Breakers_3_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/BusbarSections_3_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/Disconnectors_3_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/EarthFaultCompensators_1_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/EnergyConsumers_3_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/EnergySources_3_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/GeographicalRegions_3_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/GroundingImpedances_1_Xml_Rest_Client.java64
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/Grounds_1_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/Junctions_3_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/LineTypes_2_Xml_Rest_Client.java64
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/Lines_3_Xml_Rest_Client.java3
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/LoadBreakSwitches_3_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/PetersenCoils_1_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/Plants_2_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/PowerTransformers_3_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/SubGeographicalRegions_2_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/SubstationTypes_3_Xml_Rest_Client.java64
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/Substations_3_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/Switches_2_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/TopologyId_1_Xml_Rest_Client.java62
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/infrastructure/src/main/java/org/eclipse/openk/domain/statictopology/infrastructure/dataexchange/dataprovider/VoltageLevels_3_Xml_Rest_Client.java63
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/AbstractConnector.java42
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/ConductingEquipment.java139
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/ConductingEquipment.type20
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/Connector.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/Equipment.java96
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/Equipment.type19
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/EquipmentContainer.java165
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/EquipmentContainer.type21
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/IConductingEquipment.java71
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/IConductingEquipment.type20
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/IConnector.java25
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/IConnector.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/IEquipment.java41
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/IEquipment.type19
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/IEquipmentContainer.java68
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/IEquipmentContainer.type21
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/StaticTopology2.java41
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/StaticTopology_2.java95
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/consumption/EnergyConsumer.java55
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/consumption/EnergyConsumer.type19
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/consumption/IEnergyConsumer.java24
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/consumption/IEnergyConsumer.type19
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/core/BaseVoltage.java162
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/core/BaseVoltage.type17
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/core/ConnectivityNode.java112
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/core/ConnectivityNode.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/core/Terminal.java142
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/core/Terminal.type17
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/generation/EnergySource.java55
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/generation/EnergySource.type19
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/generation/IEnergySource.java (renamed from cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/event/ServiceEventListenerAdapter.java)17
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/generation/IEnergySource.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/generation/Plant.java47
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/generation/Plant.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/line/AcLineSegment.java150
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/line/AcLineSegment.type20
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/line/Junction.java (renamed from cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Junction.java)38
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/line/Junction.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/line/Line.java99
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/line/Line.type23
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/line/LineType.java47
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/line/LineType.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/line/WireInfo.java218
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/line/WireInfo.type38
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/region/GeographicalRegion.java47
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/region/GeographicalRegion.type19
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/region/IGeographicalRegion.java24
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/region/IGeographicalRegion.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/region/SubGeographicalRegion.java47
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/region/SubGeographicalRegion.type19
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/Bay.java49
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/Bay.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/BusbarSection.java52
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/BusbarSection.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/Substation.java99
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/Substation.type19
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/SubstationType.java47
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/SubstationType.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/VoltageLevel.java106
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/VoltageLevel.type23
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/grounding/EarthFaultCompensator.java114
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/grounding/EarthFaultCompensator.type23
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/grounding/Ground.java48
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/grounding/Ground.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/grounding/GroundingImpedance.java101
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/grounding/GroundingImpedance.type23
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/grounding/PetersenCoil.java311
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/grounding/PetersenCoil.type28
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/grounding/PetersenCoilModeKind.java30
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/grounding/PetersenCoilModeKind.type33
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/powertransformer/PowerTransformer.java224
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/powertransformer/PowerTransformer.type20
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/powertransformer/PowerTransformerEnd.java298
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/powertransformer/PowerTransformerEnd.type23
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/powertransformer/RatioTapChanger.java274
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/powertransformer/RatioTapChanger.type39
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/switches/Breaker.java48
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/switches/Breaker.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/switches/Disconnector.java (renamed from cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Disconnector.java)38
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/switches/Disconnector.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/switches/LoadBreakSwitch.java46
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/switches/LoadBreakSwitch.type16
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/switches/Switch.java106
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/model/src/main/java/org/eclipse/openk/domain/statictopology/model/substation/switches/Switch.type19
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/service/src/main/java/org/eclipse/openk/domain/statictopology/service/StaticTopologyService.java29
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/service/src/main/java/org/eclipse/openk/domain/statictopology/service/StaticTopologyServiceConfiguration.java46
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/service/src/main/java/org/eclipse/openk/domain/statictopology/service/dataexchange/dataprovider/DataProviderFactory.java159
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/service/src/main/java/org/eclipse/openk/domain/statictopology/service/dataexchange/deserializer/DeserializerFactory.java122
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/service/src/main/java/org/eclipse/openk/domain/statictopology/service/dataexchange/importer/ImporterFactory.java150
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/service/src/main/java/org/eclipse/openk/domain/statictopology/service/dataexchange/mapper/MapperFactory.java168
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/service/src/main/java/org/eclipse/openk/domain/statictopology/service/dataexchange/serializer/SerializerFactory.java6
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/service/src/test/java/org/eclipse/openk/domain/statictopology/service/StaticTopologyServiceTest.java40
-rw-r--r--cim-cache/org.eclipse.openk.domain.static-topology/service/static-topology-service.config113
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/adapter/pom.xml11
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/adapter/src/main/java/org/eclipse/openk/domain/topologystate/adapter/dataexchange/importer/SwitchStates_2_Xml_Importer.java79
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/adapter/src/main/java/org/eclipse/openk/domain/topologystate/adapter/dataexchange/mapper/cim17v07/Abstract_Cim17v07_TopologyState2_Mapper.java162
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/adapter/src/main/java/org/eclipse/openk/domain/topologystate/adapter/dataexchange/mapper/cim17v07/MeasurementPoints_1_Cim17v07_TopologyState2_Mapper.java87
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/adapter/src/main/java/org/eclipse/openk/domain/topologystate/adapter/dataexchange/mapper/cim17v07/Measurements_1_Cim17v07_TopologyState2_Mapper.java217
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/adapter/src/main/java/org/eclipse/openk/domain/topologystate/adapter/dataexchange/mapper/cim17v07/SwitchStates_1_Cim17v07_TopologyState2_Mapper.java88
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/adapter/src/main/java/org/eclipse/openk/domain/topologystate/adapter/dataexchange/mapping/SwitchStatesToCimMapper.java115
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/adapter/src/main/java/org/eclipse/openk/domain/topologystate/adapter/dataexchange/responder/SwitchStatesResponder_V3.java120
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/adapter/src/main/java/org/eclipse/openk/domain/topologystate/adapter/dataexchange/responder/parameters/SwitchStatesRequestParameters_V3.java105
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/adapter/src/test/java/org/eclipse/openk/domain/topologystate/adapter/dataexchange/mapping/SwitchStatesToCimMapperTest.java122
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/adapter/src/test/java/org/eclipse/openk/domain/topologystate/adapter/dataexchange/responder/RespondersTest.java239
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/adapter/src/test/resources/ResponderTestRegister.yaml8
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/core/src/main/java/org/eclipse/openk/domain/topologystate/core/TopologyStateDefaults.java46
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/infrastructure/src/main/java/org/eclipse/openk/domain/topologystate/dataexchange/dataprovider/Abstract_Cim_Xml_Rest_Client.java106
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/infrastructure/src/main/java/org/eclipse/openk/domain/topologystate/dataexchange/dataprovider/SwitchStates_3_Xml_Rest_Client.java62
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/infrastructure/src/main/java/org/eclipse/openk/domain/topologystate/infrastructure/dataexchange/rest/SwitchStatesRestEndPoint.java73
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/infrastructure/src/test/java/org/eclipse/openk/domain/topologystate/infrastructure/dataexchange/rest/RestEndpointTest.java151
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/infrastructure/src/test/resources/RestEndPointTestRegister.yaml8
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/logic/pom.xml19
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/logic/src/main/java/org/eclipse/openk/domain/topologystate/logic/dataexchange/view/MeasurementPointsByMeasurementTypes_1_QueryParameters.java60
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/logic/src/main/java/org/eclipse/openk/domain/topologystate/logic/dataexchange/view/MeasurementPointsByMeasurementTypes_1_View.java121
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/logic/src/main/java/org/eclipse/openk/domain/topologystate/logic/dataexchange/view/MeasurementsByMeasurementTypes_1_QueryParameters.java60
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/logic/src/main/java/org/eclipse/openk/domain/topologystate/logic/dataexchange/view/MeasurementsByMeasurementTypes_1_View.java119
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/logic/src/main/java/org/eclipse/openk/domain/topologystate/logic/dataexchange/view/SwitchStatesByIds_1_QueryParameters.java44
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/logic/src/main/java/org/eclipse/openk/domain/topologystate/logic/dataexchange/view/SwitchStatesByIds_1_View.java102
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/model/pom.xml14
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/model/src/main/java/org/eclipse/openk/domain/topologystate/model/measurement/AbstractMeasurement.java132
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/model/src/main/java/org/eclipse/openk/domain/topologystate/model/measurement/Measurement.java91
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/model/src/main/java/org/eclipse/openk/domain/topologystate/model/measurement/Measurement.type21
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/model/src/main/java/org/eclipse/openk/domain/topologystate/model/measurement/MeasurementPoint.java114
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/model/src/main/java/org/eclipse/openk/domain/topologystate/model/measurement/MeasurementPoint.type20
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/model/src/main/java/org/eclipse/openk/domain/topologystate/model/measurement/MeasurementPointType.java (renamed from cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/PerLengthLineParameter.java)23
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/model/src/main/java/org/eclipse/openk/domain/topologystate/model/measurement/MeasurementPointType.type17
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/model/src/main/java/org/eclipse/openk/domain/topologystate/model/measurement/MeasurementType.java103
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/model/src/main/java/org/eclipse/openk/domain/topologystate/model/measurement/MeasurementType.type23
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/model/src/main/java/org/eclipse/openk/domain/topologystate/model/measurement/TimeSeries.java146
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/model/src/main/java/org/eclipse/openk/domain/topologystate/model/measurement/TimeSeries.type17
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/model/src/main/java/org/eclipse/openk/domain/topologystate/model/measurement/TopologyState2.java40
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/service/pom.xml17
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/service/src/main/java/org/eclipse/openk/domain/topologystate/service/TopologyStateService.java76
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/service/src/main/java/org/eclipse/openk/domain/topologystate/service/dataexchange/dataprovider/DataProviderFactory.java68
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/service/src/main/java/org/eclipse/openk/domain/topologystate/service/dataexchange/deserializer/DeserializerFactory.java66
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/service/src/main/java/org/eclipse/openk/domain/topologystate/service/dataexchange/importer/ImporterFactory.java66
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/service/src/main/java/org/eclipse/openk/domain/topologystate/service/dataexchange/mapper/MapperFactory.java61
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/service/src/main/java/org/eclipse/openk/domain/topologystate/service/dataexchange/responder/ResponderFactory.java72
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/service/src/main/java/org/eclipse/openk/domain/topologystate/service/dataexchange/serializer/SerializerFactory.java72
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/service/src/main/java/org/eclipse/openk/domain/topologystate/service/dataexchange/view/ViewFactory.java78
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/service/src/main/resources/application.properties6
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/service/src/main/resources/favicon.icobin0 -> 90814 bytes
-rw-r--r--cim-cache/org.eclipse.openk.domain.topology-state/service/topology-state-service.config4
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/pom.xml140
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/AbstractServiceAdapterController.java29
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/IServiceAdapterController.java14
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/ServiceAdapterControllerConfiguration.java4
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/cim/CimModelConverter.java312
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/cim/CimModelMapper.java49
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/cim/deserializer/CimRdfDeserializer.java113
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/cim/importer/AbstractCimRestImporter.java6
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/cim/receiver/AbstractCimFileReceiver.java69
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/cim/receiver/CimFileReceiverConfiguration.java29
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/cim/serializer/CimRdfSerializer.java6
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/cim/serializer/CimXmlSerializer.java31
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/deserializer/AbstractDeserializerFactory.java10
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/exporter/AbstractExporter.java203
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/exporter/AbstractExporterFactory.java125
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/exporter/ExporterConfiguration.java (renamed from cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/IDomainObject.java)11
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/exporter/IExportListener.java33
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/exporter/IExporter.java101
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/exporter/IExporterFactory.java63
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/importer/AbstractImporter.java6
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/importer/AbstractImporterFactory.java4
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/importer/Deprecated_AbstractImporter.java5
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/importer/Deprecated_AbstractImporterFactory.java4
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/importer/InvalidImportParameterException.java154
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/mapper/AbstractMapperFactory.java6
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/publisher/AbstractPublisher.java170
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/publisher/AbstractPublisherFactory.java125
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/publisher/IPublisher.java58
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/publisher/IPublisherFactory.java62
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/publisher/PublisherConfiguration.java (renamed from cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/IModification.java)12
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/receiver/AbstractFileReceiver.java285
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/receiver/AbstractReceiver.java10
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/receiver/AbstractReceiverFactory.java10
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/receiver/AbstractRestReceiver.java259
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/receiver/CommandReceiverConfiguration.java24
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/receiver/FileReceiverConfiguration.java65
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/responder/AbstractResponder.java5
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/responder/AbstractResponderFactory.java10
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/responder/IHttpResponse.java12
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/dataexchange/serializer/AbstractSerializerFactory.java10
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/date/RemoteTimer.java98
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/mock/ServiceAdapterControllerMock.java25
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/mock/dataexchange/ModelDefinitionMock.java66
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/mock/dataexchange/mapper/MapperMock.java2
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/main/java/org/eclipse/openk/service/adapter/mock/dataexchange/responder/ResponderMock.java4
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/AbstractRespondersTest.java1
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/AbstractServiceAdapterControllerTest.java49
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/dataexchange/cim/deserializer/CimXmlDeserializerTest.java3
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/dataexchange/cim/serializer/CimXmlSerializerTest.java36
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/dataexchange/deserializer/AbstractDeserializerTest.java6
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/dataexchange/importer/AbstractImporterTest.java280
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/dataexchange/mapper/AbstractMapperFactoryTest.java9
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/dataexchange/mapper/AbstractMapperTest.java15
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/dataexchange/responder/AbstractResponderTest.java2
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/dataexchange/serializer/AbstractSerializerFactoryTest.java8
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/dataexchange/serializer/AbstractSerializerTest.java2
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/dataexchange/serializer/CimXmlSerializerTest.java3
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/dataexchange/serializer/MockSerializerTest.java2
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/mock/AbstractPseudoCimMock.java29
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/mock/CimDatatypeMock.java56
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/mock/CimEntityMock.java57
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/mock/CimIdentifiedObjectMock.java54
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/mock/CimModelDefinitionMock.java38
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/java/org/eclipse/openk/service/adapter/mock/PseudoCimMock.java31
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/resources/CimEntity.xml8
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/resources/CimIdentifiedObject.xml6
-rw-r--r--cim-cache/org.eclipse.openk.service/adapter/src/test/resources/CimListContent.xml12
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/AbstractServiceComponent.java4
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/AbstractServiceCoreController.java11
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/UnitMultiplier.java103
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/UnitMultiplierUtilities.java99
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/UnitSymbol.java632
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/command/CommandAcceptor.java131
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/configuration/AbstractConfigurationDataProvider.java5
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/configuration/IConfigurationDataProvider.java9
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/configuration/MissingConfigurationFileException.java5
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/configuration/PropertiesFileConfigurationDataProvider.java15
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/dataexchange/dataprovider/AbstractDataProvider.java8
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/dataexchange/dataprovider/AbstractDataProviderFactory.java6
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/event/ServiceEvent.java4
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/mock/AbstractFactoryMock.java17
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/mock/ServiceComponentMock.java6
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/main/java/org/eclipse/openk/service/core/mock/ServiceCoreControllerMock.java5
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/test/java/org/eclipse/openk/service/core/AbstractServiceCoreControllerTest.java7
-rw-r--r--cim-cache/org.eclipse.openk.service/core/src/test/java/org/eclipse/openk/service/core/dataexchange/dataprovider/AbstractDataProviderTest.java218
-rw-r--r--cim-cache/org.eclipse.openk.service/infrastructure/src/main/java/org/eclipse/openk/service/infrastructure/dataexchange/rest/AbstractHttpRestEndPoint.java15
-rw-r--r--cim-cache/org.eclipse.openk.service/logic/src/main/java/org/eclipse/openk/service/logic/AbstractServiceLogicController.java5
-rw-r--r--cim-cache/org.eclipse.openk.service/logic/src/main/java/org/eclipse/openk/service/logic/dataexchange/view/AbstractViewFactory.java6
-rw-r--r--cim-cache/org.eclipse.openk.service/logic/src/main/java/org/eclipse/openk/service/logic/mock/ServiceLogicControllerMock.java20
-rw-r--r--cim-cache/org.eclipse.openk.service/logic/src/main/java/org/eclipse/openk/service/logic/mock/dataexchange/view/ViewFactoryMock.java5
-rw-r--r--cim-cache/org.eclipse.openk.service/logic/src/test/java/org/eclipse/openk/service/logic/AbstractServiceLogicControllerTest.java7
-rw-r--r--cim-cache/org.eclipse.openk.service/logic/src/test/java/org/eclipse/openk/service/logic/dataexchange/view/AbstractViewTest.java27
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/AbstractServiceModelController.java89
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/IServiceModelController.java31
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/mock/ServiceModelControllerMock.java40
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/mock/repository/Deprecated_InMemoryRepositoryMock.java202
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/mock/repository/EntityMock.java17
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/mock/repository/ModelMock.java6
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/mock/repository/model/CimIdentifiedObjectMock.java58
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/IRepository.java747
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/InMemoryRepository.java314
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/AbstractEntity.java204
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/AssociationType.java25
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/Entity.type22
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/IEntity.java77
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/IEntity.type19
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/IEntityBuilder.java33
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/Relation.java59
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/RelationType.java31
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/unit/UnitInformation.java52
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/unit/UnitMultiplier.java100
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/unit/UnitMultiplier.type123
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/unit/UnitSymbol.java306
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/unit/UnitSymbol.type159
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/model/unit/UnitUtilities.java198
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/transaction/AlreadyCommittedTransactionException.java89
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/transaction/CanceledTransactionException.java89
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/transaction/InvalidTransactionIdException.java88
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/transaction/NotStartedTransactionException.java41
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/transaction/NotStoppedTransactionException.java86
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/transaction/Transaction.java120
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/new_repository/transaction/UncommittedTransactionException.java89
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/IEntityLookup.java (renamed from cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/EntityLookup.java)2
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/IEntityPersister.java (renamed from cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/EntityPersister.java)2
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/IKeyRepository.java14
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/IModelChangedEvent.java (renamed from cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/model/IModelChangedEvent.java)2
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/IModelListener.java (renamed from cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/model/IModelListener.java)2
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/IModelMapper.java (renamed from cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/model/IModelMapper.java)2
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/INode.java4
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/INodeVisitor.java4
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/IRepository.java13
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/ITraversalStrategy.java5
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/InMemoryEntityRepository.java10
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/InMemoryRepository.java125
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/Key.java69
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/ModelChangedEvent.java (renamed from cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/model/ModelChangedEvent.java)6
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/Relation.java8
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/ACDCTerminal.java109
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/ACLineSegment.java119
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/AbstractObjectBuilder.java41
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/AnalogToDigitalLogicKind.java43
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/ApparentPower.java89
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/AssetInfo.java63
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/BaseVoltage.java32
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Breaker.java75
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/BusbarSection.java89
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/CollectingEquipmentVisitor.java209
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/ConductingEquipment.java124
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Conductor.java54
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/ConformLoad.java57
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/ConnectivityNode.java61
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/ConnectivityNodeContainer.java51
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Connector.java34
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/CurrentFlow.java89
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/EnergyConsumer.java140
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/EnergySource.java152
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Equipment.java118
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/EquipmentContainer.java100
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/GateLogicKind.java49
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/IEquipmentVisitor.java106
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/IdentifiedObject.java30
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Length.java89
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Line.java37
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/LoadBreakSwitch.java51
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/MeasurementType.java8
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/MktEnergyConsumer.java57
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Name.java11
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/NameType.java11
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/NameTypeAuthority.java11
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/NonConformLoad.java58
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/PSRType.java31
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/PerCent.java96
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/PerLengthImpedance.java76
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/PerLengthSequenceImpedance.java91
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/PhaseCode.java110
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/PowerSystemResource.java40
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/PowerTransformer.java363
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/PowerTransformerEnd.java214
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/ProtectedSwitch.java57
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/RatioTapChanger.java69
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Reactance.java90
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/ResistancePerLength.java91
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Seconds.java76
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/StationSupply.java56
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Substation.java85
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Switch.java202
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/TapChanger.java286
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Terminal.java137
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/TransformerEnd.java250
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/Voltage.java14
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/VoltageInterval.java51
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/VoltageLevel.java101
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/WireInfo.java349
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/entity/AbstractEntityBuilder.java58
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/entity/IDomainObject.java23
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/entity/IEntity.java (renamed from cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/IEntity.java)16
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/entity/IEntityBuilder.java34
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/model/entity/IValueObject.java (renamed from cim-cache/org.eclipse.openk.service/model/src/main/java/org/eclipse/openk/service/model/repository/IValueObject.java)6
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/test/java/org/eclipse/openk/service/model/AbstractServiceModelControllerTest.java10
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/test/java/org/eclipse/openk/service/model/new_repository/model/unit/UnitUtilitiesTest.java126
-rw-r--r--cim-cache/org.eclipse.openk.service/model/src/test/java/org/eclipse/openk/service/model/repository/InMemoryRepositoryTest.java86
-rw-r--r--cim-cache/org.eclipse.openk.service/service/pom.xml1
-rw-r--r--cim-cache/org.eclipse.openk.service/service/src/test/java/org/eclipse/openk/service/service/AbstractRestIntegrationTest.java4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/converter/TopologyValueDecoder.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/converter/TopologyValueDecoder.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/mapper/MockUpModelToCimMapper.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/mapper/MockUpModelToCimMapper.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/receiver/TopologyReader.java60
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/receiver/TopologyReceiver_V1.java162
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/AbstractMockUpStaticTopologyCimRestResponder.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/AbstractMockUpTopologyCimRestResponder.java)12
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/AbstractMockUpStaticTopologyResponder.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/AbstractMockUpTopologyResponder.java)27
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/AcLineSegmentsResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/AcLineSegmentsResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/AcLineSegmentsResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/AcLineSegmentsResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/BaseVoltagesResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/BaseVoltagesResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/BaseVoltagesResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/BaseVoltagesResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/BaysResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/BaysResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/BreakersResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/BreakersResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/BreakersResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/BreakersResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/BusbarSectionsResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/BusbarSectionsResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/BusbarSectionsResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/BusbarSectionsResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/DisconnectorsResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/DisconnectorsResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/DisconnectorsResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/DisconnectorsResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/EarthFaultCompensatorsResponder_V1.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/EarthFaultCompensatorsResponder_V1.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/EnergyConsumersResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/EnergyConsumersResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/EnergyConsumersResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/EnergyConsumersResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/EnergySourcesResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/EnergySourcesResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/EnergySourcesResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/EnergySourcesResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/GeographicalRegionsResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/GeographicalRegionsResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/GroundingImpedancesResponder_V1.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/GroundingImpedancesResponder_V1.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/GroundsResponder_V1.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/GroundsResponder_V1.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/ITopologyIdParameterOwner.java34
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/JunctionsResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/JunctionsResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/JunctionsResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/JunctionsResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/LineTypesResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/LineTypesResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/LinesResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/LinesResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/LinesResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/LinesResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/LoadBreakSwitchesResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/LoadBreakSwitchesResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/LoadBreakSwitchesResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/LoadBreakSwitchesResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/OkRequestParameters.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/OkRequestParameters.java)8
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/PetersenCoilsResponder_V1.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/PetersenCoilsResponder_V1.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/PlantsResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/PlantsResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/PowerTransformersResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/PowerTransformersResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/PowerTransformersResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/PowerTransformersResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/RequestParameters.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/RequestParameters.java)20
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/SubGeographicalRegionsResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/SubGeographicalRegionsResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/SubstationTypesResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/SubstationTypesResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/SubstationsResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/SubstationsResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/SubstationsResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/SubstationsResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/SwitchesResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/SwitchesResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/SwitchesResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/SwitchesResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/TopologyIdResponder_V1.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/TopologyIdResponder_V1.java)10
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/TopologyResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/TopologyResponder_V2.java)8
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/VoltageLevelsResponder_V2.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/VoltageLevelsResponder_V2.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/VoltageLevelsResponder_V3.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/VoltageLevelsResponder_V3.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/adapter/dataexchange/responder/RespondersTest.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/adapter/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/adapter/dataexchange/responder/RespondersTest.java)8
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/core/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/core/MockUpStaticTopologyDefaults.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/core/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/common/MockUpStaticTopologyDefaults.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/AcLineSegmentsRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/AcLineSegmentsRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/BaseVoltagesRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/BaseVoltagesRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/BaysRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/BaysRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/BreakersRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/BreakersRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/BusbarSectionsRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/BusbarSectionsRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/DisconnectorsRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/DisconnectorsRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/EarthFaultCompensatorsRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/EarthFaultCompensatorsRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/EnergyConsumersRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/EnergyConsumersRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/EnergySourcesRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/EnergySourcesRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/GeographicalRegionsRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/GeographicalRegionsRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/GroundingImpedancesRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/GroundingImpedancesRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/GroundsRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/GroundsRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/JunctionsRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/JunctionsRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/LineTypesRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/LinesTypesRestEndPoint.java)10
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/LinesRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/LinesRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/LoadBreakSwitchesRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/LoadBreakSwitchesRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/PetersenCoilsRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/PetersenCoilsRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/PlantsRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/PlantsRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/PowerTransformersRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/PowerTransformersRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/SubGeographicalRegionsRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/SubGeographicalRegionsRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/SubstationTypesRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/SubstationTypesRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/SubstationsRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/SubstationsRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/SwitchesRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/SwitchesRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/TopologyIdRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/TopologyIdRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/TopologyRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/TopologyRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/VoltageLevelsRestEndPoint.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/VoltageLevelsRestEndPoint.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/.gitignore (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/.gitignore)0
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/RestEndpointOkTest.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/RestEndpointOkTest.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/infrastructure/dataexchange/rest/RestEndpointTest.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/infrastructure/dataexchange/rest/RestEndpointTest.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/infrastructure/src/test/resources/RestEndPointOkTestRegister.yaml2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/AbstractMockUpStaticTopologyView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/AbstractMockUpTopologyView.java)51
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/AcLineSegmentsView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/AcLineSegmentsView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/BaseVoltagesView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/BaseVoltagesView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/BaysView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/BaysView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/BreakersView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/BreakersView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/BusbarSectionsView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/BusbarSectionsView.java)8
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/DisconnectorsView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/DisconnectorsView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/EarthFaultCompensatorsView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/EarthFaultCompensatorsView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/EnergyConsumersView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/EnergyConsumersView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/EnergySourcesView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/EnergySourcesView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/GeographicalRegionsView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/GeographicalRegionsView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/GroundingImpedancesView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/GroundingImpedancesView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/GroundsView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/GroundsView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/JunctionsView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/JunctionsView.java)9
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/LineTypesView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/LineTypesView.java)12
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/LinesView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/LinesView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/LoadBreakSwitchesView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/LoadBreakSwitchesView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/PetersenCoilsView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/PetersenCoilsView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/PlantsView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/PlantsView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/PowerTransformersView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/PowerTransformersView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/SubGeographicalRegionsView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/SubGeographicalRegionsView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/SubstationTypesView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/SubstationTypesView.java)12
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/SubstationsView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/SubstationsView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/SwitchesView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/SwitchesView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/TopologyIdView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/TopologyIdView.java)19
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/TopologyView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/TopologyView.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/VoltageLevelsView.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/VoltageLevelsView.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/parameters/QueryParameters.java70
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/AbstractMockUpGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/AbstractMockUpGenerator.java)8
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/AcLineSegmentGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/AcLineSegmentGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/BaseVoltageGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/BaseVoltageGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/BayGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/BayGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/BreakerGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/BreakerGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/BusbarSectionGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/BusbarSectionGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/DisconnectorGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/DisconnectorGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/EarthFaultCompensatorGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/EarthFaultCompensatorGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/EnergyConsumerGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/EnergyConsumerGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/EnergySourceGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/EnergySourceGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/GeographicalRegionGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/GeographicalRegionGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/GroundGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/GroundGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/GroundingImpedanceGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/GroundingImpedanceGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/IObjectGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/IObjectGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/ITopologyElementGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/ITopologyElementGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/ITopologyGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/ITopologyGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/JunctionGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/JunctionGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/LineGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/LineGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/LoadBreakSwitchGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/LoadBreakSwitchGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/LowVoltageSubnetGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/LowVoltageSubnetGenerator.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/MidVoltageSubnetGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/MidVoltageSubnetGenerator.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/PetersenCoilGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/PetersenCoilGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/PlantGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/PlantGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/PowerTransformerEndGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/PowerTransformerEndGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/PowerTransformerGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/PowerTransformerGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/RatioTapChangerGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/RatioTapChangerGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/SimpleMockUpModel2Generator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/SimpleMockUpModel2Generator.java)22
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/SimpleMockUpModelGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/SimpleMockUpModelGenerator.java)8
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/SubGeographicalRegionGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/SubGeographicalRegionGenerator.java)8
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/SubstationGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/SubstationGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/TopologyGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/TopologyGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/VoltageLevelGenerator.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/VoltageLevelGenerator.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/AbstractConductingEquipmentFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/AbstractConductingEquipmentFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/AbstractTopologyElementFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/AbstractTopologyElementFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/AcLineSegmentFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/AcLineSegmentFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/BaseVoltageFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/BaseVoltageFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/BaseVoltageFactoryParameters.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/BaseVoltageFactoryParameters.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/BayFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/BayFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/BreakerFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/BreakerFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/BusbarSectionFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/BusbarSectionFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/ConductingEquipmentFactoryParameters.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/ConductingEquipmentFactoryParameters.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/DisconnectorFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/DisconnectorFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/EarthFaultCompensatorFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/EarthFaultCompensatorFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/EnergyConsumerFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/EnergyConsumerFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/EnergySourceFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/EnergySourceFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/GeographicalRegionFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/GeographicalRegionFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/GroundFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/GroundFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/GroundingImpedanceFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/GroundingImpedanceFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/ITopologyElementFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/ITopologyElementFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/ITopologyFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/ITopologyFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/JunctionFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/JunctionFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/LineFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/LineFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/LineTypeFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/LineTypeFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/LoadBreakSwitchFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/LoadBreakSwitchFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/MockUpStaticTopologyUtilities.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/MockUpTopologyUtilities.java)11
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/PetersenCoilFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/PetersenCoilFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/PlantFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/PlantFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/PowerTransformerFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/PowerTransformerFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/PowerTransformerFactoryParameters.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/PowerTransformerFactoryParameters.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/SubGeographicalRegionFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/SubGeographicalRegionFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/SubstationFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/SubstationFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/SubstationTypeFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/SubstationTypeFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/SwitchFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/SwitchFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/TopologyElementFactoryParameters.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/TopologyElementFactoryParameters.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/TopologyIdFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/TopologyIdFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/VoltageLevelFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/VoltageLevelFactory.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/referencetopology/ReferenceTopologyFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/referencetopology/ReferenceTopologyFactory.java)192
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/AbstractMockUpStaticTopologyViewTest.java229
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/AbstractViewTest.java60
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/AcLineSegmentsViewTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/BaseVoltagesViewTest.java87
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/BaysViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/BreakesViewTest.java91
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/BusbarSectionsViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/DisconnectorsViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/EarthFaultCompensatorsViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/EnergyConsumersViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/GeographicalRegionsViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/GroundingImpedancesViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/GroundsViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/JunctionsViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/LineTypesViewTest.java94
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/LinesViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/LoadBreakSwitchesViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/PetersenCoilsViewTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/PlantsViewTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/PowerTransformersViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/SubGeographicalRegionsViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/SubstationTypesViewTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/SubstationsViewTest.java91
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/SwitchesViewTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/TopologyIdViewTest.java49
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/TopologyViewTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/dataexchange/view/VoltageLevelsViewTest.java91
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/AbstractTestBasis.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/AbstractTestBasis.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/generator/BaseVoltageGeneratorTest.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/generator/BaseVoltageGeneratorTest.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/BaseVoltageFactoryTest.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/BaseVoltageFactoryTest.java)4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/logic/processor/topologyfactory/referencetopology/ReferenceTopologyTestFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/processor/topologyfactory/referencetopology/ReferenceTopologyTestFactory.java)102
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/logic/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/logic/dataexchange/view/BaseVoltagesViewTest.java112
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/model/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/model/TopologyElement.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/model/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/model/TopologyElement.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/pom.xml2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/MockUpStaticTopologyService.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/service/MockUpStaticTopologyService.java)57
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/dataexchange/mapper/MapperFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/service/dataexchange/mapper/MapperFactory.java)6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/dataexchange/receiver/ReceiverFactory.java66
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/dataexchange/responder/ResponderFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/service/dataexchange/responder/ResponderFactory.java)86
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/dataexchange/serializer/SerializerFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/service/dataexchange/serializer/SerializerFactory.java)7
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/main/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/dataexchange/view/ViewFactory.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/main/java/org/eclipse/openk/sourcesystem/mockuptopology/service/dataexchange/view/ViewFactory.java)56
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/main/resources/application.properties4
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/AbstractMockUpStaticTopologyResponderTest.java206
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/AcLineSegmentsIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/BaseVoltagesIntegrationTest.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/service/BaseVoltagesIntegrationTest.java)49
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/BaysIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/BreakersIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/BusbarSectionsIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/DisconnectorsIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/EarthFaultCompensatorsIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/EnergyConsumersIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/EnergySourcesIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/GeographicalRegionsIntegrationTest.java95
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/GetModelTest.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/service/GetModelTest.java)9
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/GroundingImpedancesIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/GroundsIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/IntegrationTestTemplate.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/JunctionsIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/LineTypesIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/LinesIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/LoadBreakSwitchesIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/MockUpStaticTopologyServiceTest.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/service/MockUpStaticTopologyServiceTest.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/MockUpStaticTopologyTest.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/service/MockUpStaticTopologyTest.java)8
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/PetersenCoilsIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/PlantsIntegrationTest.java95
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/PowerTransformersIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/SubGeographicalRegionsIntegrationTest.java96
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/SubstationTypesIntegrationTest.java93
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/SubstationsIntegrationTest.java96
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/SwitchesIntegrationTest.java92
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/TopologyIntegrationTest.java119
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/VoltageLevelsIntegrationTest.java96
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/generator/Assertions.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/service/generator/Assertions.java)2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockupstatictopology/service/generator/TopologyGeneratorTest.java (renamed from cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/java/org/eclipse/openk/sourcesystem/mockuptopology/service/generator/TopologyGeneratorTest.java)10
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/AcLineSegments_V3.xml153
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/BaseVoltages_V3.xml73
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/Bays_V2.xml42
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/Breakers_V3.xml53
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/BusbarSections_V3.xml37
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/Disconnectors_V3.xml53
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/EarthFaultCompensators_V1.xml42
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/EnergyConsumers_V3.xml37
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/EnergySources_V3.xml44
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/GroundingImpedances_V1.xml47
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/Grounds_V1.xml37
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/Junctions_V3.xml50
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/LineTypes_V2.xml25
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/Lines_V3.xml43
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/LoadBreakSwitches_V3.xml53
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/PetersenCoils_V1.xml68
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/PowerTransformers_V3.xml115
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/SubstationTypes_V3.xml25
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-static-topology/service/src/test/resources/Switches_V3.xml19
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-topology-state/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopologystate/adapter/dataexchange/mapper/SwitchStatesToCimMapper.java2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-topology-state/adapter/src/main/java/org/eclipse/openk/sourcesystem/mockuptopologystate/adapter/dataexchange/responder/SwitchStatesResponder_V3.java2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-topology-state/adapter/src/test/java/org/eclipse/openk/sourcesystem/mockuptopologystate/adapter/dataexchange/responder/RespondersTest.java6
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-topology-state/infrastructure/src/main/java/org/eclipse/openk/sourcesystem/mockuptopologystate/infrastructure/dataexchange/rest/SwitchStatesRestEndPoint.java2
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-topology-state/logic/src/main/java/org/eclipse/openk/sourcesystem/mockuptopologystate/dataexchange/view/SwitchStatesView_V1.java5
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-topology-state/model/src/main/java/org/eclipse/openk/sourcesystem/mockuptopologystate/.gitignore0
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-topology-state/model/src/main/java/org/eclipse/openk/sourcesystem/mockuptopologystate/repository/model/SwitchStatus.java51
-rw-r--r--cim-cache/org.eclipse.openk.source-system.mock-up-topology-state/service/src/main/resources/application.properties2
-rw-r--r--cim-cache/pom.xml6
865 files changed, 36673 insertions, 9214 deletions
diff --git a/cim-cache/org.eclipse.openk.build/build-codeconventions/src/main/resources/checkstyle/checkstyle-main.xml b/cim-cache/org.eclipse.openk.build/build-codeconventions/src/main/resources/checkstyle/checkstyle-main.xml
index d377080f..2d78eab2 100644
--- a/cim-cache/org.eclipse.openk.build/build-codeconventions/src/main/resources/checkstyle/checkstyle-main.xml
+++ b/cim-cache/org.eclipse.openk.build/build-codeconventions/src/main/resources/checkstyle/checkstyle-main.xml
@@ -5,7 +5,7 @@
This configuration file was written by the eclipse-cs plugin configuration editor
-->
<!--
- Checkstyle-Configuration: BTC
+ Checkstyle-Configuration: openK
Description: none
-->
<module name="Checker">
@@ -36,9 +36,8 @@
<property name="format" value="^(([a-z]+[A-Z]?[a-z]*)+[0-9]*)$"/>
</module>
<module name="MethodName">
- <metadata name="net.sf.eclipsecs.core.comment" value="Checks that method names follow naming convention"/>
<property name="id" value="namemethod"/>
- <property name="format" value="^(([a-z]+[A-Z]?[a-z]*)+[0-9]*)$"/>
+ <property name="format" value="^([a-z][a-zA-Z0-9])+([_a-zA-Z0-9])*$"/>
</module>
<module name="PackageName">
<metadata name="net.sf.eclipsecs.core.comment" value="Checks that package names follow naming convention"/>
@@ -121,10 +120,6 @@
<property name="id" value="lineseparator"/>
<property name="tokens" value="CLASS_DEF,CTOR_DEF,ENUM_DEF,INTERFACE_DEF,METHOD_DEF,STATIC_INIT"/>
</module>
- <module name="GenericWhitespace">
- <metadata name="net.sf.eclipsecs.core.comment" value="Checks that the whitespace around the Generic tokens &lt; and &gt; is correct to the typical convention"/>
- <property name="id" value="genericwhitespace"/>
- </module>
<module name="MethodParamPad">
<metadata name="net.sf.eclipsecs.core.comment" value="Checks the padding between the identifier of a method definition, constructor definition, method call, or constructor invocation"/>
<property name="id" value="padmethodparam"/>
@@ -133,7 +128,7 @@
<module name="NoWhitespaceAfter">
<metadata name="net.sf.eclipsecs.core.comment" value="Checks that there is no whitespace after a token"/>
<property name="id" value="whitespaceafter"/>
- <property name="tokens" value="LNOT,DOT,BNOT,DEC,UNARY_MINUS,UNARY_PLUS,INC,ARRAY_INIT,TYPECAST"/>
+ <property name="tokens" value="ARRAY_INIT,INC,DEC,UNARY_MINUS,UNARY_PLUS,BNOT,LNOT,DOT"/>
</module>
<module name="NoWhitespaceBefore">
<metadata name="net.sf.eclipsecs.core.comment" value="Checks that there is no whitespace before a token"/>
@@ -190,7 +185,6 @@
<metadata name="net.sf.eclipsecs.core.comment" value="Checks the placement of right curly braces"/>
<property name="id" value="rightcurly"/>
<property name="option" value="alone"/>
- <property name="tokens" value="LITERAL_CATCH,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_TRY"/>
</module>
<module name="CovariantEquals">
<metadata name="net.sf.eclipsecs.core.comment" value="Checks that classes that define a covariant equals() method also override method equals(java.lang.Object)."/>
@@ -199,6 +193,7 @@
<module name="DeclarationOrder">
<metadata name="net.sf.eclipsecs.core.comment" value="Check whether parts of a class or interface declaration appear in the right order "/>
<property name="id" value="orderclass"/>
+ <property name="ignoreModifiers" value="true"/>
</module>
<module name="DefaultComesLast">
<metadata name="net.sf.eclipsecs.core.comment" value="Check that the default is after all the cases in a switch statement."/>
@@ -246,6 +241,7 @@
<module name="MultipleStringLiterals">
<metadata name="net.sf.eclipsecs.core.comment" value="Checks for multiple occurrences of the same string literal within a single file."/>
<property name="id" value="multistringliterals"/>
+ <property name="ignoreStringsRegexp" value="(^&quot;&quot;$)|(^&quot;[a-zA-Z_][0-9a-zA-Z_]*&quot;$)"/>
</module>
<module name="MultipleVariableDeclarations">
<metadata name="net.sf.eclipsecs.core.comment" value="Checks that each variable declaration is in its own statement and on its own line"/>
@@ -325,48 +321,36 @@
<property name="id" value="emtyclausedescription"/>
</module>
<module name="JavadocStyle">
- <metadata name="net.sf.eclipsecs.core.comment" value="check !constructors"/>
+ <metadata name="net.sf.eclipsecs.core.comment" value="Classes &amp; Interfaces"/>
<property name="checkEmptyJavadoc" value="true"/>
- <property name="checkFirstSentence" value="false"/>
- <property name="tokens" value="INTERFACE_DEF,CLASS_DEF,METHOD_DEF,VARIABLE_DEF"/>
+ <property name="tokens" value="INTERFACE_DEF,CLASS_DEF"/>
</module>
<module name="JavadocMethod">
+ <property name="allowedAnnotations" value="Before,BeforeClass,Override,Test"/>
<property name="validateThrows" value="true"/>
<property name="suppressLoadErrors" value="true"/>
</module>
- <module name="JavadocStyle">
- <metadata name="net.sf.eclipsecs.core.comment" value="check constructors"/>
- <property name="checkEmptyJavadoc" value="true"/>
- <property name="checkFirstSentence" value="false"/>
- <property name="tokens" value="CTOR_DEF"/>
- </module>
<module name="AtclauseOrder"/>
- <module name="AbstractClassName"/>
+ <module name="AbstractClassName">
+ <property name="format" value="^Abstract((.{1,3})|(.*[^T][^e][^s][^t]))$"/>
+ </module>
<module name="ClassTypeParameterName"/>
<module name="MethodTypeParameterName"/>
<module name="InterfaceTypeParameterName"/>
<module name="CommentsIndentation"/>
- <module name="TodoComment">
- <property name="severity" value="ignore"/>
- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
- <module name="TrailingComment"/>
<module name="JavaNCSS"/>
<module name="CyclomaticComplexity"/>
- <module name="DesignForExtension"/>
<module name="ThrowsCount">
- <property name="max" value="2"/>
+ <property name="max" value="5"/>
<property name="ignorePrivateMethods" value="false"/>
</module>
<module name="VisibilityModifier">
<property name="protectedAllowed" value="true"/>
</module>
<module name="OneStatementPerLine"/>
- <module name="UnnecessaryParentheses"/>
<module name="SuperFinalize"/>
<module name="SuperClone"/>
<module name="ReturnCount">
- <property name="max" value="1"/>
<property name="maxForVoid" value="0"/>
</module>
<module name="ParameterAssignment"/>
@@ -380,10 +364,23 @@
<module name="SingleSpaceSeparator"/>
<module name="SeparatorWrap"/>
<module name="MethodLength"/>
- <module name="AvoidStaticImport"/>
+ <module name="AvoidStaticImport">
+ <property name="excludes" value="org.assertj.core.api.Assertions.*,org.junit.Assert.*,org.mockito.ArgumentMatchers.*,org.mockito.Mockito.*,org.xmlunit.matchers.CompareMatcher.*,org.xmlunit.diff.ElementSelectors.*,org.hamcrest.CoreMatchers.*"/>
+ </module>
<module name="CatchParameterName"/>
- <module name="JavadocType"/>
+ <module name="JavadocType">
+ <property name="authorFormat" value="(20[0-9][0-9]-((0[1-9])|(1[0-2]))-((0[1-9])|([1-2][0-9])|(3[0-1])) )?[a-zA-Z]+"/>
+ </module>
<module name="AnnotationLocation"/>
+ <module name="OuterTypeFilename"/>
+ <module name="JavadocStyle">
+ <metadata name="net.sf.eclipsecs.core.comment" value="Constructors, Methods &amp; Variables"/>
+ <property name="tokens" value="METHOD_DEF,CTOR_DEF,VARIABLE_DEF"/>
+ </module>
+ <module name="MutableException">
+ <metadata name="net.sf.eclipsecs.core.comment" value="Ensures that events are immutable"/>
+ <property name="format" value="^.*Event$"/>
+ </module>
</module>
<module name="FileTabCharacter">
<metadata name="net.sf.eclipsecs.core.comment" value="Checks that there are no tab characters ('\t') in the source code."/>
@@ -418,4 +415,14 @@
<property name="max" value="2500"/>
</module>
<module name="SuppressWarningsFilter"/>
+ <module name="RegexpSingleline">
+ <metadata name="net.sf.eclipsecs.core.comment" value="System.currentTimeMillis() not allowed"/>
+ <property name="format" value="System\.currentTimeMillis()"/>
+ <property name="message" value="'System.currentTimeMillis()' not allowed. Use 'IContext.getTimer().*' instead."/>
+ </module>
+ <module name="RegexpSingleline">
+ <metadata name="net.sf.eclipsecs.core.comment" value="System.nanoTime() not allowed"/>
+ <property name="format" value="System\.nanoTime()"/>
+ <property name="message" value="'System.nanoTime()' not allowed. Use 'IContext.getTimer().*' instead."/>
+ </module>
</module>
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/Cim17v07.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/Cim17v07.java
index b5c43817..cad43390 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/Cim17v07.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/Cim17v07.java
@@ -24,11 +24,13 @@ import org.eclipse.openk.common.dataexchange.cim.CimVersion;
public final class Cim17v07 extends CimModelDefinition {
// Constants
+ public static final CimVersion VERSION = new CimVersion(17, 7);
+
public static final Cim17v07 INSTANCE = new Cim17v07();
// Constructors
private Cim17v07() {
- super(new CimVersion(17, 7));
+ super(VERSION);
}
} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Assets/AcceptanceTest.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Assets/AcceptanceTest.java
index 4d970956..4469ad76 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Assets/AcceptanceTest.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Assets/AcceptanceTest.java
@@ -24,7 +24,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:09:07
*/
@SuppressWarnings("javadoc")
- public class AcceptanceTest implements ICimDatatype {
+ public class AcceptanceTest implements ICimCompound {
/**
* Date and time the asset was last tested using the 'type' of test and yielding
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Assets/LifecycleDate.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Assets/LifecycleDate.java
index 7d9bf51e..69252dda 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Assets/LifecycleDate.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Assets/LifecycleDate.java
@@ -24,7 +24,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:10:38
*/
@SuppressWarnings("javadoc")
- public class LifecycleDate implements ICimDatatype {
+ public class LifecycleDate implements ICimCompound {
/**
* (if applicable) Date current installation was completed, which may not be the
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/ElectronicAddress.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/ElectronicAddress.java
index 03c52da8..07832af8 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/ElectronicAddress.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/ElectronicAddress.java
@@ -20,7 +20,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:09:53
*/
@SuppressWarnings("javadoc")
- public class ElectronicAddress implements ICimDatatype {
+ public class ElectronicAddress implements ICimCompound {
/**
* Primary email address.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/Priority.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/Priority.java
index b5c7cca4..b5563213 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/Priority.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/Priority.java
@@ -22,7 +22,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:15
*/
@SuppressWarnings("javadoc")
- public class Priority implements ICimDatatype {
+ public class Priority implements ICimCompound {
/**
* Justification for 'rank'.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/Status.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/Status.java
index f0de9d4e..db162cc2 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/Status.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/Status.java
@@ -22,7 +22,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:43
*/
@SuppressWarnings("javadoc")
- public class Status implements ICimDatatype {
+ public class Status implements ICimCompound {
/**
* Date and time for which status 'value' applies.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/StreetAddress.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/StreetAddress.java
index cd5d1ceb..ec9e3059 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/StreetAddress.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/StreetAddress.java
@@ -20,7 +20,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:43
*/
@SuppressWarnings("javadoc")
- public class StreetAddress implements ICimDatatype {
+ public class StreetAddress implements ICimCompound {
/**
* Post office box.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/StreetDetail.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/StreetDetail.java
index cf624350..eb3bff32 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/StreetDetail.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/StreetDetail.java
@@ -22,7 +22,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:43
*/
@SuppressWarnings("javadoc")
- public class StreetDetail implements ICimDatatype {
+ public class StreetDetail implements ICimCompound {
/**
* First line of a free form address or some additional address information (for
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/TelephoneNumber.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/TelephoneNumber.java
index 38b58f67..5ae0878e 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/TelephoneNumber.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/TelephoneNumber.java
@@ -22,7 +22,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:51
*/
@SuppressWarnings("javadoc")
- public class TelephoneNumber implements ICimDatatype {
+ public class TelephoneNumber implements ICimCompound {
/**
* (if applicable) Area or region code.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/TownDetail.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/TownDetail.java
index 56d1a764..fc1f41d6 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/TownDetail.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Common/TownDetail.java
@@ -22,7 +22,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:55
*/
@SuppressWarnings("javadoc")
- public class TownDetail implements ICimDatatype {
+ public class TownDetail implements ICimCompound {
/**
* Town code.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/InfIEC61968/InfCommon/Ratio.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/InfIEC61968/InfCommon/Ratio.java
index 1b64cd9e..ce63ffb2 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/InfIEC61968/InfCommon/Ratio.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/InfIEC61968/InfCommon/Ratio.java
@@ -21,7 +21,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:22
*/
@SuppressWarnings("javadoc")
- public class Ratio implements ICimDatatype {
+ public class Ratio implements ICimCompound {
/**
* The part of a fraction that is below the line and that functions as the divisor
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/LoadControl/RemoteConnectDisconnectInfo.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/LoadControl/RemoteConnectDisconnectInfo.java
index 51fe5477..effaf99e 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/LoadControl/RemoteConnectDisconnectInfo.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/LoadControl/RemoteConnectDisconnectInfo.java
@@ -28,7 +28,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:28
*/
@SuppressWarnings("javadoc")
- public class RemoteConnectDisconnectInfo implements ICimDatatype {
+ public class RemoteConnectDisconnectInfo implements ICimCompound {
/**
* Setting of the timeout elapsed time.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/ControlledAppliance.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/ControlledAppliance.java
index 2611908d..d19d4c53 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/ControlledAppliance.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/ControlledAppliance.java
@@ -22,7 +22,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:09:36
*/
@SuppressWarnings("javadoc")
- public class ControlledAppliance implements ICimDatatype {
+ public class ControlledAppliance implements ICimCompound {
/**
* True if the appliance is an electric vehicle.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/EndDeviceCapability.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/EndDeviceCapability.java
index ca71fb87..9c7daa25 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/EndDeviceCapability.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/EndDeviceCapability.java
@@ -22,7 +22,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:09:53
*/
@SuppressWarnings("javadoc")
- public class EndDeviceCapability implements ICimDatatype {
+ public class EndDeviceCapability implements ICimCompound {
/**
* True if autonomous DST (daylight saving time) function is supported.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/EndDeviceTiming.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/EndDeviceTiming.java
index 8c652c71..77f4ce0d 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/EndDeviceTiming.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/EndDeviceTiming.java
@@ -24,7 +24,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:09:55
*/
@SuppressWarnings("javadoc")
- public class EndDeviceTiming implements ICimDatatype {
+ public class EndDeviceTiming implements ICimCompound {
/**
* Duration of the end device control action or the business event that is the
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/RationalNumber.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/RationalNumber.java
index bbec7458..9e359d89 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/RationalNumber.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/RationalNumber.java
@@ -22,7 +22,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:22
*/
@SuppressWarnings("javadoc")
- public class RationalNumber implements ICimDatatype {
+ public class RationalNumber implements ICimCompound {
/**
* Denominator. Value 1 indicates the number is a simple integer.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/ReadingInterharmonic.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/ReadingInterharmonic.java
index c7566df5..20b148af 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/ReadingInterharmonic.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Metering/ReadingInterharmonic.java
@@ -24,7 +24,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:23
*/
@SuppressWarnings("javadoc")
- public class ReadingInterharmonic implements ICimDatatype {
+ public class ReadingInterharmonic implements ICimCompound {
/**
* Interharmonic denominator. Value 0 means not applicable. Value 2 is used in
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Operations/ServicePointOutageSummary.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Operations/ServicePointOutageSummary.java
index fcbe4917..8eabc893 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Operations/ServicePointOutageSummary.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/Operations/ServicePointOutageSummary.java
@@ -23,7 +23,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:38
*/
@SuppressWarnings("javadoc")
- public class ServicePointOutageSummary implements ICimDatatype {
+ public class ServicePointOutageSummary implements ICimCompound {
/**
* Number of critical service (delivery) points affected by an outage.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/AccountMovement.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/AccountMovement.java
index 5d43c9b7..956637a0 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/AccountMovement.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/AccountMovement.java
@@ -25,7 +25,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:09:08
*/
@SuppressWarnings("javadoc")
- public class AccountMovement implements ICimDatatype {
+ public class AccountMovement implements ICimCompound {
/**
* Amount that was credited to/debited from an account. For example: payment
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/AccountingUnit.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/AccountingUnit.java
index c7b3fbbd..756192c8 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/AccountingUnit.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/AccountingUnit.java
@@ -24,7 +24,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:09:08
*/
@SuppressWarnings("javadoc")
- public class AccountingUnit implements ICimDatatype {
+ public class AccountingUnit implements ICimCompound {
/**
* Unit of service.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/BankAccountDetail.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/BankAccountDetail.java
index 20aef916..f1f78d50 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/BankAccountDetail.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/BankAccountDetail.java
@@ -22,7 +22,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:09:21
*/
@SuppressWarnings("javadoc")
- public class BankAccountDetail implements ICimDatatype {
+ public class BankAccountDetail implements ICimCompound {
/**
* Operational account reference number.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/Due.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/Due.java
index c374a0e3..ff68b548 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/Due.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/Due.java
@@ -23,7 +23,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:09:52
*/
@SuppressWarnings("javadoc")
- public class Due implements ICimDatatype {
+ public class Due implements ICimCompound {
/**
* Part of 'current' that constitutes the arrears portion.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/LineDetail.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/LineDetail.java
index 1e354d3a..8c22c501 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/LineDetail.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61968/PaymentMetering/LineDetail.java
@@ -25,7 +25,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:10:39
*/
@SuppressWarnings("javadoc")
- public class LineDetail implements ICimDatatype {
+ public class LineDetail implements ICimCompound {
/**
* Amount for this line item.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/Forecast.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/Forecast.java
deleted file mode 100644
index 6ab5c36a..00000000
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/Forecast.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * -----------------------------------------------------------------------------
- *
- * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * -----------------------------------------------------------------------------
- */
-package org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.BTC;
-
-import org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Core.ConductingEquipment;
-
-/**
- * @author BTC AG (generated); modelled by migruend
- * @version 1.0
- * @created 10-Aug-2017 18:10:15
- */
- @SuppressWarnings("javadoc")
- public class Forecast extends IntervalSchedule {
-
- private ConductingEquipment m_ConductingEquipment;
-
- public Forecast(){
-
- }
-
- /**
- * @return the m_ConductingEquipment
- */
- public ConductingEquipment getM_ConductingEquipment() {
-
- return m_ConductingEquipment;
- }
-
- /**
- * @param m_ConductingEquipment the m_ConductingEquipment to set
- */
- public void setM_ConductingEquipment(ConductingEquipment m_ConductingEquipment) {
-
- this.m_ConductingEquipment = m_ConductingEquipment;
- }
-
-} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/IntervalSchedule.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/IntervalSchedule.java
deleted file mode 100644
index f3b73a71..00000000
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/IntervalSchedule.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * -----------------------------------------------------------------------------
- *
- * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * -----------------------------------------------------------------------------
- */
-package org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.BTC;
-
-import java.util.Date;
-
-import org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Core.RegularIntervalSchedule;
-import org.eclipse.openk.common.dataexchange.cim.*;
-
-/**
- * @author BTC AG (generated); modelled by migruend
- * @version 1.0
- * @created 10-Aug-2017 18:10:36
- */
- @SuppressWarnings("javadoc")
- public class IntervalSchedule extends RegularIntervalSchedule {
-
- @Cim(originalType = "DateTime")
- private Date createdDateTime;
-
-
- public Date getCreatedDateTime() {
- return createdDateTime;
- }
-
- public void setCreatedDateTime(final Date value) {
- this.createdDateTime = value;
- }
-
- public IntervalSchedule(){
-
- }
-
-} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/Schedule.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/Schedule.java
deleted file mode 100644
index ff9929a5..00000000
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/Schedule.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * -----------------------------------------------------------------------------
- *
- * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * -----------------------------------------------------------------------------
- */
-package org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.BTC;
-
-import org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Core.ConductingEquipment;
-
-/**
- * @author BTC AG (generated); modelled by migruend
- * @version 1.0
- * @created 10-Aug-2017 18:11:34
- */
- @SuppressWarnings("javadoc")
- public class Schedule extends IntervalSchedule {
-
- private ConductingEquipment m_ConductingEquipment;
-
- public Schedule(){
-
- }
-
- /**
- * @return the m_ConductingEquipment
- */
- public ConductingEquipment getM_ConductingEquipment() {
-
- return m_ConductingEquipment;
- }
-
- /**
- * @param m_ConductingEquipment the m_ConductingEquipment to set
- */
- public void setM_ConductingEquipment(ConductingEquipment m_ConductingEquipment) {
-
- this.m_ConductingEquipment = m_ConductingEquipment;
- }
-
-} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/DateInterval.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/DateInterval.java
index 6be1cef3..8ab5d90d 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/DateInterval.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/DateInterval.java
@@ -24,7 +24,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:09:44
*/
@SuppressWarnings("javadoc")
- public class DateInterval implements ICimDatatype {
+ public class DateInterval implements ICimCompound {
/**
* End date of this interval.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/DateTimeInterval.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/DateTimeInterval.java
index d2383ee2..38eed528 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/DateTimeInterval.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/DateTimeInterval.java
@@ -24,7 +24,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:09:44
*/
@SuppressWarnings("javadoc")
- public class DateTimeInterval implements ICimDatatype {
+ public class DateTimeInterval implements ICimCompound {
/**
* End date and time of this interval.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/IntegerQuantity.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/IntegerQuantity.java
index a8ea2654..60c3e57d 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/IntegerQuantity.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/IntegerQuantity.java
@@ -13,48 +13,54 @@
*/
package org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Domain;
-import org.eclipse.openk.common.dataexchange.cim.*;
+import org.eclipse.openk.common.dataexchange.cim.ICimCompound;
/**
* Quantity with integer value and associated unit information.
+ *
* @created 10-Aug-2017 18:10:35
*/
- @SuppressWarnings("javadoc")
- public class IntegerQuantity implements ICimDatatype {
+@SuppressWarnings("javadoc")
+public class IntegerQuantity implements ICimCompound {
+
+ private UnitMultiplier multiplier;
+
+ public UnitMultiplier getMultiplier() {
+
+ return multiplier;
+ }
+
+ public void setMultiplier(final UnitMultiplier value) {
+
+ this.multiplier = value;
+ }
- private UnitMultiplier multiplier;
+ private UnitSymbol unit;
+ public UnitSymbol getUnit() {
- public UnitMultiplier getMultiplier() {
- return multiplier;
- }
+ return unit;
+ }
- public void setMultiplier(final UnitMultiplier value) {
- this.multiplier = value;
- }
- private UnitSymbol unit;
+ public void setUnit(final UnitSymbol value) {
+ this.unit = value;
+ }
- public UnitSymbol getUnit() {
- return unit;
- }
+ private Integer value;
- public void setUnit(final UnitSymbol value) {
- this.unit = value;
- }
- private Integer value;
+ public Integer getValue() {
+ return value;
+ }
- public Integer getValue() {
- return value;
- }
+ public void setValue(final Integer value) {
- public void setValue(final Integer value) {
- this.value = value;
- }
+ this.value = value;
+ }
- public IntegerQuantity(){
+ public IntegerQuantity() {
- }
+ }
} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/MonthDayInterval.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/MonthDayInterval.java
index b472f9f3..6c405b84 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/MonthDayInterval.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/MonthDayInterval.java
@@ -24,7 +24,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:10:56
*/
@SuppressWarnings("javadoc")
- public class MonthDayInterval implements ICimDatatype {
+ public class MonthDayInterval implements ICimCompound {
/**
* End time of this interval.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/StringQuantity.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/StringQuantity.java
index 1de67d40..70fbecca 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/StringQuantity.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/StringQuantity.java
@@ -21,7 +21,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:43
*/
@SuppressWarnings("javadoc")
- public class StringQuantity implements ICimDatatype {
+ public class StringQuantity implements ICimCompound {
private UnitMultiplier multiplier;
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/TimeInterval.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/TimeInterval.java
index 7d57ad4c..53edd9a4 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/TimeInterval.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Domain/TimeInterval.java
@@ -24,7 +24,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:53
*/
@SuppressWarnings("javadoc")
- public class TimeInterval implements ICimDatatype {
+ public class TimeInterval implements ICimCompound {
/**
* End time of this interval.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Faults/FaultImpedance.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Faults/FaultImpedance.java
index 88456431..8cdb22eb 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Faults/FaultImpedance.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Faults/FaultImpedance.java
@@ -24,7 +24,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:10:14
*/
@SuppressWarnings("javadoc")
- public class FaultImpedance implements ICimDatatype {
+ public class FaultImpedance implements ICimCompound {
/**
* The resistance of the fault between phases and ground.
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Generation/Production/Classification.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Generation/Production/Classification.java
index 0b1e4f45..be049d68 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Generation/Production/Classification.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Generation/Production/Classification.java
@@ -23,7 +23,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:09:28
*/
@SuppressWarnings("javadoc")
- public class Classification implements ICimDatatype {
+ public class Classification implements ICimCompound {
private UnitMultiplier multiplier;
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Meas/Measurement.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Meas/Measurement.java
index d8012710..a27b477e 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Meas/Measurement.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/Meas/Measurement.java
@@ -143,10 +143,6 @@ import org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.InfIEC61970.InfSIPS.*;
this.unitSymbol = value;
}
-
-
-
-
/**
* The power system resource that contains the measurement.
*/
@@ -205,9 +201,6 @@ import org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.InfIEC61970.InfSIPS.*;
public void setProcedures(final List<Procedure> value) {
this.Procedures = value;
}
-
-
-
/**
*
@@ -311,5 +304,4 @@ import org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.InfIEC61970.InfSIPS.*;
public Measurement(){
}
-
} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfICCP/IPAddressType.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfICCP/IPAddressType.java
index 407bddeb..ec350819 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfICCP/IPAddressType.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfICCP/IPAddressType.java
@@ -23,7 +23,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:10:37
*/
@SuppressWarnings("javadoc")
- public class IPAddressType implements ICimDatatype {
+ public class IPAddressType implements ICimCompound {
private UnitMultiplier multiplier;
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfICCP/ISOAPAddressing.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfICCP/ISOAPAddressing.java
index dd222ee4..7f02a679 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfICCP/ISOAPAddressing.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfICCP/ISOAPAddressing.java
@@ -23,7 +23,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:10:37
*/
@SuppressWarnings("javadoc")
- public class ISOAPAddressing implements ICimDatatype {
+ public class ISOAPAddressing implements ICimCompound {
private UnitMultiplier multiplier;
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfPowerSystemProjects/PowerSystemProjectLifecycle.java b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfPowerSystemProjects/PowerSystemProjectLifecycle.java
index 278334ce..3316827d 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfPowerSystemProjects/PowerSystemProjectLifecycle.java
+++ b/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/InfIEC61970/InfPowerSystemProjects/PowerSystemProjectLifecycle.java
@@ -25,7 +25,7 @@ import org.eclipse.openk.common.dataexchange.cim.*;
* @created 10-Aug-2017 18:11:13
*/
@SuppressWarnings("javadoc")
- public class PowerSystemProjectLifecycle implements ICimDatatype {
+ public class PowerSystemProjectLifecycle implements ICimCompound {
/**
* The date the Power System Project is in cancelled stage.
diff --git a/cim-cache/org.eclipse.openk.cim.profile.openkonsequenz/src/main/java/org/eclipse/openk/cim/profile/openkonsequenz/OpenKonsequenz.java b/cim-cache/org.eclipse.openk.cim.profile.openkonsequenz/src/main/java/org/eclipse/openk/cim/profile/openkonsequenz/OpenKonsequenz.java
index d7208659..2dc73433 100644
--- a/cim-cache/org.eclipse.openk.cim.profile.openkonsequenz/src/main/java/org/eclipse/openk/cim/profile/openkonsequenz/OpenKonsequenz.java
+++ b/cim-cache/org.eclipse.openk.cim.profile.openkonsequenz/src/main/java/org/eclipse/openk/cim/profile/openkonsequenz/OpenKonsequenz.java
@@ -14,79 +14,24 @@
package org.eclipse.openk.cim.profile.openkonsequenz;
import org.eclipse.openk.common.Version;
-import org.eclipse.openk.common.model.IModelDefinition;
+import org.eclipse.openk.common.model.AbstractModelDefinition;
/**
- * The <i>Openkonsequenz</i> model definition.
+ * The <i>openKONSEQUENZ</i> model definition.
*
- * @author Michael Kotten
+ * @author 2017-10-09 Felix Korb
*/
-public final class OpenKonsequenz implements IModelDefinition {
+public final class OpenKonsequenz extends AbstractModelDefinition<Version> {
// Constants
- public static final OpenKonsequenz INSTANCE = new OpenKonsequenz(new Version(1));
+ public static final String KEY = "OpenKonsequenz";
+ public static final Version VERSION = new Version(1);
- // Attributes
- private Version version;
+ public static final OpenKonsequenz INSTANCE = new OpenKonsequenz();
// Constructors
- /**
- * @param version
- * the <i>CIM</i> version
- * @throws IllegalArgumentException
- * Is thrown in the following cases:
- * <ul>
- * <li><code>version</code> is <code>null</code></li>
- * </ul>
- */
- private OpenKonsequenz(Version version) {
+ private OpenKonsequenz() {
- if(version == null)
- throw new IllegalArgumentException("version", new NullPointerException());
- else
- this.version = version;
- }
-
- // Methods
- @Override
- public int compareTo(IModelDefinition value) {
-
- int result;
-
- if(value == null)
- result = 1;
- else {
- if(value instanceof OpenKonsequenz)
- result = version.compareTo(((OpenKonsequenz) value).version);
- else
- result = encode().compareTo(value.encode());
- }
-
- return result;
- }
-
- @Override
- public String encode() {
-
- return version.encode();
- }
-
- @Override
- public String toString() {
-
- return encode();
- }
-
- // Properties
- @Override
- public Package getPackage() {
-
- return getClass().getPackage();
- }
-
- @Override
- public Version getVersion() {
-
- return version;
+ super(KEY, VERSION);
}
} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/AbstractContext.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/AbstractContext.java
index 737f7b99..af1847b4 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/AbstractContext.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/AbstractContext.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -40,7 +40,7 @@ public abstract class AbstractContext implements IContext {
* <li><code>componentId</code> is <code>null</code> or <code>""</code></li>
* </ul>
*/
- protected AbstractContext(String componentId) {
+ protected AbstractContext(String componentId) throws IllegalArgumentException {
if(!StringUtilities.hasContent(componentId))
throw new IllegalArgumentException("version", new NullPointerException());
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/IContext.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/IContext.java
index 8fe96343..417ff3ec 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/IContext.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/IContext.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -16,7 +16,7 @@ package org.eclipse.openk.common;
import org.eclipse.openk.common.date.ITimer;
/**
- * Defines the commonalities of all application/component contexts; for example revision/version for input and output
+ * Defines the commonalities of all application/component contexts.
*
* @author Felix Korb
*/
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/IVersion.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/IVersion.java
index f1a00468..a333db5d 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/IVersion.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/IVersion.java
@@ -14,13 +14,14 @@
package org.eclipse.openk.common;
import org.eclipse.openk.common.key.IKeyOwner;
+import org.eclipse.openk.common.system.type.IUnmodifiable;
/**
* Defines the commonalities of all versions.
*
* @author Felix Korb
*/
-public interface IVersion extends Comparable<IVersion>, IKeyOwner<String> {
+public interface IVersion extends Comparable<IVersion>, IKeyOwner<String>, IUnmodifiable {
// Methods
/**
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/Version.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/Version.java
index ae3cd660..bdc94258 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/Version.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/Version.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -37,7 +37,7 @@ public final class Version implements IVersion {
* <li><code>number</code> is less than <code>0</code></li>
* </ul>
*/
- public Version(int number) {
+ public Version(int number) throws IllegalArgumentException {
if(number < 0)
throw new IllegalArgumentException("number");
@@ -47,6 +47,13 @@ public final class Version implements IVersion {
// Methods
@Override
+ @SuppressWarnings({ "checkstyle:noclone", "checkstyle:superclone" })
+ public Object clone() throws CloneNotSupportedException {
+
+ return this;
+ }
+
+ @Override
public int compareTo(IVersion version) {
if(version == null)
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/array/ArrayDefaults.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/array/ArrayDefaults.java
new file mode 100644
index 00000000..babc2b5e
--- /dev/null
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/array/ArrayDefaults.java
@@ -0,0 +1,31 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
+package org.eclipse.openk.common.array;
+
+/**
+ * Provides some default values.
+ *
+ * @author 2017-10-10 Felix Korb
+ */
+public final class ArrayDefaults {
+
+ // Constants
+ public static final Object[] EMPTY_ARRAY = new Object[0];
+
+ // Constructors
+ @SuppressWarnings("checkstyle:javadocmethod")
+ private ArrayDefaults() {
+ /* suppresses the instantiation! */
+ }
+} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/array/ArrayUtilities.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/array/ArrayUtilities.java
new file mode 100644
index 00000000..c5a56f24
--- /dev/null
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/array/ArrayUtilities.java
@@ -0,0 +1,2408 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
+package org.eclipse.openk.common.array;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.openk.common.collection.CollectionDefaults;
+import org.eclipse.openk.common.value.ValueOutOfRangeException;
+import org.eclipse.openk.common.value.ValueUtilities;
+
+/**
+ * This class consists exclusively of static methods that operate on or return arrays.
+ *
+ * @author 2017-10-10 Felix Korb
+ */
+public final class ArrayUtilities {
+
+ // Constants
+ /* scopes */
+ public static final int MAX_INDEX = 1;
+ public static final int MIN_INDEX = 0;
+
+ public static final int UNSPECIFIED_LENGTH = -1;
+
+ // Constructors
+ @SuppressWarnings("checkstyle:javadocmethod")
+ private ArrayUtilities() {
+ /* suppresses the instantiation! */
+ }
+
+ // Methods
+ /**
+ * Sorts the specified array.<br/>
+ * Sort method: BubbleSort
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ */
+ public static void bubbleSort(int[] array) {
+
+ if(array != null) {
+ int j;
+ int tempBuffer;
+
+ for(int i = array.length - 1; i > 0; i--)
+ for(j = 0; j < i; j++)
+ if(array[j] > array[j + 1]) {
+ tempBuffer = array[j];
+ array[j] = array[j + 1];
+ array[j + 1] = tempBuffer;
+ }
+ }
+ }
+
+ /**
+ * Sorts the specified array.<br/>
+ * Sort method: BucketSort.
+ *
+ * @param keyCount
+ * the number of keys
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>keyCount</code> is less than <code>1</code></li>
+ * </ul>
+ */
+ public static void bucketSort(int keyCount, int[] array) throws IllegalArgumentException {
+
+ if(keyCount < 1)
+ throw new IllegalArgumentException("keyCount", new ValueOutOfRangeException("keyCount", keyCount, 1, Integer.MAX_VALUE));
+ else {
+ if(array != null) {
+ int[] tempBuckets = new int[keyCount];
+ int x = 0;
+
+ for(int i = 0; i < array.length; i++)
+ tempBuckets[array[i]]++;
+
+ for(int i = 0; i < keyCount; i++)
+ while(tempBuckets[i] > 0) {
+ array[x++] = i;
+ tempBuckets[i]--;
+ }
+ }
+ }
+ }
+
+ /**
+ * Clears the specified array.
+ * That means that all items are set to <code>null</code>.
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the cleared array; can be <code>null</code>
+ */
+ public static <I> I[] clear(I[] array) {
+
+ if(array != null)
+ for(int i = 0; i < array.length; i++)
+ array[i] = null;
+
+ return array;
+ }
+
+ /**
+ * Clones the specified array.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the cloned array<br/>
+ * <code>null</code>, if the specified array is <code>null</code>
+ */
+ public static byte[] clone(byte[] array) {
+
+ byte[] tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else {
+ tempResult = new byte[array.length];
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Clones the specified array.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the cloned array<br/>
+ * <code>null</code>, if the specified array is <code>null</code>
+ */
+ public static double[] clone(double[] array) {
+
+ double[] tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else {
+ tempResult = new double[array.length];
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Clones the specified array.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the cloned array<br/>
+ * <code>null</code>, if the specified array is <code>null</code>
+ */
+ public static int[] clone(int[] array) {
+
+ int[] tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else {
+ tempResult = new int[array.length];
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Clones the specified array.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the cloned array<br/>
+ * <code>null</code>, if the specified array is <code>null</code>
+ */
+ public static int[][] clone(int[][] array) {
+
+ int[][] tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else {
+ tempResult = new int[array.length][array[0].length];
+
+ for(int i = 0; i < array.length; i++)
+ System.arraycopy(array[i], 0, tempResult[i], 0, array[0].length);
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Concatenates the specified array with the specified items.<br/>
+ * The original array remains unmodified!
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param items
+ * the items; can be <code>null</code> or empty
+ * @return the concatenated array; not <code>null</code> but can be empty
+ */
+ public static byte[] concat(byte[] array, byte... items) {
+
+ byte[] tempResult;
+
+ if((array == null) || (array.length == 0))
+ if((items == null) || (items.length == 0))
+ tempResult = new byte[] {};
+ else {
+ tempResult = new byte[items.length];
+
+ System.arraycopy(items, 0, tempResult, 0, items.length);
+ }
+ else {
+ if((items == null) || (items.length == 0)) {
+ tempResult = new byte[array.length];
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+ }
+ else {
+ tempResult = new byte[array.length + items.length];
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+ System.arraycopy(items, 0, tempResult, array.length, items.length);
+ }
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Concatenates the specified array with the specified items.<br/>
+ * The original array will be unmodified!
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param items
+ * the items; can be <code>null</code> or empty
+ * @return the concatenated array; not <code>null</code> but can be empty
+ */
+ public static char[] concat(char[] array, char... items) {
+
+ char[] tempResult;
+
+ if((array == null) || (array.length == 0))
+ if((items == null) || (items.length == 0))
+ tempResult = new char[] {};
+ else {
+ tempResult = new char[items.length];
+
+ System.arraycopy(items, 0, tempResult, 0, items.length);
+ }
+ else {
+ if((items == null) || (items.length == 0)) {
+ tempResult = new char[array.length];
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+ }
+ else {
+ tempResult = new char[array.length + items.length];
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+ System.arraycopy(items, 0, tempResult, array.length, items.length);
+ }
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Concatenates the specified array with the specified items.<br/>
+ * The original array will be unmodified!
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param items
+ * the items; can be <code>null</code> or empty
+ * @return the concatenated array; not <code>null</code> but can be empty
+ */
+ public static float[] concat(float[] array, float... items) {
+
+ float[] tempResult;
+
+ if((array == null) || (array.length == 0))
+ if((items == null) || (items.length == 0))
+ tempResult = new float[] {};
+ else {
+ tempResult = new float[items.length];
+
+ System.arraycopy(items, 0, tempResult, 0, items.length);
+ }
+ else {
+ if((items == null) || (items.length == 0)) {
+ tempResult = new float[array.length];
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+ }
+ else {
+ tempResult = new float[array.length + items.length];
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+ System.arraycopy(items, 0, tempResult, array.length, items.length);
+ }
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Concatenates the specified array with the specified items.<br/>
+ * The original array will be unmodified!
+ *
+ * @param <I>
+ * the item type
+ * @param itemType
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param items
+ * the items; can be <code>null</code> or empty
+ * @return the concatenated array; not <code>null</code> but can be empty
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>itemType</code> is <code>null</code></li>
+ * </ul>
+ */
+ @SuppressWarnings("unchecked")
+ public static <I> I[] concat(Class<I> itemType, I[] array, I... items) throws IllegalArgumentException {
+
+ if(itemType == null)
+ throw new IllegalArgumentException("itemType", new NullPointerException());
+ else {
+ I[] tempResult;
+
+ if((array == null) || (array.length == 0))
+ if((items == null) || (items.length == 0))
+ tempResult = (I[]) Array.newInstance(itemType, 0);
+ else {
+ tempResult = (I[]) Array.newInstance(itemType, items.length);
+
+ System.arraycopy(items, 0, tempResult, 0, items.length);
+ }
+ else {
+ if((items == null) || (items.length == 0)) {
+ tempResult = (I[]) Array.newInstance(itemType, array.length);
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+ }
+ else {
+ tempResult = (I[]) Array.newInstance(itemType, array.length + items.length);
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+ System.arraycopy(items, 0, tempResult, array.length, items.length);
+ }
+ }
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Concatenates the specified array with the specified items.<br/>
+ * The original array will be unmodified!
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param items
+ * the items; can be <code>null</code> or empty
+ * @return the concatenated array; not <code>null</code> but can be empty
+ */
+ public static int[] concat(int[] array, int... items) {
+
+ int[] tempResult;
+
+ if((array == null) || (array.length == 0))
+ if((items == null) || (items.length == 0))
+ tempResult = new int[] {};
+ else {
+ tempResult = new int[items.length];
+
+ System.arraycopy(items, 0, tempResult, 0, items.length);
+ }
+ else {
+ if((items == null) || (items.length == 0)) {
+ tempResult = new int[array.length];
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+ }
+ else {
+ tempResult = new int[array.length + items.length];
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+ System.arraycopy(items, 0, tempResult, array.length, items.length);
+ }
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Checks, if the specified item is part of the specified array.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param item
+ * the item
+ * @return the result
+ */
+ public static boolean contains(byte[] array, byte item) {
+
+ return (ArrayUtilities.indexOf(array, item) != CollectionDefaults.INVALID_INDEX);
+ }
+
+ /**
+ * Checks, if the specified item is part of the specified array.
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param item
+ * the item; can be <code>null</code>
+ * @return the result
+ */
+ public static <I> boolean contains(I[] array, I item) {
+
+ return (ArrayUtilities.<I> indexOf(array, item) != CollectionDefaults.INVALID_INDEX);
+ }
+
+ /**
+ * Checks, if the specified item is part of the specified array.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param item
+ * the item
+ * @return the result
+ */
+ public static boolean contains(int[] array, int item) {
+
+ return (ArrayUtilities.indexOf(array, item) != CollectionDefaults.INVALID_INDEX);
+ }
+
+ /**
+ * Counts the number of items in the specified array.<br/>
+ * All items with the value <code>true</code> will be counted.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the number of items
+ */
+ public static int countItems(boolean[] array) {
+
+ return countItems(array, true);
+ }
+
+ /**
+ * Counts the number of items in the specified array.<br/>
+ * All items with the specified value will be counted.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param value
+ * the value
+ * @return the number of items
+ */
+ public static int countItems(boolean[] array, boolean value) {
+
+ int tempResult = 0;
+
+ if(array != null)
+ for(int i = 0; i < array.length; i++)
+ if(array[i] == value)
+ tempResult++;
+
+ return tempResult;
+ }
+
+ /**
+ * Counts the number of items in the specified array.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the number of items
+ */
+ public static int countItems(int[] array) {
+
+ int result;
+
+ if(array == null)
+ result = 0;
+ else
+ result = array.length;
+
+ return result;
+ }
+
+ /**
+ * Counts the number of items in the specified array.
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the number of items
+ */
+ public static <I> int countItems(I[] array) {
+
+ return countItems(array, true);
+ }
+
+ /**
+ * Counts the number of items in the specified array.
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param skipNull
+ * specifies if <code>null</code>-items will be ignored
+ * @return the number of items
+ */
+ public static <I> int countItems(I[] array, boolean skipNull) {
+
+ int result;
+
+ if(array == null)
+ result = 0;
+ else {
+ if(skipNull) {
+ int tempResult = 0;
+
+ for(int i = 0; i < array.length; i++)
+ if(array[i] != null)
+ tempResult++;
+
+ result = tempResult;
+ }
+ else
+ result = array.length;
+ }
+
+ return result;
+ }
+
+ /**
+ * Creates an array with continuous intervals.
+ * <p>
+ * for example:<br/>
+ * {1, 7, 3, 4, 2} => {{1, 4}, {7, 7}}
+ * </p>
+ * <p>
+ * Please note that:<br/>
+ * {@link #MIN_INDEX} is the index of the minor value,<br/>
+ * {@link #MAX_INDEX} is the index of the major value<br/>
+ * </p>
+ *
+ * @param values
+ * the values
+ * @return the result
+ */
+ public static int[][] createIntervals(int... values) {
+
+ if((values == null) || (values.length == 0))
+ return new int[0][2];
+ else {
+ int j; /* store inner loop-value */
+ int[][] tempResult;
+ int[] tempIndices = new int[values.length];
+ int[] tempIndexRange = null;
+ List<int[]> tempContinuousIndices = new ArrayList<>();
+
+ System.arraycopy(values, 0, tempIndices, 0, tempIndices.length); /* copy values */
+
+ insertionSort(tempIndices); /* sort values */
+
+ /* create index intervals */
+ for(int i = 0; i < tempIndices.length; i++)
+ if(tempIndexRange == null) {
+ tempIndexRange = new int[2];
+ tempIndexRange[MIN_INDEX] = tempIndices[i];
+ tempContinuousIndices.add(tempIndexRange);
+ }
+ else
+ for(j = 0; j < tempIndices.length - i; j++)
+ if(tempIndices[(i + j) - 1] != tempIndices[i + j])
+ if(tempIndices[(i + j) - 1] + 1 != tempIndices[i + j]) { /* no direct following value */
+ tempIndexRange[MAX_INDEX] = tempIndices[(i + j) - 1];
+ tempIndexRange = null;
+
+ i = (i + j) - 1;
+ break;
+ }
+
+ tempIndexRange[MAX_INDEX] = tempIndices[tempIndices.length - 1]; /* close last interval */
+
+ tempResult = new int[tempContinuousIndices.size()][2]; /* cast to result type (int[][]) */
+
+ for(int i = 0; i < tempContinuousIndices.size(); i++) {
+ tempResult[i][MIN_INDEX] = tempContinuousIndices.get(i)[MIN_INDEX];
+ tempResult[i][MAX_INDEX] = tempContinuousIndices.get(i)[MAX_INDEX];
+ }
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Creates a copy of the specified array.<br/>
+ * A copy doesn't clone the array items!
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the copy; can be <code>null</code> or empty
+ */
+ @SuppressWarnings("unchecked")
+ public static <I> I[] createCopy(I[] array) {
+
+ I[] result;
+
+ if(array == null)
+ result = null;
+ else {
+ result = (I[]) Array.newInstance(array.getClass().getComponentType(), array.length);
+
+ if(array.length > 0)
+ System.arraycopy(array, 0, result, 0, array.length);
+ }
+
+ return result;
+ }
+
+ /**
+ * Creates a continuous index array.
+ *
+ * @param firstIndex
+ * the first index
+ * @param length
+ * the number of indices
+ * @return the result
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>length</code> is less than <code>0</code></li>
+ * </ul>
+ * @throws IndexOutOfBoundsException
+ * {@link IndexOutOfBoundsException}
+ */
+ public static int[] createIndices(int firstIndex, int length) throws IllegalArgumentException, IndexOutOfBoundsException {
+
+ if((firstIndex < 0) || (length < 0))
+ if(firstIndex < 0)
+ throw new IndexOutOfBoundsException("firstIndex");
+ else
+ throw new IllegalArgumentException("length", new ValueOutOfRangeException("length", length, 0, Integer.MAX_VALUE));
+ else {
+ int[] tempIndices = new int[length];
+
+ for(int i = 0; i < length; i++)
+ tempIndices[i] = firstIndex + i;
+
+ return tempIndices;
+ }
+ }
+
+ /**
+ * Helper method for HeapSort.
+ *
+ * @param index
+ * the index
+ * @param length
+ * the length
+ * @param array
+ * the array
+ */
+ private static void downHeap(int index, int length, int[] array) {
+
+ int i;
+ int tempIndex = index;
+ int tempValue;
+
+ tempValue = array[tempIndex];
+
+ while((tempIndex + 1) <= ((length + 1) / 2)) {
+ i = (2 * (tempIndex + 1)) - 1;
+
+ if(i < length)
+ if(array[i] < array[i + 1])
+ i++;
+
+ if(array[i] <= tempValue)
+ break;
+
+ array[tempIndex] = array[i];
+ tempIndex = i;
+ }
+
+ array[tempIndex] = tempValue;
+ }
+
+ /**
+ * Fills all elements of the specified array with the specified content.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param content
+ * the content
+ */
+ public static void fill(byte[] array, byte content) {
+
+ if(array != null)
+ for(int i = 0; i < array.length; i++)
+ array[i] = content;
+ }
+
+ /**
+ * Fills all elements of the specified array with the specified content.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param content
+ * the content
+ */
+ public static void fill(int[] array, int content) {
+
+ if(array != null)
+ for(int i = 0; i < array.length; i++)
+ array[i] = content;
+ }
+
+ /**
+ * Returns the first n-items as subset of the specified array.
+ *
+ * @param <I>
+ * the item type
+ * @param itemType
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param length
+ * the number of items
+ * @return the subset; can be <code>null</code> or empty
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>itemType</code> is <code>null</code></li>
+ * <li><code>length</code> is less than <code>0</code></li>
+ * </ul>
+ */
+ @SuppressWarnings("unchecked")
+ public static <I> I[] first(Class<I> itemType, I[] array, int length) throws IllegalArgumentException {
+
+ if((itemType == null) || (length < 0))
+ if(itemType == null)
+ throw new IllegalArgumentException("itemType", new NullPointerException());
+ else
+ throw new IllegalArgumentException("length", new ValueOutOfRangeException("length", length, 0, Integer.MAX_VALUE));
+ else {
+ if(length == 0)
+ return (I[]) Array.newInstance(itemType, 0);
+ else
+ return ArrayUtilities.<I> subArray(itemType, array, 0, length - 1);
+ }
+ }
+
+ /**
+ * Flips the order of the specified array.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the flipped array; can be <code>null</code> or empty
+ */
+ public static int[] flip(int[] array) {
+
+ int[] result;
+
+ if(array == null)
+ result = null;
+ else {
+ result = new int[array.length];
+
+ for(int i = 0; i < array.length; i++)
+ result[i] = array[array.length - (i + 1)];
+ }
+
+ return result;
+ }
+
+ /**
+ * Returns the first item of the specified array.
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the first item; can be <code>null</code>
+ */
+ public static <I> I getFirst(I[] array) {
+
+ I tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else {
+ if(array.length == 0)
+ tempResult = null;
+ else
+ tempResult = array[0];
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Creates the interval for the specified indices.
+ * <p>
+ * for example:<br/>
+ * {1, 3, 4, 2} => {1, 4}
+ * </p>
+ * <p>
+ * The result has only two items:<br/>
+ * {@link #MIN_INDEX} is the index of the minor value,<br/>
+ * {@link #MAX_INDEX} is the index of the major value<br/>
+ * </p>
+ *
+ * @param indices
+ * the indices
+ * @return the result
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>indices</code> is <code>null</code> or empty</li>
+ * </ul>
+ */
+ public static int[] getIndexRange(int[] indices) throws IllegalArgumentException {
+
+ if((indices == null) || (indices.length == 0))
+ throw new IllegalArgumentException("indices");
+ else {
+ int[] tempResult = new int[2];
+
+ if(indices[0] > indices[indices.length - 1]) {
+ tempResult[MIN_INDEX] = indices[indices.length - 1];
+ tempResult[MAX_INDEX] = indices[0];
+ }
+ else {
+ tempResult[MIN_INDEX] = indices[0];
+ tempResult[MAX_INDEX] = indices[indices.length - 1];
+ }
+
+ for(int i = 1; i < indices.length - 1; i++) {
+ if(tempResult[MIN_INDEX] > indices[i])
+ tempResult[MAX_INDEX] = indices[i];
+
+ if(tempResult[MIN_INDEX] < indices[i])
+ tempResult[MAX_INDEX] = indices[i];
+ }
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Returns the last item of the specified array.
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the last item; can be <code>null</code>
+ */
+ public static <I> I getLast(I[] array) {
+
+ I tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else {
+ if(array.length == 0)
+ tempResult = null;
+ else
+ tempResult = array[array.length - 1];
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Helper method for QuickSort.
+ *
+ * @param left
+ * the left interval boundary
+ * @param right
+ * the right interval boundary
+ * @param array
+ * the array
+ * @return the pivot value
+ */
+ private static int getPivot(int left, int right, int[] array) {
+
+ int i;
+ int j;
+ int tempBuffer;
+ int tempPivot = array[right];
+
+ do {
+ i = 0;
+ j = right - 1;
+
+ while(array[i] < tempPivot)
+ i++;
+
+ while(array[j] > tempPivot)
+ if(j == left)
+ break;
+ else
+ j--;
+
+ tempBuffer = array[i];
+ array[i] = array[j];
+ array[j] = tempBuffer;
+
+ }
+ while(i < j);
+
+ array[j] = array[i];
+ array[i] = array[right];
+ array[right] = tempBuffer;
+
+ return i;
+ }
+
+ /**
+ * Checks if the specified array has any content.<br/>
+ * In contrast to {@link #hasContent(Object[])} there will be searched for an item that is not <code>null</code>.
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the result
+ */
+ public static <I> boolean hasAnyContent(I[] array) {
+
+ if(array != null)
+ for(I tempItem : array)
+ if(tempItem != null)
+ return true;
+
+ return false;
+ }
+
+ /**
+ * Checks if the specified array has any content.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the result
+ */
+ public static boolean hasContent(boolean[] array) {
+
+ return ((array != null) && (array.length != 0));
+ }
+
+ /**
+ * Checks if the specified array has any content.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the result
+ */
+ public static boolean hasContent(byte[] array) {
+
+ return ((array != null) && (array.length != 0));
+ }
+
+ /**
+ * Checks if the specified array has any content.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the result
+ */
+ public static boolean hasContent(char[] array) {
+
+ return ((array != null) && (array.length != 0));
+ }
+
+ /**
+ * Checks if the specified array has any content.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the result
+ */
+ public static boolean hasContent(int[] array) {
+
+ return isValid(array, UNSPECIFIED_LENGTH);
+ }
+
+ /**
+ * Checks if the specified array has any content.
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the result
+ */
+ public static <I> boolean hasContent(I[] array) {
+
+ return isValid(array, false, UNSPECIFIED_LENGTH, null);
+ }
+
+ /**
+ * Checks if the specified array has any content.
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param checkNull
+ * specifies if <code>null</code> items should be tested
+ * @return the result
+ */
+ public static <I> boolean hasContent(I[] array, boolean checkNull) {
+
+ return isValid(array, checkNull, UNSPECIFIED_LENGTH, null);
+ }
+
+ /**
+ * Sorts the specified array.<br/>
+ * Sort method: HeapSort
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ */
+ public static void heapSort(int[] array) {
+
+ if((array != null) && (array.length > 0)) {
+ int i;
+ int k;
+ int tempBuffer;
+
+ for(i = (array.length - 1) / 2; i >= 0; i--)
+ downHeap(i, array.length - 1, array);
+
+ k = array.length - 1;
+
+ do {
+ tempBuffer = array[0];
+ array[0] = array[k];
+ array[k] = tempBuffer;
+ k--;
+ downHeap(0, k, array);
+
+ }
+ while(k > 0);
+ }
+ }
+
+ /**
+ * Returns the first index of the specified item within the specified array or {@link CollectionDefaults#INVALID_INDEX} if the item is not a part of the array.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param item
+ * the item
+ * @return the result
+ */
+ public static int indexOf(byte[] array, byte item) {
+
+ if((array != null) && (array.length > 0))
+ for(int i = 0; i < array.length; i++)
+ if(array[i] == item)
+ return i;
+
+ return CollectionDefaults.INVALID_INDEX;
+ }
+
+ /**
+ * Returns the first index of the specified item within the specified array or {@link CollectionDefaults#INVALID_INDEX} if the item is not a part of the array.
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param item
+ * the item; can be <code>null</code>
+ * @return the result
+ */
+ public static <I> int indexOf(I[] array, I item) {
+
+ if((array != null) && (array.length > 0))
+ for(int i = 0; i < array.length; i++)
+ if((array[i] == item) || ((array[i] != null) && (item != null) && array[i].equals(item)))
+ return i;
+
+ return CollectionDefaults.INVALID_INDEX;
+ }
+
+ /**
+ * Returns the first index of the specified item within the specified array or {@link CollectionDefaults#INVALID_INDEX} if the item is not a part of the array.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param item
+ * the item
+ * @return the result
+ */
+ public static int indexOf(int[] array, int item) {
+
+ if((array != null) && (array.length > 0))
+ for(int i = 0; i < array.length; i++)
+ if(array[i] == item)
+ return i;
+
+ return CollectionDefaults.INVALID_INDEX;
+ }
+
+ /**
+ * Inserts the specified value at the specified index position.<br/>
+ * The original array remains unmodified!
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param index
+ * the index
+ * @param value
+ * the value
+ * @return the enlarged array; not <code>null</code> and not empty
+ * @throws IndexOutOfBoundsException
+ * {@link IndexOutOfBoundsException}
+ */
+ public static boolean[] insert(boolean[] array, int index, boolean value) throws IndexOutOfBoundsException {
+
+ boolean[] tempResult;
+
+ if(!ArrayUtilities.hasContent(array))
+ if(index != 0)
+ throw new IndexOutOfBoundsException("index");
+ else {
+ tempResult = new boolean[1];
+ tempResult[index] = value;
+ }
+ else {
+ if(!ValueUtilities.isInRange(index, 0, array.length))
+ throw new IndexOutOfBoundsException("index");
+ else {
+ tempResult = new boolean[array.length + 1];
+
+ if(index > 0)
+ System.arraycopy(array, 0, tempResult, 0, index);
+
+ if(index < array.length)
+ System.arraycopy(array, index, tempResult, index + 1, array.length - index);
+
+ tempResult[index] = value;
+ }
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Inserts the specified value at the specified index position.<br/>
+ * The original array remains unmodified!
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param index
+ * the index
+ * @param value
+ * the value
+ * @return the enlarged array; not <code>null</code> and not empty
+ * @throws IndexOutOfBoundsException
+ * {@link IndexOutOfBoundsException}
+ */
+ public static char[] insert(char[] array, int index, char value) throws IndexOutOfBoundsException {
+
+ char[] tempResult;
+
+ if(!ArrayUtilities.hasContent(array))
+ if(index != 0)
+ throw new IndexOutOfBoundsException("index");
+ else {
+ tempResult = new char[1];
+ tempResult[index] = value;
+ }
+ else {
+ if(!ValueUtilities.isInRange(index, 0, array.length))
+ throw new IndexOutOfBoundsException("index");
+ else {
+ tempResult = new char[array.length + 1];
+
+ if(index > 0)
+ System.arraycopy(array, 0, tempResult, 0, index);
+
+ if(index < array.length)
+ System.arraycopy(array, index, tempResult, index + 1, array.length - index);
+
+ tempResult[index] = value;
+ }
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Inserts the specified value at the specified index position.<br/>
+ * The original array remains unmodified!
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param index
+ * the index
+ * @param value
+ * the value
+ * @return the enlarged array; not <code>null</code> and not empty
+ * @throws IndexOutOfBoundsException
+ * {@link IndexOutOfBoundsException}
+ */
+ public static int[] insert(int[] array, int index, int value) throws IndexOutOfBoundsException {
+
+ int[] tempResult;
+
+ if(!ArrayUtilities.hasContent(array))
+ if(index != 0)
+ throw new IndexOutOfBoundsException("index");
+ else {
+ tempResult = new int[1];
+ tempResult[index] = value;
+ }
+ else {
+ if(!ValueUtilities.isInRange(index, 0, array.length))
+ throw new IndexOutOfBoundsException("index");
+ else {
+ tempResult = new int[array.length + 1];
+
+ if(index > 0)
+ System.arraycopy(array, 0, tempResult, 0, index);
+
+ if(index < array.length)
+ System.arraycopy(array, index, tempResult, index + 1, array.length - index);
+
+ tempResult[index] = value;
+ }
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Inserts the specified value at the specified index position.<br/>
+ * The original array remains unmodified!
+ *
+ * @param <I>
+ * the item type
+ * @param itemType
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param index
+ * the index
+ * @param value
+ * the value
+ * @return the enlarged array; not <code>null</code> and not empty
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>itemType</code> is <code>null</code></li>
+ * </ul>
+ * @throws IndexOutOfBoundsException
+ * {@link IndexOutOfBoundsException}
+ */
+ @SuppressWarnings("unchecked")
+ public static <I> I[] insert(Class<I> itemType, I[] array, int index, I value) throws IllegalArgumentException, IndexOutOfBoundsException {
+
+ if(itemType == null)
+ throw new IllegalArgumentException("itemType", new NullPointerException());
+ else {
+ I[] tempResult;
+
+ if(!ArrayUtilities.<I> hasContent(array))
+ if(index != 0)
+ throw new IndexOutOfBoundsException("index");
+ else {
+ tempResult = (I[]) Array.newInstance(itemType, 1);
+ tempResult[index] = value;
+ }
+ else {
+ if(!ValueUtilities.isInRange(index, 0, array.length))
+ throw new IndexOutOfBoundsException("index");
+ else {
+ tempResult = (I[]) Array.newInstance(itemType, array.length + 1);
+
+ if(index > 0)
+ System.arraycopy(array, 0, tempResult, 0, index);
+
+ if(index < array.length)
+ System.arraycopy(array, index, tempResult, index + 1, array.length - index);
+
+ tempResult[index] = value;
+ }
+ }
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Sorts the specified array.<br/>
+ * Sort method: InsertionSort
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ */
+ public static void insertionSort(int[] array) {
+
+ if((array != null) && (array.length > 0)) {
+ int j;
+ int tempValue;
+
+ for(int i = 1; i < array.length; i++) {
+ tempValue = array[i];
+ j = i;
+
+ while(array[j - 1] > tempValue) {
+ array[j] = array[j - 1];
+ j--;
+
+ if(j == 0)
+ break;
+ }
+
+ array[j] = tempValue;
+ }
+ }
+ }
+
+ /**
+ * @param array
+ * the array
+ * @param numberOfItems
+ * the number of items within the specified array.
+ * @param index
+ * the index
+ * @param value
+ * the value
+ */
+ public static void insertReorg(int[] array, int numberOfItems, int index, int value) {
+
+ if(!ArrayUtilities.hasContent(array) && (index != 0))
+ throw new IndexOutOfBoundsException("index");
+ else {
+ if(!ValueUtilities.isInRange(index, 0, numberOfItems + 1))
+ throw new IndexOutOfBoundsException("index");
+ else {
+ if(index < array.length)
+ System.arraycopy(array, index, array, index + 1, numberOfItems - index);
+
+ array[index] = value;
+ }
+ }
+ }
+
+ /**
+ * Checks is the specified array is empty or <code>null</code>.
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the result
+ */
+ public static <I> boolean isEmpty(I[] array) {
+
+ return ((array == null) || (array.length == 0));
+ }
+
+ /**
+ * Checks is the specified array is empty.
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param allowZeroLength
+ * specifies if arrays of length <code>0</code> or <code>null</code> arrays are permitted
+ * @return the result
+ */
+ public static <I> boolean isEmpty(I[] array, boolean allowZeroLength) {
+
+ boolean result;
+
+ if(array == null)
+ result = allowZeroLength;
+ else {
+ if(array.length == 0)
+ result = allowZeroLength;
+ else
+ for(I tempItem : array)
+ if(tempItem != null) {
+ result = false;
+ break;
+ }
+
+ result = true;
+ }
+
+ return result;
+ }
+
+ /**
+ * Checks is the specified array is valid.<br/>
+ * <p>
+ * An array is valid, if:
+ * <ul>
+ * <li><code>array != null</code></li>
+ * <li><code>array.length > 0</code></li>
+ * </ul>
+ * </p>
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param length
+ * specified the expected size of the array<br/>
+ * ({@link #UNSPECIFIED_LENGTH} disables this check)
+ * @return the result
+ */
+ public static boolean isValid(int[] array, int length) {
+
+ boolean result;
+
+ if(array == null)
+ result = false;
+ else {
+ if(array.length == 0)
+ result = false;
+ else {
+ if(length != UNSPECIFIED_LENGTH)
+ if(array.length != length)
+ result = false;
+
+ result = true;
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * Checks is the specified array is valid.<br/>
+ * <p>
+ * An array is valid, if:
+ * <ul>
+ * <li><code>array != null</code></li>
+ * <li><code>array.length > 0</code></li>
+ * </ul>
+ * </p>
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param checkNull
+ * specifies if <code>null</code> items should be tested
+ * @param length
+ * specified the expected size of the array<br/>
+ * ({@link #UNSPECIFIED_LENGTH} disables this check)
+ * @return the result
+ */
+ public static <I> boolean isValid(I[] array, boolean checkNull, int length) {
+
+ return isValid(array, checkNull, length, null);
+ }
+
+ /**
+ * Checks is the specified array is valid.<br/>
+ * <p>
+ * An array is valid, if:
+ * <ul>
+ * <li><code>array != null</code></li>
+ * <li><code>array.length > 0</code></li>
+ * </ul>
+ * </p>
+ *
+ * @param <I>
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param checkNull
+ * specifies if <code>null</code> items should be tested
+ * @param length
+ * specified the expected size of the array<br/>
+ * ({@link #UNSPECIFIED_LENGTH} disables this check)
+ * @param itemType
+ * specified the expected type of the array items<br/>
+ * (<code>null</code> disables this check)
+ * @return the result
+ */
+ @SuppressWarnings("checkstyle:cyclomaticcomplexity")
+ public static <I> boolean isValid(I[] array, boolean checkNull, int length, Class<?> itemType) {
+
+ if(array == null)
+ return false;
+ else {
+ if(array.length == 0)
+ return false;
+ else {
+ if(length != UNSPECIFIED_LENGTH)
+ if(array.length != length)
+ return false;
+
+ if(checkNull || (itemType != null)) {
+ for(I tempItem : array) {
+ if(checkNull && (tempItem == null))
+ return false;
+
+ if((itemType != null) && (tempItem != null))
+ if(!itemType.isInstance(tempItem))
+ return false;
+ }
+
+ return true;
+ }
+ else
+ return true;
+ }
+ }
+ }
+
+ /**
+ * Helper method for MergeSort.
+ *
+ * @param left
+ * the left interval boundary
+ * @param right
+ * the right interval boundary
+ * @param array
+ * the array
+ * @param help
+ * the helper array
+ */
+ private static void mergeSort(int left, int right, int[] array, int[] help) {
+
+ if(left < right) {
+ int i;
+ int j;
+ int k;
+ int tempMid;
+
+ tempMid = (right + left) / 2;
+ mergeSort(left, tempMid, array, help);
+ mergeSort(tempMid + 1, right, array, help);
+
+ for(i = tempMid + 1; i > left; i--)
+ help[i - 1] = array[i - 1];
+
+ for(j = tempMid; j < right; j++)
+ help[right + tempMid - j] = array[j + 1];
+
+ for(k = left; k <= right; k++)
+ if(help[i] < help[j])
+ array[k] = help[i++];
+ else
+ array[k] = help[j--];
+ }
+ }
+
+ /**
+ * Sorts the specified array.<br/>
+ * Sort method: MergeSort
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ */
+ public static void mergeSort(int[] array) {
+
+ if((array != null) && (array.length > 0))
+ mergeSort(0, array.length - 1, array, new int[array.length]);
+ }
+
+ /**
+ * Moves an item of the specified array.<br/>
+ * The original array remains unmodified!
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param index
+ * the original index position
+ * @param newIndex
+ * the new index position
+ * @return the modified array
+ * @throws IndexOutOfBoundsException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>index</code> is invalid</li>
+ * <li><code>newIndex</code> is invalid</li>
+ * </ul>
+ */
+ public static boolean[] move(boolean[] array, int index, int newIndex) throws IndexOutOfBoundsException {
+
+ boolean[] tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else if(array.length == 0)
+ tempResult = new boolean[0];
+ else {
+ if(!ValueUtilities.isInRange(index, 0, array.length - 1) || !ValueUtilities.isInRange(newIndex, 0, array.length - 1)) {
+ if(!ValueUtilities.isInRange(index, 0, array.length - 1))
+ throw new IndexOutOfBoundsException("index");
+ else
+ throw new IndexOutOfBoundsException("newIndex");
+ }
+ else {
+ int tempMaxIndex;
+ int tempMinIndex;
+
+ tempMaxIndex = Math.max(index, newIndex);
+ tempMinIndex = Math.min(index, newIndex);
+
+ tempResult = new boolean[array.length];
+
+ /* Elemente vor dem kleinsten Index kopieren */
+ if(tempMinIndex > 0)
+ System.arraycopy(array, 0, tempResult, 0, tempMinIndex);
+
+ /*
+ * Elemente, die zwischen dem kleinsten und grüüten Index liegen
+ * kopieren (nach links verschieben)
+ */
+ if(index < newIndex)
+ System.arraycopy(array, index + 1, tempResult, index, newIndex - index);
+
+ /*
+ * Elemente, die zwischen dem kleinsten und grüüten Index liegen
+ * kopieren (nach rechts verschieben)
+ */
+ if(index > newIndex)
+ System.arraycopy(array, newIndex, tempResult, newIndex + 1, index - newIndex);
+
+ /* Elemente nach dem grüüten Index kopieren */
+ if(tempMaxIndex < array.length - 1)
+ System.arraycopy(array, tempMaxIndex + 1, tempResult, tempMaxIndex + 1, (array.length - tempMaxIndex) - 1);
+
+ /* ausgewühlte Elemente kopieren */
+ tempResult[newIndex] = array[index];
+ }
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Moves an item of the specified array.<br/>
+ * The original array remains unmodified!
+ *
+ * @param <I>
+ * the item type
+ * @param itemType
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param index
+ * the original index position
+ * @param newIndex
+ * the new index position
+ * @return the modified array
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>itemType</code> is <code>null</code></li>
+ * </ul>
+ * @throws IndexOutOfBoundsException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>index</code> is invalid</li>
+ * <li><code>newIndex</code> is invalid</li>
+ * </ul>
+ */
+ @SuppressWarnings({ "checkstyle:cyclomaticcomplexity", "unchecked" })
+ public static <I> I[] move(Class<I> itemType, I[] array, int index, int newIndex) throws IllegalArgumentException, IndexOutOfBoundsException {
+
+ if(itemType == null)
+ throw new IllegalArgumentException("itemType", new NullPointerException());
+ else {
+ I[] tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else if(array.length == 0)
+ tempResult = (I[]) Array.newInstance(itemType, 0);
+ else {
+ if(!ValueUtilities.isInRange(index, 0, array.length - 1) || !ValueUtilities.isInRange(newIndex, 0, array.length - 1)) {
+ if(!ValueUtilities.isInRange(index, 0, array.length - 1))
+ throw new IndexOutOfBoundsException("index");
+ else
+ throw new IndexOutOfBoundsException("newIndex");
+ }
+ else {
+ int tempMaxIndex;
+ int tempMinIndex;
+
+ tempMaxIndex = Math.max(index, newIndex);
+ tempMinIndex = Math.min(index, newIndex);
+
+ tempResult = (I[]) Array.newInstance(itemType, array.length);
+
+ /* Elemente vor dem kleinsten Index kopieren */
+ if(tempMinIndex > 0)
+ System.arraycopy(array, 0, tempResult, 0, tempMinIndex);
+
+ /*
+ * Elemente, die zwischen dem kleinsten und grüüten Index
+ * liegen kopieren (nach links verschieben)
+ */
+ if(index < newIndex)
+ System.arraycopy(array, index + 1, tempResult, index, newIndex - index);
+
+ /*
+ * Elemente, die zwischen dem kleinsten und grüüten Index
+ * liegen kopieren (nach rechts verschieben)
+ */
+ if(index > newIndex)
+ System.arraycopy(array, newIndex, tempResult, newIndex + 1, index - newIndex);
+
+ /* Elemente nach dem grüüten Index kopieren */
+ if(tempMaxIndex < array.length - 1)
+ System.arraycopy(array, tempMaxIndex + 1, tempResult, tempMaxIndex + 1, (array.length - tempMaxIndex) - 1);
+
+ /* ausgewühlte Elemente kopieren */
+ tempResult[newIndex] = array[index];
+ }
+ }
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Moves an item of the specified array.<br/>
+ * The original array remains unmodified!
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param index
+ * the original index position
+ * @param newIndex
+ * the new index position
+ * @return the modified array
+ * @throws IndexOutOfBoundsException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>index</code> is invalid</li>
+ * <li><code>newIndex</code> is invalid</li>
+ * </ul>
+ */
+ public static int[] move(int[] array, int index, int newIndex) throws IndexOutOfBoundsException {
+
+ int[] tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else if(array.length == 0)
+ tempResult = new int[0];
+ else {
+ if(!ValueUtilities.isInRange(index, 0, array.length - 1) || !ValueUtilities.isInRange(newIndex, 0, array.length - 1)) {
+ if(!ValueUtilities.isInRange(index, 0, array.length - 1))
+ throw new IndexOutOfBoundsException("index");
+ else
+ throw new IndexOutOfBoundsException("newIndex");
+ }
+ else {
+ int tempMaxIndex;
+ int tempMinIndex;
+
+ tempMaxIndex = Math.max(index, newIndex);
+ tempMinIndex = Math.min(index, newIndex);
+
+ tempResult = new int[array.length];
+
+ /* Elemente vor dem kleinsten Index kopieren */
+ if(tempMinIndex > 0)
+ System.arraycopy(array, 0, tempResult, 0, tempMinIndex);
+
+ /*
+ * Elemente, die zwischen dem kleinsten und grüüten Index liegen
+ * kopieren (nach links verschieben)
+ */
+ if(index < newIndex)
+ System.arraycopy(array, index + 1, tempResult, index, newIndex - index);
+
+ /*
+ * Elemente, die zwischen dem kleinsten und grüüten Index liegen
+ * kopieren (nach rechts verschieben)
+ */
+ if(index > newIndex)
+ System.arraycopy(array, newIndex, tempResult, newIndex + 1, index - newIndex);
+
+ /* Elemente nach dem grüüten Index kopieren */
+ if(tempMaxIndex < array.length - 1)
+ System.arraycopy(array, tempMaxIndex + 1, tempResult, tempMaxIndex + 1, (array.length - tempMaxIndex) - 1);
+
+ /* ausgewühlte Elemente kopieren */
+ tempResult[newIndex] = array[index];
+ }
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Helper method for QuickSort.
+ *
+ * @param left
+ * the left interval boundary
+ * @param right
+ * the right interval boundary
+ * @param array
+ * the array
+ */
+ private static void quickSort(int left, int right, int[] array) {
+
+ if(left < right) {
+ int tempPivot;
+
+ tempPivot = getPivot(left, right, array);
+ quickSort(left, tempPivot - 1, array);
+ quickSort(tempPivot + 1, right, array);
+ }
+ }
+
+ /**
+ * Sorts the specified array.<br/>
+ * Sort method: QuickSort.<br/>
+ * The original array remains unmodified!
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the sorted array; can be <code>null</code> or empty
+ */
+ public static int[] quickSort(int[] array) {
+
+ int[] tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else {
+ tempResult = new int[array.length];
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+
+ quickSort(0, tempResult.length - 1, tempResult);
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Removes the value at the specified index position.<br/>
+ * The original array remains unmodified!
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param index
+ * the index
+ * @return the reduced array; can be <code>null</code> or empty
+ * @throws IndexOutOfBoundsException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>index</code> is invalid</li>
+ * </ul>
+ */
+ public static boolean[] remove(boolean[] array, int index) throws IndexOutOfBoundsException {
+
+ boolean[] tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else if(array.length == 0)
+ tempResult = new boolean[0];
+ else {
+ if(!ValueUtilities.isInRange(index, 0, array.length - 1))
+ throw new IndexOutOfBoundsException("index");
+ else {
+ tempResult = new boolean[array.length - 1];
+
+ if(tempResult.length > 0) {
+ if(index > 0)
+ System.arraycopy(array, 0, tempResult, 0, index);
+
+ if(index < (array.length - 1))
+ System.arraycopy(array, index + 1, tempResult, index, (array.length - index) - 1);
+ }
+ }
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Removes the value at the specified index position.<br/>
+ * The original array remains unmodified!
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param index
+ * the index
+ * @return the reduced array; can be <code>null</code> or empty
+ * @throws IndexOutOfBoundsException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>index</code> is invalid</li>
+ * </ul>
+ */
+ public static int[] remove(int[] array, int index) throws IndexOutOfBoundsException {
+
+ int[] tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else if(array.length == 0)
+ tempResult = new int[0];
+ else {
+ if(!ValueUtilities.isInRange(index, 0, array.length - 1))
+ throw new IndexOutOfBoundsException("index");
+ else {
+ tempResult = new int[array.length - 1];
+
+ if(tempResult.length > 0) {
+ if(index > 0)
+ System.arraycopy(array, 0, tempResult, 0, index);
+
+ if(index < (array.length - 1))
+ System.arraycopy(array, index + 1, tempResult, index, (array.length - index) - 1);
+ }
+ }
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Removes the value at the specified index position.<br/>
+ * The original array remains unmodified!
+ *
+ * @param <I>
+ * the item type
+ * @param itemType
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param index
+ * the index
+ * @return the reduced array; can be <code>null</code> or empty
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>itemType</code> is <code>null</code></li>
+ * </ul>
+ * @throws IndexOutOfBoundsException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>index</code> is invalid</li>
+ * </ul>
+ */
+ @SuppressWarnings("unchecked")
+ public static <I> I[] remove(Class<I> itemType, I[] array, int index) throws IllegalArgumentException, IndexOutOfBoundsException {
+
+ if(itemType == null)
+ throw new IllegalArgumentException("itemType", new NullPointerException());
+ else {
+ I[] tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else if(array.length == 0)
+ tempResult = (I[]) Array.newInstance(itemType, 0);
+ else {
+ if(!ValueUtilities.isInRange(index, 0, array.length - 1))
+ throw new IndexOutOfBoundsException("index");
+ else {
+ tempResult = (I[]) Array.newInstance(itemType, array.length - 1);
+
+ if(tempResult.length > 0) {
+ if(index > 0)
+ System.arraycopy(array, 0, tempResult, 0, index);
+
+ if(index < (array.length - 1))
+ System.arraycopy(array, index + 1, tempResult, index, (array.length - index) - 1);
+ }
+ }
+ }
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Sorts the specified array.<br/>
+ * Sort method: SelectionSort.<br/>
+ * The original array remains unmodified!
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @return the sorted array; can be <code>null</code> or empty
+ */
+ public static int[] selectionSort(int[] array) {
+
+ int[] tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else {
+ int buffer;
+ int min;
+
+ tempResult = new int[array.length];
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+
+ for(int i = 0; i < tempResult.length - 1; i++) {
+ min = i;
+
+ for(int j = i + 1; j < tempResult.length; j++)
+ if(tempResult[min] > tempResult[j])
+ min = j;
+
+ if(min != i) {
+ buffer = tempResult[min];
+ tempResult[min] = tempResult[i];
+ tempResult[i] = buffer;
+ }
+ }
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Returns a subset of the specified array.
+ *
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param start
+ * the start index
+ * @param end
+ * the end index
+ * @return the subset; can be <code>null</code> or empty
+ * @throws IndexOutOfBoundsException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>start</code> is invalid</li>
+ * <li><code>end</code> is invalid</li>
+ * </ul>
+ */
+ @SuppressWarnings("checkstyle:cyclomaticcomplexity")
+ public static byte[] subArray(byte[] array, int start, int end) throws IndexOutOfBoundsException {
+
+ if((array == null) || (start < 0) || ((array.length > 0) && (start > (array.length - 1))) || (end < 0) || ((array.length > 0) && (end > (array.length - 1))) || (start > end))
+ if(array == null)
+ throw new IllegalArgumentException("array", new NullPointerException());
+ else if((start < 0) || ((array.length > 0) && (start > (array.length - 1))))
+ throw new IllegalArgumentException("beginIndex", new IndexOutOfBoundsException());
+ else
+ throw new IllegalArgumentException("endIndex", new IndexOutOfBoundsException());
+ else {
+ byte[] tempResult;
+
+ tempResult = new byte[(end - start) + 1];
+
+ System.arraycopy(array, start, tempResult, 0, tempResult.length);
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Returns a subset of the specified array.
+ *
+ * @param <I>
+ * the item type
+ * @param itemType
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param start
+ * the start index
+ * @param end
+ * the end index
+ * @return the subset; can be <code>null</code> or empty
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>itemType</code> is <code>null</code></li>
+ * </ul>
+ * @throws IndexOutOfBoundsException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>start</code> is invalid</li>
+ * <li><code>end</code> is invalid</li>
+ * </ul>
+ */
+ @SuppressWarnings({ "checkstyle:cyclomaticcomplexity", "unchecked" })
+ public static <I> I[] subArray(Class<I> itemType, I[] array, int start, int end) throws IllegalArgumentException, IndexOutOfBoundsException {
+
+ if((itemType == null) || (array == null) || (start < 0) || ((array.length > 0) && (start > (array.length - 1))) || (end < 0) || ((array.length > 0) && (end > (array.length - 1))) || (start > end))
+ if(itemType == null)
+ throw new IllegalArgumentException("itemType", new NullPointerException());
+ else if(array == null)
+ throw new IllegalArgumentException("array", new NullPointerException());
+ else if((start < 0) || ((array.length > 0) && (start > (array.length - 1))))
+ throw new IllegalArgumentException("start", new IndexOutOfBoundsException());
+ else
+ throw new IllegalArgumentException("end", new IndexOutOfBoundsException());
+ else {
+ I[] tempResult;
+
+ tempResult = (I[]) Array.newInstance(itemType, (end - start) + 1);
+
+ System.arraycopy(array, start, tempResult, 0, tempResult.length);
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Converts the specified value into an array with one item.
+ *
+ * @param <I>
+ * the item type
+ * @param itemType
+ * the item type
+ * @param value
+ * the value
+ * @return the array; not <code>null</code> and not empty
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>itemType</code> is <code>null</code></li>
+ * <li><code>value</code> is <code>null</code></li>
+ * </ul>
+ */
+ public static <I> I[] toArray(Class<I> itemType, I value) throws IllegalArgumentException {
+
+ return toArray(itemType, value, false);
+ }
+
+ /**
+ * Converts the specified value into an array with one item.
+ *
+ * @param <I>
+ * the item type
+ * @param itemType
+ * the item type
+ * @param value
+ * the value
+ * @param allowNull
+ * specifies if the value can be <code>null</code>
+ * @return the array; not <code>null</code> and not empty
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>itemType</code> is <code>null</code></li>
+ * <li><code>value</code> is <code>null</code> and <code>allowNull</code> is <code>false</code></li>
+ * </ul>
+ */
+ @SuppressWarnings("unchecked")
+ public static <I> I[] toArray(Class<I> itemType, I value, boolean allowNull) throws IllegalArgumentException {
+
+ if((itemType == null) || ((value == null) && (!allowNull)))
+ if(itemType == null)
+ throw new IllegalArgumentException("itemType", new NullPointerException());
+ else
+ throw new IllegalArgumentException("value", new NullPointerException());
+ else {
+ I[] tempResult;
+
+ tempResult = (I[]) Array.newInstance(itemType, 1);
+ tempResult[0] = value;
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Converts the specified value into an array with one item.
+ *
+ * @param value
+ * the value
+ * @return the array; not <code>null</code> and not empty
+ */
+ public static int[] toArray(int value) {
+
+ int[] tempResult;
+
+ tempResult = new int[1];
+ tempResult[0] = value;
+
+ return tempResult;
+ }
+
+ /**
+ * Converts the specified list into an array.
+ *
+ * @param <I>
+ * the item type
+ * @param itemType
+ * the item type
+ * @param list
+ * the list; can be <code>null</code> or empty
+ * @return the array; can be <code>null</code> or empty
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>itemType</code> is <code>null</code></li>
+ * </ul>
+ */
+ public static <I> I[] toArray(Class<I> itemType, List<I> list) throws IllegalArgumentException {
+
+ return ArrayUtilities.<I> toArray(itemType, list, false);
+ }
+
+ /**
+ * Converts the specified list into an array.
+ *
+ * @param <I>
+ * the item type
+ * @param itemType
+ * the item type
+ * @param list
+ * the list; can be <code>null</code> or empty
+ * @param omitNull
+ * specifies if <code>null</code>-values will be omitted
+ * @return the array; can be <code>null</code> or empty
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>itemType</code> is <code>null</code></li>
+ * </ul>
+ */
+ @SuppressWarnings("unchecked")
+ public static <I> I[] toArray(Class<I> itemType, List<I> list, boolean omitNull) throws IllegalArgumentException {
+
+ if(itemType == null)
+ throw new IllegalArgumentException("itemType", new NullPointerException());
+ else {
+ if(list == null)
+ return null;
+ else {
+ List<I> tempList;
+ I[] tempResult;
+
+ if(omitNull) {
+ tempList = new ArrayList<>(list);
+
+ for(int i = tempList.size() - 1; i >= 0; i--)
+ if(tempList.get(i) == null)
+ tempList.remove(i);
+ }
+ else
+ tempList = list;
+
+ tempResult = (I[]) Array.newInstance(itemType, tempList.size());
+
+ for(int i = 0; i < tempList.size(); i++)
+ tempResult[i] = tempList.get(i);
+
+ return tempResult;
+ }
+ }
+ }
+
+ /**
+ * Converts the specified list into an array.
+ *
+ * @param list
+ * the list
+ * @return the array
+ */
+ public static boolean[] toBooleanArray(List<Boolean> list) {
+
+ boolean[] tempResult;
+
+ if(list == null)
+ tempResult = null;
+ else {
+ tempResult = new boolean[list.size()];
+
+ if(!list.isEmpty())
+ for(int i = 0; i < list.size(); i++)
+ tempResult[i] = ValueUtilities.toBoolean(list.get(i));
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Converts the specified list into an array.
+ *
+ * @param list
+ * the list
+ * @return the array
+ */
+ public static int[] toIntArray(List<Integer> list) {
+
+ int[] tempResult;
+
+ if(list == null)
+ tempResult = null;
+ else {
+ tempResult = new int[list.size()];
+
+ if(!list.isEmpty())
+ for(int i = 0; i < list.size(); i++)
+ tempResult[i] = ValueUtilities.toInt(list.get(i));
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Toggles the positions of the items at the specified indices in the specified array.<br/>
+ * The original array remains unmodified!
+ *
+ * @param <I>
+ * the item type
+ * @param itemType
+ * the item type
+ * @param array
+ * the array; can be <code>null</code> or empty
+ * @param index1
+ * the index of the first item
+ * @param index2
+ * the index of the second item
+ * @return the toggled array
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>itemType</code> is <code>null</code></li>
+ * <li><code>index1</code> is invalid</li>
+ * <li><code>index2</code> is invalid</li>
+ * </ul>
+ */
+ @SuppressWarnings("unchecked")
+ public static <I> I[] toggle(Class<I> itemType, I[] array, int index1, int index2) throws IllegalArgumentException {
+
+ if(itemType == null)
+ throw new IllegalArgumentException("itemType", new NullPointerException());
+ else {
+ I[] tempResult;
+
+ if(array == null)
+ tempResult = null;
+ else if(array.length == 0)
+ tempResult = (I[]) Array.newInstance(itemType, 0);
+ else {
+ if(!ValueUtilities.isInRange(index1, 0, array.length - 1) || !ValueUtilities.isInRange(index2, 0, array.length - 1)) {
+ if(!ValueUtilities.isInRange(index1, 0, array.length - 1))
+ throw new IllegalArgumentException("index1", new IndexOutOfBoundsException());
+ else
+ throw new IllegalArgumentException("index2", new IndexOutOfBoundsException());
+ }
+ else {
+ I tempCache;
+
+ tempResult = (I[]) Array.newInstance(itemType, array.length);
+
+ System.arraycopy(array, 0, tempResult, 0, array.length);
+
+ tempCache = tempResult[index1];
+ tempResult[index1] = tempResult[index2];
+ tempResult[index2] = tempCache;
+ }
+ }
+
+ return tempResult;
+ }
+ }
+} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/AlreadyExistingItemException.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/AlreadyExistingItemException.java
index 3ea10318..45ef7d95 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/AlreadyExistingItemException.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/AlreadyExistingItemException.java
@@ -55,7 +55,7 @@ public class AlreadyExistingItemException extends AbstractRuntimeException {
*/
public AlreadyExistingItemException(Throwable cause) {
- super("The operation is invalid!", cause);
+ this(null, cause);
}
// Methods
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/CollectionDefaults.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/CollectionDefaults.java
new file mode 100644
index 00000000..bd17b726
--- /dev/null
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/CollectionDefaults.java
@@ -0,0 +1,31 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
+package org.eclipse.openk.common.collection;
+
+/**
+ * Provides some default values.
+ *
+ * @author 2017-10-10 Felix Korb
+ */
+public final class CollectionDefaults {
+
+ // Constants
+ public static final int INVALID_INDEX = -1;
+
+ // Constructors
+ @SuppressWarnings("checkstyle:javadocmethod")
+ private CollectionDefaults() {
+ /* suppresses the instantiation! */
+ }
+} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/CollectionUtilities.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/CollectionUtilities.java
new file mode 100644
index 00000000..9f3e1cdc
--- /dev/null
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/CollectionUtilities.java
@@ -0,0 +1,501 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
+package org.eclipse.openk.common.collection;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.eclipse.openk.common.key.IKeyOwner;
+import org.eclipse.openk.common.system.type.ICloneable;
+
+/**
+ * This class consists exclusively of static methods that operate on or return collections.
+ *
+ * @author 2017-10-10 Felix Korb
+ */
+public final class CollectionUtilities {
+
+ // Constructors
+ @SuppressWarnings("checkstyle:javadocmethod")
+ private CollectionUtilities() {
+ /* suppresses the instantiation! */
+ }
+
+ // Methods
+ /**
+ * Checks if the specified lists are equal or have the same content.
+ *
+ * @param <I>
+ * the item type
+ * @param value1
+ * the first value
+ * @param value2
+ * the second value
+ * @return the result
+ */
+ public static <I> boolean areEqual(List<I> value1, List<I> value2) {
+
+ if(value1 == value2)
+ return true;
+
+ if(value1 == null)
+ return (value2 == null);
+ else {
+ if(value2 == null)
+ return false;
+ else {
+ if(value1.getClass() != value2.getClass())
+ return false;
+ else
+ return value1.equals(value2);
+ }
+ }
+ }
+
+ /**
+ * Checks if the specified sets are equal or have the same content.
+ *
+ * @param <I>
+ * the item type
+ * @param value1
+ * the first value
+ * @param value2
+ * the second value
+ * @return the result
+ */
+ public static <I> boolean areEqual(Set<I> value1, Set<I> value2) {
+
+ if(value1 == value2)
+ return true;
+
+ if(value1 == null)
+ return (value2 == null);
+ else {
+ if(value2 == null)
+ return false;
+ else {
+ if(value1.getClass() != value2.getClass())
+ return false;
+ else
+ return value1.equals(value2);
+ }
+ }
+ }
+
+ /**
+ * Casts the specified list.
+ *
+ * @param <C>
+ * the new item type
+ * @param <I>
+ * the item type
+ * @param list
+ * the list; can be <code>null</code>
+ * @return the casted list; can be <code>null</code>
+ */
+ @SuppressWarnings("unchecked")
+ public static <C, I> List<C> castList(List<I> list) {
+
+ List<C> tempResult;
+
+ if(list == null)
+ tempResult = null;
+ else {
+ int tempSize = list.size();
+ tempResult = new ArrayList<>(tempSize);
+
+ for(int i = 0; i < tempSize; i++)
+ tempResult.add((C) list.get(i));
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Returns size of the specified collection.
+ *
+ * @param collection
+ * the collection; can be <code>null</code> or empty
+ * @return the size of the collection<br/>
+ * <code>0</code>, if
+ * <ul>
+ * <li><code>collection</code> is <code>null</code> or empty</li>
+ * </ul>
+ */
+ public static int countItems(Collection<?> collection) {
+
+ if(collection == null)
+ return 0;
+ else
+ return collection.size();
+ }
+
+ /**
+ * Returns size of the specified map.
+ *
+ * @param map
+ * the map; can be <code>null</code> or empty
+ * @return the size of the map<br/>
+ * <code>0</code>, if
+ * <ul>
+ * <li><code>map</code> is <code>null</code> or empty</li>
+ * </ul>
+ */
+ public static int countItems(Map<?, ?> map) {
+
+ if(map == null)
+ return 0;
+ else
+ return map.size();
+ }
+
+ /**
+ * Creates a clone of the specified map.<br/>
+ * Also every map item will be cloned.
+ *
+ * @param <K>
+ * the key type
+ * @param <I>
+ * the item type
+ * @param value
+ * the map
+ * @return the clone
+ * @throws CloneNotSupportedException
+ * {@link CloneNotSupportedException}
+ */
+ @SuppressWarnings("unchecked")
+ public static <K extends Comparable<K>, I extends ICloneable> LinkedHashMap<K, I> createClone(LinkedHashMap<K, I> value) throws CloneNotSupportedException {
+
+ if(value == null)
+ return null;
+ else {
+ LinkedHashMap<K, I> tempResult = new LinkedHashMap<>(value.size());
+
+ for(Entry<K, I> tempEntry : value.entrySet())
+ tempResult.put(tempEntry.getKey(), (I) tempEntry.getValue().clone());
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Creates a clone of the specified list.<br/>
+ * Also every list item will be cloned.
+ *
+ * @param <I>
+ * the item type
+ * @param value
+ * the list
+ * @return the clone
+ * @throws CloneNotSupportedException
+ * {@link CloneNotSupportedException}
+ */
+ @SuppressWarnings("unchecked")
+ public static <I extends ICloneable> List<I> createClone(List<I> value) throws CloneNotSupportedException {
+
+ if(value == null)
+ return null;
+ else {
+ List<I> tempResult;
+
+ tempResult = new ArrayList<>(value.size());
+
+ for(I tempItem : value)
+ tempResult.add((I) tempItem.clone());
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Creates a clone of the specified map.<br/>
+ * Also every map item will be cloned.
+ *
+ * @param <K>
+ * the key type
+ * @param <I>
+ * the item type
+ * @param value
+ * the map
+ * @return the clone
+ * @throws CloneNotSupportedException
+ * {@link CloneNotSupportedException}
+ */
+ @SuppressWarnings("unchecked")
+ public static <K extends Comparable<K>, I extends ICloneable> Map<K, I> createClone(Map<K, I> value) throws CloneNotSupportedException {
+
+ if(value == null)
+ return null;
+ else {
+ Map<K, I> tempResult = new HashMap<>(value.size());
+
+ for(Entry<K, I> tempEntry : value.entrySet())
+ tempResult.put(tempEntry.getKey(), (I) tempEntry.getValue().clone());
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Returns the first element of the specified list.
+ *
+ * @param <I>
+ * the item type
+ * @param list
+ * the list; can be <code>null</code> or empty
+ * @return the first element<br/>
+ * <code>null</code>, if the list is <code>null</code> or empty
+ */
+ public static <I> I getFirst(List<I> list) {
+
+ if((list == null) || list.isEmpty())
+ return null;
+ else
+ return list.get(0);
+ }
+
+ /**
+ * Returns the last element of the specified list.
+ *
+ * @param <I>
+ * the item type
+ * @param list
+ * the list; can be <code>null</code> or empty
+ * @return the last element<br/>
+ * <code>null</code>, if the list is <code>null</code> or empty
+ */
+ public static <I> I getLast(List<I> list) {
+
+ if((list == null) || list.isEmpty())
+ return null;
+ else
+ return list.get(list.size() - 1);
+ }
+
+ /**
+ * Returns the unique item within the specified list.
+ *
+ * @param <I>
+ * the item type
+ * @param list
+ * the list; can be <code>null</code> or empty
+ * @return the unique item<br/>
+ * <code>null</code>, if
+ * <ul>
+ * <li>there are no items within the specified list</li>
+ * <li>there is more then one item within the specified list</li>
+ * </ul>
+ */
+ public static <I> I getUnique(List<I> list) {
+
+ if((list == null) || (list.size() != 1))
+ return null;
+ else
+ return list.get(0);
+ }
+
+ /**
+ * Checks if the specified list has any content.
+ *
+ * @param <I>
+ * the item type
+ * @param list
+ * the list; can be <code>null</code> or empty
+ * @return the result
+ */
+ public static <I> boolean hasContent(List<I> list) {
+
+ return (list != null) && !list.isEmpty();
+ }
+
+ /**
+ * Converts the specified items into a list.
+ *
+ * @param <I>
+ * the item type
+ * @param items
+ * the items; can be <code>null</code> or empty
+ * @return the list; can be <code>null</code> or empty
+ */
+ @SuppressWarnings("unchecked")
+ public static <I> List<I> toList(I... items) {
+
+ if(items == null)
+ return null;
+ else {
+ List<I> tempResult = new ArrayList<>(items.length);
+
+ for(I tempItem : items)
+ tempResult.add(tempItem);
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Converts the specified item into a map.
+ *
+ * @param <K>
+ * the key type
+ * @param <I>
+ * the item type
+ * @param item
+ * the item; can be <code>null</code>
+ * @return the map
+ */
+ public static <K extends Comparable<K>, I extends IKeyOwner<K>> Map<K, I> toMap(I item) {
+
+ Map<K, I> tempResult;
+
+ if(item == null)
+ tempResult = null;
+ else {
+ tempResult = new HashMap<>(1);
+ tempResult.put(item.getKey(), item);
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Converts the specified item into a map.
+ * <p>
+ * <b><i>NOTE:</i></b><br/>
+ * Since this is a performance critical operation, the parameter-check is skipped!<br/>
+ * It is assumed that
+ * <ul>
+ * <li><code>key</code> is not <code>null</code></li>
+ * <li><code>key</code> is valid</li>
+ * </ul>
+ * </p>
+ *
+ * @param <K>
+ * the key type
+ * @param <I>
+ * the item type
+ * @param key
+ * the key
+ * @param item
+ * the item; can be <code>null</code>
+ * @return the map
+ */
+ public static <K, I> Map<K, I> toMap(K key, I item) {
+
+ Map<K, I> tempResult;
+
+ if(item == null)
+ tempResult = null;
+ else {
+ tempResult = new HashMap<>(1);
+ tempResult.put(key, item);
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Converts the specified list into a map.
+ *
+ * @param <K>
+ * the key type
+ * @param <I>
+ * the item type
+ * @param list
+ * the list; can be <code>null</code>
+ * @return the map
+ */
+ public static <K extends Comparable<K>, I extends IKeyOwner<K>> Map<K, I> toMap(List<I> list) {
+
+ Map<K, I> tempResult;
+
+ if(list == null)
+ tempResult = null;
+ else {
+ int tempItemCount = list.size();
+
+ tempResult = new HashMap<>(tempItemCount);
+
+ for(int i = 0; i < tempItemCount; i++)
+ tempResult.put(list.get(i).getKey(), list.get(i));
+ }
+
+ return tempResult;
+ }
+
+ /**
+ * Creates a safe list.
+ *
+ * @param <I>
+ * the item type
+ * @param item
+ * the item; can be <code>null</code>
+ * @return the safe list<br/>
+ * an empty list if the specified list is <code>null</code>
+ */
+ public static <I> List<I> toSafeList(I item) {
+
+ if(item == null)
+ return Collections.<I> emptyList();
+ else {
+ List<I> tempResult = new ArrayList<>(1);
+
+ tempResult.add(item);
+
+ return tempResult;
+ }
+ }
+
+ /**
+ * Creates a safe list.
+ *
+ * @param <I>
+ * the item type
+ * @param list
+ * the list; can be <code>null</code> or empty
+ * @return the safe list<br/>
+ * an empty list if the specified list is <code>null</code>
+ */
+ public static <I> List<I> toSafeList(List<I> list) {
+
+ if(list == null)
+ return Collections.<I> emptyList();
+ else
+ return list;
+ }
+
+ /**
+ * Creates a safe set.
+ *
+ * @param <I>
+ * the item type
+ * @param set
+ * the set; can be <code>null</code> or empty
+ * @return the safe set<br/>
+ * an empty list if the specified set is <code>null</code>
+ */
+ public static <I> Set<I> toSafeSet(Set<I> set) {
+
+ if(set == null)
+ return Collections.<I> emptySet();
+ else
+ return set;
+ }
+} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/MissingItemException.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/MissingItemException.java
new file mode 100644
index 00000000..91d3c936
--- /dev/null
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/collection/MissingItemException.java
@@ -0,0 +1,76 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
+package org.eclipse.openk.common.collection;
+
+import org.eclipse.openk.common.messaging.AbstractRuntimeException;
+import org.eclipse.openk.common.string.StringUtilities;
+
+/**
+ * The notification for missing items.
+ *
+ * @author Felix Korb
+ */
+public class MissingItemException extends AbstractRuntimeException {
+
+ // Constants
+ private static final long serialVersionUID = 1L;
+
+ // Constructors
+ /**
+ * @param item
+ * the item, can be <code>null</code> or <code>""</code>
+ */
+ public MissingItemException(String item) {
+
+ this(item, null);
+ }
+
+ /**
+ * @param item
+ * the item, can be <code>null</code> or <code>""</code>
+ * @param cause
+ * the causing inner exception, can be <code>null</code>
+ */
+ public MissingItemException(String item, Throwable cause) {
+
+ super(createText(item), cause);
+
+ addParameter("item", item);
+ }
+
+ /**
+ * @param cause
+ * the causing inner exception, can be <code>null</code>
+ */
+ public MissingItemException(Throwable cause) {
+
+ this(null, cause);
+ }
+
+ // Methods
+ /**
+ * Creates the message-text.
+ *
+ * @param item
+ * the item, can be <code>null</code> or <code>""</code>
+ * @return the text
+ */
+ private static String createText(String item) {
+
+ if(StringUtilities.hasContent(item))
+ return "The item '" + item + "' is missing!";
+ else
+ return "The item is missing!";
+ }
+}
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/Command.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/Command.java
index e134e7ad..78c7b4e9 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/Command.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/Command.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -38,7 +38,7 @@ public final class Command {
* @param parameters
* the mandatory and optional parameters belonging to the command
* @throws NullPointerException
- * when type is null
+ * when type is null
*/
public Command(CommandType type, Map<String, Object> parameters) {
@@ -53,7 +53,6 @@ public final class Command {
// Properties
/**
- * Returns the command type
* @return the {@link CommandType}; never <code>null</code>
*/
public CommandType getType() {
@@ -63,6 +62,7 @@ public final class Command {
/**
* Returns the parameters belonging to this command.
+ *
* @return the parameters of this command; never null, but can be emtpy
*/
public Map<String, Object> getParameters() {
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandController.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandController.java
index e4f317f1..bc806082 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandController.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandController.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -38,9 +38,7 @@ public final class CommandController {
private Map<CommandExecutionId, CommandExecution> executions;
// Constructors
- /**
- * Initializes this controller
- */
+ @SuppressWarnings("checkstyle:javadocmethod")
public CommandController() {
executions = new ConcurrentHashMap<>();
}
@@ -48,35 +46,36 @@ public final class CommandController {
// Methods
/**
* Executes the specified command.
+ *
* @param command
* the command to be executed
- * @return the id of the started command execution. It may be used to obtain status via {@link #getCommandExecutionProgress(CommandExecutionId)}
+ * @return the id of the started command execution. It may be used to obtain status via {@link #getCommandExecutionProgress(CommandType, CommandExecutionId)}
* @throws NullPointerException
- * if the specified command is null
+ * if the specified command is null
* @throws InvalidParametersException
* if the parameters of the specified command don't match the command type
* @throws UnsupportedOperationException
* if no {@link ICommandExecutor} is found for the specified command
*/
public CommandExecutionId executeCommand(Command command) throws InvalidParametersException {
-
- if (command == null)
+
+ if(command == null)
throw new NullPointerException("command is mandatory");
CommandExecution execution = new CommandExecution(command);
CommandExecutionId id = execution.getId();
- if (executors.isPresent()) {
- for (ICommandExecutor executor: executors.get()) {
- if (executor.canExecute(command)) {
+ if(executors.isPresent()) {
+ for(ICommandExecutor executor : executors.get()) {
+ if(executor.canExecute(command)) {
executions.put(id, execution);
executor.execute(execution);
break;
}
}
}
-
- if (!executions.containsKey(id))
+
+ if(!executions.containsKey(id))
throw new UnsupportedOperationException("No matching " + ICommandExecutor.class.getSimpleName() + " found for command of type " + command.getType());
return id;
@@ -84,6 +83,7 @@ public final class CommandController {
/**
* Returns the progress log of the specified command execution.
+ *
* @param id
* the id of the command execution
* @return the log
@@ -94,14 +94,14 @@ public final class CommandController {
*/
public List<String> getCommandExecutionProgress(CommandType type, CommandExecutionId id) {
- if (id == null)
+ if(id == null)
throw new NullPointerException("id is mandatory");
CommandExecution execution = executions.get(id);
- if (execution == null)
+ if(execution == null)
throw new IllegalStateException("no execution could be found for id " + id.getUuid());
- if (!execution.getCommand().getType().equals(type))
+ if(!execution.getCommand().getType().equals(type))
throw new IllegalStateException("no execution could be found for type " + type + " id " + id.getUuid());
-
+
return execution.getProgressLog();
}
}
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandExecution.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandExecution.java
index 34d7ab48..7aab3793 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandExecution.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandExecution.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -40,19 +40,19 @@ public final class CommandExecution {
* for this command execution.
*
* @param value
- * the corresponding command,
+ * the corresponding command,
* @throws NullPointerException
- * when value is null
+ * when value is null
*/
public CommandExecution(Command value) {
- if (value == null)
+ if(value == null)
throw new NullPointerException("command is mandatory");
command = value;
id = new CommandExecutionId();
progressLog = new CopyOnWriteArrayList<>();
unmodifiableProgressLog = unmodifiableList(progressLog);
}
-
+
// Methods
/**
* This method may be used by the {@link ICommandExecutor} to report progress.
@@ -61,40 +61,43 @@ public final class CommandExecution {
* @param value
* a {@link String} containing information about the progress of this execution
* @throws NullPointerException
- * when value is null
+ * when value is null
*/
public void reportProgress(String value) {
- if (value == null)
+
+ if(value == null)
throw new NullPointerException("command is mandatory");
progressLog.add(value);
}
-
// Properties
/**
* Returns the id of this command execution.
+ *
* @return the id
*/
public CommandExecutionId getId() {
-
+
return id;
}
/**
* Returns the command of this command execution.
+ *
* @return the command
*/
public Command getCommand() {
-
+
return command;
}
/**
* Returns the progress log of this command execution.
+ *
* @return the progress log
*/
public List<String> getProgressLog() {
-
+
return unmodifiableProgressLog;
- }
+ }
}
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandExecutionId.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandExecutionId.java
index 1f90dd87..a65a95e7 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandExecutionId.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandExecutionId.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandType.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandType.java
index 4d575f45..5912a207 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandType.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/CommandType.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -29,24 +29,23 @@ public final class CommandType {
// Constructors
/**
- * Creates a command type
- *
* @param value
* the name of the command type
* @throws NullPointerException
- * when value is null
+ * when value is null
*/
public CommandType(String value) {
- if(value == null) {
+ if(value == null)
throw new NullPointerException("The name of a command type is mandatory");
- }
- name = value;
+ else
+ name = value;
}
// Properties
/**
* Returns the name of this command type.
+ *
* @return the name of this command type; never <code>null</code>
*/
public String getName() {
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/ICommandExecutor.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/ICommandExecutor.java
index 73a1aa41..701e180e 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/ICommandExecutor.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/command/ICommandExecutor.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -22,7 +22,8 @@ import org.springframework.scheduling.annotation.Async;
* @author Arne Limburg
*/
public interface ICommandExecutor {
-
+
+ // Methods
/**
* Tests, if the specified command is executable by this {@link ICommandExecutor}.
* That means, that this {@link ICommandExecutor} is able to execute commands of the specified type
@@ -33,7 +34,7 @@ public interface ICommandExecutor {
* if this executor is appropriate for the specified command, but the parameters are invalid
*/
boolean canExecute(Command command) throws InvalidParameterException;
-
+
/**
* Executes the command specified by the execution.
* Implementations of this method may be annotated with \@{@link Async} to be executed asynchronously.
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/CimModelDefinition.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/CimModelDefinition.java
index 8a843ef8..aab69d5d 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/CimModelDefinition.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/CimModelDefinition.java
@@ -7,23 +7,23 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
package org.eclipse.openk.common.dataexchange.cim;
-import org.eclipse.openk.common.model.IModelDefinition;
+import org.eclipse.openk.common.model.AbstractModelDefinition;
/**
* The <i>CIM</i> model definition.
*
* @author Felix Korb
*/
-public class CimModelDefinition implements IModelDefinition {
+public class CimModelDefinition extends AbstractModelDefinition<CimVersion> {
- // Attributes
- private CimVersion version;
+ // Constants
+ public static final String KEY = "cim";
// Constructors
/**
@@ -35,54 +35,8 @@ public class CimModelDefinition implements IModelDefinition {
* <li><code>version</code> is <code>null</code></li>
* </ul>
*/
- public CimModelDefinition(CimVersion version) {
+ protected CimModelDefinition(CimVersion version) throws IllegalArgumentException {
- if(version == null)
- throw new IllegalArgumentException("version", new NullPointerException());
- else
- this.version = version;
- }
-
- // Methods
- @Override
- public int compareTo(IModelDefinition value) {
-
- int result;
-
- if(value == null)
- result = 1;
- else {
- if(value instanceof CimModelDefinition)
- result = version.compareTo(((CimModelDefinition) value).version);
- else
- result = encode().compareTo(value.encode());
- }
-
- return result;
- }
-
- @Override
- public String encode() {
-
- return version.encode();
- }
-
- @Override
- public final String toString() {
-
- return encode();
- }
-
- // Properties
- @Override
- public Package getPackage() {
-
- return getClass().getPackage();
- }
-
- @Override
- public final CimVersion getVersion() {
-
- return version;
+ super(KEY, version);
}
} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/CimVersion.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/CimVersion.java
index 8a0c4527..c050f3e6 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/CimVersion.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/CimVersion.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -19,7 +19,7 @@ import org.eclipse.openk.common.string.StringUtilities;
/**
* The <i>CIM</i> version.
*
- * The form of a cim version is <code>cim{<b>XX</b>}v{<b>YY</b>}[<b>z</b>]</code>:
+ * The form of a cim version is <code>{<b>XX</b>}v{<b>YY</b>}[<b>z</b>]</code>:
* <ul>
* <li><code><b>XX</b></code> is the major <i>CIM</i> package version</li>
* <li><code><b>YY</b></code> is the minor version</li>
@@ -27,7 +27,7 @@ import org.eclipse.openk.common.string.StringUtilities;
* </ul>
*
* For example:<br/>
- * <code>cim16v26a</code>
+ * <code>16v26a</code>
*
* @author Felix Korb
*/
@@ -51,7 +51,7 @@ public final class CimVersion implements IVersion {
* <li><code>minorVersion</code> is less than <code>0</code></li>
* </ul>
*/
- public CimVersion(int majorVersion, int minorVersion) {
+ public CimVersion(int majorVersion, int minorVersion) throws IllegalArgumentException {
this(majorVersion, minorVersion, null);
}
@@ -70,7 +70,7 @@ public final class CimVersion implements IVersion {
* <li><code>minorVersion</code> is less than <code>0</code></li>
* </ul>
*/
- public CimVersion(int majorVersion, int minorVersion, String subMinorVersion) {
+ public CimVersion(int majorVersion, int minorVersion, String subMinorVersion) throws IllegalArgumentException {
if((majorVersion < 0) || (minorVersion < 0))
if(majorVersion < 0)
@@ -86,6 +86,13 @@ public final class CimVersion implements IVersion {
// Methods
@Override
+ @SuppressWarnings({ "checkstyle:noclone", "checkstyle:superclone" })
+ public Object clone() throws CloneNotSupportedException {
+
+ return this;
+ }
+
+ @Override
public int compareTo(IVersion value) {
int result;
@@ -116,9 +123,8 @@ public final class CimVersion implements IVersion {
@Override
public String encode() {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
- result.append("cim");
result.append(String.format("%02d", Integer.valueOf(majorVersion)));
result.append('v');
result.append(String.format("%02d", Integer.valueOf(minorVersion)));
diff --git a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/NonRotatingEnergy.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/ICimCompound.java
index b2e9ab7e..71829fd5 100644
--- a/cim-cache/org.eclipse.openk.cim.cim17v07/src/main/java/org/eclipse/openk/cim/cim17v07/TC57CIM/IEC61970/Base/BTC/NonRotatingEnergy.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/ICimCompound.java
@@ -11,20 +11,16 @@
*
* -----------------------------------------------------------------------------
*/
-package org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.BTC;
-
-import org.eclipse.openk.common.dataexchange.cim.*;
+package org.eclipse.openk.common.dataexchange.cim;
/**
- * @author BTC AG (generated); modelled by migruend
- * @version 1.0
- * @created 10-Aug-2017 18:10:59
+ * Defines the commonalities of all <i>&lt;&lt;Compound&gt;&gt;</i> stereotypes .
+ *
+ * @author 2017-10-18 Christian Brunzendorf
+ * @author 2017-10-18 Felix Korb
+ * @author 2017-10-18 Frank Jäger
*/
- @SuppressWarnings("javadoc")
- public class NonRotatingEnergy implements ICimEntity {
-
- public NonRotatingEnergy(){
-
- }
+public interface ICimCompound extends ICimEntity {
+ /* this is a marker-interface with no methods */
} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/ICimDatatype.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/ICimDatatype.java
index 4f7f7295..bfe2a57e 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/ICimDatatype.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/ICimDatatype.java
@@ -14,12 +14,26 @@
package org.eclipse.openk.common.dataexchange.cim;
/**
- * Defines the commonalities of all <i>CIM</i> datatypes.
+ * Defines the commonalities of all <i>&lt;&lt;CIMDatatype&gt;&gt;</i> stereotypes .
*
- * @author Felix Korb
- * @author Renko Ortgies
+ * @author 2017-10-18 Felix Korb
+ * @author 2017-10-18 Renko Ortgies
*/
-public interface ICimDatatype extends ICimEntity {
+public interface ICimDatatype extends ICimEntity {
- /* this is a marker-interface with no methods */
+ // Properties
+ /**
+ * @return the unit multiplier; can be <code>null</code> or <code>none</code>
+ */
+ Enum<?> getMultiplier();
+
+ /**
+ * @return the unit symbol; can be <code>null</code> or <code>none</code>
+ */
+ Enum<?> getUnit();
+
+ /**
+ * @return the value; can be <code>null</code>
+ */
+ Double getValue();
} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/ICimRevision.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/ICimRevision.java
index 3c83d8cf..647dec59 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/ICimRevision.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/ICimRevision.java
@@ -20,6 +20,7 @@ import org.eclipse.openk.common.IVersion;
*
* @author Felix Korb
*/
+@Deprecated
public interface ICimRevision extends IVersion {
// Properties
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/AbstractRdf1_1PayloadReader.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/AbstractRdf1_1PayloadReader.java
new file mode 100644
index 00000000..29ddd2f0
--- /dev/null
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/AbstractRdf1_1PayloadReader.java
@@ -0,0 +1,114 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
+package org.eclipse.openk.common.dataexchange.cim.message;
+
+import java.net.URI;
+
+import org.eclipse.openk.common.dataexchange.cim.ICimEntity;
+import org.eclipse.openk.common.dataexchange.cim.ICimIdentifiedObject;
+import org.eclipse.openk.common.dataexchange.converter.IValueDecoder;
+import org.eclipse.openk.common.dataexchange.xml.IXmlNamespaceSolver;
+import org.eclipse.openk.common.dataexchange.xml.XmlNamespaceMapping;
+import org.eclipse.openk.common.dataexchange.xml.rdf.AbstractRdf1_1Reader;
+import org.eclipse.openk.common.dataexchange.xml.rdf.IRdfExternalObjectReferenceSolver;
+import org.eclipse.openk.common.dataexchange.xml.rdf.RdfObjectReference;
+import org.eclipse.openk.common.net.UrlDefaults;
+import org.eclipse.openk.common.system.type.ITypeInformationProvider;
+
+/**
+ * Transforms a valid <i>RDF 1.1</i> message into a <i>CIM</i> model.
+ *
+ * @author Felix Korb
+ *
+ * @param <R>
+ * the result type
+ */
+public abstract class AbstractRdf1_1PayloadReader<R> extends AbstractRdf1_1Reader<ICimEntity, R> {
+
+ // Constructors
+ /**
+ * @param typeInformationProvider
+ * the {@link ITypeInformationProvider}
+ * @param xmlNamespaceSolver
+ * the {@link IXmlNamespaceSolver}
+ * @param valueDecoder
+ * the {@link IValueDecoder}
+ * @param externalEntityReferenceSolver
+ * the {@link IRdfExternalObjectReferenceSolver} to solve external entity references; can be <code>null</code>
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>typeInformationProvider</code> is <code>null</code></li>
+ * <li><code>xmlNamespaceSolver</code> is <code>null</code></li>
+ * <li><code>valueDecoder</code> is <code>null</code></li>
+ * </ul>
+ */
+ protected AbstractRdf1_1PayloadReader(ITypeInformationProvider typeInformationProvider, IXmlNamespaceSolver xmlNamespaceSolver, IValueDecoder valueDecoder, IRdfExternalObjectReferenceSolver<ICimEntity> externalEntityReferenceSolver) {
+
+ super(ICimEntity.class, typeInformationProvider, xmlNamespaceSolver, valueDecoder, externalEntityReferenceSolver);
+ }
+
+ // Methods
+ @Override
+ protected final void setSubjectKey(ICimEntity subject, URI subjectUri) {
+
+ if(subject instanceof ICimIdentifiedObject)
+ ((ICimIdentifiedObject) subject).setKey(subjectUri.toString());
+ }
+
+ @Override
+ protected final ICimEntity solveExternalReferencedObject(RdfObjectReference<ICimEntity> reference) {
+
+ ICimEntity result;
+
+ if(!Enum.class.isAssignableFrom(reference.attribute.getType()))
+ result = super.solveExternalReferencedObject(reference);
+ else {
+ Enum<?> currentEnum;
+ String enumName;
+ String namespaceUri;
+
+ /* determine enum name & namespace uri */
+ {
+ String uriAsString = reference.objectUri.toString();
+ int hashPosition = uriAsString.lastIndexOf(UrlDefaults.FRAGMENT_SEPARATOR);
+
+ /* enum name */
+ enumName = uriAsString.substring(hashPosition + 1);
+
+ /* namespace uri */
+ namespaceUri = uriAsString.substring(0, hashPosition + 1);
+ }
+
+ /* find enum */
+ {
+ /* determine namespace mapping */
+ XmlNamespaceMapping namespaceMapping = getXmlNamespaceSolver().getNamespaceMappingByUri(namespaceUri);
+
+ if(namespaceMapping == null)
+ throw new UnsupportedOperationException("There is no namespace-mapping for '" + namespaceUri + "'!"); // FIXME 2017-04-16 Felix: geeignete Ausnahme schmeißen
+
+ /* find enum */
+ currentEnum = getEntityInformationProvider().findEnum(namespaceMapping.getModelDefinitionPackage(), enumName);
+
+ if(currentEnum == null)
+ throw new UnsupportedOperationException("Missing enum '" + enumName + "'!"); // FIXME 2017-04-16 Felix: geeignete Ausnahme schmeißen
+ }
+
+ result = (ICimEntity) currentEnum;
+ }
+
+ return result;
+ }
+} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/CimMessageDefaults.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/CimMessageDefaults.java
index 9fec0ea8..1bd2caae 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/CimMessageDefaults.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/CimMessageDefaults.java
@@ -58,6 +58,7 @@ public final class CimMessageDefaults {
public static final XmlNamespace CIM_NAMESPACE = new XmlNamespace(CimMessageDefaults.CIM_URI + "#", "cim");
// Constructors
+ @SuppressWarnings("checkstyle:javadocmethod")
private CimMessageDefaults() {
/* suppresses the instantiation! */
}
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/ErrorCreatingUriException.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/ErrorCreatingUriException.java
index 7f69ccfc..1fe50972 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/ErrorCreatingUriException.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/ErrorCreatingUriException.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -15,7 +15,6 @@ package org.eclipse.openk.common.dataexchange.cim.message;
import org.eclipse.openk.common.messaging.AbstractException;
-
public class ErrorCreatingUriException extends AbstractException {
// Constants
@@ -24,6 +23,7 @@ public class ErrorCreatingUriException extends AbstractException {
private static final String TEXT = "The URI is malformed or null or empty!";
// Constructors
+ @SuppressWarnings("checkstyle:javadocmethod")
public ErrorCreatingUriException() {
this(null);
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/FailedToWriteMessageException.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/FailedToWriteMessageException.java
index 117b5aef..b2cfd976 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/FailedToWriteMessageException.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/FailedToWriteMessageException.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -18,7 +18,7 @@ import java.lang.reflect.InvocationTargetException;
import org.eclipse.openk.common.messaging.AbstractRuntimeException;
/**
- * Exception handling for: failed writing <i>CIM</i> message
+ * Exception handling for: failed writing <i>CIM</i> message.
*
* @author Frank Jäger
*/
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/RdfPayloadReader.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/RdfPayloadReader.java
new file mode 100644
index 00000000..8b45cc05
--- /dev/null
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/RdfPayloadReader.java
@@ -0,0 +1,98 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
+package org.eclipse.openk.common.dataexchange.cim.message;
+
+import java.util.Map;
+
+import org.eclipse.openk.common.dataexchange.cim.ICimEntity;
+import org.eclipse.openk.common.dataexchange.converter.IValueDecoder;
+import org.eclipse.openk.common.dataexchange.xml.IXmlNamespaceSolver;
+import org.eclipse.openk.common.dataexchange.xml.rdf.IRdfExternalObjectReferenceSolver;
+import org.eclipse.openk.common.dataexchange.xml.rdf.RdfSubject;
+import org.eclipse.openk.common.system.type.ITypeInformationProvider;
+import org.xml.sax.Attributes;
+
+/**
+ * Transforms a valid <i>RDF 1.1</i> message into a <i>CIM</i> payload model.
+ *
+ * @author Felix Korb
+ */
+public final class RdfPayloadReader extends AbstractRdf1_1PayloadReader<Map<String, RdfSubject<ICimEntity>>> {
+
+ // Constants
+ private static final String TAG_NAME_PAYLOAD = "Payload";
+
+ // Attributes
+ private boolean payloadSection;
+
+ // Constructors
+ /**
+ * @param typeInformationProvider
+ * the {@link ITypeInformationProvider}
+ * @param xmlNamespaceSolver
+ * the {@link IXmlNamespaceSolver}
+ * @param valueDecoder
+ * the {@link IValueDecoder}
+ * @param externalEntityReferenceSolver
+ * the {@link IRdfExternalObjectReferenceSolver} to solve external entity references; can be <code>null</code>
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>typeInformationProvider</code> is <code>null</code></li>
+ * <li><code>xmlNamespaceSolver</code> is <code>null</code></li>
+ * <li><code>valueDecoder</code> is <code>null</code></li>
+ * </ul>
+ */
+ public RdfPayloadReader(ITypeInformationProvider typeInformationProvider, IXmlNamespaceSolver xmlNamespaceSolver, IValueDecoder valueDecoder, IRdfExternalObjectReferenceSolver<ICimEntity> externalEntityReferenceSolver) {
+
+ super(typeInformationProvider, xmlNamespaceSolver, valueDecoder, externalEntityReferenceSolver);
+
+ this.payloadSection = false;
+ }
+
+ // Methods
+ @Override
+ protected Map<String, RdfSubject<ICimEntity>> createResult(Map<String, RdfSubject<ICimEntity>> subjects, Map<String, RdfSubject<ICimEntity>> unreferencedSubjects) {
+
+ if(subjects.isEmpty())
+ return null;
+ else
+ return subjects;
+ }
+
+ @Override
+ protected boolean isPayloadEndElement(String uri, String localName, String qName) {
+
+ if(payloadSection)
+ if(localName.equals(TAG_NAME_PAYLOAD))
+ payloadSection = false;
+ else
+ return true;
+
+ return false;
+ }
+
+ @Override
+ protected boolean isPayloadStartElement(String uri, String localName, String qName, Attributes atts) {
+
+ if(!payloadSection) {
+ if(localName.equals(TAG_NAME_PAYLOAD))
+ payloadSection = true;
+ }
+ else
+ return true;
+
+ return false;
+ }
+} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/RdfPayloadWriter.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/RdfPayloadWriter.java
index 64cca41b..b11fd739 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/RdfPayloadWriter.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/RdfPayloadWriter.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -223,14 +223,15 @@ public final class RdfPayloadWriter extends AbstractRdf1_1Writer implements IPay
}
/**
- * Iterating method writing all elements of a {@link ICimEntity} into a RDF document
+ * Iterating method writing all elements of a {@link ICimEntity} into a RDF document.
*
* @param subject
* the given {@link ICimEntity} subject
* @return the {@link RdfSubject} references; not <code>null</code> but can be empty
* @throws IOException
+ * {@link IOException}
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "checkstyle:cyclomaticcomplexity", "unchecked" })
protected List<RdfSubject<ICimEntity>> writeEntity(RdfSubject<ICimEntity> subject) throws IOException {
List<RdfSubject<ICimEntity>> result = Collections.emptyList();
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/XmlPayloadReader.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/XmlPayloadReader.java
index 6f66ffb7..74d798ef 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/XmlPayloadReader.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/XmlPayloadReader.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -41,7 +41,7 @@ public final class XmlPayloadReader<P> extends AbstractXmlReader {
// Constants
private static final String TAG_NAME_PAYLOAD = "Payload";
-
+
// Attributes
private Field currentValueAttribute;
private P payload;
@@ -302,6 +302,7 @@ public final class XmlPayloadReader<P> extends AbstractXmlReader {
* the attributes attached to the element. If there are no attributes, it shall be an empty {@link Attributes} object.
* @return the {@link CimTagType}; not <code>null</code>
*/
+ @SuppressWarnings({ "checkstyle:cyclomaticcomplexity" })
private CimTagType determineTagType(String uri, String localName, String qName, Attributes atts) {
CimTagType result;
@@ -363,6 +364,7 @@ public final class XmlPayloadReader<P> extends AbstractXmlReader {
}
@Override
+ @SuppressWarnings({ "checkstyle:cyclomaticcomplexity" })
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
if(!payloadSection) {
@@ -418,7 +420,7 @@ public final class XmlPayloadReader<P> extends AbstractXmlReader {
*
* @author Felix Korb
*/
- private static enum CimTagType {
+ private enum CimTagType {
AddList, /* Payload_ParentType_is_entity_attributeType_is_list */
AddListItem, /* Payload_ParentType_is_List */
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/XmlPayloadWriter.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/XmlPayloadWriter.java
index c93cdc94..6a4a601a 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/XmlPayloadWriter.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/cim/message/XmlPayloadWriter.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/converter/ValueDecoder.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/converter/ValueDecoder.java
index 8027c04f..a7f46da7 100644
--- a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/converter/ValueDecoder.java
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/converter/ValueDecoder.java
@@ -7,7 +7,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* -----------------------------------------------------------------------------
*/
@@ -149,7 +149,7 @@ public class ValueDecoder implements IValueDecoder {
}
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "checkstyle:cyclomaticcomplexity", "checkstyle:javancss", "unchecked" })
public <V> V decodeValue(Field attribute, String valueAsString) {
V result;
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/CsvFileReader.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/CsvFileReader.java
new file mode 100644
index 00000000..d7900728
--- /dev/null
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/CsvFileReader.java
@@ -0,0 +1,122 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
+package org.eclipse.openk.common.dataexchange.csv;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.List;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.eclipse.openk.common.system.type.ITypeInformationProvider;
+
+/**
+ * Reads <i>CSV</i> data from a file.
+ *
+ * @author Felix Korb
+ * @author Renko Ortgies
+ *
+ * @param <E>
+ * the entity type
+ */
+public class CsvFileReader<E> extends CsvReader<E> {
+
+ // Constants
+ private static final char CSV_DELIMITER = ';';
+ private static final CSVFormat CSV_FORMAT = CSVFormat.EXCEL;
+ private static final String FILE_FORMAT_UTF_8_WITHOUT_BOM = "UTF-8";
+
+ // Constructors
+ /**
+ * @param typeInformationProvider
+ * the {@link ITypeInformationProvider}
+ * @param entityType
+ * the entity type<br/>
+ * <b><i>NOTE:</i></b><br/>
+ * It is assumed that <code>entityType</code> has a public constructor with no parameter.
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>typeInformationProvider</code> is <code>null</code></li>
+ * <li><code>entityType</code> is <code>null</code></li>
+ * </ul>
+ */
+ public CsvFileReader(ITypeInformationProvider typeInformationProvider, Class<E> entityType) {
+
+ super(typeInformationProvider, entityType);
+ }
+
+ // Methods
+ /**
+ * Reads all entities from the specified <i>CSV</i> file.
+ *
+ * @param file
+ * the file to read
+ * @param withHeader
+ * defines if the csv has headers
+ * @param ignoreInvalidRecords
+ * specifies, if invalid records will be ignored
+ * @return the entities; can be <code>null</code> or empty
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases
+ * <ul>
+ * <li><code>file</code> is <code>null</code></li>
+ * </ul>
+ * @throws IOException
+ * Is thrown in the following cases
+ * <ul>
+ * <li><code>file</code> does not exist or is not reachable</li>
+ * <li><code>file</code> could not be parsed</li>
+ * </ul>
+ */
+ public final List<E> readEntities(File file, boolean withHeader, boolean ignoreInvalidRecords) throws IOException {
+
+ if(file == null)
+ throw new IllegalArgumentException("file", new NullPointerException());
+ else {
+ CSVFormat csvFormat;
+ List<E> result = null;
+
+ /* create CSV-format */
+ {
+ csvFormat = CSV_FORMAT;
+
+ /* set CSV-delimiter */
+ csvFormat = csvFormat.withDelimiter(CSV_DELIMITER);
+
+ /* set header */
+ if(withHeader)
+ csvFormat = csvFormat.withHeader();
+ }
+
+ /* read the import file */
+ try(Reader reader = new InputStreamReader(new FileInputStream(file), FILE_FORMAT_UTF_8_WITHOUT_BOM);) {
+
+ /* parse the file */
+ CSVParser records = csvFormat.parse(reader);
+
+ /* read entities */
+ result = readEntities(records, ignoreInvalidRecords);
+ }
+ catch(IllegalArgumentException exception) {
+ throw new IOException(exception);
+ }
+
+ return result;
+ }
+ }
+} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/CsvReader.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/CsvReader.java
new file mode 100644
index 00000000..243935f2
--- /dev/null
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/CsvReader.java
@@ -0,0 +1,204 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
+package org.eclipse.openk.common.dataexchange.csv;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.eclipse.openk.common.messaging.ILogger;
+import org.eclipse.openk.common.messaging.LoggerFactory;
+import org.eclipse.openk.common.string.StringUtilities;
+import org.eclipse.openk.common.system.type.ITypeInformationProvider;
+import org.eclipse.openk.common.value.parameter.ICustomParameterValidator;
+import org.eclipse.openk.common.value.parameter.ParameterUtilities;
+import org.eclipse.openk.common.value.parameter.definitions.IParameterDefinition;
+import org.eclipse.openk.common.value.parameter.exceptions.AbstractParameterException;
+import org.eclipse.openk.common.value.parameter.exceptions.InvalidParametersException;
+
+/**
+ * The reader for <i>CSV</i> data.
+ *
+ * @author Felix Korb
+ *
+ * @param <E>
+ * the entity type
+ */
+public class CsvReader<E> {
+
+ // Constants
+ private static final ILogger LOGGER = LoggerFactory.createLogger(CsvReader.class);
+
+ // Attributes
+ private Map<String, IParameterDefinition<?>> attributeDefinitions;
+ private Class<E> entityType;
+
+ // Constructors
+ /**
+ * @param typeInformationProvider
+ * the {@link ITypeInformationProvider}
+ * @param entityType
+ * the entity type<br/>
+ * <b><i>NOTE:</i></b><br/>
+ * It is assumed that <code>entityType</code> has a public constructor with no parameter.
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>typeInformationProvider</code> is <code>null</code></li>
+ * <li><code>entityType</code> is <code>null</code></li>
+ * </ul>
+ */
+ public CsvReader(ITypeInformationProvider typeInformationProvider, Class<E> entityType) throws IllegalArgumentException {
+
+ if((typeInformationProvider == null) || (entityType == null))
+ if(typeInformationProvider == null)
+ throw new IllegalArgumentException("typeInformationProvider", new NullPointerException());
+ else
+ throw new IllegalArgumentException("entityType", new NullPointerException());
+ else {
+ this.attributeDefinitions = ParameterUtilities.createParameterDefinitions(typeInformationProvider, entityType);
+ this.entityType = entityType;
+ }
+ }
+
+ // Methods
+ /**
+ * Reads all entities from the specified {@link CSVParser}.
+ *
+ * @param records
+ * the {@link CSVParser}; can be <code>null</code> if there are no records
+ * @param ignoreInvalidRecords
+ * specifies, if invalid records will be ignored
+ * @return the entities; can be <code>null</code> or empty
+ * @throws IOException
+ * {@link IOException}
+ */
+ public final List<E> readEntities(CSVParser records, boolean ignoreInvalidRecords) throws IOException {
+
+ List<E> result = null;
+
+ /* read entities */
+ if(records != null) {
+ List<E> entities = new ArrayList<>();
+ E entity;
+
+ for(CSVRecord record : records)
+ try {
+ entity = readEntity(record);
+
+ entities.add(entity);
+ }
+ catch(InvalidParametersException exception) {
+ ErrorReadingCsvException ioException = new ErrorReadingCsvException("Invalid record '" + record.getRecordNumber() + "': " + exception.getMessage(), exception);
+
+ if(ignoreInvalidRecords)
+ LOGGER.warn(ioException);
+ else
+ throw ioException;
+ }
+
+ if(!entities.isEmpty())
+ result = entities;
+ }
+
+ return result;
+ }
+
+ /**
+ * Reads the entity from the specified {@link CSVRecord}.
+ *
+ * @param record
+ * the {@link CSVRecord}; can be <code>null</code>
+ * @return the entity object; can be <code>null</code>
+ * @throws InvalidParametersException
+ * {@link InvalidParametersException}
+ */
+ @SuppressWarnings("unchecked")
+ // REMIND 2017-06-29 Felix: mit Parametern zusammenführen
+ public final E readEntity(CSVRecord record) throws InvalidParametersException {
+
+ E result;
+
+ if(record == null)
+ result = null;
+ else {
+ List<AbstractParameterException> errors = null;
+
+ /* create entity object */
+ try {
+ result = entityType.newInstance();
+ }
+ catch(InstantiationException | IllegalAccessException exception) {
+ throw new IllegalArgumentException("entityType", exception);
+ }
+
+ /* set/reset attribute values */
+ {
+ AbstractParameterException error;
+ String attributeValue;
+
+ if(attributeDefinitions != null) {
+ /* check single attributes */
+ for(IParameterDefinition<?> attributeDefinition : attributeDefinitions.values()) {
+ attributeValue = record.get(attributeDefinition.getName());
+
+ error = attributeDefinition.checkValueAsString(attributeValue);
+
+ if(error != null) {
+ if(errors == null)
+ errors = new ArrayList<>();
+
+ errors.add(error);
+ }
+ else {
+ if(!StringUtilities.hasContent(attributeValue))
+ attributeDefinition.reset(result);
+ else
+ attributeDefinition.setValueAsString(result, attributeValue);
+ }
+ }
+
+ // REMIND 2017-06-01 Felix: Refactoren => single vs. inter-parameter validation
+
+ /* check complete entity object */
+ for(IParameterDefinition<?> attributeDefinition : attributeDefinitions.values())
+ if(attributeDefinition.hasCustomValidator()) {
+ error = ((ICustomParameterValidator<E>) attributeDefinition.getCustomValidator()).checkValue(entityType, result, attributeDefinition);
+
+ if(error != null) {
+ if(errors == null)
+ errors = new ArrayList<>();
+
+ errors.add(error);
+ }
+ }
+ }
+ }
+
+ /* check unnecessary attributes */
+ {
+
+ }
+
+ /* */
+ if((errors != null) && !errors.isEmpty())
+ throw new InvalidParametersException(errors);
+ }
+
+ return result;
+ }
+} \ No newline at end of file
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/ErrorReadingCsvException.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/ErrorReadingCsvException.java
new file mode 100644
index 00000000..e2f90c71
--- /dev/null
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/ErrorReadingCsvException.java
@@ -0,0 +1,75 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
+package org.eclipse.openk.common.dataexchange.csv;
+
+import org.eclipse.openk.common.messaging.AbstractIOException;
+
+/**
+ * An exception for documenting a reading csv.
+ * Since it implements the interface <code>INotification</code> it
+ * is possible to use the exception within the <strong>BTC</strong> message- and logging-system.
+ *
+ * <p>
+ * Check the constructor for detailed information about the exception type.
+ * </p>
+ *
+ * @author Renko Ortgies
+ */
+public final class ErrorReadingCsvException extends AbstractIOException {
+
+ // Constants
+ private static final long serialVersionUID = 1L;
+
+ private static final String TEXT = "An error occured while reading a CSV-file!";
+
+ // Constructors
+ /**
+ * the default constructor
+ */
+ public ErrorReadingCsvException() {
+
+ this(TEXT, null);
+ }
+
+ /**
+ * @param cause
+ * the causing inner exception, can be <code>null</code>
+ */
+ public ErrorReadingCsvException(Throwable cause) {
+
+ this(TEXT, cause);
+ }
+
+
+ /**
+ * @param text
+ * the message text, can be <code>null</code>
+ */
+ public ErrorReadingCsvException(String text) {
+
+ this(text, null);
+ }
+
+ /**
+ * @param text
+ * the message text, can be <code>null</code>
+ * @param cause
+ * the causing inner exception, can be <code>null</code>
+ */
+ public ErrorReadingCsvException(String text, Throwable cause) {
+
+ super(text, cause);
+ }
+
+}
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/ErrorWritingCsvException.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/ErrorWritingCsvException.java
new file mode 100644
index 00000000..b3b357b2
--- /dev/null
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/csv/ErrorWritingCsvException.java
@@ -0,0 +1,75 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
+package org.eclipse.openk.common.dataexchange.csv;
+
+import org.eclipse.openk.common.messaging.AbstractIOException;
+
+/**
+ * An exception for documenting writing csv files.
+ * Since it implements the interface <code>INotification</code> it
+ * is possible to use the exception within the <strong>BTC</strong> message- and logging-system.
+ *
+ * <p>
+ * Check the constructor for detailed information about the exception type.
+ * </p>
+ *
+ * @author Michael Kotten
+ */
+public final class ErrorWritingCsvException extends AbstractIOException {
+
+ // Constants
+ private static final long serialVersionUID = 1L;
+
+ private static final String TEXT = "An error occured while writing a CSV-file!";
+
+ // Constructors
+ /**
+ * the default constructor
+ */
+ public ErrorWritingCsvException() {
+
+ this(TEXT, null);
+ }
+
+ /**
+ * @param cause
+ * the causing inner exception, can be <code>null</code>
+ */
+ public ErrorWritingCsvException(Throwable cause) {
+
+ this(TEXT, cause);
+ }
+
+
+ /**
+ * @param text
+ * the message text, can be <code>null</code>
+ */
+ public ErrorWritingCsvException(String text) {
+
+ this(text, null);
+ }
+
+ /**
+ * @param text
+ * the message text, can be <code>null</code>
+ * @param cause
+ * the causing inner exception, can be <code>null</code>
+ */
+ public ErrorWritingCsvException(String text, Throwable cause) {
+
+ super(text, cause);
+ }
+
+}
diff --git a/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/xml/rdf/AbstractRdf1_1Reader.java b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/xml/rdf/AbstractRdf1_1Reader.java
new file mode 100644
index 00000000..eadd2b13
--- /dev/null
+++ b/cim-cache/org.eclipse.openk.common/src/main/java/org/eclipse/openk/common/dataexchange/xml/rdf/AbstractRdf1_1Reader.java
@@ -0,0 +1,694 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2017 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
+package org.eclipse.openk.common.dataexchange.xml.rdf;
+
+import java.lang.reflect.Field;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.eclipse.openk.common.dataexchange.converter.IValueDecoder;
+import org.eclipse.openk.common.dataexchange.xml.AbstractXmlReader;
+import org.eclipse.openk.common.dataexchange.xml.IXmlNamespaceSolver;
+import org.eclipse.openk.common.net.UrlDefaults;
+import org.eclipse.openk.common.string.StringUtilities;
+import org.eclipse.openk.common.system.FatalException;
+import org.eclipse.openk.common.system.type.ITypeInformationProvider;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * The base of all <i>RDF 1.1</i> readers.
+ *
+ * @author Felix Korb
+ *
+ * @param <E>
+ * the <i>RDF</i> entity-type for subjects and objects
+ * @param <R>
+ * the result type
+ */
+public abstract class AbstractRdf1_1Reader<E, R> extends AbstractXmlReader {
+
+ // Attributes
+ private Field currentPredicateAttribute;
+ private E currentSubject;
+ private RdfTagType currentTagType;
+ private Class<E> entityType;
+ private IRdfExternalObjectReferenceSolver<E> externalObjectReferenceSolver;
+ private List<RdfObjectReference<E>> objectReferences;
+ private R result;
+ private Map<String, RdfSubject<E>> subjects;
+ private Map<String, RdfSubject<E>> unreferencedSubjects;
+
+ // Constructors
+ /**
+ * @param entityType
+ * the <i>RDF</i> entity-type for subjects and objects
+ * @param typeInformationProvider
+ * the {@link ITypeInformationProvider}
+ * @param xmlNamespaceSolver
+ * the {@link IXmlNamespaceSolver}
+ * @param valueDecoder
+ * the {@link IValueDecoder}
+ * @param externalObjectReferenceSolver
+ * the {@link IRdfExternalObjectReferenceSolver}; can be <code>null</code>
+ * @throws IllegalArgumentException
+ * Is thrown in the following cases:
+ * <ul>
+ * <li><code>objectType</code> is <code>null</code></li>
+ * <li><code>typeInformationProvider</code> is <code>null</code></li>
+ * <li><code>xmlNamespaceSolver</code> is <code>null</code></li>
+ * <li><code>valueDecoder</code> is <code>null</code></li>
+ * </ul>
+ */
+ protected AbstractRdf1_1Reader(Class<E> entityType, ITypeInformationProvider typeInformationProvider, IXmlNamespaceSolver xmlNamespaceSolver, IValueDecoder valueDecoder, IRdfExternalObjectReferenceSolver<E> externalObjectReferenceSolver) throws IllegalArgumentException {
+
+ super(typeInformationProvider, xmlNamespaceSolver, valueDecoder);
+
+ if(entityType == null)
+ throw new IllegalArgumentException("entityType", new NullPointerException());
+ else {
+ this.currentPredicateAttribute = null;
+ this.currentSubject = null;
+ this.currentTagType = RdfTagType.Unknown;
+ this.entityType = entityType;
+ this.externalObjectReferenceSolver = externalObjectReferenceSolver;
+ this.objectReferences = new ArrayList<>();
+ this.result = null;
+ this.subjects = new TreeMap<>();
+ this.unreferencedSubjects = null;
+ }
+ }
+
+ // Methods
+ @Override
+ public final void characters(char[] ch, int start, int length) throws SAXException {
+
+ if(currentPredicateAttribute != null) {
+ String predicateAsString;
+
+ /* determine predicate as string */
+ {
+ char[] value = new char[length];
+
+ System.arraycopy(ch, start, value, 0, length);
+
+ predicateAsString = new String(value);
+ }
+
+ /* set predicate */
+ setPredicate(currentSubject, currentPredicateAttribute, predicateAsString);