Revision 59cf966f
Added by Lutz Suhrbier over 12 years ago
| .gitattributes | ||
|---|---|---|
| 1 | 1 |
* text=auto !eol |
| 2 | 2 |
/LICENSE.txt -text |
| 3 | 3 |
/README.txt -text |
| 4 |
eu.etaxonomy.taxeditor.application/.classpath -text |
|
| 5 |
eu.etaxonomy.taxeditor.application/.project -text |
|
| 4 | 6 |
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF -text |
| 5 | 7 |
eu.etaxonomy.taxeditor.application/build.properties -text |
| 6 | 8 |
eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif -text |
| ... | ... | |
| 31 | 33 |
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/PolytomousKey.java -text |
| 32 | 34 |
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java -text |
| 33 | 35 |
eu.etaxonomy.taxeditor.application/src/main/resources/log4j.properties -text |
| 36 |
eu.etaxonomy.taxeditor.bulkeditor/.classpath -text |
|
| 37 |
eu.etaxonomy.taxeditor.bulkeditor/.project -text |
|
| 34 | 38 |
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF -text |
| 35 | 39 |
eu.etaxonomy.taxeditor.bulkeditor/build.properties -text |
| 36 | 40 |
eu.etaxonomy.taxeditor.bulkeditor/icons/merge_candidate.gif -text |
| ... | ... | |
| 115 | 119 |
eu.etaxonomy.taxeditor.bulkeditor/src/test/java/eu/etaxonomy/taxeditor/bulkeditor/ApplicationWorkbenchAdvisor.java -text |
| 116 | 120 |
eu.etaxonomy.taxeditor.bulkeditor/src/test/java/eu/etaxonomy/taxeditor/bulkeditor/ApplicationWorkbenchWindowAdvisor.java -text |
| 117 | 121 |
eu.etaxonomy.taxeditor.bulkeditor/src/test/java/eu/etaxonomy/taxeditor/bulkeditor/Perspective.java -text |
| 122 |
eu.etaxonomy.taxeditor.cdmlib/.classpath -text |
|
| 123 |
eu.etaxonomy.taxeditor.cdmlib/.project -text |
|
| 118 | 124 |
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF -text |
| 119 | 125 |
eu.etaxonomy.taxeditor.cdmlib/README.txt -text |
| 120 | 126 |
eu.etaxonomy.taxeditor.cdmlib/build.properties -text |
| ... | ... | |
| 153 | 159 |
eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.3.jar -text |
| 154 | 160 |
eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.3src.zip -text |
| 155 | 161 |
eu.etaxonomy.taxeditor.cdmlib/lib/dom4j-1.6.1.jar -text |
| 156 |
eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0-sources.jar -text |
|
| 157 | 162 |
eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0.jar -text |
| 163 |
eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0src.zip -text |
|
| 158 | 164 |
eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-1.2.3.jar -text |
| 159 | 165 |
eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-1.2.3src.zip -text |
| 160 | 166 |
eu.etaxonomy.taxeditor.cdmlib/lib/ejb3-persistence.jar -text |
| ... | ... | |
| 198 | 204 |
eu.etaxonomy.taxeditor.cdmlib/lib/jsr250-api-1.0src.zip -text |
| 199 | 205 |
eu.etaxonomy.taxeditor.cdmlib/lib/jta.jar -text |
| 200 | 206 |
eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.2.2.jar -text |
| 201 |
eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.4.jar -text |
|
| 202 |
eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1-sources.jar -text |
|
| 203 | 207 |
eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1.jar -text |
| 208 |
eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1src.zip -text |
|
| 204 | 209 |
eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.2.14.jar -text |
| 205 | 210 |
eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.2.14src.zip -text |
| 206 | 211 |
eu.etaxonomy.taxeditor.cdmlib/lib/lsid-client-1.1.2.jar -text |
| ... | ... | |
| 222 | 227 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.apache.commons.codec-1.3.0.jar -text |
| 223 | 228 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar -text |
| 224 | 229 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar -text |
| 225 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.0.4.RELEASE-sources.jar -text |
|
| 226 | 230 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.0.4.RELEASE.jar -text |
| 227 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.asm-3.0.4.RELEASE-sources.jar -text
|
|
| 231 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.0.4.RELEASEsrc.zip -text
|
|
| 228 | 232 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.asm-3.0.4.RELEASE.jar -text |
| 229 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.0.4.RELEASE-sources.jar -text
|
|
| 233 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.asm-3.0.4.RELEASEsrc.zip -text
|
|
| 230 | 234 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.0.4.RELEASE.jar -text |
| 231 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.0.4.RELEASE-sources.jar -text
|
|
| 235 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.0.4.RELEASEsrc.zip -text
|
|
| 232 | 236 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.0.4.RELEASE.jar -text |
| 233 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.0.4.RELEASE-sources.jar -text
|
|
| 237 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.0.4.RELEASEsrc.zip -text
|
|
| 234 | 238 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.0.4.RELEASE.jar -text |
| 235 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context.support-3.0.4.RELEASE-sources.jar -text
|
|
| 239 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.0.4.RELEASEsrc.zip -text
|
|
| 236 | 240 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context.support-3.0.4.RELEASE.jar -text |
| 237 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.0.4.RELEASE-sources.jar -text
|
|
| 241 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context.support-3.0.4.RELEASEsrc.zip -text
|
|
| 238 | 242 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.0.4.RELEASE.jar -text |
| 239 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.0.4.RELEASE-sources.jar -text
|
|
| 243 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.0.4.RELEASEsrc.zip -text
|
|
| 240 | 244 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.0.4.RELEASE.jar -text |
| 241 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.0.4.RELEASE-sources.jar -text
|
|
| 245 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.0.4.RELEASEsrc.zip -text
|
|
| 242 | 246 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.0.4.RELEASE.jar -text |
| 243 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.0.4.RELEASE-sources.jar -text
|
|
| 247 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.0.4.RELEASEsrc.zip -text
|
|
| 244 | 248 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.0.4.RELEASE.jar -text |
| 245 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.0.4.RELEASE-sources.jar -text
|
|
| 249 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.0.4.RELEASEsrc.zip -text
|
|
| 246 | 250 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.0.4.RELEASE.jar -text |
| 247 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.0.4.RELEASE-sources.jar -text
|
|
| 251 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.0.4.RELEASEsrc.zip -text
|
|
| 248 | 252 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.0.4.RELEASE.jar -text |
| 249 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.0.4.RELEASE-sources.jar -text
|
|
| 253 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.0.4.RELEASEsrc.zip -text
|
|
| 250 | 254 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.0.4.RELEASE.jar -text |
| 251 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.0.4.RELEASE-sources.jar -text
|
|
| 255 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.0.4.RELEASEsrc.zip -text
|
|
| 252 | 256 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.0.4.RELEASE.jar -text |
| 257 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.0.4.RELEASEsrc.zip -text |
|
| 253 | 258 |
eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.1-FINAL.jar -text |
| 254 | 259 |
eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-8.2-504.jdbc4.jar -text |
| 255 | 260 |
eu.etaxonomy.taxeditor.cdmlib/lib/sanselan-0.97-incubator.jar -text |
| ... | ... | |
| 308 | 313 |
eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.3.1src.zip -text |
| 309 | 314 |
eu.etaxonomy.taxeditor.cdmlib/lib/yjp-controller-api-redist-8.0.1.jar -text |
| 310 | 315 |
eu.etaxonomy.taxeditor.cdmlib/pom.xml -text |
| 316 |
eu.etaxonomy.taxeditor.editor/.classpath -text |
|
| 317 |
eu.etaxonomy.taxeditor.editor/.project -text |
|
| 311 | 318 |
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF -text |
| 312 | 319 |
eu.etaxonomy.taxeditor.editor/build.properties -text |
| 313 | 320 |
eu.etaxonomy.taxeditor.editor/icons/address-book-new.png -text |
| ... | ... | |
| 490 | 497 |
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperationTest.java -text |
| 491 | 498 |
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java -text |
| 492 | 499 |
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java -text |
| 500 |
eu.etaxonomy.taxeditor.feature.platform/.classpath -text |
|
| 501 |
eu.etaxonomy.taxeditor.feature.platform/.project -text |
|
| 493 | 502 |
eu.etaxonomy.taxeditor.feature.platform/build.properties -text |
| 494 | 503 |
eu.etaxonomy.taxeditor.feature.platform/feature.xml -text |
| 495 | 504 |
eu.etaxonomy.taxeditor.feature.platform/pom.xml -text |
| 505 |
eu.etaxonomy.taxeditor.feature/.project -text |
|
| 496 | 506 |
eu.etaxonomy.taxeditor.feature/build.properties -text |
| 497 | 507 |
eu.etaxonomy.taxeditor.feature/feature.xml -text |
| 498 | 508 |
eu.etaxonomy.taxeditor.feature/pom.xml -text |
| ... | ... | |
| 597 | 607 |
eu.etaxonomy.taxeditor.help/src/eu/etaxonomy/taxeditor/help/Activator.java -text |
| 598 | 608 |
eu.etaxonomy.taxeditor.help/toc.xml -text |
| 599 | 609 |
eu.etaxonomy.taxeditor.help/tocgettingstarted.xml -text |
| 610 |
eu.etaxonomy.taxeditor.navigation/.classpath -text |
|
| 611 |
eu.etaxonomy.taxeditor.navigation/.project -text |
|
| 600 | 612 |
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF -text |
| 601 | 613 |
eu.etaxonomy.taxeditor.navigation/build.properties -text |
| 602 | 614 |
eu.etaxonomy.taxeditor.navigation/icons/edit_16x16.gif -text |
| 603 | 615 |
eu.etaxonomy.taxeditor.navigation/icons/preferences-system-windows.png -text |
| 604 | 616 |
eu.etaxonomy.taxeditor.navigation/icons/system-search.png -text |
| 605 | 617 |
eu.etaxonomy.taxeditor.navigation/icons/tree_icon.jpg -text |
| 606 |
eu.etaxonomy.taxeditor.navigation/p2.inf -text |
|
| 607 | 618 |
eu.etaxonomy.taxeditor.navigation/plugin.xml -text |
| 608 | 619 |
eu.etaxonomy.taxeditor.navigation/pom.xml -text |
| 609 | 620 |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java -text |
| ... | ... | |
| 657 | 668 |
eu.etaxonomy.taxeditor.navigation/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text |
| 658 | 669 |
eu.etaxonomy.taxeditor.navigation/src/test/resources/eu/etaxonomy/cdm/defaultApplicationContext.xml -text |
| 659 | 670 |
eu.etaxonomy.taxeditor.navigation/src/test/resources/log4j.properties -text |
| 671 |
eu.etaxonomy.taxeditor.printpublisher/.classpath -text |
|
| 672 |
eu.etaxonomy.taxeditor.printpublisher/.project -text |
|
| 660 | 673 |
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF -text |
| 661 | 674 |
eu.etaxonomy.taxeditor.printpublisher/build.properties -text |
| 662 | 675 |
eu.etaxonomy.taxeditor.printpublisher/plugin.xml -text |
| ... | ... | |
| 678 | 691 |
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java -text |
| 679 | 692 |
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectStylesheetWizardPage.java -text |
| 680 | 693 |
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java -text |
| 694 |
eu.etaxonomy.taxeditor.store/.classpath -text |
|
| 695 |
eu.etaxonomy.taxeditor.store/.project -text |
|
| 681 | 696 |
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF -text |
| 682 | 697 |
eu.etaxonomy.taxeditor.store/build.properties -text |
| 683 | 698 |
eu.etaxonomy.taxeditor.store/icons/256color_16x16.bmp -text |
| ... | ... | |
| 1316 | 1331 |
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/LoginTest.java -text |
| 1317 | 1332 |
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/NewMenuTest.java -text |
| 1318 | 1333 |
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/NewTaxonWizardTest.java -text |
| 1334 |
eu.etaxonomy.taxeditor/.classpath -text |
|
| 1335 |
eu.etaxonomy.taxeditor/.project -text |
|
| 1319 | 1336 |
eu.etaxonomy.taxeditor/deploy_nightly.sh -text |
| 1320 | 1337 |
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product -text |
| 1321 | 1338 |
eu.etaxonomy.taxeditor/plugin_customization.ini -text |
Also available in: Unified diff
Result of first merge, updated getTaxon() String