Projects >> nuxeo-features >>cdabfe66840dbef04d3368bfa3601ac52916a698

Chunk
Conflicting content 
                    if (eventEnabled) {
                        eventNames.add(eventName);
                        if (log.isDebugEnabled())
    }

    @Override
<<<<<<< HEAD
    public void registerContribution(Object contribution,
            String extensionPoint, ComponentInstance contributor)
            throws Exception {
        if (extensionPoint.equals(EVENT_EXT_POINT)) {
            doRegisterEvent((EventDescriptor) contribution);
        } else if (extensionPoint.equals(EXTENDED_INFO_EXT_POINT)) {
            doRegisterExtendedInfo((ExtendedInfoDescriptor) contribution);
        } else if (extensionPoint.equals(HIBERNATE_OPTIONS_EXT_POINT)) {
            doRegisterHibernateOptions((HibernateOptionsDescriptor) contribution);
        }
    }
=======
    public void registerExtension(Extension extension) {
        Object[] contributions = extension.getContributions();
        if (contributions != null) {
            if (extension.getExtensionPoint().equals(EVENT_EXT_POINT)) {
                for (Object contribution : contributions) {
                    EventDescriptor desc = (EventDescriptor) contribution;
                    String eventName = desc.getName();
                            log.debug("Registered event: " + eventName);
                    boolean eventEnabled = desc.getEnabled();
                    } else if (eventNames.contains(eventName) && !eventEnabled) {
                        eventNames.remove(eventName);
                        if (log.isDebugEnabled())
                            log.debug("Unregistered event: " + eventName);
                    }
                }
            }

            // TODO add append and enabling behaviours
            else if (extension.getExtensionPoint().equals(
                    EXTENDED_INFO_EXT_POINT)) {
                for (Object contribution : contributions) {
                    ExtendedInfoDescriptor desc = (ExtendedInfoDescriptor) contribution;
                    if (log.isDebugEnabled())
                        log.debug("Registered extended info mapping : "
                                + desc.getKey());
>>>>>>> 9143c89308ddd0384d77eb0f3ef8092557109fda

    protected void doRegisterEvent(EventDescriptor desc) {
        String eventName = desc.getName();
Solution content 
    }

    @Override
    public void registerContribution(Object contribution,
            String extensionPoint, ComponentInstance contributor)
            throws Exception {
        if (extensionPoint.equals(EVENT_EXT_POINT)) {
            doRegisterEvent((EventDescriptor) contribution);
        } else if (extensionPoint.equals(EXTENDED_INFO_EXT_POINT)) {
            doRegisterExtendedInfo((ExtendedInfoDescriptor) contribution);
        } else if (extensionPoint.equals(HIBERNATE_OPTIONS_EXT_POINT)) {
            doRegisterHibernateOptions((HibernateOptionsDescriptor) contribution);
        }
    }

    protected void doRegisterEvent(EventDescriptor desc) {
        String eventName = desc.getName();
File
NXAuditEventsService.java
Developer's decision
Version 1
Kind of conflict
Cast expression
Comment
For statement
If statement
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content 
    }

<<<<<<< HEAD
    protected LogEntry doCreateAndFillEntryFromEvent(CoreEvent event) {
=======
    protected LogEntry doCreateAndFillEntryFromEvent(CoreEvent event)
            throws AuditException {
>>>>>>> 9143c89308ddd0384d77eb0f3ef8092557109fda
        Principal principal = guardedPrincipal(event);
        DocumentModel document = (DocumentModel) event.getSource();
        LogEntry entry = new LogEntry();
Solution content 
    }

    protected LogEntry doCreateAndFillEntryFromEvent(CoreEvent event) {
        Principal principal = guardedPrincipal(event);
        DocumentModel document = (DocumentModel) event.getSource();
        LogEntry entry = new LogEntry();
File
NXAuditEventsService.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
        hibernateConfiguration = configuration;
    }

<<<<<<< HEAD
    protected HibernateConfiguration hibernateConfiguration;

=======
>>>>>>> 9143c89308ddd0384d77eb0f3ef8092557109fda
    public void setHibernateConfiguration(HibernateConfiguration configuration) {
        hibernateConfiguration = configuration;
    }
Solution content 
        hibernateConfiguration = configuration;
    }

    public void setHibernateConfiguration(HibernateConfiguration configuration) {
        hibernateConfiguration = configuration;
    }
File
PersistenceProvider.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
    }

    public void closePersistenceUnit() {
<<<<<<< HEAD
        if (emf == null)
            return;

=======
        if (emf == null) {
            return;
        }
>>>>>>> 9143c89308ddd0384d77eb0f3ef8092557109fda
        if (emf.isOpen()) {
            emf.close();
        }
Solution content 
    }

    public void closePersistenceUnit() {
        if (emf == null) {
            return;
        }
        if (emf.isOpen()) {
            emf.close();
        }
File
PersistenceProvider.java
Developer's decision
Version 2
Kind of conflict
If statement