Projects >> embed-for-vaadin >>e1324f33636a9746384d621cddcea8cedd241318

Chunk
Conflicting content 
     */
    public EmbedVaadinApplication(Class uiClass) {
        super();
<<<<<<< HEAD
        assertNotNull(applicationClass, "applicationClass could not be null.");
        this.applicationClass = applicationClass;
=======
        assertNotNull(uiClass, "uiClass could not be null.");
        this.uiClass = uiClass;
>>>>>>> 2d7a5c65be3db9c5dd05443cb3299d0ddce63a3a
        initializeConfig(EmbedVaadinConfig.loadProperties());
    }
Solution content 
     */
    public EmbedVaadinApplication(Class uiClass) {
        super();
        assertNotNull(uiClass, "uiClass could not be null.");
        this.uiClass = uiClass;
        initializeConfig(EmbedVaadinConfig.loadProperties());
    }
File
EmbedVaadinApplication.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        if (server.getConfig().isDevelopmentHeader()) {
            final VerticalSplitPanel mainLayout = new VerticalSplitPanel();
            mainLayout.setSizeFull();
<<<<<<< HEAD
            mainLayout.setSplitPosition(SPLIT_POSITION, Sizeable.UNITS_PIXELS);
=======
            mainLayout.setSplitPosition(SPLIT_POSITION, Sizeable.Unit.PIXELS);
>>>>>>> 2d7a5c65be3db9c5dd05443cb3299d0ddce63a3a
            mainLayout.setLocked(true);

            final DevApplicationHeader header = new DevApplicationHeader(server);
Solution content 
        if (server.getConfig().isDevelopmentHeader()) {
            final VerticalSplitPanel mainLayout = new VerticalSplitPanel();
            mainLayout.setSizeFull();
            mainLayout.setSplitPosition(SPLIT_POSITION, Sizeable.Unit.PIXELS);
            mainLayout.setLocked(true);

            final DevApplicationHeader header = new DevApplicationHeader(server);
File
ComponentWrapper.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
import com.bsb.common.vaadin.embed.AbstractEmbedVaadinTomcat;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Button;
<<<<<<< HEAD
import com.vaadin.ui.ComponentContainer;
=======
import com.vaadin.ui.Component;
>>>>>>> 2d7a5c65be3db9c5dd05443cb3299d0ddce63a3a
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Layout;
import com.vaadin.ui.UI;
Solution content 
import com.bsb.common.vaadin.embed.AbstractEmbedVaadinTomcat;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Button;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Layout;
import com.vaadin.ui.UI;
File
ComponentWrapperTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
        final ComponentWrapper wrapper = createWrapper(config);

        final HorizontalLayout layout = new HorizontalLayout();
<<<<<<< HEAD
        final Application app = wrapper.wrap(layout);
=======
        final UI app = wrapper.wrap(layout);
>>>>>>> 2d7a5c65be3db9c5dd05443cb3299d0ddce63a3a

        final Layout l = assertWrappingLayout(app);
Solution content 
        final ComponentWrapper wrapper = createWrapper(config);

        final HorizontalLayout layout = new HorizontalLayout();
        final Application app = instance.wrap(layout);

        final Layout l = assertWrappingLayout(app);
File
ComponentWrapperTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    public void wrapLayoutWithoutDevelopmentHeader() {
        final HorizontalLayout layout = new HorizontalLayout();
        // Wrap without development header should just set the layout as the main content of the window
<<<<<<< HEAD
        final Application app = instance.wrap(layout);
=======
        final UI app = instance.wrap(layout);
>>>>>>> 2d7a5c65be3db9c5dd05443cb3299d0ddce63a3a

        assertNotNull("Main content must not be null", app.getContent());
        assertEquals("Layout should be set as the main layout since no header was expected", layout,
Solution content 
    public void wrapLayoutWithoutDevelopmentHeader() {
        final HorizontalLayout layout = new HorizontalLayout();
        // Wrap without development header should just set the layout as the main content of the window
        final Application app = wrapper.wrap(layout);

        assertNotNull("Main content must not be null", app.getContent());
        assertEquals("Layout should be set as the main layout since no header was expected", layout,
File
ComponentWrapperTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        final Button component = new Button("Hello");
        final UI app = instance.wrap(component);

<<<<<<< HEAD
        final ComponentContainer content = app.getMainWindow().getContent();
=======
        final Component content = app.getUI().getContent();
>>>>>>> 2d7a5c65be3db9c5dd05443cb3299d0ddce63a3a
        assertEquals("Main content must be vertical layout", VerticalLayout.class,
                content.getClass());
        final VerticalLayout layout = (VerticalLayout) content;
Solution content 
        final Button component = new Button("Hello");
        final UI app = instance.wrap(component);

        final Layout l = assertWrappingLayout(app);
        assertEquals("Main content must be vertical layout", VerticalLayout.class,
                content.getClass());
        final VerticalLayout layout = (VerticalLayout) content;
File
ComponentWrapperTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable