Projects >> openengsb >>0d62fbf9046fe68da88f544d272f1c9badfed78c

Chunk
Conflicting content
    }

    public ConnectorEditorPage(PageParameters parameters) {
<<<<<<< HEAD
        super(parameters, pageNameKey);
        String serviceId = parameters.get("id").toString();
        String domainType = parameters.get("domainType").toString();
        String connectorType = parameters.get("connectorType").toString();

        ConnectorDefinition connectorId = new ConnectorDefinition(domainType, connectorType, serviceId);
        retrieveDescriptor(connectorType);
        initEditor(connectorType);
        createEditor(connectorId);
=======
        super(parameters);
        domainType = parameters.get("domainType").toOptionalString();
        connectorType = parameters.get("connectorType").toOptionalString();
        initEditor();
        StringValue idValue = parameters.get("id");
        if (!idValue.isEmpty()) {
            String id = idValue.toString();
            ConnectorDescription desc = serviceManager.getAttributeValues(id);
            createEditor(id, desc);
        } else {
            createEditor();
        }

    }

    /*
     * create a new connector
     */
    public ConnectorEditorPage(String domainType, String connectorType) {
        this.domainType = domainType;
        this.connectorType = connectorType;
        initEditor();
        createEditor();
>>>>>>> 39631b6e772fdf9147424b501bd02cb3de22e276
    }

    private void initEditor() {
Solution content
    }

    public ConnectorEditorPage(PageParameters parameters) {
        super(parameters);
        domainType = parameters.get("domainType").toOptionalString();
        connectorType = parameters.get("connectorType").toOptionalString();
        initEditor();
        StringValue idValue = parameters.get("id");
        if (!idValue.isEmpty()) {
            String id = idValue.toString();
            ConnectorDescription desc = serviceManager.getAttributeValues(id);
            createEditor(id, desc);
        } else {
            createEditor();
        }

    }

    /*
     * create a new connector
     */
     
    public ConnectorEditorPage(String domainType, String connectorType) {
        this.domainType = domainType;
        this.connectorType = connectorType;
        initEditor();
        createEditor();
    }

    private void initEditor() {
File
ConnectorEditorPage.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
If statement
Method invocation
Method signature
Variable