Projects >> mes >>2fd7f4b8eed5ffa79a93583c689b5d5b62dc3ffd

Chunk
Conflicting content 
    /*
     * TODO: BAKU clean this mess
     */
<<<<<<< HEAD
    private Entity addOperationComponent(final Entity technology, final Entity parent, final Entity operation,
            final int productsComponentsQuantity, final int recurencyLevel) {
=======
    private Entity addOperationComponent(final Entity technology, final Entity parent, Entity operation,
            final int productsComponentsQuantity) {
>>>>>>> 61ee33955c6f1574ae814bd2dc3932df85e8f6a9

        Preconditions.checkNotNull(technology, "Technology entity is null");
        Entity operationComponent = dataDefinitionService.get("technologies", "technologyOperationComponent").create();
Solution content 
    /*
     * TODO: BAKU clean this mess
     */

    private Entity addOperationComponent(final Entity technology, final Entity parent, Entity operation,
            final int productsComponentsQuantity) {
        Preconditions.checkNotNull(technology, "Technology entity is null");
        Entity operationComponent = dataDefinitionService.get("technologies", "technologyOperationComponent").create();
File
SamplesGeneratorModule.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
        List operations = new LinkedList();
        Entity operation = null;
        for (int i = 0; i < 4; i++) {
<<<<<<< HEAD
            if (operations.isEmpty()) {
                operation = addOperationComponent(technology, null, getRandomOperation(), RANDOM.nextInt(3) + 3,
                        RANDOM.nextInt(3));
            } else {
                operation = addOperationComponent(technology, operations.get(RANDOM.nextInt(operations.size())),
                        getRandomOperation(), RANDOM.nextInt(3) + 3, RANDOM.nextInt(3));
=======
            if (!operations.isEmpty()) {
                operation = addOperationComponent(technology, operations.get(RANDOM.nextInt(operations.size())),
                        getRandomOperation(), RANDOM.nextInt(3) + 3);
            } else {
                operation = addOperationComponent(technology, null, getRandomOperation(), RANDOM.nextInt(3) + 3);
>>>>>>> 61ee33955c6f1574ae814bd2dc3932df85e8f6a9
            }
            operations.add(operation);
        }
Solution content 
        List operations = new LinkedList();
        Entity operation = null;
        for (int i = 0; i < 4; i++) {
            if (!operations.isEmpty()) {
                operation = addOperationComponent(technology, operations.get(RANDOM.nextInt(operations.size())),
                        getRandomOperation(), RANDOM.nextInt(3) + 3);
            } else {
                operation = addOperationComponent(technology, null, getRandomOperation(), RANDOM.nextInt(3) + 3);
            }
            operations.add(operation);
        }
File
SamplesGeneratorModule.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable