Projects >> qcadoo >>9f3f2e8532042462d59ac73069b59c62b93bb1a0

Chunk
Conflicting content 
package com.qcadoo.view.api;

/**
<<<<<<< HEAD
 * ViewDefinitionState is instance of single view. It is generated using {@link com.qcadoo.view.internal.api.ViewDefinition} in
 * request scope.
=======
 * ViewDefinitionState is instance of single view. It is generated using {@link com.qcadoo.view.internal.api.ViewDefinition} in request
 * scope.
>>>>>>> 0f5c207ff2fed734dd993d31af1dcd8904d6d37f
 * 

 * It contains all {@link com.qcadoo.view.api.ComponentState ComponentStates} of this view and other data necessary display this
 * view to client. Changing its data will also change state displayed to system user.
Solution content 
package com.qcadoo.view.api;

/**
<<<<<<< HEAD
 * ViewDefinitionState is instance of single view. It is generated using {@link com.qcadoo.view.internal.api.ViewDefinition} in
 * request scope.
=======
 * ViewDefinitionState is instance of single view. It is generated using {@link com.qcadoo.view.internal.api.ViewDefinition} in request
 * scope.
>>>>>>> 0f5c207ff2fed734dd993d31af1dcd8904d6d37f
 * 

 * It contains all {@link com.qcadoo.view.api.ComponentState ComponentStates} of this view and other data necessary display this
 * view to client. Changing its data will also change state displayed to system user.
File
ViewDefinitionState.java
Developer's decision
Manual
Kind of conflict
Comment
Chunk
Conflicting content 
import org.w3c.dom.Node;

<<<<<<< HEAD
=======
import com.qcadoo.view.api.ComponentState;
import com.qcadoo.view.api.ViewDefinitionState;
>>>>>>> 0f5c207ff2fed734dd993d31af1dcd8904d6d37f
import com.qcadoo.view.internal.xml.ViewDefinitionParser;

/**
Solution content 
import org.w3c.dom.Node;

import com.qcadoo.view.internal.xml.ViewDefinitionParser;

/**
File
ComponentPattern.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.qcadoo.model.api.DataDefinition;
import com.qcadoo.security.api.SecurityRole;
<<<<<<< HEAD:qcadoo-view/src/main/java/com/qcadoo/view/internal/api/ViewDefinition.java
=======
import com.qcadoo.view.api.ViewDefinitionState;
>>>>>>> 0f5c207ff2fed734dd993d31af1dcd8904d6d37f:qcadoo-view/src/main/java/com/qcadoo/view/internal/api/ViewDefinition.java

/**
 * ViewDefinition defines single 'view' in system.
Solution content 
import com.qcadoo.model.api.DataDefinition;
import com.qcadoo.security.api.SecurityRole;

/**
 * ViewDefinition defines single 'view' in system.
File
ViewDefinition.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.qcadoo.localization.api.TranslationService;
import com.qcadoo.security.api.SecurityService;
<<<<<<< HEAD
import com.qcadoo.view.internal.api.ViewDefinitionService;
import com.qcadoo.view.internal.menu.MenuService;
=======
import com.qcadoo.view.api.MenuService;
import com.qcadoo.view.internal.api.ViewDefinitionService;
>>>>>>> 0f5c207ff2fed734dd993d31af1dcd8904d6d37f

@Controller
public final class MainController {
Solution content 
import com.qcadoo.localization.api.TranslationService;
import com.qcadoo.security.api.SecurityService;
import com.qcadoo.view.internal.api.ViewDefinitionService;
import com.qcadoo.view.internal.menu.MenuService;

@Controller
public final class MainController {
File
MainController.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.qcadoo.security.api.SecurityRole;
import com.qcadoo.security.api.SecurityRolesService;
import com.qcadoo.security.api.SecurityViewDefinitionRoleResolver;
<<<<<<< HEAD
import com.qcadoo.view.api.utils.TranslationUtilsService;
=======
import com.qcadoo.view.api.menu.MenuDefinition;
import com.qcadoo.view.api.menu.MenuItemsGroup;
>>>>>>> 0f5c207ff2fed734dd993d31af1dcd8904d6d37f
import com.qcadoo.view.internal.api.InternalMenuService;
import com.qcadoo.view.internal.menu.items.UrlMenuItem;
import com.qcadoo.view.internal.menu.items.ViewDefinitionMenuItemItem;
Solution content 
import com.qcadoo.security.api.SecurityRole;
import com.qcadoo.security.api.SecurityRolesService;
import com.qcadoo.security.api.SecurityViewDefinitionRoleResolver;
import com.qcadoo.view.api.utils.TranslationUtilsService;
import com.qcadoo.view.internal.api.InternalMenuService;
import com.qcadoo.view.internal.menu.items.UrlMenuItem;
import com.qcadoo.view.internal.menu.items.ViewDefinitionMenuItemItem;
File
MenuServiceImpl.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.qcadoo.view.internal.api.InternalComponentState;
import com.qcadoo.view.internal.api.InternalViewDefinition;
import com.qcadoo.view.internal.api.InternalViewDefinitionService;
<<<<<<< HEAD
import com.qcadoo.view.internal.api.InternalViewDefinitionState;
=======
>>>>>>> 0f5c207ff2fed734dd993d31af1dcd8904d6d37f
import com.qcadoo.view.internal.api.ViewDefinition;
import com.qcadoo.view.internal.states.AbstractComponentState;
import com.qcadoo.view.internal.xml.ViewDefinitionParser;
Solution content 
import com.qcadoo.view.internal.api.InternalComponentState;
import com.qcadoo.view.internal.api.InternalViewDefinition;
import com.qcadoo.view.internal.api.InternalViewDefinitionService;
import com.qcadoo.view.internal.api.InternalViewDefinitionState;
import com.qcadoo.view.internal.api.ViewDefinition;
import com.qcadoo.view.internal.states.AbstractComponentState;
import com.qcadoo.view.internal.xml.ViewDefinitionParser;
File
AbstractComponentPattern.java
Developer's decision
Version 1
Kind of conflict
Import