Projects >> aperte-workflow-core >>a38fc0392945c4cc7102536c3c49eea3ee0c7ab7

Chunk
Conflicting content 
import com.vaadin.Application;
import com.vaadin.ui.Component;
import com.vaadin.ui.Field;
<<<<<<< HEAD
import com.vaadin.ui.Layout;
=======
import com.vaadin.ui.Table;
>>>>>>> 58ac23fa4adbc33869c570df7e52be3da2bd59cb
import pl.net.bluesoft.rnd.processtool.model.config.ProcessDefinitionConfig;

/**
Solution content 
import com.vaadin.Application;
import com.vaadin.ui.Component;
import com.vaadin.ui.Field;
import com.vaadin.ui.Layout;
import com.vaadin.ui.Table;
import pl.net.bluesoft.rnd.processtool.model.config.ProcessDefinitionConfig;

/**
File
HelpProvider.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
    Component wrapComponentWithHelp(Component component, String key);
    Component wrapComponentWithHelp(Component component, String key, String iconPlacement, String popupPlacement);

<<<<<<< HEAD
    void attachToLayout(Layout layout);
=======
    Field getFieldWithHelp(final Field wrappedField, Component helpButton);
    void makeTableHelpEnabled(Table t);
    void addHelpForColumn(Table t, Object propertyId, String key);
    boolean isFieldWithHelp(Field f);

    void makeTableHelpEnabled(Table t, Component helpPosition);
>>>>>>> 58ac23fa4adbc33869c570df7e52be3da2bd59cb
}
Solution content 
    Component wrapComponentWithHelp(Component component, String key);
    Component wrapComponentWithHelp(Component component, String key, String iconPlacement, String popupPlacement);


    void attachToLayout(Layout layout);
    Field getFieldWithHelp(final Field wrappedField, Component helpButton);
    void makeTableHelpEnabled(Table t);
    void addHelpForColumn(Table t, Object propertyId, String key);
    boolean isFieldWithHelp(Field f);

    void makeTableHelpEnabled(Table t, Component helpPosition);
}
File
HelpProvider.java
Developer's decision
Concatenation
Kind of conflict
Method interface
Chunk
Conflicting content 
import com.vaadin.terminal.Sizeable;
import com.vaadin.ui.*;
import com.vaadin.ui.Field;
<<<<<<< HEAD
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
=======
>>>>>>> 58ac23fa4adbc33869c570df7e52be3da2bd59cb
import org.aperteworkflow.ui.help.HelpProvider;
import org.vaadin.addon.customfield.FieldWrapper;
import org.vaadin.jonatan.contexthelp.ContextHelp;
Solution content 
import com.vaadin.terminal.Sizeable;
import com.vaadin.ui.*;
import com.vaadin.ui.Field;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
import org.aperteworkflow.ui.help.HelpProvider;
import org.vaadin.addon.customfield.FieldWrapper;
import org.vaadin.jonatan.contexthelp.ContextHelp;
File
HelpProviderImpl.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
                   Placement.valueOf(popupPlacement));
   	}

<<<<<<< HEAD
    @Override
    public void attachToLayout(Layout layout) {
        layout.addComponent(helpFactory.getContextHelp());
=======
    private class FieldWrapperImpl {

    }

    @Override
    public Field getFieldWithHelp(final Field wrappedField, Component helpButton) {
        return new FieldWithHelp(wrappedField, helpButton);
    }

    @Override
    public void makeTableHelpEnabled(Table t) {
        makeTableHelpEnabled(t, t);
    }

    @Override
    public void makeTableHelpEnabled(final Table t, final Component helpPosition) {
        t.setSortDisabled(true);
        t.setData(new HashMap());

        helpFactory.getContextHelp().addHelpForComponent(helpPosition, "help.empty", Placement.ABOVE);
        t.addListener(new Table.HeaderClickListener() {

            @Override
            public void headerClick(Table.HeaderClickEvent event) {
                Map helpMap = (Map) t.getData();
                Object propertyId = event.getPropertyId();
                if (helpMap.containsKey(propertyId)) {
                    helpFactory.showHelp(helpPosition, helpMap.get(propertyId), Placement.ABOVE);
                }
            }
        });
    }

    @Override
    public void addHelpForColumn(Table t, Object propertyId, String key) {
        Map helpMap = (Map) t.getData();
        t.setColumnIcon(propertyId, helpFactory.helpIcon(8));
        helpFactory.logHelpKey(key);
        helpMap.put(propertyId, key);
    }

    @Override
    public boolean isFieldWithHelp(Field f) {
        return f instanceof FieldWithHelp;
>>>>>>> 58ac23fa4adbc33869c570df7e52be3da2bd59cb
    }
}
Solution content 
                   Placement.valueOf(popupPlacement));
   	}

    @Override
    public void attachToLayout(Layout layout) {
        layout.addComponent(helpFactory.getContextHelp());

    }

    private class FieldWrapperImpl {


    @Override
    public Field getFieldWithHelp(final Field wrappedField, Component helpButton) {
        return new FieldWithHelp(wrappedField, helpButton);
    }

    @Override
    public void makeTableHelpEnabled(Table t) {
        makeTableHelpEnabled(t, t);
    }

    @Override
    public void makeTableHelpEnabled(final Table t, final Component helpPosition) {
        t.setSortDisabled(true);
        t.setData(new HashMap());

        helpFactory.getContextHelp().addHelpForComponent(helpPosition, "help.empty", Placement.ABOVE);
        t.addListener(new Table.HeaderClickListener() {

            @Override
            public void headerClick(Table.HeaderClickEvent event) {
                Map helpMap = (Map) t.getData();
                Object propertyId = event.getPropertyId();
                if (helpMap.containsKey(propertyId)) {
                    helpFactory.showHelp(helpPosition, helpMap.get(propertyId), Placement.ABOVE);
                }
            }
        });
    }

    @Override
    public void addHelpForColumn(Table t, Object propertyId, String key) {
        Map helpMap = (Map) t.getData();
        t.setColumnIcon(propertyId, helpFactory.helpIcon(8));
        helpFactory.logHelpKey(key);
        helpMap.put(propertyId, key);
    }

    @Override
    public boolean isFieldWithHelp(Field f) {
        return f instanceof FieldWithHelp;

    }
}
File
HelpProviderImpl.java
Developer's decision
Combination
Kind of conflict
Annotation
Class declaration
Method declaration
Method invocation
Method signature
Return statement
Variable