fix #7831 excluding the current name from the WeaklyRelatedEntityCombobox for genus...

[cdm-vaadin.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 72c625a2cbd5d32b217b076ed0376105d637ca07..20171987ff74515330b74f22fe220f10b3e75762 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,13 @@
 * text=auto !eol
+pom.xml merge=ours
 ide/eclipse/cdm-vaadin.launch -text
 /pom.xml -text
 src/main/java/eu/etaxonomy/cdm/vaadin/AppWidgetSet.gwt.xml -text
 src/main/java/eu/etaxonomy/cdm/vaadin/CdmAppInitializer.java.bkp -text
+src/main/java/eu/etaxonomy/cdm/vaadin/component/ConceptRelationshipComposite.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/component/ConfigWindow.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/component/DetailWindow.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/component/EditConceptRelationshipComposite.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/component/HorizontalToolbar.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/component/NewTaxonBaseComposite.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/component/StatusComposite.java -text
@@ -10,6 +15,8 @@ src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainer.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSpringConnectionPool.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/container/IdAndUuid.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/container/LeafNodeTaxonContainer.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3ConceptRelationshipTree.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3ConceptRelationshipTreeState.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/model/BeanItemContainerExample.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/model/CdmTaxonTableCollection.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/model/DbTableDTO.java -text
@@ -19,10 +26,13 @@ src/main/java/eu/etaxonomy/cdm/vaadin/model/LazyLoadedContainer.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/model/StatusDTO.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/model/taxonDTO.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/AuthenticationPresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/EditConceptRelationshipPresenter.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/NewTaxonBasePresenter.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenter.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/DistributionSelectionPresenter.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/DistributionTablePresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/distributionStatus/DistributionSelectionPresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/distributionStatus/DistributionTablePresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/distributionStatus/settings/SettingsPresenter.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/servlet/CdmVaadinConversationalServlet.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/session/CdmChangeEvent.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/session/CdmDataChangeService.java -text
@@ -34,7 +44,8 @@ src/main/java/eu/etaxonomy/cdm/vaadin/statement/CdmStatementDelegate.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/ui/AbstractAuthenticatedUI.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/ui/CdmBaseUI.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/ui/CheckUI.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/ui/DbStatusUI.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUI.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/ui/DistributionStatusUI.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/ui/StatusEditorUI.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmQueryFactory.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmSQLStringDecorator.java -text
@@ -43,14 +54,16 @@ src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmVaadinSessionUtilities.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmVaadinUtilities.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/util/SQLUtils.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/view/AuthenticationView.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/ConceptRelationshipView.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/view/IAuthenticationComponent.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/IConceptRelationshipComponentListener.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/view/INewTaxonBaseComponentListener.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/view/INewTaxonBaseComposite.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/view/IStatusComposite.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/view/dbstatus/DistributionSelectionView.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/view/dbstatus/DistributionTableView.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/view/dbstatus/IDistributionSelectionComponent.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/view/dbstatus/IDistributionTableComponent.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionSelectionView.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableView.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/IDistributionSelectionComponent.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/IDistributionTableComponent.java -text
 src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/css/d3.conceptrelationshiptree.css -text
 src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/extlib/d3.min.js -text
 src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/lib/d3.conceptrelationshiptree_connector.js -text
@@ -61,6 +74,7 @@ src/main/webapp/META-INF/context.xml -text
 src/main/webapp/META-INF/services/javax.servlet.ServletContainerInitializer -text
 src/main/webapp/VAADIN/themes/edit/addons.scss -text
 src/main/webapp/VAADIN/themes/edit/edit.scss -text
+src/main/webapp/VAADIN/themes/edit/favicon.ico -text
 src/main/webapp/VAADIN/themes/edit/styles.css -text
 src/main/webapp/VAADIN/themes/edit/styles.scss -text
 src/main/webapp/VAADIN/themes/macosx/addons.scss -text
@@ -104,6 +118,7 @@ src/main/webapp/VAADIN/themes/macosx/icons/32/note.png -text
 src/main/webapp/VAADIN/themes/macosx/icons/32/ok.png -text
 src/main/webapp/VAADIN/themes/macosx/icons/32/reload.png -text
 src/main/webapp/VAADIN/themes/macosx/icons/32/settings.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/settings_1.png -text
 src/main/webapp/VAADIN/themes/macosx/icons/32/top-left.png -text
 src/main/webapp/VAADIN/themes/macosx/icons/32/top-right.png -text
 src/main/webapp/VAADIN/themes/macosx/icons/32/trash-full.png -text
@@ -134,8 +149,14 @@ src/test/java/eu/etaxonomy/cdm/remote/config/LoggingConfigurer.java -text
 src/test/java/eu/etaxonomy/cdm/unitils/CdmTestDataSourceFactory.java -text
 src/test/java/eu/etaxonomy/cdm/vaadin/CdmVaadinBaseTest.java -text
 src/test/java/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainerTest.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3CTree.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3CTreeState.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenterTest.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/presenter/EditConceptRelationshipPresenterTest.java -text
 src/test/java/eu/etaxonomy/cdm/vaadin/presenter/NewTaxonBasePresenterTest.java -text
 src/test/java/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenterTest.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/ui/CheckTestUI.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/ui/D3CTreeUI.java -text
 src/test/java/eu/etaxonomy/cdm/vaadin/ui/NavigatorTestUI.java -text
 src/test/java/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelperTest.java -text
 src/test/java/eu/etaxonomy/cdm/vaadin/view/NaviTestView.java -text
@@ -146,6 +167,10 @@ src/test/resources/eu/etaxonomy/cdm/remote/ehcache.xml -text
 src/test/resources/eu/etaxonomy/cdm/vaadin/PUBLIC.xsd -text
 src/test/resources/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainerTest.xml -text
 src/test/resources/eu/etaxonomy/cdm/vaadin/dataset.xsd -text
+src/test/resources/eu/etaxonomy/cdm/vaadin/jscomponent/css/d3.ctree.css -text
+src/test/resources/eu/etaxonomy/cdm/vaadin/jscomponent/extlib/d3.min.js -text
+src/test/resources/eu/etaxonomy/cdm/vaadin/jscomponent/lib/d3ctree_connector.js -text
+src/test/resources/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenterTest.xml -text
 src/test/resources/eu/etaxonomy/cdm/vaadin/presenter/NewTaxonBasePresenterTest.xml -text
 src/test/resources/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenterTest.xml -text
 src/test/resources/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelperTest.xml -text