Projects >> mes >>38b88ae5c1c0262162327d22ff681fdc7db8dd18

Chunk
Conflicting content 
        DataDefinitionImpl dataDefinition = new DataDefinitionImpl("plugins", "plugin", dataAccessService);

        FieldDefinitionImpl fieldName = createFieldDefinition("name", fieldTypeFactory.stringType()).withValidator(
<<<<<<< HEAD
                fieldValidationFactory.requiredOnCreate()).withReadOnly(true);
        FieldDefinitionImpl fieldDescription = createFieldDefinition("description", fieldTypeFactory.textType()).withReadOnly(
                true);
        FieldDefinitionImpl fieldPublisher = createFieldDefinition("publisher", fieldTypeFactory.stringType()).withValidator(
                fieldValidationFactory.requiredOnCreate()).withReadOnly(true);
        FieldDefinitionImpl fieldVersion = createFieldDefinition("version", fieldTypeFactory.stringType()).withValidator(
                fieldValidationFactory.requiredOnCreate()).withReadOnly(true);
        FieldDefinitionImpl fieldActive = createFieldDefinition("active", fieldTypeFactory.booleanType()).withValidator(
                fieldValidationFactory.requiredOnCreate());
        FieldDefinitionImpl fieldBase = createFieldDefinition("base", fieldTypeFactory.booleanType()).withValidator(
                fieldValidationFactory.requiredOnCreate()).withReadOnly(true);
        FieldDefinitionImpl fieldCodeId = createFieldDefinition("codeId", fieldTypeFactory.stringType()).withReadOnly(true);
        FieldDefinitionImpl fieldPackageName = createFieldDefinition("packageName", fieldTypeFactory.stringType()).withReadOnly(
                true);
        FieldDefinitionImpl fieldFileName = createFieldDefinition("fileName", fieldTypeFactory.stringType()).withReadOnly(true);

        dataDefinition.setFullyQualifiedClassName("com.qcadoo.mes.plugins.beans.plugins.Plugin");
        dataDefinition.withField(fieldName);
        dataDefinition.withField(fieldDescription);
        dataDefinition.withField(fieldVersion);
        dataDefinition.withField(fieldPublisher);
        dataDefinition.withField(fieldActive);
        dataDefinition.withField(fieldBase);
        dataDefinition.withField(fieldCodeId);
        dataDefinition.withField(fieldPackageName);
        dataDefinition.withField(fieldFileName);
=======
                fieldValidationFactory.requiredOnCreate()).readOnly();
        FieldDefinitionImpl fieldDescription = createFieldDefinition("description", fieldTypeFactory.textType()).readOnly();
        FieldDefinitionImpl fieldVendor = createFieldDefinition("vendor", fieldTypeFactory.stringType()).withValidator(
                fieldValidationFactory.requiredOnCreate()).readOnly();
        FieldDefinitionImpl fieldVersion = createFieldDefinition("version", fieldTypeFactory.stringType()).withValidator(
                fieldValidationFactory.requiredOnCreate()).readOnly();
        FieldDefinitionImpl fieldStatus = createFieldDefinition("status",
                fieldTypeFactory.enumType("downloaded", "installed", "active")).withValidator(
                fieldValidationFactory.requiredOnCreate());
        FieldDefinitionImpl fieldBase = createFieldDefinition("base", fieldTypeFactory.booleanType()).withValidator(
                fieldValidationFactory.requiredOnCreate()).readOnly();
        FieldDefinitionImpl fieldIdentifier = createFieldDefinition("identifier", fieldTypeFactory.stringType()).readOnly();
        FieldDefinitionImpl fieldPackageName = createFieldDefinition("packageName", fieldTypeFactory.stringType()).readOnly();
        FieldDefinitionImpl fieldFileName = createFieldDefinition("fileName", fieldTypeFactory.stringType()).readOnly();

        dataDefinition.setFullyQualifiedClassName("com.qcadoo.mes.core.data.beans.Plugin");
        dataDefinition.addField(fieldName);
        dataDefinition.addField(fieldDescription);
        dataDefinition.addField(fieldVersion);
        dataDefinition.addField(fieldVendor);
        dataDefinition.addField(fieldStatus);
        dataDefinition.addField(fieldBase);
        dataDefinition.addField(fieldIdentifier);
        dataDefinition.addField(fieldPackageName);
        dataDefinition.addField(fieldFileName);
>>>>>>> 93739d29f867c3c6a3f51fdcd0f03695bda37b9d

        return dataDefinition;
    }
Solution content 
        DataDefinitionImpl dataDefinition = new DataDefinitionImpl("plugins", "plugin", dataAccessService);

        FieldDefinitionImpl fieldName = createFieldDefinition("name", fieldTypeFactory.stringType()).withValidator(
                fieldValidationFactory.requiredOnCreate()).withReadOnly(true);
        FieldDefinitionImpl fieldDescription = createFieldDefinition("description", fieldTypeFactory.textType()).withReadOnly(
                true);
        FieldDefinitionImpl fieldVendor = createFieldDefinition("vendor", fieldTypeFactory.stringType()).withValidator(
                fieldValidationFactory.requiredOnCreate()).withReadOnly(true);
        FieldDefinitionImpl fieldVersion = createFieldDefinition("version", fieldTypeFactory.stringType()).withValidator(
                fieldValidationFactory.requiredOnCreate()).withReadOnly(true);
        FieldDefinitionImpl fieldStatus = createFieldDefinition("status",
                fieldTypeFactory.enumType("downloaded", "installed", "active")).withValidator(
                fieldValidationFactory.requiredOnCreate());
        FieldDefinitionImpl fieldBase = createFieldDefinition("base", fieldTypeFactory.booleanType()).withValidator(
                fieldValidationFactory.requiredOnCreate()).withReadOnly(true);
        FieldDefinitionImpl fieldIdentifier = createFieldDefinition("identifier", fieldTypeFactory.stringType()).withReadOnly(
                true);
        FieldDefinitionImpl fieldPackageName = createFieldDefinition("packageName", fieldTypeFactory.stringType()).withReadOnly(
                true);
        FieldDefinitionImpl fieldFileName = createFieldDefinition("fileName", fieldTypeFactory.stringType()).withReadOnly(true);

        dataDefinition.setFullyQualifiedClassName("com.qcadoo.mes.core.data.beans.Plugin");
        dataDefinition.withField(fieldName);
        dataDefinition.withField(fieldDescription);
        dataDefinition.withField(fieldVersion);
        dataDefinition.withField(fieldVendor);
        dataDefinition.withField(fieldStatus);
        dataDefinition.withField(fieldBase);
        dataDefinition.withField(fieldIdentifier);
        dataDefinition.withField(fieldPackageName);
        dataDefinition.withField(fieldFileName);

        return dataDefinition;
    }
File
DataDefinitionServiceImpl.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    @Transactional(readOnly = true)
    public ViewDefinition getViewDefinition(final String viewName) {
        ViewDefinition viewDefinition = viewDefinitions.get(viewName);
<<<<<<< HEAD
        DataDefinition dataDefinition = dataDefinitionService.get("plugins", "plugin");
        Entity entity = getActivePlugin(dataDefinition, viewDefinition.getPluginIdentifier());
        if (entity != null) {
=======
        Plugin plugin = pluginManagementService.getPluginWithStatus(viewDefinition.getPluginIdentifier(), "active");
        if (plugin != null) {
>>>>>>> 93739d29f867c3c6a3f51fdcd0f03695bda37b9d
            return viewDefinition;
        }
        return new ViewDefinitionImpl("main", null, "");
Solution content 
    @Transactional(readOnly = true)
    public ViewDefinition getViewDefinition(final String viewName) {
        ViewDefinition viewDefinition = viewDefinitions.get(viewName);
        Plugin plugin = pluginManagementService.getPluginWithStatus(viewDefinition.getPluginIdentifier(), "active");
        if (plugin != null) {
            return viewDefinition;
        }
        return new ViewDefinitionImpl("main", null, "");
File
ViewDefinitionServiceImpl.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
    @Transactional(readOnly = true)
    public List getAllViews() {
        List viewsList = new ArrayList();
<<<<<<< HEAD
        DataDefinition dataDefinition = dataDefinitionService.get("plugins", "plugin");
        List activePluginList = getActivePlugins(dataDefinition);
        for (Object activePlugin : activePluginList) {
            Entity entity = entityService.convertToGenericEntity(dataDefinition, activePlugin);
=======
        List activePluginList = pluginManagementService.getPluginsWithStatus("active");
        for (Plugin activePlugin : activePluginList) {

>>>>>>> 93739d29f867c3c6a3f51fdcd0f03695bda37b9d
            for (ViewDefinition viewDefinition : viewDefinitions.values()) {
                if (activePlugin.getIdentifier().equals(viewDefinition.getPluginIdentifier())) {
                    viewsList.add(viewDefinition);
Solution content 
    @Transactional(readOnly = true)
    public List getAllViews() {
        List viewsList = new ArrayList();
        List activePluginList = pluginManagementService.getPluginsWithStatus("active");
        for (Plugin activePlugin : activePluginList) {
            for (ViewDefinition viewDefinition : viewDefinitions.values()) {
                if (activePlugin.getIdentifier().equals(viewDefinition.getPluginIdentifier())) {
                    viewsList.add(viewDefinition);
File
ViewDefinitionServiceImpl.java
Developer's decision
Version 2
Kind of conflict
For statement
Method invocation
Variable
Chunk
Conflicting content 
    }

    private void removePlugin(final String entityId) {
<<<<<<< HEAD
        DataDefinition dataDefinition = dataDefinitionService.get("plugins", "plugin");

        Criteria criteria = sessionFactory.getCurrentSession().createCriteria(dataDefinition.getClassForEntity())
                .add(Restrictions.idEq(Long.valueOf(entityId)));
        if (dataDefinition.isDeletable()) {
            entityService.addDeletedRestriction(criteria);
        }
=======
>>>>>>> 93739d29f867c3c6a3f51fdcd0f03695bda37b9d

        Plugin databasePlugin = pluginManagementService.getPlugin(entityId);
Solution content 
    }

    private void removePlugin(final String entityId) {
        Plugin databasePlugin = pluginManagementService.getPlugin(entityId);
File
PluginManagementController.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
                    }

                }
<<<<<<< HEAD
                genericEntity.setField("deleted", false);
                DataDefinition dataDefinition = dataDefinitionService.get("plugins", "plugin");
                Criteria criteria = sessionFactory.getCurrentSession().createCriteria(dataDefinition.getClassForEntity())
                        .add(Restrictions.eq("name", genericEntity.getField("name")))
                        .add(Restrictions.eq("publisher", genericEntity.getField("publisher")))
                        .add(Restrictions.ge("version", genericEntity.getField("version")));

                if (dataDefinition.isDeletable()) {
                    entityService.addDeletedRestriction(criteria);
                }
=======
>>>>>>> 93739d29f867c3c6a3f51fdcd0f03695bda37b9d

                Plugin databasePlugin = pluginManagementService.getInstalledPlugin(plugin);
                if (databasePlugin != null) {
Solution content 
                    }

                }

                Plugin databasePlugin = pluginManagementService.getInstalledPlugin(plugin);
                if (databasePlugin != null) {
File
PluginManagementController.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable