Projects >> openengsb >>1b36f3dec2a0d298c7152ac8634d38189503fb51

Chunk
Conflicting content 
import org.openengsb.ui.admin.model.MethodCall;
import org.openengsb.ui.admin.model.MethodId;
import org.openengsb.ui.admin.model.ServiceId;
<<<<<<< HEAD
import org.openengsb.ui.admin.organizeGlobalsPage.OrganizeGlobalsPage;
=======
import org.openengsb.ui.admin.organizeImportsPage.OrganizeImportsPage;
>>>>>>> 70181519016c268a4bbe96e831f5062120b3ff7e
import org.openengsb.ui.common.model.LocalizableStringModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Solution content 
import org.openengsb.ui.admin.model.MethodCall;
import org.openengsb.ui.admin.model.MethodId;
import org.openengsb.ui.admin.model.ServiceId;
<<<<<<< HEAD
import org.openengsb.ui.admin.organizeGlobalsPage.OrganizeGlobalsPage;
=======
import org.openengsb.ui.admin.organizeImportsPage.OrganizeImportsPage;
>>>>>>> 70181519016c268a4bbe96e831f5062120b3ff7e
import org.openengsb.ui.common.model.LocalizableStringModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
File
TestClient.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
        serviceManagementContainer.setOutputMarkupId(true);
        add(serviceManagementContainer);
        MetaDataRoleAuthorizationStrategy.authorize(serviceManagementContainer, RENDER, "ROLE_ADMIN");
<<<<<<< HEAD
=======
        IModel> domainModel = new LoadableDetachableModel>() {
            @Override
            protected List load() {
                return services.domains();
            }
        };
        availableDomains = initAvailableDomainsMap();

        serviceManagementContainer.add(new ListView("domains", domainModel) {

            @Override
            protected void populateItem(final ListItem item) {
                item.add(new Label("domain.name", new LocalizableStringModel(this, item.getModelObject().getName())));
                item.add(new Link("proxy.create.new", item.getModel()) {

                    @Override
                    public void onClick() {
                        ServiceManager serviceManager = proxyFactory.createProxyForDomain(item.getModelObject());
                        setResponsePage(new ConnectorEditorPage(serviceManager));
                    }
                });
                item.add(new Label("domain.description", new LocalizableStringModel(this, item.getModelObject()
                        .getDescription())));
>>>>>>> 70181519016c268a4bbe96e831f5062120b3ff7e

        serviceManagementContainer.add(makeServiceList());
Solution content 
        serviceManagementContainer.setOutputMarkupId(true);
        add(serviceManagementContainer);
        MetaDataRoleAuthorizationStrategy.authorize(serviceManagementContainer, RENDER, "ROLE_ADMIN");

        serviceManagementContainer.add(makeServiceList());
File
TestClient.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
        serviceManagementContainer.add(makeServiceList());

<<<<<<< HEAD
=======
                    @Override
                    protected void populateItem(ListItem item) {
                        ServiceDescriptor desc = item.getModelObject().getDescriptor();
                        item.add(new Link("create.new", item.getModel()) {

                            @Override
                            public void onClick() {
                                setResponsePage(new ConnectorEditorPage(getModelObject()));
                            }
                        });
                        item.add(new Label("service.name", new LocalizableStringModel(this, desc.getName())));
                        item.add(new Label("service.description", new LocalizableStringModel(this, desc
                                .getDescription())));
                    }
                });
            }
        });
>>>>>>> 70181519016c268a4bbe96e831f5062120b3ff7e
        Form organize = createOrganizeForm();
        add(organize);
Solution content 
        serviceManagementContainer.add(makeServiceList());

        Form organize = createOrganizeForm();
        add(organize);
File
TestClient.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
        organize.setOutputMarkupId(true);

        @SuppressWarnings("serial")
<<<<<<< HEAD
        AjaxButton globalsButton = new AjaxButton("globalsButton", organize) {
            @Override
            protected void onSubmit(AjaxRequestTarget target, Form form) {
                setResponsePage(new OrganizeGlobalsPage());
            }
        };
        globalsButton.setOutputMarkupId(true);
        organize.add(globalsButton);
=======
        AjaxButton importsButton = new AjaxButton("importsButton", organize) {
            @Override
            protected void onSubmit(AjaxRequestTarget target, Form form) {
                setResponsePage(new OrganizeImportsPage());
            }
        };
        importsButton.setOutputMarkupId(true);
        organize.add(importsButton);
>>>>>>> 70181519016c268a4bbe96e831f5062120b3ff7e

        return organize;
    }
Solution content 
        organize.setOutputMarkupId(true);

        @SuppressWarnings("serial")
        AjaxButton globalsButton = new AjaxButton("globalsButton", organize) {
            @Override
            protected void onSubmit(AjaxRequestTarget target, Form form) {
                setResponsePage(new OrganizeGlobalsPage());
            }
        };
        globalsButton.setOutputMarkupId(true);
        organize.add(globalsButton);
        AjaxButton importsButton = new AjaxButton("importsButton", organize) {
            @Override
            protected void onSubmit(AjaxRequestTarget target, Form form) {
                setResponsePage(new OrganizeImportsPage());
            }
        };
        importsButton.setOutputMarkupId(true);
        organize.add(importsButton);

        return organize;
    }
File
TestClient.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Variable