Projects >> gwtp-idea-plugin >>00ecf678705ad6be9d0d06479f706b1c468f158f

Chunk
Conflicting content 
        this.useAddUihandlers = useAddUihandlers;
    }

<<<<<<< HEAD
    public boolean isUseAddOnbind() {
        return useAddOnbind;
    }

    public void setUseAddOnbind(final boolean useAddOnbind) {
        this.useAddOnbind = useAddOnbind;
    }

    public boolean isUseAddOnhide() {
        return useAddOnhide;
    }

    public void setUseAddOnhide(final boolean useAddOnhide) {
        this.useAddOnhide = useAddOnhide;
    }

    public boolean isUseAddOnreset() {
        return useAddOnreset;
    }

    public void setUseAddOnreset(final boolean useAddOnreset) {
        this.useAddOnreset = useAddOnreset;
    }

    public boolean isUseAddOnunbind() {
        return useAddOnunbind;
    }

    public void setUseAddOnunbind(final boolean useAddOnunbind) {
        this.useAddOnunbind = useAddOnunbind;
=======
    public PsiPackage getSelectedPackageRoot() {
        return selectedPackageRoot;
    }

    public void setSelectedPackageRoot(PsiPackage selectedPackageRoot) {
        this.selectedPackageRoot = selectedPackageRoot;
>>>>>>> 48b6df4575fbd8a13bd1052fb1568ed716648437
    }

    public void setModule(Module module) {
Solution content 
        this.useAddUihandlers = useAddUihandlers;
    }

    public boolean isUseAddOnbind() {
        return useAddOnbind;
    }

    public void setUseAddOnbind(final boolean useAddOnbind) {
        this.useAddOnbind = useAddOnbind;
    }

    public boolean isUseAddOnhide() {
        return useAddOnhide;
    }

    public void setUseAddOnhide(final boolean useAddOnhide) {
        this.useAddOnhide = useAddOnhide;
    }

    public boolean isUseAddOnreset() {
        return useAddOnreset;
    }

    public void setUseAddOnreset(final boolean useAddOnreset) {
        this.useAddOnreset = useAddOnreset;
    }

    public boolean isUseAddOnunbind() {
        return useAddOnunbind;
    }

    public void setUseAddOnunbind(final boolean useAddOnunbind) {
        this.useAddOnunbind = useAddOnunbind;
    }

    public void setModule(Module module) {
File
PresenterConfigModel.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method declaration
Method signature
Chunk
Conflicting content 
package com.arcbees.plugin.idea.wizards.createpresenter;

<<<<<<< HEAD
import java.awt.*;
=======
import java.awt.EventQueue;
>>>>>>> 48b6df4575fbd8a13bd1052fb1568ed716648437
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
Solution content 
package com.arcbees.plugin.idea.wizards.createpresenter;

import java.awt.*;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;

import org.jetbrains.annotations.NotNull;

import java.awt.EventQueue;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
File
CreatePresenterAction.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
    }

    private void createPresenterModule() {
<<<<<<< HEAD
        createdModulePsiClass =
                packageHierarchy.findInterfaceTypeInPackage(createdPresenterPackage, ABSTRACT_GIN_MODULE);

        if (createdModulePsiClass == null) {
            RenderedTemplate renderedTemplate = null;
            if (presenterConfigModel.getNestedPresenter()) {
                renderedTemplate = createdNestedPresenterTemplates.getModule();
            } else if (presenterConfigModel.getPresenterWidget()) {
                renderedTemplate = createdPresenterWidgetTemplates.getModule();
            } else if (presenterConfigModel.getPopupPresenter()) {
                renderedTemplate = createdPopupPresenterTemplates.getModule();
            }
=======
        RenderedTemplate renderedTemplate = null;
        if (presenterConfigModel.getSelectedPresenter() == PresenterType.NESTED_PRESENTER) {
            renderedTemplate = createdNestedPresenterTemplates.getModule();
        } else if (presenterConfigModel.getSelectedPresenter() == PresenterType.PRESENTER_WIDGET) {
            renderedTemplate = createdPresenterWidgetTemplates.getModule();
        } else if (presenterConfigModel.getSelectedPresenter() == PresenterType.POPUP_PRESENTER) {
            renderedTemplate = createdPopupPresenterTemplates.getModule();
        }
>>>>>>> 48b6df4575fbd8a13bd1052fb1568ed716648437

            createdModulePsiClass = createPsiClass(createdPresenterPackage, renderedTemplate);
        }
Solution content 
    }

    private void createPresenterModule() {
        createdModulePsiClass =
                packageHierarchy.findInterfaceTypeInPackage(createdPresenterPackage, ABSTRACT_GIN_MODULE);
        
        if (createdModulePsiClass == null) {
            RenderedTemplate renderedTemplate = null;
            if (presenterConfigModel.getSelectedPresenter() == PresenterType.NESTED_PRESENTER) {
                renderedTemplate = createdNestedPresenterTemplates.getModule();
            } else if (presenterConfigModel.getSelectedPresenter() == PresenterType.PRESENTER_WIDGET) {
                renderedTemplate = createdPresenterWidgetTemplates.getModule();
            } else if (presenterConfigModel.getSelectedPresenter() == PresenterType.POPUP_PRESENTER) {
                renderedTemplate = createdPopupPresenterTemplates.getModule();
            }

            createdModulePsiClass = createPsiClass(createdPresenterPackage, renderedTemplate);
        }
File
CreatePresenterAction.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Method invocation
Variable
Chunk
Conflicting content 
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

<<<<<<< HEAD
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
=======
import javax.swing.JPanel;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComponent;
import javax.swing.JRadioButton;
import javax.swing.JTabbedPane;
import javax.swing.JTextField;
>>>>>>> 48b6df4575fbd8a13bd1052fb1568ed716648437
import javax.swing.plaf.metal.MetalTabbedPaneUI;

import org.jetbrains.annotations.Nullable;
Solution content 
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.plaf.metal.MetalTabbedPaneUI;

import org.jetbrains.annotations.Nullable;
File
CreatePresenterForm.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.arcbees.plugin.idea.dialogs.ContentSlotDialog;
import com.arcbees.plugin.idea.domain.PresenterConfigModel;
<<<<<<< HEAD
import com.arcbees.plugin.idea.utils.PackageUtilExt;
=======
import com.arcbees.plugin.idea.domain.PresenterType;
import com.arcbees.plugin.idea.domain.RevealLocation;
>>>>>>> 48b6df4575fbd8a13bd1052fb1568ed716648437
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.LangDataKeys;
import com.intellij.openapi.module.Module;
Solution content 
import com.arcbees.plugin.idea.dialogs.ContentSlotDialog;
import com.arcbees.plugin.idea.domain.PresenterConfigModel;
import com.arcbees.plugin.idea.domain.PresenterType;
import com.arcbees.plugin.idea.domain.RevealLocation;
import com.arcbees.plugin.idea.utils.PackageUtilExt;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.LangDataKeys;
import com.intellij.openapi.module.Module;
File
CreatePresenterForm.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
        data.setUseOverrideDefaultPopup(useOverrideDefaultPopup.isSelected());
        data.setUseAddUihandlers(useAddUihandlers.isSelected());
        data.setUseManualReveal(useManualReveal.isSelected());
<<<<<<< HEAD
        data.setUsePrepareFromRequest(usePrepareFromRequest.isSelected());
=======
        data.setSelectedPackageRoot(getSelectedPackageRoot());
>>>>>>> 48b6df4575fbd8a13bd1052fb1568ed716648437
    }

    public boolean isModified(PresenterConfigModel data) {
Solution content 
        data.setUseOverrideDefaultPopup(useOverrideDefaultPopup.isSelected());
        data.setUseAddUihandlers(useAddUihandlers.isSelected());
        data.setUseManualReveal(useManualReveal.isSelected());
    }

    public boolean isModified(PresenterConfigModel data) {
File
CreatePresenterForm.java
Developer's decision
None
Kind of conflict
Method invocation
Chunk
Conflicting content 
        if (contentSlot.getText() != null ? !contentSlot.getText().equals(
                data.getContentSlot()) : data.getContentSlot() != null) {
            return true;
<<<<<<< HEAD
=======
        if (useCrawlable.isSelected() != data.isUseCrawlable()) return true;
        if (useCodesplit.isSelected() != data.isUseCodesplit()) return true;
        if (useSingleton.isSelected() != data.isUseSingleton()) return true;
        if (useSingleton2.isSelected() != data.isUseSingleton()) return true;
        if (useOverrideDefaultPopup.isSelected() != data.isUseOverrideDefaultPopup()) return true;
        if (useAddUihandlers.isSelected() != data.isUseAddUihandlers()) return true;
        if (useManualReveal.isSelected() != data.getUseManualReveal()) return true;
        return false;
    }

    public PsiPackage getSelectedPackageRoot() {
        PsiElement e = sourceEvent.getData(LangDataKeys.PSI_ELEMENT);

        PsiPackage selectedPackage = null;
        if (e instanceof PsiClass) {
            PsiClass clazz = (PsiClass) e;
            PsiJavaFile javaFile = (PsiJavaFile) clazz.getContainingFile();
            selectedPackage = JavaPsiFacade.getInstance(presenterConfigModel.getProject()).findPackage(javaFile.getPackageName());

        } else if (e instanceof PsiDirectory) {
            selectedPackage = JavaDirectoryService.getInstance().getPackage((PsiDirectory) e);
>>>>>>> 48b6df4575fbd8a13bd1052fb1568ed716648437
        }
        if (usePlace.isSelected() != data.isUsePlace()) {
            return true;
Solution content 
        }
        if (contentSlot.getText() != null ? !contentSlot.getText().equals(
                data.getContentSlot()) : data.getContentSlot() != null) {
            return true;
        if (usePlace.isSelected() != data.isUsePlace()) {
            return true;
File
CreatePresenterForm.java
Developer's decision
Version 1
Kind of conflict
Cast expression
If statement
Method invocation
Method signature
Return statement
Variable