Projects information

Chunk

Conflicting content
* a {@link ServiceInstanceFactory}. Creating a new service manager should be as simple as implementing the * {@link ServiceInstanceFactory} and creating a subclass of this class: * <<<<<<< HEAD ======= * This class has to be instantiated via Spring, as the BundleContext has to be set as it is BundleContextAware. * >>>>>>> e1f967a526a3ddd31cfac4887089c6bea59bd78d * * public class ExampleServiceManager extends AbstractServiceManager<ExampleDomain, TheInstanceType> { * public ExampleServiceManager(ServiceInstanceFactory<ExampleDomain, TheInstanceType> factory) {

Conflicting content

 * a {@link ServiceInstanceFactory}. Creating a new service manager should be as simple as implementing the
 * {@link ServiceInstanceFactory} and creating a subclass of this class:
 * 
<<<<<<< HEAD
=======
 * This class has to be instantiated via Spring, as the BundleContext has to be set as it is BundleContextAware.
 * 
>>>>>>> e1f967a526a3ddd31cfac4887089c6bea59bd78d
 *  * public class ExampleServiceManager extends AbstractServiceManager<ExampleDomain, TheInstanceType> {
 *     public ExampleServiceManager(ServiceInstanceFactory<ExampleDomain, TheInstanceType> factory) {

Solution content
* a {@link ServiceInstanceFactory}. Creating a new service manager should be as simple as implementing the * {@link ServiceInstanceFactory} and creating a subclass of this class: * * This class has to be instantiated via Spring, as the BundleContext has to be set as it is BundleContextAware. * * * public class ExampleServiceManager extends AbstractServiceManager<ExampleDomain, TheInstanceType> { * public ExampleServiceManager(ServiceInstanceFactory<ExampleDomain, TheInstanceType> factory) {

Solution content

 * a {@link ServiceInstanceFactory}. Creating a new service manager should be as simple as implementing the
 * {@link ServiceInstanceFactory} and creating a subclass of this class:
 * 
 * This class has to be instantiated via Spring, as the BundleContext has to be set as it is BundleContextAware.
 * 
 *  * public class ExampleServiceManager extends AbstractServiceManager<ExampleDomain, TheInstanceType> {
 *     public ExampleServiceManager(ServiceInstanceFactory<ExampleDomain, TheInstanceType> factory) {

File
AbstractServiceManager.java

Developer's decision
Version 2

Kind of conflict
Comment

Projects >> openengsb >>43469837ebe7108150c0817e6f5444d29730e3c7