diff --git a/.travis.yml b/.travis.yml index 3744476b..f55947a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,15 +17,15 @@ env: global: - INTEGRATION_TEST_ARGS="-Ptravis-integration-test -Dspring.data.mongodb.port=28001 -Dgedbrowser.home=/home/travis/gedbrowser -Dgeoservice.keyfile=stub -Dgeoservice.backupfile=/home/travis/gedbrowser/geoservice-test-backup.json" # REPOTOKEN - - secure: "nqpQ1c4b74dd15/eSZBb02QE3HS4Hq/3cPdzUAtKNWErHALkWjRXa6VvrjO9F30G+2TGm/cdK6tX2lp1PPYeUnR8eEwxbTSw1czw/Dzc/RvggbIek/fTn3O6ihUXESY+rbRhRMyGlQ7vPmQKo0f0dMjv33SsKfHxL3jtlbFUnJSFFxhGgDCe54akTMZyCGBiYYnQZKOWWhKAFTS1kT8Um+/l2fZo1LTmLSfr8aJF1irDLfvAbtV3DKsJwgnt7um/PqYOBXK+6XaZ7P6Zo7nd5qS+ZNm2WzgTnHETNSvDRAzAyUydJHorf52MsmNiLSb3qQdWluk+9vewWVs61qPMH9pZPTlS8wgCcyJ3jceTlG9HM1dREALhXXHFoCmKUX9DgWHxREuSy/88gTVKg5qiRTVo/UXE5BrsXb08AawXi8IM4yuQHJxfTcuIv05+CsbzHqyysUQkwSVXA7wYjEMJ3WhY2p0ss0Oxohu5JHQZ1YYByO0xg4Hrm0eTLWsnq9ZTnfoT4MpATX8h73grSWe4mSmIVmqcs2egEwLolmTBD5lFRaQum7N3+SZ66dVwT1H3fgqhne1wuMPWwAWVVdZY3l0fxZoR7qD6WbO7BUwo0F4fSIo9RFgcQUKtx+jWJ9Bgql5th9prc3wuJuSdUHOe6hmcDyfsSi8BMoB2jZP4Hcs=" + - secure: "cSqCmrTZ20xqVkiG7sC3XR3JQxWAayaoQQe8zfc5nhf5oy3zOWxNU7KrpWVCfMVHIQcC50qqHyfXH1Z4qIs6T4+GgVpiUxLv6zLYSAk+TtX/5eJ1ER7ZHDrtrFTHB9NAEW95RfAp0Ee/7OjuwP8GLTPQ0F05TWrbY8RPZ8ecZcmgzNKFTjMuHPnQhVGkYdgU8UlYr3Y/+1/yox+e4wNzoA84HTh4Cmld3g7Yx5jOx5vg/uVNgYqbvQ3oCYB0nAQNc6vF8IX5XwIS7EKdzJXrzuvMWcDs5IQki2MmAoVHXuvYB6UB6GuZ2MvO6PFQUwaXY02hZ1W+2XeGB+jGhE3cam34riFAQVW1OnhiTArKMQK8SOLKPSHHsI3vjIHQLAhRKC2kRWShIq/i0pnUevgkN0etub/Jc1uUCvusLqYIR/NFvuauz7ywFqaXejvstVnYOXrx/hZQ10dE6Aha5W2uKCRfJlGsb7Iln5OAGsIfoZk/8tn2m8MebsBsUdutAjudFOKJz6e+0Sv0RpJgZCTtM/Fo7Bx+YldDQ7M/ofCqDnrocIhXFnma8d1qdZM/qmj+6kpnoNEGBTK8+Z+bXXKMOZcbPBkVVWcKiVPM0cES8ZDetkI3RoITPPlUiQIziX9FXCiWqiAqTRsDzpVUaDdPND/ZQgyU/ySpdoy4tOilNXI=" # GPG_PASSPHRASE - secure: "bxrzTYVeLpxKcO37OTVBKlNgny2rE1A4B2/Yw5I/OnO0iS1hl3kIcIPw07LUXG83HGMpkK/xncIoG6UQgKZWHHLYKKSC9H0QIg9sb+catrlSGp6JHdga/Xa2prbcdw1CxvPphGm0FUSa8ZhsFJvSBgealGLkEZvnhUbHVhdx+TmL2DLAPdX1dUGoZvhOGYmjwcsRpKwbV4ByOo27A7uwdVSTSBJb0rU9Wef4yX5/RGODTxp0GRSIlHmzaRcnLACAsYVO5Wikb7o/Yg3l3mV56a2qwt7SKCTbeAWhi1hOb+GsJOCNvnCIZP2IBh+L3h9nYjheavzmhhZ+yKUAfr5Lh1by0wgEHHXZVvzfpRePBLDuw5v8zXcR1B8EeMVWv5bia+nOpkfbiGW6l3h1QO+6QSI6KT9MVy1GCALPMYQ47HMEOReNMNyz6MPiqMU7sZXP9HVS9LYZNCIPA5qIfKXQ55VyzGqqJWRw4B92kZp+No+O22A9m/hh8H2aRzNYRiJqDQf8l2bidq6vGqFSZp2/P8rXaCaCuKdo+tIfbxvTdZb7fznnY8UewVYT9dXgbUHUx9kGPTOarMjmrcH9wxaBFqR3DRSQPceZlQ7ZR9itJq4c5CxVRH2GZIOCNb7SmmQBAe4970EzvFVL1Xv/PT8Q7MEhUER+Oi5AAj2CmTQ13PU=" # GPG_KEY_NAME - secure: "KVpOHU7Oy44evUDdcWwWvNWWf2EvWQBeC5xcEiObCPz09U8tKRz8pX8bqwM1B8kFrXBNfrALFVkpgkqbb0pVuWbrKjqXKby+r05JR2pe0wPp/228nrNaRyD2OoruvF1+AJyWquS2CiDt68MkfNF6eJNcptYDMZnv8Nr2vb+hZkUn10Fqek9NvWnAsWTjPANZdpQjPrHHScRvLVadkCMubYr6WA+CSptBwYw+Tc9/Qgm0FZPsnDH82zD79JIKRQlorTedwZ1HxRwKFuwL1R1FgQXGIEFXgkT9N4E+93pF6QoeKacRrJWEt8Pq52dWpBqvT/mECkSPQ4swtVpoFU2NboBrtDcTyndH9yDfk0Xl6ASBSuV1KLUF4fF2My4Pv+HhB4j9TayrHkOkxSVdBJFNuo/UTProj4RxfGd4Zjca1ia9rHTYViAfX6syM2yrG0/Sx1tdHoDaZtmm54eJBxYqmCZnzw2ve69heIgdgBuy5U5qJPeJw+KMZx57yPEUpz1tgOk8KufAFB1k3S/AkBrnBPEhxY5+ls0GR2hVZwNwUi5CHcfKv5VkMQs2yyYmqM/rDu7ls0FmeOkFVOFnojM2dEyvOnegMkpJRlEAhIjRg7GtiTRQSZArohxFqWGxJUS6JscxaUlP6VklHcI5IwlFCI47G2ZsvUHxpj40J+0taGA=" # DOCKERUSER - - secure: "oWjizEIkmJeJl2JSe7KcbB4+Fhz5UPs7agqOuh2nU+3RE60YE7HkCGKhmWYfz4jhl2bvC1KKeK1YfhZCeHtU5dBhYtipQRmrfc46vuqSR0DjTR6TuE4YhhHGjBrlkdSX/wx9zjidp51ZIC/p0ne3YL0Ehgo6Mm4WRzkrz69Ka8vg1G44gf5Tkw9ZDvYrLt7tDSxOWRzXc6sOnf5JxH+2VBPrYF544DVXdylHMewVDGvOXAb+8Xvmb6JHqkjinTtJK7bzV9gMau/SRPea03ticy6rksh4aC9LTU2GsRkAbVd6xtD135kbaMexj4Z66RaxMvZy4rP9EpgRbfSD9Rc/gO2N2JBxFK2q2aZNxQOOx4fUM4RMm1YSpovL7ENuYRzVmaBZxMF6BOxIzZFmUo8pv6IJkO9NpV6PczbVwl8WX7TcK87l4g0NbbzV0mM95LS4rYF8Xii4MN2EVFaURzjae8vE+IknWyaeK+P+V+0iC0PcNN4+jPffN8UC1oQ4zu8KGN5oZAQtuCtmRFiXaIEvHrfxXXc5COc6yBNCtBPZP/LsXBcbdX172bu0jpSAcPOfCiKJ/CT7+1KtVE0EKnuMpDYegPOSAAIRROd9Brn7bKWhsFDtftr8hNY7nVEBDKiIPZxbCEzXgLRzv0x9UymqVXYPBBHHTVaSrzcDk5TQ00A=" + - secure: "PjikRww8S7H8xY1i6GSDfmpdcSE9fc0ZVkEcbuX8r2/PgJWqY2VyvAQjWpOTZrx/SmyY7WSb+yLZ8t44VdHIVSONjEmyNvtymxw+uscVEBYB2waH8pv0Fi24wNN6x6kCFfrh1IFqVOWlF+7rVIPansJCsL0iToWZFGbmZqBbe3aWQVeSz51bCKu9CisEo5kEtuIAi/lYUbVDnKgKVm4i0zDVLDxtFyuYR4juwg6a7/y3ckBwtdCxCcq2gdl91qcP4dajSkGHlEw2BZZVVvO0UPU7crewylq4YiINf9owDEi0ojwCfQrUWs5IHqm3sz34GWMgkzuc57dKyHfpK+lxaWGuJ0sQMKf6edv845VFkLCMyKw3lpoLwN4qUtXubVODL9t0pytxupwfT211V4s/YUbSNG8WeuNoOu0GdzqJFmruilq8X6bIHLRjiYniqdnqAc9XRfCOBOPef1MPAm9mrIAZP/wAwqeSrmn0ml2x9uogSvP4/m3guHmCuMHW3kZDc6nRzbTFxK24BUGf1WSLH0FKuDSSBV1xRqubY78UxbmGDsR0VEaZ2Mo+NgceCZGivQemprsG2ugthlfwDk5/DESdA7NvfyaDcEV1zUEtfuIkjnkw9btaE1SeDbhaG4jjbntY2UfsoLcpo6TJAXCyB1eHDI0SKDmEnwz87Vzrq08=" # DOCKERPASS - - secure: "C0bDP7SoCRKAg45ZdUQOJjGshwsZZVHOgCO/IH/6lkGbFfIVeUPhaaEivyMvzB58lwNzvyYVu7db/FblddNj1PDETq/XIhK3N+8k5egSsBeL1WTrxDVJQTucVMBEsudz9+QYu6Ieelowyxma5aN9m1dKMwzv0IiGDw6TZgnZA0wOALk+UQeXBgCATaDkEm2uPzaKnG/g2V6tqSghB1SbrvmvFOn5xEqyvxHZxJ5cdpnto2QiIfhFH4vBscQwUAltTupi1A+pTQF2IrKEVL5YGXB6E0IexOWzpuhk7pN2SbkepM0ZPzaKIDGplkt3eoj7GafHWgbOgSJeBr7SD2JKkSW8UgM3Afd7hilF+qdvbC8btMIhS2E7tiuHL1vQg0BZbwYkjWtet/y5hU3asFId5aluZXToCLBKm8WO8BZcAeVq+OwgXsLzFbldVQdhWTNiOOiWsqKLmqfdF680Ma0eU3bY5YXLhK7+pv2gZH54FwnrV5k8TN/qDK81qz/k8sJj0fXMxgPLMa0i9f3QL9WuWBBE30il5XMwugE7CZH8w+p6wOiEtqSX6B6+uSvZw+LMMnMfC9Bqwwsvg3oW6dug0Vd1AuKbY7VQOf1idDJ/xsjvCcjr4Hv5wBQYDGbEmqhMgUKFaqYCxvUlMzabEh0srxXw2DeY5OLznADhqbEeEe8=" + - secure: "Dwo5GJjdDeTAIhje4zIgb81s5TLvZnr/nsrkBxlJE7PnAKQnpe/UFUaqE60st4yZUuQwn84EvULRUlj2t6e2OgRj91QwaryNCWQmyCHh/3CqfhZPqAZ2M7ZMsS31TyB5HgiFBqTlOjbPUScjKEldptffVaU9DwUpvoyutoczNfmIw++gUCzAhudZd7QQNezW++dCRiWxcAW75n8br4bm2Uz3cMPI5dxnda74a5kwCvQBjoev/wxzVY1JDdNxOiNS3Qn2WmClMQ3PyLaIofIDfVhrQvRtlEPeevyH61uPLh/NwDuF0btNTAGNEtWFsKpC41WqfY/+gQNhTs8q4V1HFXuEExKQU0CjsepWbxlj7Sn7upearQRZuaxSXphasxsn525ebqPYyllslBopvruyDrkEucDJt303cTzE2gbTZRW+badlEWnBrwvWGeTtqgQSiYse3e0E95VxpPcU6BLnhiXmGBbE41sic9JQSV6lPskg6Oxr91pNKBTlU5UwZ05NzRSYu8MY0w96Wwfyk8mLn9BCkeJrVBFqJc0TCNNM1JTXPmmhr5fb6eePdza/BmOWK8eFjfoKHquyG4Qap6U1GiDCFcU/K1UfAWBzArajlWCZQfmF4xBSpWpsr8FXUYjX87EiF7eu2aK8IGQSMKVB2BlplDhYDWfnNXixMV7Suu0=" # OSSRH_USER - secure: "I7kpYvDzSW8c/aitLg+xrTSTihCEmravYKiBHQd5uEfLUq4iF59jAntYyQZWiO2Hr4GjeVekq6XpMBloddcyfg9RIXWh36BZ6v+1HOTNaA1GqjDLFjGdNBX8zgp1M0tCKor3xM00rMn9XvUcJIYRX3DkPLCefzsoBum4XZEhcVWxppClz1fHgJ/m4Wuc9IX47XWjXOiWha5ACM0osTXgNGEcDDtXDxZV3L+WPeNurATURiKXaCSlYOVIvpVHYAMLga4IT65ia3croRA37+EksRunt5rlhm5F0q9h/GtgCDdUVCl6sRFlq2xjzq5Ff3EpE+p0NWOH/vcvxc6Nre/+qDtoqHbw2Vc9lmnGYw+LUuboGY3hnmbDsqpi1C3aklNPlLgjldQKQ75bi6iWwyFcQ1Gp0+WoQ84qH1xV+HtEcPi8W5HBnD+vyi3RveL44FJ9ttXFwzymmWbgGGNaTwePl+hhwcXp3jYpnAfvlp9pgsKmMnw12g+8WBd5c3NbKCX85NFbKpa3aTp5x5RbfYsmar+qqf1FreiXM0B5noksca1FG0iQCRlTQIwLcQRjQc9AX4MkSPCvu9rrP9vToIBFITjgIaVjZEknf3eNkNjGD96fS1im+56+So5wJmpASPJnVbIJM6Fui+VMZAF4jhUgOi7In7zwDgALKr0oFSbxs44=" # OSSRH_PASS @@ -54,7 +54,7 @@ before_script: - docker ps --all script: - - mvn install jacoco:report coveralls:report --settings=config/settings.xml -Ptravis-build -DrepoToken=${REPOTOKEN} -B -Dspring.data.mongodb.port=28001 -Dgedbrowser.home=/home/travis/gedbrowser -Dgeoservice.keyfile=stub -Dgeoservice.backupfile=/home/travis/gedbrowser/geoservice-test-backup.json -DpushImage -DpushImageTag + - mvn install jacoco:report coveralls:report --settings=config/settings.xml -Ptravis-build -DrepoToken=${REPOTOKEN} -B -Dspring.data.mongodb.port=28001 -Dgedbrowser.home=/home/travis/gedbrowser -Dgeoservice.keyfile=stub -Dgeoservice.backupfile=/home/travis/gedbrowser/geoservice-test-backup.json -DpushImage -DpushImageTag 2>&1 | grep -v DEBUG # browser choices - android, chrome, firefox, MicrosoftEdge, iexplore, safari, # operablink, konqueror, "internet explorer", iPhone, iPad, diff --git a/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/AgeEstimator.java b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/AgeEstimator.java index 60e8d8b7..0fab0b91 100644 --- a/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/AgeEstimator.java +++ b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/AgeEstimator.java @@ -7,6 +7,7 @@ import org.joda.time.PeriodType; import org.joda.time.format.PeriodFormatter; import org.joda.time.format.PeriodFormatterBuilder; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.util.DateParser; import org.schoellerfamily.gedbrowser.datamodel.visitor.GetDateVisitor; diff --git a/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/LivingEstimator.java b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/LivingEstimator.java index 5e21e4b5..4ecac2d6 100644 --- a/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/LivingEstimator.java +++ b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/LivingEstimator.java @@ -10,6 +10,7 @@ import org.joda.time.LocalDate; import org.joda.time.Period; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.GedObject; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.visitor.PersonVisitor; diff --git a/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/CalendarProvider.java b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/CalendarProvider.java similarity index 85% rename from gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/CalendarProvider.java rename to gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/CalendarProvider.java index d64bf76c..61c366b0 100644 --- a/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/CalendarProvider.java +++ b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/CalendarProvider.java @@ -1,4 +1,4 @@ -package org.schoellerfamily.gedbrowser.analytics; +package org.schoellerfamily.gedbrowser.analytics.calendar; import java.util.Calendar; diff --git a/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/CalendarProviderFacade.java b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/CalendarProviderFacade.java new file mode 100644 index 00000000..0b366fa6 --- /dev/null +++ b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/CalendarProviderFacade.java @@ -0,0 +1,40 @@ +package org.schoellerfamily.gedbrowser.analytics.calendar; + +import java.util.Calendar; + +import org.joda.time.LocalDate; + +/** + * Provides means for a class to be a facade for CalendarProvider. A class can + * be a facade for CalendarProvider by doing the following: + * + * + * @author Dick Schoeller + */ +@SuppressWarnings("PMD.CommentSize") +public interface CalendarProviderFacade extends CalendarProvider { + /** + * @return the calendar provider implementation + */ + CalendarProvider getCalendarProvider(); + + /** + * {@inheritDoc} + */ + @Override + default Calendar now() { + return getCalendarProvider().now(); + } + + /** + * {@inheritDoc} + */ + @Override + default LocalDate nowDate() { + return getCalendarProvider().nowDate(); + } +} diff --git a/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/CalendarProviderImpl.java b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/CalendarProviderImpl.java similarity index 87% rename from gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/CalendarProviderImpl.java rename to gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/CalendarProviderImpl.java index e6769e3f..88f468c3 100644 --- a/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/CalendarProviderImpl.java +++ b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/CalendarProviderImpl.java @@ -1,4 +1,4 @@ -package org.schoellerfamily.gedbrowser.analytics; +package org.schoellerfamily.gedbrowser.analytics.calendar; import java.util.Calendar; diff --git a/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/CalendarProviderStub.java b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/CalendarProviderStub.java similarity index 92% rename from gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/CalendarProviderStub.java rename to gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/CalendarProviderStub.java index 1af30d7e..e215b9f2 100644 --- a/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/CalendarProviderStub.java +++ b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/CalendarProviderStub.java @@ -1,4 +1,4 @@ -package org.schoellerfamily.gedbrowser.analytics; +package org.schoellerfamily.gedbrowser.analytics.calendar; import java.util.Calendar; import java.util.Locale; diff --git a/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/package-info.java b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/package-info.java new file mode 100644 index 00000000..5bcce01c --- /dev/null +++ b/gedbrowser-analytics/src/main/java/org/schoellerfamily/gedbrowser/analytics/calendar/package-info.java @@ -0,0 +1,5 @@ +/** + * Copyright 2017 Richard Schoeller + * Calendar handling for gedbrowser. + */ +package org.schoellerfamily.gedbrowser.analytics.calendar; diff --git a/gedbrowser-analytics/src/test/java/org/schoellerfamily/gedbrowser/analytics/test/AgeEstimatorTest.java b/gedbrowser-analytics/src/test/java/org/schoellerfamily/gedbrowser/analytics/test/AgeEstimatorTest.java index 6e2f2488..2c9daabf 100644 --- a/gedbrowser-analytics/src/test/java/org/schoellerfamily/gedbrowser/analytics/test/AgeEstimatorTest.java +++ b/gedbrowser-analytics/src/test/java/org/schoellerfamily/gedbrowser/analytics/test/AgeEstimatorTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.schoellerfamily.gedbrowser.analytics.AgeEstimator; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; import org.schoellerfamily.gedbrowser.analytics.order.test.AnalyzerTest; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.util.FamilyBuilder; diff --git a/gedbrowser-analytics/src/test/java/org/schoellerfamily/gedbrowser/analytics/test/LivingEstimatorTest.java b/gedbrowser-analytics/src/test/java/org/schoellerfamily/gedbrowser/analytics/test/LivingEstimatorTest.java index 4e1b4c36..6c4a6749 100644 --- a/gedbrowser-analytics/src/test/java/org/schoellerfamily/gedbrowser/analytics/test/LivingEstimatorTest.java +++ b/gedbrowser-analytics/src/test/java/org/schoellerfamily/gedbrowser/analytics/test/LivingEstimatorTest.java @@ -11,8 +11,8 @@ import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.analytics.LivingEstimator; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.reader.AbstractGedLine; diff --git a/gedbrowser-analytics/src/test/java/org/schoellerfamily/gedbrowser/analytics/test/TestConfiguration.java b/gedbrowser-analytics/src/test/java/org/schoellerfamily/gedbrowser/analytics/test/TestConfiguration.java index 58202cea..f26ad971 100644 --- a/gedbrowser-analytics/src/test/java/org/schoellerfamily/gedbrowser/analytics/test/TestConfiguration.java +++ b/gedbrowser-analytics/src/test/java/org/schoellerfamily/gedbrowser/analytics/test/TestConfiguration.java @@ -1,7 +1,7 @@ package org.schoellerfamily.gedbrowser.analytics.test; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; -import org.schoellerfamily.gedbrowser.analytics.CalendarProviderStub; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProviderStub; import org.schoellerfamily.gedbrowser.analytics.order.test.OrderAnalyzerTestWrapper; import org.schoellerfamily.gedbrowser.datamodel.util.GedObjectBuilder; import org.schoellerfamily.gedbrowser.reader.GedObjectCreator; diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/AbstractLinkRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/AbstractLinkRenderer.java index dfa904c3..9145864e 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/AbstractLinkRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/AbstractLinkRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.AbstractLink; /** @@ -14,12 +13,10 @@ public abstract class AbstractLinkRenderer extends * @param gedObject the gedObject to render * @param rendererFactory the factory to get additional renderers * @param renderingContext the context that we are rendering in - * @param provider calendar provider */ public AbstractLinkRenderer(final T gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ApplicationInfoRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ApplicationInfoRenderer.java index 60b6b6af..28a57348 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ApplicationInfoRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ApplicationInfoRenderer.java @@ -1,5 +1,7 @@ package org.schoellerfamily.gedbrowser.renderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; + /** * @author Dick Schoeller */ @@ -20,8 +22,8 @@ public ApplicationInfoRenderer(final ApplicationInfo applicationInfo) { * {@inheritDoc} */ @Override - public final String getName() { - return applicationInfo.getName(); + public final String getApplicationName() { + return applicationInfo.getApplicationName(); } /** diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/AttributeRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/AttributeRenderer.java index 80c4f9f8..dbcc3443 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/AttributeRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/AttributeRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Attribute; /** @@ -14,13 +13,11 @@ public final class AttributeRenderer extends GedRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider calendar provider */ public AttributeRenderer(final Attribute gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); setListItemRenderer(new AttributeListItemRenderer(this)); setPhraseRenderer(new AttributePhraseRenderer(this)); } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ChildRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ChildRenderer.java index 12983f2c..0644306b 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ChildRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ChildRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Child; /** @@ -14,12 +13,10 @@ public final class ChildRenderer extends AbstractLinkRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider calendar provider */ public ChildRenderer(final Child gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/DateRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/DateRenderer.java index b82df220..b63654a3 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/DateRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/DateRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Date; /** @@ -14,13 +13,11 @@ public final class DateRenderer extends GedRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider calendar provider */ public DateRenderer(final Date gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); setListItemRenderer(new DateListItemRenderer(this)); setPhraseRenderer(new DatePhraseRenderer(this)); } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/DefaultRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/DefaultRenderer.java index d7eec1c5..7b6376b8 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/DefaultRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/DefaultRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.GedObject; /** @@ -13,12 +12,10 @@ public final class DefaultRenderer extends GedRenderer { * @param gedObject the gedObject from the parent renderer * @param rendererFactory the renderFactory from the parent renderer * @param renderingContext the context that we are rendering in - * @param provider calendar provider */ public DefaultRenderer(final GedObject gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ErrorRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ErrorRenderer.java index 96923edd..64d632c3 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ErrorRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ErrorRenderer.java @@ -1,5 +1,7 @@ package org.schoellerfamily.gedbrowser.renderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; + /** * @author Dick Schoeller */ diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/FamCRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/FamCRenderer.java index 3c60d714..af9a2f35 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/FamCRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/FamCRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.FamC; /** @@ -14,12 +13,10 @@ public final class FamCRenderer extends AbstractLinkRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider calendar provider */ public FamCRenderer(final FamC gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/FamSRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/FamSRenderer.java index 3fa378c5..f65dff10 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/FamSRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/FamSRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.FamS; /** @@ -14,12 +13,10 @@ public final class FamSRenderer extends AbstractLinkRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider calendar provider */ public FamSRenderer(final FamS gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/FamilyRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/FamilyRenderer.java index c7c1c7d0..c8ddc56e 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/FamilyRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/FamilyRenderer.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Family; import org.schoellerfamily.gedbrowser.datamodel.GedObject; import org.schoellerfamily.gedbrowser.datamodel.Person; @@ -23,13 +22,11 @@ public final class FamilyRenderer extends GedRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider calendar provider */ public FamilyRenderer(final Family gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } /** diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/GedRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/GedRenderer.java index 38349235..fd6295d4 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/GedRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/GedRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.GedObject; /** @@ -18,24 +17,18 @@ public abstract class GedRenderer /** */ private final transient GedRendererFactory rendererFactory; - /** */ - private final CalendarProvider provider; - /** * @param gedObject the GedObject that we are going to render * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider provides information about today */ public GedRenderer(final G gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { + final RenderingContext renderingContext) { super(renderingContext); this.gedObject = gedObject; this.rendererFactory = rendererFactory; - this.provider = provider; } /** @@ -109,9 +102,7 @@ protected static final StringBuilder renderPad(final StringBuilder builder, */ protected final GedRenderer createGedRenderer( final GedObject attribute) { - return getRendererFactory().create(attribute, - getRenderingContext(), - provider); + return getRendererFactory().create(attribute, getRenderingContext()); } /** @@ -159,13 +150,6 @@ private String getDbName(final G gedObj) { return gedObj.getDbName(); } - /** - * @return the calendar provider to inform us about "today" - */ - public final CalendarProvider getCalendarProvider() { - return provider; - } - /** * {@inheritDoc} */ diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/GedRendererFactory.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/GedRendererFactory.java index 4e99e43b..52e8d950 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/GedRendererFactory.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/GedRendererFactory.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Attribute; import org.schoellerfamily.gedbrowser.datamodel.Child; import org.schoellerfamily.gedbrowser.datamodel.Date; @@ -25,6 +25,7 @@ import org.schoellerfamily.gedbrowser.datamodel.SubmittorLink; import org.schoellerfamily.gedbrowser.datamodel.Trailer; import org.schoellerfamily.gedbrowser.datamodel.Wife; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; /** * Factory to create the appropriate type of renderer based on the type of the @@ -39,65 +40,65 @@ public final class GedRendererFactory { */ private static Map, RendererBuilder> builders = new HashMap<>(); static { - builders.put(Husband.class, (g, f, r, p) -> { - return new HusbandRenderer((Husband) g, f, r, p); + builders.put(Husband.class, (g, f, r) -> { + return new HusbandRenderer((Husband) g, f, r); }); - builders.put(Wife.class, (g, f, r, p) -> { - return new WifeRenderer((Wife) g, f, r, p); + builders.put(Wife.class, (g, f, r) -> { + return new WifeRenderer((Wife) g, f, r); }); - builders.put(Person.class, (g, f, r, p) -> { - return new PersonRenderer((Person) g, f, r, p); + builders.put(Person.class, (g, f, r) -> { + return new PersonRenderer((Person) g, f, r); }); - builders.put(Place.class, (g, f, r, p) -> { - return new PlaceRenderer((Place) g, f, r, p); + builders.put(Place.class, (g, f, r) -> { + return new PlaceRenderer((Place) g, f, r); }); - builders.put(Name.class, (g, f, r, p) -> { - return new NameRenderer((Name) g, f, r, p); + builders.put(Name.class, (g, f, r) -> { + return new NameRenderer((Name) g, f, r); }); - builders.put(Attribute.class, (g, f, r, p) -> { - return new AttributeRenderer((Attribute) g, f, r, p); + builders.put(Attribute.class, (g, f, r) -> { + return new AttributeRenderer((Attribute) g, f, r); }); - builders.put(Multimedia.class, (g, f, r, p) -> { - return new MultimediaRenderer((Multimedia) g, f, r, p); + builders.put(Multimedia.class, (g, f, r) -> { + return new MultimediaRenderer((Multimedia) g, f, r); }); - builders.put(Child.class, (g, f, r, p) -> { - return new ChildRenderer((Child) g, f, r, p); + builders.put(Child.class, (g, f, r) -> { + return new ChildRenderer((Child) g, f, r); }); - builders.put(Date.class, (g, f, r, p) -> { - return new DateRenderer((Date) g, f, r, p); + builders.put(Date.class, (g, f, r) -> { + return new DateRenderer((Date) g, f, r); }); - builders.put(FamC.class, (g, f, r, p) -> { - return new FamCRenderer((FamC) g, f, r, p); + builders.put(FamC.class, (g, f, r) -> { + return new FamCRenderer((FamC) g, f, r); }); - builders.put(Family.class, (g, f, r, p) -> { - return new FamilyRenderer((Family) g, f, r, p); + builders.put(Family.class, (g, f, r) -> { + return new FamilyRenderer((Family) g, f, r); }); - builders.put(FamS.class, (g, f, r, p) -> { - return new FamSRenderer((FamS) g, f, r, p); + builders.put(FamS.class, (g, f, r) -> { + return new FamSRenderer((FamS) g, f, r); }); - builders.put(Head.class, (g, f, r, p) -> { - return new HeadRenderer((Head) g, f, r, p); + builders.put(Head.class, (g, f, r) -> { + return new HeadRenderer((Head) g, f, r); }); - builders.put(Root.class, (g, f, r, p) -> { - return new RootRenderer((Root) g, f, r, p); + builders.put(Root.class, (g, f, r) -> { + return new RootRenderer((Root) g, f, r); }); - builders.put(Source.class, (g, f, r, p) -> { - return new SourceRenderer((Source) g, f, r, p); + builders.put(Source.class, (g, f, r) -> { + return new SourceRenderer((Source) g, f, r); }); - builders.put(SourceLink.class, (g, f, r, p) -> { - return new SourceLinkRenderer((SourceLink) g, f, r, p); + builders.put(SourceLink.class, (g, f, r) -> { + return new SourceLinkRenderer((SourceLink) g, f, r); }); - builders.put(Submittor.class, (g, f, r, p) -> { - return new SubmittorRenderer((Submittor) g, f, r, p); + builders.put(Submittor.class, (g, f, r) -> { + return new SubmittorRenderer((Submittor) g, f, r); }); - builders.put(SubmittorLink.class, (g, f, r, p) -> { - return new SubmittorLinkRenderer((SubmittorLink) g, f, r, p); + builders.put(SubmittorLink.class, (g, f, r) -> { + return new SubmittorLinkRenderer((SubmittorLink) g, f, r); }); - builders.put(Trailer.class, (g, f, r, p) -> { - return new TrailerRenderer((Trailer) g, f, r, p); + builders.put(Trailer.class, (g, f, r) -> { + return new TrailerRenderer((Trailer) g, f, r); }); - builders.put(Link.class, (g, f, r, p) -> { - return new LinkRenderer((Link) g, f, r, p); + builders.put(Link.class, (g, f, r) -> { + return new LinkRenderer((Link) g, f, r); }); } @@ -111,14 +112,12 @@ private interface RendererBuilder { * @param gedObject a gedobject to render * @param factory the factory that we're working with * @param renderingContext the current rendering context - * @param provider provides information about "today" * @return the appropriate renderer */ GedRenderer build( GedObject gedObject, GedRendererFactory factory, - RenderingContext renderingContext, - CalendarProvider provider); + RenderingContext renderingContext); } /** @@ -131,7 +130,7 @@ GedRenderer build( */ public GedRenderer create(final GedObject gedObject, final CalendarProvider provider, final ApplicationInfo appInfo) { - return create(gedObject, RenderingContext.anonymous(appInfo), provider); + return create(gedObject, RenderingContext.anonymous(appInfo, provider)); } /** @@ -139,21 +138,18 @@ public GedRenderer create(final GedObject gedObject, * * @param gedObject the GedObject to be rendered * @param renderingContext the user context we are rendering in - * @param provider provides information about "today" * @return the renderer */ public GedRenderer create( final GedObject gedObject, - final RenderingContext renderingContext, - final CalendarProvider provider) { + final RenderingContext renderingContext) { if (gedObject != null) { final RendererBuilder builder = builders.get(gedObject.getClass()); if (builder != null) { - return builder.build(gedObject, this, renderingContext, - provider); + return builder.build(gedObject, this, renderingContext); } } return new DefaultRenderer( - gedObject, this, renderingContext, provider); + gedObject, this, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/HeadRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/HeadRenderer.java index 90893381..44a8cf25 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/HeadRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/HeadRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Head; /** @@ -14,12 +13,10 @@ public final class HeadRenderer extends GedRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider calendar provider */ public HeadRenderer(final Head gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/HusbandRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/HusbandRenderer.java index 59b76c37..69841e80 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/HusbandRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/HusbandRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Husband; /** @@ -14,12 +13,10 @@ public final class HusbandRenderer extends AbstractLinkRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider calendar provider */ public HusbandRenderer(final Husband gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/IndexRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/IndexRenderer.java index 10d4d171..40e229f5 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/IndexRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/IndexRenderer.java @@ -6,7 +6,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.analytics.LivingEstimator; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Root; @@ -21,8 +20,6 @@ public final class IndexRenderer extends GedRenderer { /** */ private final String base; - /** Provides the "today" for use in comparisons. */ - private final CalendarProvider provider; /** * Constructor. @@ -30,14 +27,11 @@ public final class IndexRenderer extends GedRenderer { * @param root root of data set * @param base base string for page * @param renderingContext the context that we are rendering in - * @param provider the calendar provider we are using to determine now */ public IndexRenderer(final Root root, final String base, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(root, new GedRendererFactory(), renderingContext, provider); + final RenderingContext renderingContext) { + super(root, new GedRendererFactory(), renderingContext); this.base = base; - this.provider = provider; } /** @@ -83,7 +77,8 @@ private boolean isHidden(final Person person) { if (getRenderingContext().isUser()) { return false; } - final LivingEstimator le = new LivingEstimator(person, provider); + final LivingEstimator le = new LivingEstimator(person, + getRenderingContext()); return le.estimate(); } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/LinkRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/LinkRenderer.java index d4f4b358..cf33e4f3 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/LinkRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/LinkRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Link; /** @@ -14,12 +13,10 @@ public final class LinkRenderer extends AbstractLinkRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider the calendar provider */ public LinkRenderer(final Link gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/LivingRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/LivingRenderer.java index f976eea6..16a49cc9 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/LivingRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/LivingRenderer.java @@ -9,7 +9,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.analytics.LivingEstimator; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Root; @@ -25,21 +24,16 @@ public final class LivingRenderer extends GedRenderer { private static final int AGE_BUCKET_SIZE = 10; /** If a person is older than this, guess that they are dead. */ private static final int ANCIENT = 100; - /** Provides the "today" for use in comparisons. */ - private final CalendarProvider provider; /** * Constructor. * * @param root root of data set * @param renderingContext the context that we are rendering in - * @param provider the calendar provider we are using to determine now */ public LivingRenderer(final Root root, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(root, new GedRendererFactory(), renderingContext, provider); - this.provider = provider; + final RenderingContext renderingContext) { + super(root, new GedRendererFactory(), renderingContext); } /** @@ -53,7 +47,8 @@ public List getBuckets() { final List living = new ArrayList<>(); final Map> buckets = new HashMap<>(); final List dead = new ArrayList<>(); - LivingEstimator.fillBuckets(root, living, dead, buckets, provider); + LivingEstimator.fillBuckets(root, living, dead, buckets, + getRenderingContext()); // FIXME this involves too much knowledge of bucket structure for (int lower = 0; lower < ANCIENT; lower += AGE_BUCKET_SIZE) { final Bucket bucket = createBucket(buckets, lower); diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/MultimediaRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/MultimediaRenderer.java index 3cbd61de..1eee1e98 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/MultimediaRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/MultimediaRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Multimedia; /** @@ -12,13 +11,11 @@ public final class MultimediaRenderer extends GedRenderer { * @param rendererFactory the factory that creates the renderers for the * multimedia objects * @param renderingContext the context that we are rendering in - * @param provider calendar provider */ public MultimediaRenderer(final Multimedia gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); setListItemRenderer(new MultimediaListItemRenderer(this)); setPhraseRenderer(new MultimediaPhraseRenderer(this)); } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/NameRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/NameRenderer.java index c3fff27a..6dce98bf 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/NameRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/NameRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Name; /** @@ -14,13 +13,11 @@ public final class NameRenderer extends GedRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider the calendar provider */ public NameRenderer(final Name gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); setNameHtmlRenderer(new NameNameHtmlRenderer(this)); setListItemRenderer(new NameListItemRenderer(this)); setPhraseRenderer(new NamePhraseRenderer(this)); diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/NullRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/NullRenderer.java index d2794c17..39e5affa 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/NullRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/NullRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.GedObject; /** @@ -14,12 +13,10 @@ public final class NullRenderer extends GedRenderer { * @param rendererFactory * The factory that creates the renderers for the attributes. * @param renderingContext the context that we are rendering in - * @param provider calendar provider */ public NullRenderer(final GedObject gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/PersonRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/PersonRenderer.java index 875f4bc4..b3c40813 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/PersonRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/PersonRenderer.java @@ -4,7 +4,6 @@ import java.util.Collections; import java.util.List; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.analytics.LivingEstimator; import org.schoellerfamily.gedbrowser.datamodel.Family; import org.schoellerfamily.gedbrowser.datamodel.GedObject; @@ -41,17 +40,15 @@ public final class PersonRenderer extends GedRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the user context we are rendering in - * @param provider the calendar provider we are using to determine now */ public PersonRenderer(final Person gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); setNameHtmlRenderer(new PersonNameHtmlRenderer(this)); setNameIndexRenderer(new PersonNameIndexRenderer(this)); setAttributeListOpenRenderer(new PersonAttributeListOpenRenderer()); - le = new LivingEstimator(gedObject, provider); + le = new LivingEstimator(gedObject, renderingContext); navigator = new PersonNavigator(gedObject); parentsRenderer = new ParentsRenderer(this); } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/PlaceListRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/PlaceListRenderer.java index 13d8a40c..77f3ca31 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/PlaceListRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/PlaceListRenderer.java @@ -12,11 +12,10 @@ import org.geojson.LngLatAlt; import org.geojson.Point; import org.geojson.Polygon; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.analytics.LivingEstimator; import org.schoellerfamily.gedbrowser.datamodel.Person; -import org.schoellerfamily.gedbrowser.datamodel.visitor.PlaceVisitor; import org.schoellerfamily.gedbrowser.datamodel.visitor.PersonVisitor; +import org.schoellerfamily.gedbrowser.datamodel.visitor.PlaceVisitor; import org.schoellerfamily.geoservice.client.GeoServiceClient; import org.schoellerfamily.geoservice.model.GeoServiceGeocodingResult; import org.schoellerfamily.geoservice.model.GeoServiceItem; @@ -42,16 +41,14 @@ public final class PlaceListRenderer { * @param person the person * @param client the geoservice client * @param renderingContext the current rendering context - * @param provider the calendar provider we are using to determine now */ public PlaceListRenderer(final Person person, final GeoServiceClient client, - final RenderingContext renderingContext, - final CalendarProvider provider) { + final RenderingContext renderingContext) { this.person = person; this.client = client; this.renderingContext = renderingContext; - this.le = new LivingEstimator(person, provider); + this.le = new LivingEstimator(person, renderingContext); } /** diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/PlaceRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/PlaceRenderer.java index b99d559b..dee459c7 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/PlaceRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/PlaceRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Place; /** @@ -14,13 +13,11 @@ public final class PlaceRenderer extends GedRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider the calendar provider */ public PlaceRenderer(final Place gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); setListItemRenderer(new PlaceListItemRenderer(this)); setPhraseRenderer(new PlacePhraseRenderer(this)); } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/Renderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/Renderer.java index 763e03ff..f174ae0d 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/Renderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/Renderer.java @@ -10,7 +10,7 @@ public interface Renderer { /** * @return the application name. */ - String getName(); + String getApplicationName(); /** * @return the application URL. diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/RenderingContext.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/RenderingContext.java index fdf875c1..6a49cc86 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/RenderingContext.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/RenderingContext.java @@ -1,11 +1,21 @@ package org.schoellerfamily.gedbrowser.renderer; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProviderFacade; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProviderStub; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfoFacade; +import org.schoellerfamily.gedbrowser.renderer.user.User; +import org.schoellerfamily.gedbrowser.renderer.user.UserFacade; +import org.schoellerfamily.gedbrowser.renderer.user.UserImpl; + /** * Keep track of the user context that we are rendering under. * * @author Dick Schoeller */ -public final class RenderingContext { +public final class RenderingContext + implements ApplicationInfoFacade, CalendarProviderFacade, UserFacade { /** Whether this is an identified user. */ private final boolean isUser; @@ -18,18 +28,34 @@ public final class RenderingContext { /** */ private final ApplicationInfo appInfo; + /** */ + private final CalendarProvider calendarProvider; + /** * Special case anonymous context. - * @param appInfo the application info to use in the context * + * @param appInfo the application info to use in the context * @return the created context */ public static RenderingContext anonymous(final ApplicationInfo appInfo) { - final User user2 = new User(); + return anonymous(appInfo, new CalendarProviderStub()); + } + + /** + * Special case anonymous context. + * + * @param appInfo the application info to use in the context + * @param provider the calendar provider to use in this context + * @return the created context + */ + public static RenderingContext anonymous(final ApplicationInfo appInfo, + final CalendarProvider provider) { + final UserImpl user2 = new UserImpl(); user2.setUsername("Anonymous"); user2.setFirstname("Al"); user2.setLastname("Anonymous"); - return new RenderingContext(user2, false, false, appInfo); + return new RenderingContext(user2, false, false, appInfo, + provider); } /** @@ -39,11 +65,12 @@ public static RenderingContext anonymous(final ApplicationInfo appInfo) { * @return the created context */ public static RenderingContext user(final ApplicationInfo appInfo) { - final User user2 = new User(); + final UserImpl user2 = new UserImpl(); user2.setUsername("User"); user2.setFirstname("Ursula"); user2.setLastname("User"); - return new RenderingContext(user2, true, false, appInfo); + return new RenderingContext(user2, true, false, appInfo, + new CalendarProviderStub()); } /** @@ -52,20 +79,16 @@ public static RenderingContext user(final ApplicationInfo appInfo) { * @param isUser whether it is an identified user * @param isAdmin whether this user is an administrator * @param appInfo provides common strings about the application + * @param calendarProvider the calendar provider to use */ public RenderingContext(final User user, final boolean isUser, - final boolean isAdmin, final ApplicationInfo appInfo) { + final boolean isAdmin, final ApplicationInfo appInfo, + final CalendarProvider calendarProvider) { this.isUser = isUser; this.isAdmin = isAdmin; this.user = user; this.appInfo = appInfo; - } - - /** - * @return the user's name - */ - public String getName() { - return user.getUsername(); + this.calendarProvider = calendarProvider; } /** @@ -83,64 +106,26 @@ public boolean isAdmin() { } /** - * @return user's first name - */ - public String getFirstname() { - return user.getFirstname(); - } - - /** - * Check if the user has a particular role. - * - * @param role role that we are looking for - * @return true if the user has the role - */ - public boolean hasRole(final String role) { - if (user == null) { - return false; - } - return user.hasRole(role); - } - - /** - * @return the URL for the home link on the menu bar - */ - public String getHomeURL() { - return appInfo.getHomeURL(); - } - - /** - * @return the maintainer's name - */ - public String getMaintainerName() { - return appInfo.getMaintainerName(); - } - - /** - * @return the email for the product owner/maintainer - */ - public String getMaintainerEmail() { - return appInfo.getMaintainerEmail(); - } - - /** - * @return the version string + * {@inheritDoc} */ - public String getVersion() { - return appInfo.getVersion(); + @Override + public User getUser() { + return user; } /** - * @return the application URL. + * {@inheritDoc} */ - public String getApplicationURL() { - return appInfo.getApplicationURL(); + @Override + public CalendarProvider getCalendarProvider() { + return calendarProvider; } /** - * @return the application name. + * {@inheritDoc} */ - public String getApplicationName() { - return appInfo.getName(); + @Override + public ApplicationInfo getApplicationInfo() { + return appInfo; } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/RenderingContextRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/RenderingContextRenderer.java index 9e35a10d..e9bb9106 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/RenderingContextRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/RenderingContextRenderer.java @@ -25,7 +25,7 @@ public RenderingContextRenderer(final RenderingContext renderingContext) { /** * @return the user context we are rendering in */ - protected final RenderingContext getRenderingContext() { + public final RenderingContext getRenderingContext() { return renderingContext; } @@ -33,7 +33,7 @@ protected final RenderingContext getRenderingContext() { * {@inheritDoc} */ @Override - public final String getName() { + public final String getApplicationName() { return renderingContext.getApplicationName(); } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/RootRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/RootRenderer.java index 4166e0bb..94201ad6 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/RootRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/RootRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Root; /** @@ -14,12 +13,10 @@ public final class RootRenderer extends GedRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider the calendar provider */ public RootRenderer(final Root gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SourceLinkRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SourceLinkRenderer.java index 1d447e1b..7976b0e4 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SourceLinkRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SourceLinkRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.SourceLink; /** @@ -14,13 +13,11 @@ public final class SourceLinkRenderer extends AbstractLinkRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider the calendar provider */ public SourceLinkRenderer(final SourceLink gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); setListItemRenderer(new SourceLinkListItemRenderer(this)); setPhraseRenderer(new SourceLinkPhraseRenderer(this)); } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SourceRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SourceRenderer.java index 07dcfb4c..e4c2977b 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SourceRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SourceRenderer.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.GedObject; import org.schoellerfamily.gedbrowser.datamodel.Source; import org.schoellerfamily.gedbrowser.datamodel.visitor.SourceVisitor; @@ -19,13 +18,11 @@ public final class SourceRenderer extends GedRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider calendar provider */ public SourceRenderer(final Source gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } /** diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SubmittorLinkRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SubmittorLinkRenderer.java index 4de80717..0a1072b2 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SubmittorLinkRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SubmittorLinkRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Submittor; import org.schoellerfamily.gedbrowser.datamodel.SubmittorLink; @@ -16,13 +15,11 @@ public final class SubmittorLinkRenderer extends * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider the calendar provider */ public SubmittorLinkRenderer(final SubmittorLink gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); setListItemRenderer(new SubmittorLinkListItemRenderer(this)); setPhraseRenderer(new SubmittorLinkPhraseRenderer(this)); } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SubmittorRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SubmittorRenderer.java index 34e29a1a..8b81e6f2 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SubmittorRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/SubmittorRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Submittor; /** @@ -14,12 +13,10 @@ public final class SubmittorRenderer extends GedRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider the calendar provider */ public SubmittorRenderer(final Submittor gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/TrailerRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/TrailerRenderer.java index b0f2db13..84458502 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/TrailerRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/TrailerRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Trailer; /** @@ -14,12 +13,10 @@ public final class TrailerRenderer extends GedRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider the calendar provider */ public TrailerRenderer(final Trailer gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/WifeRenderer.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/WifeRenderer.java index d717e83b..2808ca1e 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/WifeRenderer.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/WifeRenderer.java @@ -1,6 +1,5 @@ package org.schoellerfamily.gedbrowser.renderer; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Wife; /** @@ -14,12 +13,10 @@ public final class WifeRenderer extends AbstractLinkRenderer { * @param rendererFactory the factory that creates the renderers for the * attributes * @param renderingContext the context that we are rendering in - * @param provider the calendar provider */ public WifeRenderer(final Wife gedObject, final GedRendererFactory rendererFactory, - final RenderingContext renderingContext, - final CalendarProvider provider) { - super(gedObject, rendererFactory, renderingContext, provider); + final RenderingContext renderingContext) { + super(gedObject, rendererFactory, renderingContext); } } diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ApplicationInfo.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/application/ApplicationInfo.java similarity index 91% rename from gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ApplicationInfo.java rename to gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/application/ApplicationInfo.java index b28021bd..e0c89ad6 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/ApplicationInfo.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/application/ApplicationInfo.java @@ -1,4 +1,4 @@ -package org.schoellerfamily.gedbrowser.renderer; +package org.schoellerfamily.gedbrowser.renderer.application; import java.util.HashMap; import java.util.Map; @@ -14,7 +14,7 @@ public interface ApplicationInfo { /** * @return the application name. */ - String getName(); + String getApplicationName(); /** * @return the version string. @@ -46,7 +46,7 @@ public interface ApplicationInfo { */ default Map getInfoMap() { final Map infoMap = new HashMap<>(); - infoMap.put("name", getName()); + infoMap.put("name", getApplicationName()); infoMap.put("version", getVersion()); infoMap.put("URL", getApplicationURL()); final Map maintainerMap = getMaintainerMap(); diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/application/ApplicationInfoFacade.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/application/ApplicationInfoFacade.java new file mode 100644 index 00000000..05f21092 --- /dev/null +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/application/ApplicationInfoFacade.java @@ -0,0 +1,78 @@ +package org.schoellerfamily.gedbrowser.renderer.application; + +import java.util.Map; + +/** + * @author Dick Schoeller + */ +public interface ApplicationInfoFacade extends ApplicationInfo { + /** + * @return the contained application information object + */ + ApplicationInfo getApplicationInfo(); + + /** + * {@inheritDoc} + */ + @Override + default String getApplicationName() { + return getApplicationInfo().getApplicationName(); + } + + /** + * {@inheritDoc} + */ + @Override + default String getVersion() { + return getApplicationInfo().getVersion(); + } + + /** + * {@inheritDoc} + */ + @Override + default String getMaintainerEmail() { + return getApplicationInfo().getMaintainerEmail(); + } + + /** + * {@inheritDoc} + */ + @Override + default String getMaintainerName() { + return getApplicationInfo().getMaintainerName(); + } + + /** + * {@inheritDoc} + */ + @Override + default String getApplicationURL() { + return getApplicationInfo().getApplicationURL(); + } + + /** + * {@inheritDoc} + */ + @Override + default String getHomeURL() { + return getApplicationInfo().getHomeURL(); + } + + /** + * {@inheritDoc} + */ + @Override + default Map getInfoMap() { + return getApplicationInfo().getInfoMap(); + } + + /** + * {@inheritDoc} + */ + @Override + default Map getMaintainerMap() { + return getApplicationInfo().getMaintainerMap(); + } + +} diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/application/package-info.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/application/package-info.java new file mode 100644 index 00000000..008d0f65 --- /dev/null +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/application/package-info.java @@ -0,0 +1,5 @@ +/** + * Copyright 2017 Richard Schoeller + * Conveys application information, primarily for rendering. + */ +package org.schoellerfamily.gedbrowser.renderer.application; diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/package-info.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/package-info.java index e3955be8..c69eac95 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/package-info.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2013-2016 Richard Schoeller + * Copyright 2013-2017 Richard Schoeller * HTML rendering classes for gedbrowser. */ package org.schoellerfamily.gedbrowser.renderer; diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/user/User.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/user/User.java new file mode 100644 index 00000000..4da7f948 --- /dev/null +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/user/User.java @@ -0,0 +1,46 @@ +package org.schoellerfamily.gedbrowser.renderer.user; + +/** + * @author Dick Schoeller + */ +public interface User { + /** + * @return the username + */ + String getUsername(); + + /** + * @return the user's first name + */ + String getFirstname(); + + /** + * @return the user's last name + */ + String getLastname(); + + /** + * @return the user's email address + */ + String getEmail(); + + /** + * @return the user's password + */ + String getPassword(); + + /** + * The roles supported are user and admin. + * + * @return the set of roles for this user + */ + String[] getRoles(); + + /** + * Check if the user has a particular role. + * + * @param role role that we are looking for + * @return true if the user has the role + */ + boolean hasRole(String role); +} diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/user/UserFacade.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/user/UserFacade.java new file mode 100644 index 00000000..0945b4fa --- /dev/null +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/user/UserFacade.java @@ -0,0 +1,90 @@ +package org.schoellerfamily.gedbrowser.renderer.user; + +/** + * @author Dick Schoeller + */ +public interface UserFacade extends User { + /** + * Get the associated User object. + * + * @return the user + */ + User getUser(); + + /** + * {@inheritDoc} + */ + @Override + default String getUsername() { + if (getUser() == null) { + return null; + } + return getUser().getUsername(); + } + + /** + * {@inheritDoc} + */ + @Override + default String getFirstname() { + if (getUser() == null) { + return null; + } + return getUser().getFirstname(); + } + + /** + * {@inheritDoc} + */ + @Override + default String getLastname() { + if (getUser() == null) { + return null; + } + return getUser().getLastname(); + } + + /** + * {@inheritDoc} + */ + @Override + default String getEmail() { + if (getUser() == null) { + return null; + } + return getUser().getEmail(); + } + + /** + * {@inheritDoc} + */ + @Override + default String getPassword() { + if (getUser() == null) { + return null; + } + return getUser().getPassword(); + } + + /** + * {@inheritDoc} + */ + @Override + default String[] getRoles() { + if (getUser() == null) { + return new String[0]; + } + return getUser().getRoles(); + } + + /** + * {@inheritDoc} + */ + @Override + default boolean hasRole(String role) { + if (getUser() == null) { + return false; + } + return getUser().hasRole(role); + } +} diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/User.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/user/UserImpl.java similarity index 96% rename from gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/User.java rename to gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/user/UserImpl.java index 9b31552d..414f36f1 100644 --- a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/User.java +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/user/UserImpl.java @@ -1,4 +1,4 @@ -package org.schoellerfamily.gedbrowser.renderer; +package org.schoellerfamily.gedbrowser.renderer.user; import java.util.HashSet; import java.util.Set; @@ -8,7 +8,7 @@ * * @author Dick Schoeller */ -public final class User { +public final class UserImpl implements User { /** */ private String username; /** */ diff --git a/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/user/package-info.java b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/user/package-info.java new file mode 100644 index 00000000..4158b68c --- /dev/null +++ b/gedbrowser-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/user/package-info.java @@ -0,0 +1,5 @@ +/** + * Copyright 2017 Richard Schoeller + * Package for managing the data about a user. + */ +package org.schoellerfamily.gedbrowser.renderer.user; diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AbstractLinkRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AbstractLinkRendererTest.java index f1a04697..6346931f 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AbstractLinkRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AbstractLinkRendererTest.java @@ -5,11 +5,9 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.AbstractLink; import org.schoellerfamily.gedbrowser.datamodel.visitor.GedObjectVisitor; import org.schoellerfamily.gedbrowser.renderer.AbstractLinkRenderer; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.NullNameHtmlRenderer; @@ -17,6 +15,7 @@ import org.schoellerfamily.gedbrowser.renderer.NullPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -27,9 +26,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class AbstractLinkRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -110,7 +106,7 @@ private AbstractLinkRenderer createRenderer() { final AbstractLinkRenderer renderer = new AbstractLinkRenderer(createAbstractLink(), new GedRendererFactory(), - anonymousContext, provider) { + anonymousContext) { }; return renderer; } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AnonymousModePersonNameHtmlRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AnonymousModePersonNameHtmlRendererTest.java index 91f0baa0..5f802567 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AnonymousModePersonNameHtmlRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AnonymousModePersonNameHtmlRendererTest.java @@ -5,16 +5,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Name; import org.schoellerfamily.gedbrowser.datamodel.ObjectId; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Root; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.PersonNameHtmlRenderer; import org.schoellerfamily.gedbrowser.renderer.PersonRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -33,9 +32,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class AnonymousModePersonNameHtmlRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -61,7 +57,7 @@ public void testGetNameHtmlNull() { final Name name = new Name(person); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Expected Living", "Living", pnhr.getNameHtml()); @@ -73,7 +69,7 @@ public void testGetNameHtmlEmpty() { final Name name = new Name(person, ""); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Expected Living", "Living", pnhr.getNameHtml()); @@ -85,7 +81,7 @@ public void testGetNameHtmlSurnameOnly() { final Name name = new Name(person, "/Schoeller/"); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Expected Living", "Living", pnhr.getNameHtml()); @@ -97,7 +93,7 @@ public void testGetNameHtmlSurnameLast() { final Name name = new Name(person, "Richard/Schoeller/"); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Expected Living", "Living", pnhr.getNameHtml()); @@ -109,7 +105,7 @@ public void testGetNameHtmlSurnameFirst() { final Name name = new Name(person, "/Deng/Shao Ping"); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Expected Living", "Living", pnhr.getNameHtml()); @@ -121,7 +117,7 @@ public void testGetNameHtmlSurnameMiddle() { final Name name = new Name(person, "Karl Frederick/Schoeller/Sr."); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Expected Living", "Living", pnhr.getNameHtml()); @@ -131,7 +127,7 @@ public void testGetNameHtmlSurnameMiddle() { @Test public void testGetNameHtmlPersonUnset() { final PersonRenderer personRenderer = new PersonRenderer(new Person(), - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Expected empty name", "", pnhr.getNameHtml()); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AnonymousPersonNameIndexRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AnonymousPersonNameIndexRendererTest.java index ecd666b8..a7661220 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AnonymousPersonNameIndexRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AnonymousPersonNameIndexRendererTest.java @@ -5,16 +5,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Name; import org.schoellerfamily.gedbrowser.datamodel.ObjectId; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Root; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.PersonNameIndexRenderer; import org.schoellerfamily.gedbrowser.renderer.PersonRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -25,9 +24,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class AnonymousPersonNameIndexRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -53,7 +49,7 @@ public void testGetNameHtmlNull() { final Name name = new Name(person); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final PersonNameIndexRenderer pnhr = (PersonNameIndexRenderer) personRenderer.getNameIndexRenderer(); assertEquals("Rendered string doesn't match expectation", @@ -66,7 +62,7 @@ public void testGetNameHtmlEmpty() { final Name name = new Name(person, ""); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final PersonNameIndexRenderer pnhr = (PersonNameIndexRenderer) personRenderer.getNameIndexRenderer(); assertEquals("Rendered string doesn't match expectation", @@ -79,7 +75,7 @@ public void testGetNameHtmlSurnameOnly() { final Name name = new Name(person, "/Schoeller/"); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final PersonNameIndexRenderer pnhr = (PersonNameIndexRenderer) personRenderer.getNameIndexRenderer(); assertEquals("Rendered string doesn't match expectation", @@ -92,7 +88,7 @@ public void testGetNameHtmlSurnameLast() { final Name name = new Name(person, "Richard/Schoeller/"); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final PersonNameIndexRenderer pnhr = (PersonNameIndexRenderer) personRenderer.getNameIndexRenderer(); assertEquals("Rendered string doesn't match expectation", @@ -105,7 +101,7 @@ public void testGetNameHtmlSurnameFirst() { final Name name = new Name(person, "/Deng/Shao Ping"); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final PersonNameIndexRenderer pnhr = (PersonNameIndexRenderer) personRenderer.getNameIndexRenderer(); assertEquals("Rendered string doesn't match expectation", @@ -118,7 +114,7 @@ public void testGetNameHtmlSurnameMiddle() { final Name name = new Name(person, "Karl Frederick/Schoeller/Sr."); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final PersonNameIndexRenderer pnhr = (PersonNameIndexRenderer) personRenderer.getNameIndexRenderer(); assertEquals("Rendered string doesn't match expectation", @@ -129,7 +125,7 @@ public void testGetNameHtmlSurnameMiddle() { @Test public void testGetNameHtmlPersonUnset() { final PersonRenderer personRenderer = new PersonRenderer(new Person(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final PersonNameIndexRenderer pnhr = (PersonNameIndexRenderer) personRenderer.getNameIndexRenderer(); assertEquals("Expected empty string", "", pnhr.getIndexName()); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AnonymousPersonRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AnonymousPersonRendererTest.java index ba6f4426..b5be6a0b 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AnonymousPersonRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AnonymousPersonRendererTest.java @@ -9,13 +9,11 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.ObjectId; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.datamodel.navigator.PersonNavigator; import org.schoellerfamily.gedbrowser.reader.testreader.TestDataReader; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.CellRenderer; import org.schoellerfamily.gedbrowser.renderer.CellRow; import org.schoellerfamily.gedbrowser.renderer.FamilyRenderer; @@ -28,6 +26,7 @@ import org.schoellerfamily.gedbrowser.renderer.PersonNameIndexRenderer; import org.schoellerfamily.gedbrowser.renderer.PersonRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -44,9 +43,6 @@ public final class AnonymousPersonRendererTest { private transient TestDataReader reader; /** */ @Autowired - private transient CalendarProvider provider; - /** */ - @Autowired private transient ApplicationInfo appInfo; /** @@ -389,7 +385,7 @@ public void testPhraseRenderer() { private PersonRenderer createRenderer() { final PersonRenderer renderer = new PersonRenderer( new Person(null, new ObjectId("I1")), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); return renderer; } @@ -401,7 +397,7 @@ public void testRenderMelissaTreeAnonymous() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final CellRow[] cellRows = personRenderer.getTreeRows(5); int i = 0; for (final CellRow cellRow : cellRows) { @@ -437,7 +433,7 @@ public void testRenderGeorgeTree() throws IOException { final Root root = reader.readBigTestSource(); final Person george = (Person) root.find("I9"); final PersonRenderer personRenderer = new PersonRenderer(george, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final CellRow[] cellRows = personRenderer.getTreeRows(); int i = 0; for (final CellRow cellRow : cellRows) { @@ -459,7 +455,7 @@ public void testRenderArnoldTree() throws IOException { final Root root = reader.readBigTestSource(); final Person arnold = (Person) root.find("I7"); final PersonRenderer personRenderer = new PersonRenderer(arnold, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final CellRow[] cellRows = personRenderer.getTreeRows(); int i = 0; for (final CellRow cellRow : cellRows) { @@ -481,7 +477,7 @@ public void testRenderNullFather() throws IOException { final Root root = reader.readSmallTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final StringBuilder builder = new StringBuilder(); personRenderer.getParents().renderFather(builder, 2, null); final String actual = builder.toString(); @@ -496,7 +492,7 @@ public void testRenderFather() throws IOException { final Root root = reader.readSmallTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final StringBuilder builder = new StringBuilder(); final PersonNavigator navigator = new PersonNavigator(melissa); personRenderer.getParents().renderFather( @@ -517,7 +513,7 @@ public void testRenderNullMother() throws IOException { final Root root = reader.readSmallTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final StringBuilder builder = new StringBuilder(); personRenderer.getParents().renderMother(builder, 2, null); final String actual = builder.toString(); @@ -532,7 +528,7 @@ public void testRenderMelissaFather() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final StringBuilder builder = new StringBuilder(); final PersonNavigator navigator = new PersonNavigator(melissa); personRenderer.getParents().renderFather( @@ -549,7 +545,7 @@ public void testRenderMother() throws IOException { final Root root = reader.readSmallTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final StringBuilder builder = new StringBuilder(); final PersonNavigator navigator = new PersonNavigator(melissa); personRenderer.getParents().renderMother( @@ -570,7 +566,7 @@ public void testRenderMotherConfidentialAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person sabino = (Person) root.find("I4248"); final PersonRenderer personRenderer = new PersonRenderer(sabino, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final StringBuilder builder = new StringBuilder(); final PersonNavigator navigator = new PersonNavigator(sabino); personRenderer.getParents().renderMother( @@ -591,7 +587,7 @@ public void testRenderMelissaMother() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final StringBuilder builder = new StringBuilder(); final PersonNavigator navigator = new PersonNavigator(melissa); personRenderer.getParents().renderMother( @@ -608,7 +604,7 @@ public void testRenderMelissaTitleAnonymous() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I4248"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getTitleName(); assertEquals("Mismatched rendered string", "Confidential", actual); } @@ -621,7 +617,7 @@ public void testRenderGeorgeTitle() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I9"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getTitleName(); assertEquals("Mismatched rendered string", "Living", actual); } @@ -634,7 +630,7 @@ public void testRenderMelissaWholeName() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getWholeName(); assertEquals("Mismatched rendered string", "Living", actual); } @@ -647,7 +643,7 @@ public void testRenderSabinoWholeNameAnonymous() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I4248"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getWholeName(); assertEquals("Mismatched rendered string", "Confidential", actual); } @@ -660,7 +656,7 @@ public void testRenderGeorgeWholeName() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I9"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getWholeName(); assertEquals("Mismatched rendered string", "Living", actual); } @@ -673,7 +669,7 @@ public void testRenderMelissaFatherNameHtml() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getParents() .getFatherNameHtml(); assertTrue("Expected empty string", actual.isEmpty()); @@ -687,7 +683,7 @@ public void testRenderCiciFatherNameHtmlAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I5266"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getParents() .getFatherNameHtml(); assertTrue("Expected empty string", actual.isEmpty()); @@ -701,7 +697,7 @@ public void testRenderVivianFatherNameHtmlAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getParents() .getFatherNameHtml(); assertTrue("Expected empty string", actual.isEmpty()); @@ -715,7 +711,7 @@ public void testRenderGeorgeFatherNameHtml() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I9"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getParents() .getFatherNameHtml(); assertTrue("Expected empty string", actual.isEmpty()); @@ -729,7 +725,7 @@ public void testRenderMelissaMotherNameHtml() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getParents() .getMotherNameHtml(); assertTrue("Expected empty string", actual.isEmpty()); @@ -743,7 +739,7 @@ public void testRenderCiciMotherNameHtml() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I5266"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getParents() .getMotherNameHtml(); assertTrue("Expected empty string", actual.isEmpty()); @@ -757,7 +753,7 @@ public void testRenderVivianMotherNameHtmlAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getParents() .getMotherNameHtml(); assertTrue("Expected empty string", actual.isEmpty()); @@ -771,7 +767,7 @@ public void testRenderGeorgeMotherNameHtml() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I9"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getParents() .getMotherNameHtml(); assertTrue("Expected empty string", actual.isEmpty()); @@ -785,7 +781,7 @@ public void testRenderMelissaFatherRendition() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getParents() .getFatherRendition(); assertTrue("Expected empty string", actual.isEmpty()); @@ -799,7 +795,7 @@ public void testRenderGeorgeFatherRendition() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I9"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String expected = "\n

\n Father: \n

"; final String actual = personRenderer.getParents() @@ -817,7 +813,7 @@ public void testRenderMelissaMotherRendition() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getParents() .getMotherRendition(); assertTrue("Expected empty string", actual.isEmpty()); @@ -831,7 +827,7 @@ public void testRenderGeorgeMotherRendition() throws IOException { final Root root = reader.readBigTestSource(); final Person george = (Person) root.find("I9"); final PersonRenderer personRenderer = new PersonRenderer(george, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String expected = "\n

\n" + " Mother:" + " \n

"; @@ -848,7 +844,7 @@ public void testRenderDickLifeSpan() throws IOException { final Root root = reader.readBigTestSource(); final Person dick = (Person) root.find("I2"); final PersonRenderer personRenderer = new PersonRenderer(dick, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getLifeSpanString(); assertTrue("Expected empty string", actual.isEmpty()); } @@ -861,7 +857,7 @@ public void testRenderArnoldLifeSpan() throws IOException { final Root root = reader.readBigTestSource(); final Person arnold = (Person) root.find("I7"); final PersonRenderer personRenderer = new PersonRenderer(arnold, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String expected = "(12 AUG 1917-02 OCT 1969)"; final String actual = personRenderer.getLifeSpanString(); assertEquals("Mismatched rendered string", expected, actual); @@ -875,7 +871,7 @@ public void testRenderMelissaLifeSpan() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getLifeSpanString(); assertTrue("Expected empty string", actual.isEmpty()); } @@ -888,7 +884,7 @@ public void testRenderDickFamilies() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I2"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final List families = personRenderer.getFamilies(); assertTrue("Expected empty families list", families.isEmpty()); } @@ -901,7 +897,7 @@ public void testRenderMelissaFamilies() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final List families = personRenderer.getFamilies(); assertTrue("Expected empty families list", families.isEmpty()); } @@ -914,7 +910,7 @@ public void testRenderDickAttributes() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I2"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final List> attributes = personRenderer.getAttributes(); assertTrue("Expected empty attributes list", attributes.isEmpty()); } @@ -927,7 +923,7 @@ public void testRenderJohnSchoellerAttributes() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I4"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final List> attributes = personRenderer.getAttributes(); assertTrue("Expected empty attributes list", attributes.isEmpty()); } @@ -940,7 +936,7 @@ public void testRenderArnoldAttributes() throws IOException { final Root root = reader.readBigTestSource(); final Person arnold = (Person) root.find("I7"); final PersonRenderer personRenderer = new PersonRenderer(arnold, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final int expect = 8; final List> attributes = personRenderer.getAttributes(); assertEquals("Expected 8 attributes", expect, attributes.size()); @@ -954,7 +950,7 @@ public void testRenderMelissaAttributes() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final List> attributes = personRenderer.getAttributes(); assertTrue("Expected empty attributes list", attributes.isEmpty()); } @@ -967,7 +963,7 @@ public void testRenderDickIdString() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I2"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getIdString(); assertEquals("Mismatched ID string", "I2", actual); } @@ -980,7 +976,7 @@ public void testRenderMelissaIdString() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getIdString(); assertEquals("Mismatched ID string", "I1", actual); } @@ -993,7 +989,7 @@ public void testRenderMelissaIndexHref() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String expected = "surnames?db=null&letter=?#?"; final String actual = personRenderer.getIndexHref(); assertEquals("Mismatched rendered string", expected, actual); @@ -1007,7 +1003,7 @@ public void testVivianSurnameLetterAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getSurnameLetter(); assertEquals("Mismatched rendered string", "?", actual); } @@ -1020,7 +1016,7 @@ public void testVivianSurnameAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getSurname(); assertEquals("Mismatched rendered string", "?", actual); } @@ -1033,7 +1029,7 @@ public void testVivianLifespanAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final String actual = personRenderer.getLifeSpanString(); assertTrue("Expected empty string", actual.isEmpty()); } @@ -1046,7 +1042,7 @@ public void testVivianFamiliesAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final List families = personRenderer.getFamilies(); assertTrue("Expected empty families list", families.isEmpty()); } @@ -1059,7 +1055,7 @@ public void testVivianAttributesAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final List> attributes = personRenderer.getAttributes(); assertTrue("Expected empty attributes list", attributes.isEmpty()); } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ApplicationInfoRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ApplicationInfoRendererTest.java index 8ca7a485..c0bd33b4 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ApplicationInfoRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ApplicationInfoRendererTest.java @@ -9,9 +9,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.schoellerfamily.gedbrowser.datamodel.GedObject; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.ApplicationInfoRenderer; import org.schoellerfamily.gedbrowser.renderer.Renderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -187,7 +187,7 @@ public void testGetHomeUrl() { @Test public void testGetName() { assertEquals("Application name does not match expectation", - "gedbrowser", renderer.getName()); + "gedbrowser", renderer.getApplicationName()); } /** */ diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ApplicationInfoStub.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ApplicationInfoStub.java index b85d74d4..12a24098 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ApplicationInfoStub.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ApplicationInfoStub.java @@ -1,7 +1,7 @@ package org.schoellerfamily.gedbrowser.renderer.test; import org.schoellerfamily.gedbrowser.datamodel.GedObject; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; /** * @author Dick Schoeller @@ -11,7 +11,7 @@ public final class ApplicationInfoStub implements ApplicationInfo { * {@inheritDoc} */ @Override - public String getName() { + public String getApplicationName() { return "gedbrowser"; } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ApplicationInfoTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ApplicationInfoTest.java index f52483be..2ff59993 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ApplicationInfoTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ApplicationInfoTest.java @@ -6,7 +6,7 @@ import org.junit.Before; import org.junit.Test; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; /** * @author Dick Schoeller @@ -23,7 +23,7 @@ public void init() { * {@inheritDoc} */ @Override - public String getName() { + public String getApplicationName() { return "renderer"; } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AttributeListItemRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AttributeListItemRendererTest.java index 1a138263..0bfdfa9e 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AttributeListItemRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AttributeListItemRendererTest.java @@ -5,14 +5,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Attribute; import org.schoellerfamily.gedbrowser.datamodel.Person; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.AttributeListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.AttributeRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -23,9 +22,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class AttributeListItemRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -62,7 +58,7 @@ public void init() { @Test public void testRenderAsListItemEmpty() { final AttributeRenderer aRenderer = new AttributeRenderer(attribute1, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final AttributeListItemRenderer apr = (AttributeListItemRenderer) aRenderer.getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -76,7 +72,7 @@ public void testRenderAsListItemEmpty() { @Test public void testRenderAsListItemString() { final AttributeRenderer aRenderer = new AttributeRenderer(attribute2, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final AttributeListItemRenderer apr = (AttributeListItemRenderer) aRenderer.getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -90,7 +86,7 @@ public void testRenderAsListItemString() { @Test public void testRenderAsListItem() { final AttributeRenderer aRenderer = new AttributeRenderer(attribute3, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final AttributeListItemRenderer apr = (AttributeListItemRenderer) aRenderer .getListItemRenderer(); final StringBuilder builder = new StringBuilder(); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AttributePhraseRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AttributePhraseRendererTest.java index 31ea5b82..1d57a3c6 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AttributePhraseRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AttributePhraseRendererTest.java @@ -5,14 +5,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Attribute; import org.schoellerfamily.gedbrowser.datamodel.Person; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.AttributePhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.AttributeRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -23,9 +22,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class AttributePhraseRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -62,7 +58,7 @@ public void init() { @Test public void testRenderAsPhraseEmpty() { final AttributeRenderer aRenderer = new AttributeRenderer(attribute1, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final AttributePhraseRenderer apRenderer = (AttributePhraseRenderer) aRenderer.getPhraseRenderer(); final String string = apRenderer.renderAsPhrase(); @@ -73,7 +69,7 @@ public void testRenderAsPhraseEmpty() { @Test public void testRenderAsPhraseString() { final AttributeRenderer aRenderer = new AttributeRenderer(attribute2, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final AttributePhraseRenderer apRenderer = (AttributePhraseRenderer) aRenderer.getPhraseRenderer(); final String string = apRenderer.renderAsPhrase(); @@ -85,7 +81,7 @@ public void testRenderAsPhraseString() { @Test public void testRenderAsPhrase() { final AttributeRenderer aRenderer = new AttributeRenderer(attribute3, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final AttributePhraseRenderer apRenderer = (AttributePhraseRenderer) aRenderer.getPhraseRenderer(); final String string = apRenderer.renderAsPhrase(); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AttributeRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AttributeRendererTest.java index d0fbfc1e..fd5f25ac 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AttributeRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/AttributeRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Attribute; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.AttributeListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.AttributePhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.AttributeRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.NullNameIndexRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class AttributeRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -50,7 +46,7 @@ public void init() { public void testAttributeListOpenRenderer() { final AttributeRenderer renderer = new AttributeRenderer( new Attribute(null), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertTrue("Wrong renderer type", renderer.getAttributeListOpenRenderer() instanceof SimpleAttributeListOpenRenderer); @@ -64,7 +60,7 @@ public void testAttributeListOpenRenderer() { public void testAttributeListItemRenderer() { final AttributeRenderer renderer = new AttributeRenderer( new Attribute(null), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertTrue("Wrong renderer type", renderer.getListItemRenderer() instanceof AttributeListItemRenderer); @@ -78,7 +74,7 @@ public void testAttributeListItemRenderer() { public void testNameHtmlRenderer() { final AttributeRenderer renderer = new AttributeRenderer( new Attribute(null), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertTrue("Wrong renderer type", renderer.getNameHtmlRenderer() instanceof NullNameHtmlRenderer); @@ -92,7 +88,7 @@ public void testNameHtmlRenderer() { public void testNameIndexRenderer() { final AttributeRenderer renderer = new AttributeRenderer( new Attribute(null), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertTrue("Wrong renderer type", renderer.getNameIndexRenderer() instanceof NullNameIndexRenderer); @@ -106,7 +102,7 @@ public void testNameIndexRenderer() { public void testPhraseRenderer() { final AttributeRenderer renderer = new AttributeRenderer( new Attribute(null), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertTrue("Wrong renderer type", renderer.getPhraseRenderer() instanceof AttributePhraseRenderer); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ChildRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ChildRendererTest.java index 94a20339..de104eac 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ChildRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ChildRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Child; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.ChildRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.NullPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class ChildRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -42,7 +38,7 @@ public final class ChildRendererTest { @Before public void init() { renderer = new ChildRenderer(new Child(), new GedRendererFactory(), - RenderingContext.anonymous(appInfo), provider); + RenderingContext.anonymous(appInfo)); } /** diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DateListItemRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DateListItemRendererTest.java index 58e87082..19ab440e 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DateListItemRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DateListItemRendererTest.java @@ -5,15 +5,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Attribute; import org.schoellerfamily.gedbrowser.datamodel.Date; import org.schoellerfamily.gedbrowser.datamodel.Person; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.DateListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.DateRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -24,9 +23,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class DateListItemRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -55,7 +51,7 @@ public void init() { @Test public void testGetRenderAsListItem() { final DateRenderer dRenderer = new DateRenderer(date, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final DateListItemRenderer dlir = (DateListItemRenderer) dRenderer .getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -69,7 +65,7 @@ public void testGetRenderAsListItem() { @Test public void testGetRenderAsListItemEmpty() { final DateRenderer dRenderer = new DateRenderer(new Date(attribute, ""), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final DateListItemRenderer dlir = (DateListItemRenderer) dRenderer .getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -83,7 +79,7 @@ public void testGetRenderAsListItemEmpty() { public void testGetRenderAsListItemNull() { final DateRenderer dRenderer = new DateRenderer( new Date(attribute, null), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); final DateListItemRenderer dlir = (DateListItemRenderer) dRenderer .getListItemRenderer(); final StringBuilder builder = new StringBuilder(); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DatePhraseRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DatePhraseRendererTest.java index 5b0366f7..4d8bced2 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DatePhraseRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DatePhraseRendererTest.java @@ -5,15 +5,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Attribute; import org.schoellerfamily.gedbrowser.datamodel.Date; import org.schoellerfamily.gedbrowser.datamodel.Person; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.DatePhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.DateRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -24,9 +23,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class DatePhraseRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -55,7 +51,7 @@ public void init() { @Test public void testGetRenderAsPhrase() { final DateRenderer dRenderer = new DateRenderer(date, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final DatePhraseRenderer dpRenderer = (DatePhraseRenderer) dRenderer .getPhraseRenderer(); final String string = dpRenderer.renderAsPhrase(); @@ -68,7 +64,7 @@ public void testGetRenderAsPhrase() { public void testGetRenderAsPhraseEmpty() { final DateRenderer dRenderer = new DateRenderer( new Date(attribute, ""), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); final DatePhraseRenderer dpRenderer = (DatePhraseRenderer) dRenderer .getPhraseRenderer(); final String string = dpRenderer.renderAsPhrase(); @@ -80,7 +76,7 @@ public void testGetRenderAsPhraseEmpty() { public void testGetRenderAsPhraseNull() { final DateRenderer dRenderer = new DateRenderer( new Date(attribute, null), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); final DatePhraseRenderer dpRenderer = (DatePhraseRenderer) dRenderer .getPhraseRenderer(); final String string = dpRenderer.renderAsPhrase(); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DateRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DateRendererTest.java index dbaa9d48..b62beaf0 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DateRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DateRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Date; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.DateListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.DatePhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.DateRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.NullNameIndexRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class DateRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -49,7 +45,7 @@ public void init() { @Test public void testAttributeListOpenRenderer() { final DateRenderer renderer = new DateRenderer(new Date(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getAttributeListOpenRenderer() instanceof SimpleAttributeListOpenRenderer); @@ -62,7 +58,7 @@ public void testAttributeListOpenRenderer() { @Test public void testListItemRenderer() { final DateRenderer renderer = new DateRenderer(new Date(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getListItemRenderer() instanceof DateListItemRenderer); @@ -75,7 +71,7 @@ public void testListItemRenderer() { @Test public void testNameHtmlRenderer() { final DateRenderer renderer = new DateRenderer(new Date(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameHtmlRenderer() instanceof NullNameHtmlRenderer); @@ -88,7 +84,7 @@ public void testNameHtmlRenderer() { @Test public void testNameIndexRenderer() { final DateRenderer renderer = new DateRenderer(new Date(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameIndexRenderer() instanceof NullNameIndexRenderer); @@ -101,7 +97,7 @@ public void testNameIndexRenderer() { @Test public void testPhraseRenderer() { final DateRenderer renderer = new DateRenderer(new Date(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getPhraseRenderer() instanceof DatePhraseRenderer); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DefaultRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DefaultRendererTest.java index 5eb35028..9bff2169 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DefaultRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DefaultRendererTest.java @@ -5,10 +5,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.GedObject; import org.schoellerfamily.gedbrowser.datamodel.visitor.GedObjectVisitor; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.DefaultRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; @@ -17,6 +15,7 @@ import org.schoellerfamily.gedbrowser.renderer.NullPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -27,9 +26,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class DefaultRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -108,7 +104,7 @@ public void testPhraseRenderer() { */ private DefaultRenderer createRenderer() { return new DefaultRenderer(createGedObject(), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); } /** diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ErrorRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ErrorRendererTest.java index bde7ab30..069888d1 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ErrorRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/ErrorRendererTest.java @@ -9,9 +9,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.schoellerfamily.gedbrowser.datamodel.GedObject; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.ErrorRenderer; import org.schoellerfamily.gedbrowser.renderer.Renderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -186,7 +186,7 @@ public void testGetHomeUrl() { @Test public void testGetName() { assertEquals("Application name does not match expectation", - "gedbrowser", renderer.getName()); + "gedbrowser", renderer.getApplicationName()); } /** */ diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/FamCRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/FamCRendererTest.java index 38e5baa7..3d94112d 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/FamCRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/FamCRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.FamC; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.FamCRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.NullPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class FamCRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -49,7 +45,7 @@ public void init() { @Test public void testAttributeListOpenRenderer() { final FamCRenderer renderer = new FamCRenderer(new FamC(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getAttributeListOpenRenderer() instanceof SimpleAttributeListOpenRenderer); @@ -62,7 +58,7 @@ public void testAttributeListOpenRenderer() { @Test public void testListItemRenderer() { final FamCRenderer renderer = new FamCRenderer(new FamC(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getListItemRenderer() instanceof NullListItemRenderer); @@ -75,7 +71,7 @@ public void testListItemRenderer() { @Test public void testNameHtmlRenderer() { final FamCRenderer renderer = new FamCRenderer(new FamC(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameHtmlRenderer() instanceof NullNameHtmlRenderer); @@ -88,7 +84,7 @@ public void testNameHtmlRenderer() { @Test public void testNameIndexRenderer() { final FamCRenderer renderer = new FamCRenderer(new FamC(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameIndexRenderer() instanceof NullNameIndexRenderer); @@ -101,7 +97,7 @@ public void testNameIndexRenderer() { @Test public void testPhraseRenderer() { final FamCRenderer renderer = new FamCRenderer(new FamC(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getPhraseRenderer() instanceof NullPhraseRenderer); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/FamSRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/FamSRendererTest.java index f931b471..505024d8 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/FamSRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/FamSRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.FamS; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.FamSRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.NullPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class FamSRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -49,7 +45,7 @@ public void init() { @Test public void testAttributeListOpenRenderer() { final FamSRenderer renderer = new FamSRenderer(new FamS(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getAttributeListOpenRenderer() instanceof SimpleAttributeListOpenRenderer); @@ -62,7 +58,7 @@ public void testAttributeListOpenRenderer() { @Test public void testListItemRenderer() { final FamSRenderer renderer = new FamSRenderer(new FamS(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getListItemRenderer() instanceof NullListItemRenderer); @@ -75,7 +71,7 @@ public void testListItemRenderer() { @Test public void testNameHtmlRenderer() { final FamSRenderer renderer = new FamSRenderer(new FamS(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameHtmlRenderer() instanceof NullNameHtmlRenderer); @@ -88,7 +84,7 @@ public void testNameHtmlRenderer() { @Test public void testNameIndexRenderer() { final FamSRenderer renderer = new FamSRenderer(new FamS(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameIndexRenderer() instanceof NullNameIndexRenderer); @@ -101,7 +97,7 @@ public void testNameIndexRenderer() { @Test public void testPhraseRenderer() { final FamSRenderer renderer = new FamSRenderer(new FamS(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getPhraseRenderer() instanceof NullPhraseRenderer); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/FamilyRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/FamilyRendererTest.java index 835cd2b1..041f6a4a 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/FamilyRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/FamilyRendererTest.java @@ -9,13 +9,11 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Family; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.datamodel.navigator.PersonNavigator; import org.schoellerfamily.gedbrowser.reader.testreader.TestDataReader; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.FamilyRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; @@ -26,6 +24,7 @@ import org.schoellerfamily.gedbrowser.renderer.PersonRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -41,9 +40,6 @@ public final class FamilyRendererTest { private transient TestDataReader reader; /** */ @Autowired - private transient CalendarProvider provider; - /** */ - @Autowired private transient ApplicationInfo appInfo; /** */ @@ -66,7 +62,7 @@ public void init() { @Test public void testAttributeListOpenRenderer() { final FamilyRenderer renderer = new FamilyRenderer(new Family(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getAttributeListOpenRenderer() instanceof SimpleAttributeListOpenRenderer); @@ -79,7 +75,7 @@ public void testAttributeListOpenRenderer() { @Test public void testListItemRenderer() { final FamilyRenderer renderer = new FamilyRenderer(new Family(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getListItemRenderer() instanceof NullListItemRenderer); @@ -92,7 +88,7 @@ public void testListItemRenderer() { @Test public void testNameHtmlRenderer() { final FamilyRenderer renderer = new FamilyRenderer(new Family(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameHtmlRenderer() instanceof NullNameHtmlRenderer); @@ -105,7 +101,7 @@ public void testNameHtmlRenderer() { @Test public void testNameIndexRenderer() { final FamilyRenderer renderer = new FamilyRenderer(new Family(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameIndexRenderer() instanceof NullNameIndexRenderer); @@ -118,7 +114,7 @@ public void testNameIndexRenderer() { @Test public void testPhraseRenderer() { final FamilyRenderer renderer = new FamilyRenderer(new Family(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getPhraseRenderer() instanceof NullPhraseRenderer); @@ -133,8 +129,7 @@ public void testSpouseConstructUsedInPersonTemplate() final Root root = reader.readBigTestSource(); final Person dick = (Person) root.find("I2"); final PersonRenderer personRenderer = new PersonRenderer(dick, - new GedRendererFactory(), userContext, - provider); + new GedRendererFactory(), userContext); final PersonNavigator navigator = new PersonNavigator(dick); final Family family = navigator.getFamilies().get(0); final FamilyRenderer familyRenderer = createFamilyRenderer(family, @@ -155,8 +150,7 @@ public void testSpouseConstructUsedInPersonTemplateAnonymous() final Root root = reader.readBigTestSource(); final Person dick = (Person) root.find("I2"); final PersonRenderer personRenderer = new PersonRenderer(dick, - new GedRendererFactory(), anonymousContext, - provider); + new GedRendererFactory(), anonymousContext); final PersonNavigator navigator = new PersonNavigator(dick); final Family family = navigator.getFamilies().get(0); final FamilyRenderer familyRenderer = createFamilyRenderer(family, @@ -176,8 +170,7 @@ public void testSpouseConstructUsedInPersonTemplateAnonymous() */ private FamilyRenderer createFamilyRenderer(final Family family, final RenderingContext context) { - return new FamilyRenderer(family, new GedRendererFactory(), context, - provider); + return new FamilyRenderer(family, new GedRendererFactory(), context); } /** @@ -189,8 +182,7 @@ public void testRenderF1Attributes() throws IOException { final Family fam = (Family) root.find("F1"); final FamilyRenderer familyRenderer = new FamilyRenderer(fam, new GedRendererFactory(), - anonymousContext, - provider); + anonymousContext); final List> attributes = familyRenderer.getAttributes(); final String expected = "Marriage:" + " 27 MAY 1984, Temple Emanu-el, Providence, Providence" @@ -212,8 +204,7 @@ public void testRenderF1Children() throws IOException { final Root root = reader.readBigTestSource(); final Family fam = (Family) root.find("F1"); final FamilyRenderer familyRenderer = new FamilyRenderer(fam, - new GedRendererFactory(), userContext, - provider); + new GedRendererFactory(), userContext); final List children = familyRenderer.getChildren(); final String expected = "Melissa Robinson " @@ -230,8 +221,7 @@ public void testRenderF1ChildrenAnonymous() throws IOException { final Root root = reader.readBigTestSource(); final Family fam = (Family) root.find("F1"); final FamilyRenderer familyRenderer = new FamilyRenderer(fam, - new GedRendererFactory(), anonymousContext, - provider); + new GedRendererFactory(), anonymousContext); final List children = familyRenderer.getChildren(); final String expected = "Living"; assertEquals("Rendered html doesn't match expectation", diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedRendererFactoryTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedRendererFactoryTest.java index 1e376d2a..0fcb08c5 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedRendererFactoryTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedRendererFactoryTest.java @@ -5,7 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Attribute; import org.schoellerfamily.gedbrowser.datamodel.Child; import org.schoellerfamily.gedbrowser.datamodel.Date; @@ -27,7 +27,6 @@ import org.schoellerfamily.gedbrowser.datamodel.Trailer; import org.schoellerfamily.gedbrowser.datamodel.Wife; import org.schoellerfamily.gedbrowser.datamodel.visitor.GedObjectVisitor; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.AttributeRenderer; import org.schoellerfamily.gedbrowser.renderer.ChildRenderer; import org.schoellerfamily.gedbrowser.renderer.DateRenderer; @@ -50,6 +49,7 @@ import org.schoellerfamily.gedbrowser.renderer.SubmittorRenderer; import org.schoellerfamily.gedbrowser.renderer.TrailerRenderer; import org.schoellerfamily.gedbrowser.renderer.WifeRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedRendererTest.java index 568a7753..0a3f8fcb 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedRendererTest.java @@ -10,11 +10,10 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.GedObject; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.datamodel.visitor.GedObjectVisitor; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.DefaultRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; @@ -24,7 +23,8 @@ import org.schoellerfamily.gedbrowser.renderer.NullPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; -import org.schoellerfamily.gedbrowser.renderer.User; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.user.UserImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -120,7 +120,7 @@ public void testPhraseRenderer() { */ private GedRenderer createRenderer() { return new GedRenderer(createGedObject(), - new GedRendererFactory(), anonymousContext, provider) { + new GedRendererFactory(), anonymousContext) { }; } @@ -129,7 +129,7 @@ private GedRenderer createRenderer() { public void testGetTrailerHtmlEmpty() { final Root root = new Root(); final GedRenderer renderer = new GedRenderer(root, - new GedRendererFactory(), anonymousContext, provider) { + new GedRendererFactory(), anonymousContext) { }; assertEquals("Rendered string does not match expectation", "\n" @@ -171,7 +171,7 @@ public void testGetHeaderHtml() { final Root root = new Root(); final GedRenderer renderer = new DefaultRenderer(root, new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); final String keywords = "one two three"; final String title = "title"; @@ -205,7 +205,7 @@ public void testGetTrailerHtml() { final Root root = new Root(); final GedRenderer renderer = new DefaultRenderer(root, new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertEquals("Rendered string does not match expectation", "\n" + "
\n" @@ -246,7 +246,7 @@ public void testHasRoleAdminFalse() { final Root root = new Root(); final GedRenderer renderer = new DefaultRenderer(root, new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertFalse("Expected admin to be false", renderer.hasRole("Admin")); } @@ -255,16 +255,16 @@ public void testHasRoleAdminFalse() { public void testHasRoleUserTrue() { final Root root = new Root(); final ApplicationInfo appInfo1 = appInfo; - final User user2 = new User(); + final UserImpl user2 = new UserImpl(); user2.setUsername("User"); user2.setFirstname("Ursula"); user2.setLastname("User"); user2.addRole("User"); final RenderingContext context = - new RenderingContext(user2, true, false, appInfo1); + new RenderingContext(user2, true, false, appInfo1, provider); final GedRenderer renderer = new DefaultRenderer(root, new GedRendererFactory(), - context, provider); + context); assertTrue("Expected user to be true", renderer.hasRole("User")); } @@ -274,7 +274,7 @@ public void testHasRoleUserFalse() { final Root root = new Root(); final GedRenderer renderer = new DefaultRenderer(root, new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertFalse("Expected user to be false", renderer.hasRole("User")); } @@ -284,7 +284,7 @@ public void testUserGetFirstname() { final Root root = new Root(); final GedRenderer renderer = new DefaultRenderer(root, new GedRendererFactory(), - RenderingContext.user(appInfo), provider); + RenderingContext.user(appInfo)); assertEquals("Expected user to be Ursula", "Ursula", renderer.getUserFirstname()); } @@ -295,7 +295,7 @@ public void testGetTrailerHtmlHeader() { final Root root = new Root(); final GedRenderer renderer = new DefaultRenderer(root, new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertEquals("Rendered string does not match expectation", "\n" + "
\n" @@ -337,7 +337,7 @@ public void testGetTrailerHtmlSurnames() { final Root root = new Root(); final GedRenderer renderer = new DefaultRenderer(root, new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertEquals("Rendered string does not match expectation", "\n" + "
\n" @@ -380,7 +380,7 @@ public void testGetTrailerHtmlIndex() { final Root root = new Root(); final GedRenderer renderer = new DefaultRenderer(root, new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertEquals("Rendered string does not match expectation", "\n" + "
\n" @@ -443,7 +443,7 @@ public void testGetLivingHref() { @Test public void testGetCalendarProvider() { final GedRenderer renderer = createRenderer(); - final CalendarProvider cp = renderer.getCalendarProvider(); + final CalendarProvider cp = renderer.getRenderingContext(); final String nowString = cp.nowDate().toString("YYYYMMdd"); assertEquals("Should match fixed past date for testing", "20151214", nowString); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedResourceNotFoundRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedResourceNotFoundRendererTest.java index 0fdc4608..bd5ebaea 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedResourceNotFoundRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedResourceNotFoundRendererTest.java @@ -6,9 +6,9 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedResourceNotFoundRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/HeadRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/HeadRendererTest.java index f42719c1..992bee8d 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/HeadRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/HeadRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Head; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.HeadRenderer; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.NullPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class HeadRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -49,7 +45,7 @@ public void init() { @Test public void testAttributeListOpenRenderer() { final HeadRenderer renderer = new HeadRenderer(new Head(null, "Header"), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getAttributeListOpenRenderer() instanceof SimpleAttributeListOpenRenderer); @@ -62,7 +58,7 @@ public void testAttributeListOpenRenderer() { @Test public void testListItemRenderer() { final HeadRenderer renderer = new HeadRenderer(new Head(null, "Header"), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getListItemRenderer() instanceof NullListItemRenderer); @@ -75,7 +71,7 @@ public void testListItemRenderer() { @Test public void testNameHtmlRenderer() { final HeadRenderer renderer = new HeadRenderer(new Head(null, "Header"), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameHtmlRenderer() instanceof NullNameHtmlRenderer); @@ -88,7 +84,7 @@ public void testNameHtmlRenderer() { @Test public void testNameIndeRenderer() { final HeadRenderer renderer = new HeadRenderer(new Head(null, "Header"), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameIndexRenderer() instanceof NullNameIndexRenderer); @@ -101,7 +97,7 @@ public void testNameIndeRenderer() { @Test public void testPhraseRenderer() { final HeadRenderer renderer = new HeadRenderer(new Head(null, "Header"), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getPhraseRenderer() instanceof NullPhraseRenderer); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/HusbandRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/HusbandRendererTest.java index 02245c94..0849ee4c 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/HusbandRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/HusbandRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Husband; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.HusbandRenderer; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.NullPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class HusbandRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -108,7 +104,7 @@ public void testPhraseRenderer() { private HusbandRenderer createRenderer() { final HusbandRenderer renderer = new HusbandRenderer( new Husband(null, "Husband", null), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); return renderer; } } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/IndexRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/IndexRendererTest.java index 0322083b..14ebf151 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/IndexRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/IndexRendererTest.java @@ -8,12 +8,11 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.reader.testreader.TestDataReader; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.IndexRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -29,9 +28,6 @@ public final class IndexRendererTest { private transient TestDataReader reader; /** */ @Autowired - private transient CalendarProvider provider; - /** */ - @Autowired private transient ApplicationInfo appInfo; /** */ @@ -69,7 +65,7 @@ public void testLetters() throws IOException { }; final Root root = reader.readBigTestSource(); final IndexRenderer ir = new IndexRenderer(root, "S", - anonymousContext, provider); + anonymousContext); final Collection letters = ir.getLetters(); int i = 0; for (final String letter : letters) { @@ -88,7 +84,7 @@ public void testSurnames() throws IOException { }; final Root root = reader.readBigTestSource(); final IndexRenderer ir = new IndexRenderer(root, "S", - anonymousContext, provider); + anonymousContext); final Collection surnames = ir.getSurnames(); int i = 0; for (final String surname : surnames) { @@ -130,7 +126,7 @@ public void testIndexNameHtmlSchoeller() throws IOException { }; final Root root = reader.readBigTestSource(); final IndexRenderer ir = new IndexRenderer(root, "S", - anonymousContext, provider); + anonymousContext); final Collection indexNames = ir.getIndexNameHtmls("Schoeller"); int i = 0; for (final String indexName : indexNames) { @@ -146,7 +142,7 @@ public void testIndexNameHtmlSchoeller() throws IOException { public void testIndexBase() throws IOException { final Root root = reader.readBigTestSource(); final IndexRenderer ir = new IndexRenderer(root, "S", - anonymousContext, provider); + anonymousContext); assertEquals("Mismatch index letter", "S", ir.getBase()); } } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/LinkRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/LinkRendererTest.java index 2789d9ff..da89036b 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/LinkRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/LinkRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Link; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.LinkRenderer; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.NullPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class LinkRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -49,7 +45,7 @@ public void init() { @Test public void testAttributeListOpenRenderer() { final LinkRenderer renderer = new LinkRenderer(new Link(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getAttributeListOpenRenderer() instanceof SimpleAttributeListOpenRenderer); @@ -62,7 +58,7 @@ public void testAttributeListOpenRenderer() { @Test public void testListItemRenderer() { final LinkRenderer renderer = new LinkRenderer(new Link(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getListItemRenderer() instanceof NullListItemRenderer); @@ -75,7 +71,7 @@ public void testListItemRenderer() { @Test public void testNameHtmlRenderer() { final LinkRenderer renderer = new LinkRenderer(new Link(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameHtmlRenderer() instanceof NullNameHtmlRenderer); @@ -88,7 +84,7 @@ public void testNameHtmlRenderer() { @Test public void testNameIndeRenderer() { final LinkRenderer renderer = new LinkRenderer(new Link(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameIndexRenderer() instanceof NullNameIndexRenderer); @@ -101,7 +97,7 @@ public void testNameIndeRenderer() { @Test public void testPhraseRenderer() { final LinkRenderer renderer = new LinkRenderer(new Link(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getPhraseRenderer() instanceof NullPhraseRenderer); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/LivingRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/LivingRendererTest.java index a438c082..c5a60cbd 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/LivingRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/LivingRendererTest.java @@ -10,15 +10,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.reader.testreader.TestDataReader; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.LivingRenderer; import org.schoellerfamily.gedbrowser.renderer.LivingRenderer.Bucket; import org.schoellerfamily.gedbrowser.renderer.PersonRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; -import org.schoellerfamily.gedbrowser.renderer.User; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.user.UserImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -54,15 +54,17 @@ public final class LivingRendererTest { @Before public void init() throws IOException { root = reader.readBigTestSource(); - final User admin = new User(); + final UserImpl admin = new UserImpl(); admin.setUsername("admin"); admin.addRole("USER"); admin.addRole("ADMIN"); - adminContext = new RenderingContext(admin, true, true, appInfo); - final User user = new User(); + adminContext = new RenderingContext(admin, true, true, appInfo, + provider); + final UserImpl user = new UserImpl(); user.setUsername("user"); user.addRole("USER"); - userContext = new RenderingContext(user, true, false, appInfo); + userContext = new RenderingContext(user, true, false, appInfo, + provider); } /** @@ -70,8 +72,7 @@ public void init() throws IOException { */ @Test public void testRenderUserIndexHref() { - final LivingRenderer renderer = new LivingRenderer(root, userContext, - provider); + final LivingRenderer renderer = new LivingRenderer(root, userContext); assertEquals("The index link should refer to the letter A", "surnames?db=null&letter=A", renderer.getIndexHref()); } @@ -79,8 +80,7 @@ public void testRenderUserIndexHref() { /** */ @Test public void testRenderAdminIndexHref() { - final LivingRenderer renderer = new LivingRenderer(root, adminContext, - provider); + final LivingRenderer renderer = new LivingRenderer(root, adminContext); assertEquals("The index link should refer to the letter A", "surnames?db=null&letter=A", renderer.getIndexHref()); } @@ -90,8 +90,7 @@ public void testRenderAdminIndexHref() { */ @Test public void testRenderUserBuckets() { - final LivingRenderer renderer = new LivingRenderer(root, userContext, - provider); + final LivingRenderer renderer = new LivingRenderer(root, userContext); assertTrue("In user context, this is always empty", renderer.getBuckets().isEmpty()); } @@ -101,8 +100,7 @@ public void testRenderUserBuckets() { */ @Test public void testRenderAdminBuckets() { - final LivingRenderer renderer = new LivingRenderer(root, adminContext, - provider); + final LivingRenderer renderer = new LivingRenderer(root, adminContext); assertFalse("In admin context, there should be some buckets", renderer.getBuckets().isEmpty()); } @@ -110,8 +108,7 @@ public void testRenderAdminBuckets() { /** */ @Test public void testRenderAdminBucket() { - final LivingRenderer renderer = new LivingRenderer(root, adminContext, - provider); + final LivingRenderer renderer = new LivingRenderer(root, adminContext); final int twentyToTwentyNine = 2; final List persons = renderer.getBuckets() .get(twentyToTwentyNine).getPersons(); @@ -124,8 +121,7 @@ public void testRenderAdminBucket() { */ @Test public void testRenderBucketSizes() { - final LivingRenderer renderer = new LivingRenderer(root, adminContext, - provider); + final LivingRenderer renderer = new LivingRenderer(root, adminContext); final List buckets = renderer.getBuckets(); final int increment = 10; final int limit = 100; diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/MultimediaListItemRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/MultimediaListItemRendererTest.java index d4c684a9..78c687f1 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/MultimediaListItemRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/MultimediaListItemRendererTest.java @@ -5,15 +5,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Attribute; import org.schoellerfamily.gedbrowser.datamodel.Multimedia; import org.schoellerfamily.gedbrowser.datamodel.Person; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.MultimediaListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.MultimediaRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -24,9 +23,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class MultimediaListItemRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -82,7 +78,7 @@ public void init() { @Test public void testRenderAsListItemEmpty() { final MultimediaRenderer aRenderer = new MultimediaRenderer(multimedia1, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final MultimediaListItemRenderer apr = (MultimediaListItemRenderer) aRenderer.getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -99,7 +95,7 @@ public void testRenderAsListItemEmpty() { @Test public void testRenderAsListItemString() { final MultimediaRenderer aRenderer = new MultimediaRenderer(multimedia2, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final MultimediaListItemRenderer apr = (MultimediaListItemRenderer) aRenderer.getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -114,7 +110,7 @@ public void testRenderAsListItemString() { @Test public void testRenderAsListItem() { final MultimediaRenderer aRenderer = new MultimediaRenderer(multimedia3, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final MultimediaListItemRenderer apr = (MultimediaListItemRenderer) aRenderer .getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -129,7 +125,7 @@ public void testRenderAsListItem() { @Test public void testGetListItemContentsEmpty() { final MultimediaRenderer aRenderer = new MultimediaRenderer(multimedia1, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final MultimediaListItemRenderer apr = (MultimediaListItemRenderer) aRenderer.getListItemRenderer(); final String contents = apr.getListItemContents(); @@ -145,7 +141,7 @@ public void testGetListItemContentsEmpty() { @Test public void testGetListItemContentsString() { final MultimediaRenderer aRenderer = new MultimediaRenderer(multimedia2, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final MultimediaListItemRenderer apr = (MultimediaListItemRenderer) aRenderer.getListItemRenderer(); final String contents = apr.getListItemContents(); @@ -159,7 +155,7 @@ public void testGetListItemContentsString() { @Test public void testGetListItemContents() { final MultimediaRenderer aRenderer = new MultimediaRenderer(multimedia3, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final MultimediaListItemRenderer apr = (MultimediaListItemRenderer) aRenderer .getListItemRenderer(); final String contents = apr.getListItemContents(); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/MultimediaPhraseRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/MultimediaPhraseRendererTest.java index e0bc1901..e4ce64d5 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/MultimediaPhraseRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/MultimediaPhraseRendererTest.java @@ -5,15 +5,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Attribute; import org.schoellerfamily.gedbrowser.datamodel.Multimedia; import org.schoellerfamily.gedbrowser.datamodel.Person; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.MultimediaPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.MultimediaRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -24,9 +23,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class MultimediaPhraseRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -82,7 +78,7 @@ public void init() { @Test public void testRenderAsPhraseEmpty() { final MultimediaRenderer aRenderer = new MultimediaRenderer(multimedia1, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final MultimediaPhraseRenderer apRenderer = (MultimediaPhraseRenderer) aRenderer.getPhraseRenderer(); final String string = apRenderer.renderAsPhrase(); @@ -94,7 +90,7 @@ public void testRenderAsPhraseEmpty() { @Test public void testRenderAsPhraseString() { final MultimediaRenderer aRenderer = new MultimediaRenderer(multimedia2, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final MultimediaPhraseRenderer apRenderer = (MultimediaPhraseRenderer) aRenderer.getPhraseRenderer(); final String string = apRenderer.renderAsPhrase(); @@ -106,7 +102,7 @@ public void testRenderAsPhraseString() { @Test public void testRenderAsPhrase() { final MultimediaRenderer aRenderer = new MultimediaRenderer(multimedia3, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final MultimediaPhraseRenderer apRenderer = (MultimediaPhraseRenderer) aRenderer.getPhraseRenderer(); final String string = apRenderer.renderAsPhrase(); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/MultimediaRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/MultimediaRendererTest.java index ea911c6f..4d2a3a7d 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/MultimediaRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/MultimediaRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Multimedia; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.MultimediaListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.MultimediaPhraseRenderer; @@ -15,6 +13,7 @@ import org.schoellerfamily.gedbrowser.renderer.NullNameHtmlRenderer; import org.schoellerfamily.gedbrowser.renderer.NullNameIndexRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -25,9 +24,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class MultimediaRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -94,8 +90,7 @@ public void testPhraseRenderer() { */ private MultimediaRenderer createRenderer() { final MultimediaRenderer renderer = new MultimediaRenderer( - new Multimedia(), new GedRendererFactory(), anonymousContext, - provider); + new Multimedia(), new GedRendererFactory(), anonymousContext); return renderer; } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameListItemRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameListItemRendererTest.java index 6a2594f7..3609f579 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameListItemRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameListItemRendererTest.java @@ -5,13 +5,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Name; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NameListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.NameRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -22,9 +21,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class NameListItemRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -49,7 +45,7 @@ public void init() { public void testRenderSimple() { final Name name = new Name(null, "Richard /Schoeller/"); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameListItemRenderer nlir = (NameListItemRenderer) nameRenderer .getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -63,7 +59,7 @@ public void testRenderSimple() { public void testRenderHarder() { final Name name = new Name(null, "Karl Frederick /Schoeller/Jr."); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameListItemRenderer nlir = (NameListItemRenderer) nameRenderer .getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -77,7 +73,7 @@ public void testRenderHarder() { public void testRenderNonZeroPad() { final Name name = new Name(null, "Karl Frederick /Schoeller/Jr."); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameListItemRenderer nlir = (NameListItemRenderer) nameRenderer .getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -90,7 +86,7 @@ public void testRenderNonZeroPad() { public void testRenderNewLine() { final Name name = new Name(null, "Karl Frederick /Schoeller/Jr."); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameListItemRenderer nlir = (NameListItemRenderer) nameRenderer .getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -104,7 +100,7 @@ public void testRenderNewLine() { public void testRenderNoPrefix() { final Name name = new Name(null, "/Schoeller/"); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameListItemRenderer nlir = (NameListItemRenderer) nameRenderer .getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -117,7 +113,7 @@ public void testRenderNoPrefix() { public void testRenderEmpty() { final Name name = new Name(null, ""); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameListItemRenderer nlir = (NameListItemRenderer) nameRenderer .getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -130,7 +126,7 @@ public void testRenderEmpty() { public void testRenderNull() { final Name name = new Name(null); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameListItemRenderer nlir = (NameListItemRenderer) nameRenderer .getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -143,7 +139,7 @@ public void testRenderNull() { public void testRenderPrefixSuffix() { final Name name = new Name(null, "Foo//Bar"); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameListItemRenderer nlir = (NameListItemRenderer) nameRenderer .getListItemRenderer(); final StringBuilder builder = new StringBuilder(); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameNameHtmlRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameNameHtmlRendererTest.java index eeaf446d..73b47a5b 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameNameHtmlRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameNameHtmlRendererTest.java @@ -5,17 +5,16 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Name; import org.schoellerfamily.gedbrowser.datamodel.ObjectId; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Root; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NameHtmlRenderer; import org.schoellerfamily.gedbrowser.renderer.NameNameHtmlRenderer; import org.schoellerfamily.gedbrowser.renderer.NameRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class NameNameHtmlRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -54,7 +50,7 @@ public void testGetNameHtmlNull() { final Name name = new Name(person); person.addAttribute(name); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameHtmlRenderer nameHtmlRenderer = new NameNameHtmlRenderer( nameRenderer); assertEquals("Rendered string mismatch", @@ -68,7 +64,7 @@ public void testGetNameHtmlEmpty() { final Name name = new Name(person, ""); person.addAttribute(name); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameHtmlRenderer nameHtmlRenderer = new NameNameHtmlRenderer( nameRenderer); assertEquals("Rendered string mismatch", @@ -82,7 +78,7 @@ public void testGetNameHtmlSurnameOnly() { final Name name = new Name(person, "/Schoeller/"); person.addAttribute(name); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameHtmlRenderer nameHtmlRenderer = new NameNameHtmlRenderer( nameRenderer); assertEquals("Rendered string mismatch", @@ -96,7 +92,7 @@ public void testGetNameHtmlSurnameLast() { final Name name = new Name(person, "Richard/Schoeller/"); person.addAttribute(name); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameHtmlRenderer nameHtmlRenderer = new NameNameHtmlRenderer( nameRenderer); assertEquals("Rendered string mismatch", @@ -110,7 +106,7 @@ public void testGetNameHtmlSurnameFirst() { final Name name = new Name(person, "/Deng/Shao Ping"); person.addAttribute(name); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameHtmlRenderer nameHtmlRenderer = new NameNameHtmlRenderer( nameRenderer); assertEquals("Rendered string mismatch", @@ -124,7 +120,7 @@ public void testGetNameHtmlSurnameMiddle() { final Name name = new Name(person, "Karl Frederick/Schoeller/Sr."); person.addAttribute(name); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameHtmlRenderer nameHtmlRenderer = new NameNameHtmlRenderer( nameRenderer); assertEquals("Rendered string mismatch", @@ -138,7 +134,7 @@ public void testGetNameHtmlWeirdEmpty() { final Name name = new Name(person, "//"); person.addAttribute(name); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameHtmlRenderer nameHtmlRenderer = new NameNameHtmlRenderer( nameRenderer); assertEquals("Rendered string mismatch", diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameNameIndexRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameNameIndexRendererTest.java index a5453476..4510be3f 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameNameIndexRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameNameIndexRendererTest.java @@ -5,13 +5,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Name; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NameNameIndexRenderer; import org.schoellerfamily.gedbrowser.renderer.NameRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -22,9 +21,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class NameNameIndexRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -47,7 +43,7 @@ public void init() { public void testRenderSimple() { final Name name = new Name(null, "Richard/Schoeller/"); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameNameIndexRenderer nnir = (NameNameIndexRenderer) nameRenderer .getNameIndexRenderer(); assertEquals(UNEXPECTED_STRING, @@ -60,7 +56,7 @@ public void testRenderSimple() { public void testRenderHarder() { final Name name = new Name(null, "Karl Frederick/Schoeller/Jr."); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameNameIndexRenderer nnir = (NameNameIndexRenderer) nameRenderer .getNameIndexRenderer(); assertEquals(UNEXPECTED_STRING, @@ -74,7 +70,7 @@ public void testRenderHarder() { public void testRenderNoPrefix() { final Name name = new Name(null, "/Schoeller/"); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameNameIndexRenderer nnir = (NameNameIndexRenderer) nameRenderer .getNameIndexRenderer(); assertEquals(UNEXPECTED_STRING, @@ -87,7 +83,7 @@ public void testRenderNoPrefix() { public void testRenderEmpty() { final Name name = new Name(null, ""); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameNameIndexRenderer nnir = (NameNameIndexRenderer) nameRenderer .getNameIndexRenderer(); assertEquals(UNEXPECTED_STRING, @@ -100,7 +96,7 @@ public void testRenderEmpty() { public void testRenderNull() { final Name name = new Name(null); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameNameIndexRenderer nnir = (NameNameIndexRenderer) nameRenderer .getNameIndexRenderer(); assertEquals(UNEXPECTED_STRING, @@ -113,7 +109,7 @@ public void testRenderNull() { public void testRenderUnset() { final Name name = new Name(); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameNameIndexRenderer nnir = (NameNameIndexRenderer) nameRenderer .getNameIndexRenderer(); assertEquals(UNEXPECTED_STRING, @@ -126,7 +122,7 @@ public void testRenderUnset() { public void testRenderPrefixSuffix() { final Name name = new Name(null, "Foo//Bar"); final NameRenderer nameRenderer = new NameRenderer(name, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final NameNameIndexRenderer nnir = (NameNameIndexRenderer) nameRenderer .getNameIndexRenderer(); assertEquals(UNEXPECTED_STRING, diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameRendererTest.java index 989fd53e..9838fad5 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NameRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Name; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NameListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.NameNameHtmlRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.NameRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class NameRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -49,7 +45,7 @@ public void init() { @Test public void testAttributeListOpenRenderer() { final NameRenderer renderer = new NameRenderer(new Name(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getAttributeListOpenRenderer() instanceof SimpleAttributeListOpenRenderer); @@ -62,7 +58,7 @@ public void testAttributeListOpenRenderer() { @Test public void testListItemRenderer() { final NameRenderer renderer = new NameRenderer(new Name(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getListItemRenderer() instanceof NameListItemRenderer); @@ -75,7 +71,7 @@ public void testListItemRenderer() { @Test public void testNameHtmlRenderer() { final NameRenderer renderer = new NameRenderer(new Name(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameHtmlRenderer() instanceof NameNameHtmlRenderer); @@ -88,7 +84,7 @@ public void testNameHtmlRenderer() { @Test public void testNameIndexRenderer() { final NameRenderer renderer = new NameRenderer(new Name(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameIndexRenderer() instanceof NameNameIndexRenderer); @@ -101,7 +97,7 @@ public void testNameIndexRenderer() { @Test public void testPhraseRenderer() { final NameRenderer renderer = new NameRenderer(new Name(null), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getPhraseRenderer() instanceof NamePhraseRenderer); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NullListItemRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NullListItemRendererTest.java index 2c689069..12c5026e 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NullListItemRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NullListItemRendererTest.java @@ -5,14 +5,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.GedObject; import org.schoellerfamily.gedbrowser.datamodel.visitor.GedObjectVisitor; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.DefaultRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -23,9 +22,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class NullListItemRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -39,7 +35,7 @@ public void init() { final RenderingContext anonymousContext = RenderingContext.anonymous(appInfo); final DefaultRenderer renderer = new DefaultRenderer(createGedObject(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); nsr = (NullListItemRenderer) renderer .getListItemRenderer(); } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NullPhraseRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NullPhraseRendererTest.java index ef15e66f..772502b2 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NullPhraseRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NullPhraseRendererTest.java @@ -5,14 +5,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.GedObject; import org.schoellerfamily.gedbrowser.datamodel.visitor.GedObjectVisitor; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.DefaultRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -23,9 +22,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class NullPhraseRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -37,8 +33,7 @@ public final class NullPhraseRendererTest { @Before public void init() { final DefaultRenderer renderer = new DefaultRenderer(createGedObject(), - new GedRendererFactory(), RenderingContext.anonymous(appInfo), - provider); + new GedRendererFactory(), RenderingContext.anonymous(appInfo)); npr = (NullPhraseRenderer) renderer.getPhraseRenderer(); } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NullRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NullRendererTest.java index 7e3dd367..46f16bf4 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NullRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/NullRendererTest.java @@ -9,11 +9,9 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.GedObject; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.datamodel.visitor.GedObjectVisitor; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.NullNameHtmlRenderer; @@ -22,6 +20,7 @@ import org.schoellerfamily.gedbrowser.renderer.NullRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -35,9 +34,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class NullRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -116,8 +112,7 @@ public void testPhraseRenderer() { public void testGetTrailerHtmlEmpty() { final Root root = new Root(); final NullRenderer renderer = new NullRenderer(root, - new GedRendererFactory(), anonymousContext, - provider); + new GedRendererFactory(), anonymousContext); assertEquals("Rendered string does not match expectation", "\n" + "
\n" + "

\n" + "

\n" + "
\n" @@ -147,8 +142,7 @@ public void testGetTrailerHtmlEmpty() { public void testGetHeaderHtml() { final Root root = new Root(); final NullRenderer renderer = new NullRenderer(root, - new GedRendererFactory(), anonymousContext, - provider); + new GedRendererFactory(), anonymousContext); final String keywords = "one two three"; final String title = "title"; @@ -175,8 +169,7 @@ public void testGetHeaderHtml() { public void testGetTrailerHtml() { final Root root = new Root(); final NullRenderer renderer = new NullRenderer(root, - new GedRendererFactory(), anonymousContext, - provider); + new GedRendererFactory(), anonymousContext); assertEquals("Rendered string does not match expectation", "\n" + "
\n" + "

\n" + "

\n" + "
\n" @@ -206,8 +199,7 @@ public void testGetTrailerHtml() { public void testGetTrailerHtmlHeader() { final Root root = new Root(); final NullRenderer renderer = new NullRenderer(root, - new GedRendererFactory(), anonymousContext, - provider); + new GedRendererFactory(), anonymousContext); assertEquals("Rendered string does not match expectation", "\n" + "
\n" + "

\n" + " Header
\n" @@ -238,8 +230,7 @@ public void testGetTrailerHtmlHeader() { public void testGetTrailerHtmlSurnames() { final Root root = new Root(); final NullRenderer renderer = new NullRenderer(root, - new GedRendererFactory(), anonymousContext, - provider); + new GedRendererFactory(), anonymousContext); assertEquals("Rendered string does not match expectation", "\n" + "

\n" + "

\n" + " \n" + "

\n" + " Figliuolo", personRenderer.getTitleName()); @@ -841,7 +842,7 @@ public void testRenderMelissaTitleUser() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I4248"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "Confidential", personRenderer.getTitleName()); @@ -855,7 +856,7 @@ public void testRenderGeorgeTitle() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I9"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "George Steven Sacerdote", personRenderer.getTitleName()); @@ -869,7 +870,7 @@ public void testRenderMelissaWholeName() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "Melissa Robinson Schoeller", personRenderer.getWholeName()); @@ -883,7 +884,7 @@ public void testRenderSabinoWholeName() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I4248"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), adminContext, provider); + new GedRendererFactory(), adminContext); assertEquals("Rendered html doesn't match expectation", "Sabino Figliuolo", personRenderer.getWholeName()); } @@ -896,7 +897,7 @@ public void testRenderSabinoWholeNameUser() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I4248"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "Confidential", personRenderer.getWholeName()); } @@ -909,7 +910,7 @@ public void testRenderGeorgeWholeNameUser() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I9"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "George Steven Sacerdote", personRenderer.getWholeName()); } @@ -922,7 +923,7 @@ public void testRenderMelissaFatherNameHtml() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "" + "Richard John" @@ -940,7 +941,7 @@ public void testRenderCiciFatherNameHtmlAdmin() throws IOException { final Person melissa = (Person) root.find("I5266"); final PersonRenderer personRenderer = new PersonRenderer(melissa, new GedRendererFactory(), - adminContext, provider); + adminContext); assertEquals("Rendered html doesn't match expectation", "" + "Sabino" @@ -956,7 +957,7 @@ public void testRenderCiciFatherNameHtmlAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I5266"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "Confidential", personRenderer.getParents().getFatherNameHtml()); @@ -971,7 +972,7 @@ public void testRenderVivianFatherNameHtmlAdmin() throws IOException { final Person melissa = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(melissa, new GedRendererFactory(), - adminContext, provider); + adminContext); assertEquals("Rendered html doesn't match expectation", "" + "John Vincent" @@ -988,7 +989,7 @@ public void testRenderVivianFatherNameHtmlAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Expected empty string", "", personRenderer.getParents().getFatherNameHtml()); } @@ -1001,7 +1002,7 @@ public void testRenderGeorgeFatherNameHtml() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I9"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Expected empty string", "", personRenderer.getParents().getFatherNameHtml()); } @@ -1014,7 +1015,7 @@ public void testRenderMelissaMotherNameHtml() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "" + "Lisa Hope" @@ -1032,7 +1033,7 @@ public void testRenderCiciMotherNameHtmlAdmin() throws IOException { final Person melissa = (Person) root.find("I5266"); final PersonRenderer personRenderer = new PersonRenderer(melissa, new GedRendererFactory(), - adminContext, provider); + adminContext); assertEquals("Rendered html doesn't match expectation", "" + "Vivian Grace" @@ -1049,7 +1050,7 @@ public void testRenderCiciMotherNameHtmlAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I5266"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "Confidential", personRenderer.getParents().getMotherNameHtml()); @@ -1064,7 +1065,7 @@ public void testRenderVivianMotherNameHtmlAdmin() throws IOException { final Person melissa = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(melissa, new GedRendererFactory(), - adminContext, provider); + adminContext); assertEquals("Rendered html doesn't match expectation", "" + "Patricia Ruth" @@ -1081,7 +1082,7 @@ public void testRenderVivianMotherNameHtmlAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Expected empty string", "", personRenderer.getParents().getMotherNameHtml()); } @@ -1094,7 +1095,7 @@ public void testRenderGeorgeMotherNameHtml() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I9"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Expected empty string", "", personRenderer.getParents().getMotherNameHtml()); } @@ -1107,7 +1108,7 @@ public void testRenderMelissaFatherRendition() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "\n

\n Father:" + " " @@ -1124,7 +1125,7 @@ public void testRenderGeorgeFatherRendition() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I9"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "\n

\n Father:" + " \n

", @@ -1139,7 +1140,7 @@ public void testRenderMelissaMotherRendition() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "\n

\n Mother:" + " " @@ -1156,7 +1157,7 @@ public void testRenderGeorgeMotherRendition() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I9"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "\n

\n Mother:" + " \n

", @@ -1171,7 +1172,7 @@ public void testRenderDickLifeSpan() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I2"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "(14 DEC 1958-)", personRenderer.getLifeSpanString()); @@ -1185,7 +1186,7 @@ public void testRenderMelissaLifeSpan() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered html doesn't match expectation", "(-)", personRenderer.getLifeSpanString()); @@ -1199,7 +1200,7 @@ public void testRenderDickFamilies() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I2"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); final List families = personRenderer.getFamilies(); assertEquals("Expected family string F1", "F1", families.get(0).getString()); @@ -1213,7 +1214,7 @@ public void testRenderMelissaFamilies() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Person should have 0 families", 0, personRenderer.getFamilies().size()); } @@ -1227,7 +1228,7 @@ public void testRenderDickAttributes() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I2"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); final int expect = 8; assertEquals("Expected 8 attributes", expect, personRenderer.getAttributes().size()); @@ -1241,7 +1242,7 @@ public void testRenderMelissaAttributes() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); final int expect = 4; assertEquals("Expected 4 attributes", expect, personRenderer.getAttributes().size()); @@ -1255,7 +1256,7 @@ public void testRenderDickIdString() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I2"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Expected person ID string I2", "I2", personRenderer.getIdString()); } @@ -1268,7 +1269,7 @@ public void testRenderMelissaIdString() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Expected person ID string I1", "I1", personRenderer.getIdString()); } @@ -1281,7 +1282,7 @@ public void testRenderMelissaIndexHref() throws IOException { final Root root = reader.readBigTestSource(); final Person melissa = (Person) root.find("I1"); final PersonRenderer personRenderer = new PersonRenderer(melissa, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered string mismatch", "surnames?db=null&letter=S#Schoeller", personRenderer.getIndexHref()); @@ -1295,7 +1296,7 @@ public void testVivianSurnameLetterAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered string mismatch", "?", personRenderer.getSurnameLetter()); } @@ -1309,7 +1310,7 @@ public void testVivianSurnameLetterAdmin() throws IOException { final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, new GedRendererFactory(), - adminContext, provider); + adminContext); assertEquals("Rendered string mismatch", "S", personRenderer.getSurnameLetter()); } @@ -1322,7 +1323,7 @@ public void testVivianSurnameAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Rendered string mismatch", "?", personRenderer.getSurname()); } @@ -1336,7 +1337,7 @@ public void testVivianSurnameAdmin() throws IOException { final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, new GedRendererFactory(), - adminContext, provider); + adminContext); assertEquals("Rendered string mismatch", "Schoeller", personRenderer.getSurname()); } @@ -1349,7 +1350,7 @@ public void testVivianLifespanAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Expected empty string", "", personRenderer.getLifeSpanString()); } @@ -1363,7 +1364,7 @@ public void testVivianLifespanAdmin() throws IOException { final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, new GedRendererFactory(), - adminContext, provider); + adminContext); assertEquals("Rendered html doesn't match expectation", "(16 APR 1960-)", personRenderer.getLifeSpanString()); } @@ -1376,7 +1377,7 @@ public void testVivianFamiliesAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Expected empty family list", 0, personRenderer.getFamilies().size()); } @@ -1390,7 +1391,7 @@ public void testVivianFamiliesAdmin() throws IOException { final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, new GedRendererFactory(), - adminContext, provider); + adminContext); assertEquals("Expected 1 family in family list", 1, personRenderer.getFamilies().size()); } @@ -1403,7 +1404,7 @@ public void testVivianAttributesAnon() throws IOException { final Root root = reader.readBigTestSource(); final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), userContext, provider); + new GedRendererFactory(), userContext); assertEquals("Expected 0 attributes", 0, personRenderer.getAttributes().size()); } @@ -1417,7 +1418,7 @@ public void testVivianAttributesAdmin() throws IOException { final Person person = (Person) root.find("I5"); final PersonRenderer personRenderer = new PersonRenderer(person, new GedRendererFactory(), - adminContext, provider); + adminContext); final int expectedLength = 8; assertEquals("Attribute list size mismatch", expectedLength, personRenderer.getAttributes().size()); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlaceListItemRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlaceListItemRendererTest.java index b4fb9915..86724c36 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlaceListItemRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlaceListItemRendererTest.java @@ -5,15 +5,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Attribute; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Place; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.PlaceListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.PlaceRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -24,9 +23,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class PlaceListItemRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -55,7 +51,7 @@ public void init() { @Test public void testGetRenderAsListItem() { final PlaceRenderer dRenderer = new PlaceRenderer(place, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final StringBuilder builder = new StringBuilder(); final PlaceListItemRenderer liRenderer = (PlaceListItemRenderer) dRenderer.getListItemRenderer(); @@ -70,7 +66,7 @@ public void testGetRenderAsListItem() { public void testGetRenderAsListItemEmpty() { final PlaceRenderer dRenderer = new PlaceRenderer( new Place(attribute, ""), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); final StringBuilder builder = new StringBuilder(); final PlaceListItemRenderer liRenderer = (PlaceListItemRenderer) dRenderer.getListItemRenderer(); @@ -84,7 +80,7 @@ public void testGetRenderAsListItemEmpty() { public void testGetRenderAsListItemNull() { final PlaceRenderer dRenderer = new PlaceRenderer( new Place(attribute, null), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); final StringBuilder builder = new StringBuilder(); final PlaceListItemRenderer liRenderer = (PlaceListItemRenderer) dRenderer.getListItemRenderer(); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlaceListRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlaceListRendererTest.java index 9ab422a4..9cf44f4d 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlaceListRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlaceListRendererTest.java @@ -7,17 +7,17 @@ import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Attribute; import org.schoellerfamily.gedbrowser.datamodel.Family; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.util.GedObjectBuilder; import org.schoellerfamily.gedbrowser.datamodel.util.PersonBuilder; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.PlaceInfo; import org.schoellerfamily.gedbrowser.renderer.PlaceListRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; -import org.schoellerfamily.gedbrowser.renderer.User; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.user.UserImpl; import org.schoellerfamily.geoservice.client.GeoServiceClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; @@ -72,7 +72,7 @@ static class ContextConfiguration { @Test public void testNullArgsUser() { final PlaceListRenderer plr = new PlaceListRenderer(null, null, - RenderingContext.user(appInfo), provider); + RenderingContext.user(appInfo)); final List list = plr.render(); assertTrue("Should cleanly provide an empty list", list.isEmpty()); } @@ -81,7 +81,7 @@ public void testNullArgsUser() { @Test public void testNullArgsAdmin() { final PlaceListRenderer plr = new PlaceListRenderer(null, null, - createAdminContext(), provider); + createAdminContext()); final List list = plr.render(); assertTrue("Should cleanly provide an empty list", list.isEmpty()); } @@ -91,7 +91,7 @@ public void testNullArgsAdmin() { public void testNullClient() { final Person person = createJRandom(); final PlaceListRenderer plr = new PlaceListRenderer(person, null, - RenderingContext.user(appInfo), provider); + RenderingContext.user(appInfo)); final List list = plr.render(); assertTrue("Should cleanly provide an empty list", list.isEmpty()); } @@ -101,7 +101,7 @@ public void testNullClient() { public void testNullClientAdmin() { final Person person = createJRandom(); final PlaceListRenderer plr = new PlaceListRenderer(person, null, - createAdminContext(), provider); + createAdminContext()); final List list = plr.render(); assertTrue("Should cleanly provide an empty list", list.isEmpty()); } @@ -211,7 +211,7 @@ public void testAdminCanSeeConfidential() { attr.setTail("confidential"); final PlaceListRenderer plr = new PlaceListRenderer(person, client, - createAdminContext(), provider); + createAdminContext()); final List list = plr.render(); assertEquals("Should have one result", 1, list.size()); } @@ -227,7 +227,7 @@ public void testUserCanNotSeeConfidential() { attr.setTail("confidential"); final PlaceListRenderer plr = new PlaceListRenderer(person, client, - RenderingContext.user(appInfo), provider); + RenderingContext.user(appInfo)); final List list = plr.render(); assertEquals("Should have one result", 0, list.size()); } @@ -243,7 +243,7 @@ public void testAnonCanNotSeeConfidential() { attr.setTail("confidential"); final PlaceListRenderer plr = new PlaceListRenderer(person, client, - RenderingContext.user(appInfo), provider); + RenderingContext.user(appInfo)); final List list = plr.render(); assertEquals("Should have one result", 0, list.size()); } @@ -255,7 +255,7 @@ public void testAnonCanNotSeeLiving() { createBirth(person, "Needham, Massachusetts, USA"); final PlaceListRenderer plr = new PlaceListRenderer(person, client, - RenderingContext.anonymous(appInfo), provider); + RenderingContext.anonymous(appInfo)); final List list = plr.render(); assertEquals("Should have one result", 0, list.size()); } @@ -268,7 +268,7 @@ public void testAnonCanSeeDead() { createDeath(person, "Needham, Massachusetts, USA"); final PlaceListRenderer plr = new PlaceListRenderer(person, client, - RenderingContext.anonymous(appInfo), provider); + RenderingContext.anonymous(appInfo)); final List list = plr.render(); assertEquals("Should have one result", 1, list.size()); } @@ -281,7 +281,7 @@ public void testAnonCanSeeDeadAltConstruction() { createDeath(person, "Needham, MA, USA"); final PlaceListRenderer plr = new PlaceListRenderer(person, client, - RenderingContext.anonymous(appInfo), provider); + RenderingContext.anonymous(appInfo)); final List list = plr.render(); assertEquals("Should have one result", 2, list.size()); } @@ -291,8 +291,7 @@ public void testAnonCanSeeDeadAltConstruction() { * @return the renderer */ private PlaceListRenderer createAdminRenderer(final Person person) { - return new PlaceListRenderer(person, client, createAdminContext(), - provider); + return new PlaceListRenderer(person, client, createAdminContext()); } /** @@ -319,9 +318,9 @@ private void createDeath(final Person person, final String placeName) { * @return a rendering context with admin privs */ private RenderingContext createAdminContext() { - final User user = new User(); + final UserImpl user = new UserImpl(); user.setUsername("dick"); - return new RenderingContext(user, true, true, appInfo); + return new RenderingContext(user, true, true, appInfo, provider); } /** */ @@ -341,7 +340,7 @@ public void testAnonCanSeeDeadMarriage() { builder.addPlaceToEvent(marriage, "Needham, Massachusetts, USA"); final PlaceListRenderer plr = new PlaceListRenderer(person, client, - RenderingContext.anonymous(appInfo), provider); + RenderingContext.anonymous(appInfo)); final List list = plr.render(); assertEquals("Should have one result", 1, list.size()); } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlacePhraseRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlacePhraseRendererTest.java index d9aa55c5..6307eb3e 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlacePhraseRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlacePhraseRendererTest.java @@ -5,15 +5,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Attribute; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Place; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.PlacePhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.PlaceRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -24,9 +23,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class PlacePhraseRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -55,7 +51,7 @@ public void init() { @Test public void testGetRenderAsPhrase() { final PlaceRenderer dRenderer = new PlaceRenderer(place, - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); final PlacePhraseRenderer ppRenderer = (PlacePhraseRenderer) dRenderer.getPhraseRenderer(); final String string = ppRenderer.renderAsPhrase(); @@ -68,7 +64,7 @@ public void testGetRenderAsPhrase() { public void testGetRenderAsListItemEmpty() { final PlaceRenderer dRenderer = new PlaceRenderer( new Place(attribute, ""), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); final PlacePhraseRenderer ppRenderer = (PlacePhraseRenderer) dRenderer.getPhraseRenderer(); final String string = ppRenderer.renderAsPhrase(); @@ -80,7 +76,7 @@ public void testGetRenderAsListItemEmpty() { public void testGetRenderAsListItemNull() { final PlaceRenderer dRenderer = new PlaceRenderer( new Place(attribute, null), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); final PlacePhraseRenderer ppRenderer = (PlacePhraseRenderer) dRenderer.getPhraseRenderer(); final String string = ppRenderer.renderAsPhrase(); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlaceRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlaceRendererTest.java index 0f9a7680..3ab2f6b4 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlaceRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/PlaceRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Place; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullNameHtmlRenderer; import org.schoellerfamily.gedbrowser.renderer.NullNameIndexRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.PlaceRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class PlaceRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -49,7 +45,7 @@ public void init() { @Test public void testAttributeListOpenRenderer() { final PlaceRenderer renderer = new PlaceRenderer(new Place(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getAttributeListOpenRenderer() instanceof SimpleAttributeListOpenRenderer); @@ -62,7 +58,7 @@ public void testAttributeListOpenRenderer() { @Test public void testListItemRenderer() { final PlaceRenderer renderer = new PlaceRenderer(new Place(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getListItemRenderer() instanceof PlaceListItemRenderer); @@ -75,7 +71,7 @@ public void testListItemRenderer() { @Test public void testNameHtmlRenderer() { final PlaceRenderer renderer = new PlaceRenderer(new Place(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameHtmlRenderer() instanceof NullNameHtmlRenderer); @@ -88,7 +84,7 @@ public void testNameHtmlRenderer() { @Test public void testNameIndexRenderer() { final PlaceRenderer renderer = new PlaceRenderer(new Place(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameIndexRenderer() instanceof NullNameIndexRenderer); @@ -101,7 +97,7 @@ public void testNameIndexRenderer() { @Test public void testPhraseRenderer() { final PlaceRenderer renderer = new PlaceRenderer(new Place(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getPhraseRenderer() instanceof PlacePhraseRenderer); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/RootRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/RootRendererTest.java index 2de82940..0f38e0bc 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/RootRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/RootRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Root; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.NullNameHtmlRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.RootRenderer; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class RootRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -49,7 +45,7 @@ public void init() { @Test public void testAttributeListOpenRenderer() { final RootRenderer renderer = new RootRenderer(new Root(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getAttributeListOpenRenderer() instanceof SimpleAttributeListOpenRenderer); @@ -62,7 +58,7 @@ public void testAttributeListOpenRenderer() { @Test public void testListItemRenderer() { final RootRenderer renderer = new RootRenderer(new Root(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getListItemRenderer() instanceof NullListItemRenderer); @@ -75,7 +71,7 @@ public void testListItemRenderer() { @Test public void testNameHtmlRenderer() { final RootRenderer renderer = new RootRenderer(new Root(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameHtmlRenderer() instanceof NullNameHtmlRenderer); @@ -88,7 +84,7 @@ public void testNameHtmlRenderer() { @Test public void testNameIndexRenderer() { final RootRenderer renderer = new RootRenderer(new Root(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getNameIndexRenderer() instanceof NullNameIndexRenderer); @@ -101,7 +97,7 @@ public void testNameIndexRenderer() { @Test public void testPhraseRenderer() { final RootRenderer renderer = new RootRenderer(new Root(), - new GedRendererFactory(), anonymousContext, provider); + new GedRendererFactory(), anonymousContext); assertTrue("Wrong renderer type", renderer.getPhraseRenderer() instanceof NullPhraseRenderer); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SimpleAttributeListOpenRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SimpleAttributeListOpenRendererTest.java index 4311e548..574587cb 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SimpleAttributeListOpenRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SimpleAttributeListOpenRendererTest.java @@ -5,14 +5,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.GedObject; import org.schoellerfamily.gedbrowser.datamodel.visitor.GedObjectVisitor; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.DefaultRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -23,9 +22,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class SimpleAttributeListOpenRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -56,8 +52,7 @@ public void accept(final GedObjectVisitor visitor) { public void init() { final DefaultRenderer renderer = new DefaultRenderer(gob, new GedRendererFactory(), - RenderingContext.anonymous(appInfo), - provider); + RenderingContext.anonymous(appInfo)); npr = (SimpleAttributeListOpenRenderer) renderer .getAttributeListOpenRenderer(); } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SourceLinkListItemRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SourceLinkListItemRendererTest.java index d49f5d17..9806daef 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SourceLinkListItemRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SourceLinkListItemRendererTest.java @@ -5,17 +5,16 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.ObjectId; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.datamodel.Source; import org.schoellerfamily.gedbrowser.datamodel.SourceLink; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SourceLinkListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.SourceLinkRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class SourceLinkListItemRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -57,8 +53,7 @@ public void testRenderAsListItem() { new SourceLink(person, "SOUR", new ObjectId("S1")); person.addAttribute(sourceLink); final SourceLinkRenderer slRenderer = new SourceLinkRenderer(sourceLink, - new GedRendererFactory(), anonymousContext, - provider); + new GedRendererFactory(), anonymousContext); final SourceLinkListItemRenderer lir = (SourceLinkListItemRenderer) slRenderer .getListItemRenderer(); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SourceLinkRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SourceLinkRendererTest.java index b3794c23..013aed75 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SourceLinkRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SourceLinkRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.SourceLink; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullNameHtmlRenderer; import org.schoellerfamily.gedbrowser.renderer.NullNameIndexRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.SourceLinkListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.SourceLinkPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.SourceLinkRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class SourceLinkRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -108,7 +104,7 @@ public void testPhraseRenderer() { private SourceLinkRenderer createRenderer() { final SourceLinkRenderer renderer = new SourceLinkRenderer( new SourceLink(), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); return renderer; } } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SourceRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SourceRendererTest.java index b4b231e1..192f6a12 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SourceRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SourceRendererTest.java @@ -8,12 +8,10 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.ObjectId; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.datamodel.Source; import org.schoellerfamily.gedbrowser.reader.testreader.TestDataReader; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; @@ -23,6 +21,7 @@ import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; import org.schoellerfamily.gedbrowser.renderer.SourceRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -38,9 +37,6 @@ public final class SourceRendererTest { private transient TestDataReader reader; /** */ @Autowired - private transient CalendarProvider provider; - /** */ - @Autowired private transient ApplicationInfo appInfo; /** */ @@ -118,7 +114,7 @@ public void testPhraseRenderer() { private SourceRenderer createRenderer() { final SourceRenderer renderer = new SourceRenderer( new Source(null, new ObjectId("S1")), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); return renderer; } @@ -131,7 +127,7 @@ public void testTitleString() throws IOException { final Source source = (Source) root.find("S3"); final SourceRenderer renderer = new SourceRenderer(source, new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertEquals("Mismatched title string", "Schoeller, Richard John, birth certificate", renderer.getTitleString()); @@ -146,7 +142,7 @@ public void testIdString() throws IOException { final Source source = (Source) root.find("S3"); final SourceRenderer renderer = new SourceRenderer(source, new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertEquals("Mismatched source ID", "S3", renderer.getIdString()); @@ -167,7 +163,7 @@ public void testIdAttributes() throws IOException { final Source source = (Source) root.find("S3"); final SourceRenderer renderer = new SourceRenderer(source, new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); int i = 0; for (final GedRenderer attribute : renderer.getAttributes()) { assertEquals("Rendered html doesn't match expectation", diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkListItemRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkListItemRendererTest.java index ed6129f3..5f028033 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkListItemRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkListItemRendererTest.java @@ -5,18 +5,17 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Head; import org.schoellerfamily.gedbrowser.datamodel.Name; import org.schoellerfamily.gedbrowser.datamodel.ObjectId; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.datamodel.Submittor; import org.schoellerfamily.gedbrowser.datamodel.SubmittorLink; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SubmittorLinkListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.SubmittorLinkRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -27,9 +26,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class SubmittorLinkListItemRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -62,7 +58,7 @@ public void init() { public void testRenderAsListItem() { final SubmittorLinkRenderer slr = new SubmittorLinkRenderer( submittorLink, new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); final SubmittorLinkListItemRenderer lir = (SubmittorLinkListItemRenderer) slr.getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -77,7 +73,7 @@ submittorLink, new GedRendererFactory(), public void testRenderAsListItemNewLine() { final SubmittorLinkRenderer slr = new SubmittorLinkRenderer( submittorLink, new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); final SubmittorLinkListItemRenderer lir = (SubmittorLinkListItemRenderer) slr.getListItemRenderer(); final StringBuilder builder = new StringBuilder(); @@ -92,7 +88,7 @@ submittorLink, new GedRendererFactory(), public void testRenderAsListItemPad() { final SubmittorLinkRenderer slr = new SubmittorLinkRenderer( submittorLink, new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); final SubmittorLinkListItemRenderer lir = (SubmittorLinkListItemRenderer) slr.getListItemRenderer(); final StringBuilder builder = new StringBuilder(); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkPhraseRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkPhraseRendererTest.java index 2cac9e38..78f8aa56 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkPhraseRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkPhraseRendererTest.java @@ -5,18 +5,17 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Head; import org.schoellerfamily.gedbrowser.datamodel.Name; import org.schoellerfamily.gedbrowser.datamodel.ObjectId; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.datamodel.Submittor; import org.schoellerfamily.gedbrowser.datamodel.SubmittorLink; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SubmittorLinkPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.SubmittorLinkRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -27,9 +26,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class SubmittorLinkPhraseRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -62,8 +58,7 @@ public void init() { @Test public void testRenderAsPhrase() { final SubmittorLinkRenderer slr = new SubmittorLinkRenderer( - submittorLink, new GedRendererFactory(), anonymousContext, - provider); + submittorLink, new GedRendererFactory(), anonymousContext); final SubmittorLinkPhraseRenderer slpr = (SubmittorLinkPhraseRenderer) slr.getPhraseRenderer(); assertEquals("Rendered html doesn't match expectation", diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkRendererTest.java index 5a1d1eb0..ab041d20 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.SubmittorLink; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullNameHtmlRenderer; import org.schoellerfamily.gedbrowser.renderer.NullNameIndexRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.SubmittorLinkListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.SubmittorLinkPhraseRenderer; import org.schoellerfamily.gedbrowser.renderer.SubmittorLinkRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class SubmittorLinkRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -50,7 +46,7 @@ public void init() { public void testAttributeListOpenRenderer() { final SubmittorLinkRenderer renderer = new SubmittorLinkRenderer( new SubmittorLink(), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertTrue("Wrong renderer type", renderer.getAttributeListOpenRenderer() instanceof SimpleAttributeListOpenRenderer); @@ -64,7 +60,7 @@ public void testAttributeListOpenRenderer() { public void testListItemRenderer() { final SubmittorLinkRenderer renderer = new SubmittorLinkRenderer( new SubmittorLink(), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertTrue("Wrong renderer type", renderer.getListItemRenderer() instanceof SubmittorLinkListItemRenderer); @@ -78,7 +74,7 @@ public void testListItemRenderer() { public void testNameHtmlRenderer() { final SubmittorLinkRenderer renderer = new SubmittorLinkRenderer( new SubmittorLink(), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertTrue("Wrong renderer type", renderer.getNameHtmlRenderer() instanceof NullNameHtmlRenderer); @@ -92,7 +88,7 @@ public void testNameHtmlRenderer() { public void testNameIndeRenderer() { final SubmittorLinkRenderer renderer = new SubmittorLinkRenderer( new SubmittorLink(), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertTrue("Wrong renderer type", renderer.getNameIndexRenderer() instanceof NullNameIndexRenderer); @@ -106,7 +102,7 @@ public void testNameIndeRenderer() { public void testPhraseRenderer() { final SubmittorLinkRenderer renderer = new SubmittorLinkRenderer( new SubmittorLink(), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); assertTrue("Wrong renderer type", renderer.getPhraseRenderer() instanceof SubmittorLinkPhraseRenderer); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorRendererTest.java index 2d47be8c..4f07f266 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Submittor; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.NullNameHtmlRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; import org.schoellerfamily.gedbrowser.renderer.SubmittorRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class SubmittorRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -108,7 +104,7 @@ public void testPhraseRenderer() { private SubmittorRenderer createRenderer() { final SubmittorRenderer renderer = new SubmittorRenderer( new Submittor(), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); return renderer; } } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/TestConfiguration.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/TestConfiguration.java index cb87d4e5..b92a4499 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/TestConfiguration.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/TestConfiguration.java @@ -1,10 +1,10 @@ package org.schoellerfamily.gedbrowser.renderer.test; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; -import org.schoellerfamily.gedbrowser.analytics.CalendarProviderStub; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProviderStub; import org.schoellerfamily.gedbrowser.reader.GedObjectCreator; import org.schoellerfamily.gedbrowser.reader.testreader.TestDataReader; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.schoellerfamily.geoservice.client.GeoServiceClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/TrailerRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/TrailerRendererTest.java index 0f2aa2b0..a65810e5 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/TrailerRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/TrailerRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Trailer; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.NullNameHtmlRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; import org.schoellerfamily.gedbrowser.renderer.TrailerRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,9 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class TrailerRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -104,7 +100,7 @@ public void testPhraseRenderer() { private TrailerRenderer createRenderer() { final TrailerRenderer renderer = new TrailerRenderer( new Trailer(null, "Trailer"), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); return renderer; } } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/UserModePersonNameHtmlRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/UserModePersonNameHtmlRendererTest.java index 388fc19e..7ca53fec 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/UserModePersonNameHtmlRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/UserModePersonNameHtmlRendererTest.java @@ -5,16 +5,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Name; import org.schoellerfamily.gedbrowser.datamodel.ObjectId; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Root; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.PersonNameHtmlRenderer; import org.schoellerfamily.gedbrowser.renderer.PersonRenderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -25,9 +24,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class UserModePersonNameHtmlRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; /** */ @Autowired private transient ApplicationInfo appInfo; @@ -53,7 +49,7 @@ public void testGetNameHtmlNull() { final Name name = new Name(person); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Rendered string mismatch", @@ -68,7 +64,7 @@ public void testGetNameHtmlEmpty() { final Name name = new Name(person, ""); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Rendered string mismatch", @@ -83,7 +79,7 @@ public void testGetNameHtmlSurnameOnly() { final Name name = new Name(person, "/Schoeller/"); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Rendered string mismatch", @@ -98,7 +94,7 @@ public void testGetNameHtmlSurnameLast() { final Name name = new Name(person, "Richard/Schoeller/"); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Rendered string mismatch", @@ -114,7 +110,7 @@ public void testGetNameHtmlSurnameFirst() { final Name name = new Name(person, "/Deng/Shao Ping"); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Rendered string mismatch", @@ -129,7 +125,7 @@ public void testGetNameHtmlSurnameMiddle() { final Name name = new Name(person, "Karl Frederick/Schoeller/Sr."); person.addAttribute(name); final PersonRenderer personRenderer = new PersonRenderer(person, - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Rendered string mismatch", @@ -143,7 +139,7 @@ public void testGetNameHtmlSurnameMiddle() { @Test public void testGetNameHtmlPersonUnset() { final PersonRenderer personRenderer = new PersonRenderer(new Person(), - new GedRendererFactory(), renderingContext, provider); + new GedRendererFactory(), renderingContext); final PersonNameHtmlRenderer pnhr = (PersonNameHtmlRenderer) personRenderer.getNameHtmlRenderer(); assertEquals("Rendered string mismatch (expected empty)", diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/UserTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/UserTest.java index 3b16f883..b1bb11b0 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/UserTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/UserTest.java @@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.schoellerfamily.gedbrowser.renderer.User; +import org.schoellerfamily.gedbrowser.renderer.user.UserImpl; /** * Test the User object. The only thing slightly complex is role management. @@ -17,49 +17,49 @@ public final class UserTest { /** */ @Test public void testDefaultUsername() { - final User user = new User(); + final UserImpl user = new UserImpl(); assertNull("Expected null user name", user.getUsername()); } /** */ @Test public void testDefaultFirstname() { - final User user = new User(); + final UserImpl user = new UserImpl(); assertNull("Expected null user first name", user.getFirstname()); } /** */ @Test public void testDefaultLastname() { - final User user = new User(); + final UserImpl user = new UserImpl(); assertNull("Expected null last name", user.getLastname()); } /** */ @Test public void testDefaultEmail() { - final User user = new User(); + final UserImpl user = new UserImpl(); assertNull("Expected null email address", user.getEmail()); } /** */ @Test public void testDefaultPassword() { - final User user = new User(); + final UserImpl user = new UserImpl(); assertNull("Expected null password", user.getPassword()); } /** */ @Test public void testDefaultRoles() { - final User user = new User(); + final UserImpl user = new UserImpl(); assertEquals("Expected empty roles list", 0, user.getRoles().length); } /** */ @Test public void testUsername() { - final User user = new User(); + final UserImpl user = new UserImpl(); user.setUsername("test"); assertEquals("Username mismatch", "test", user.getUsername()); } @@ -67,7 +67,7 @@ public void testUsername() { /** */ @Test public void testFirstname() { - final User user = new User(); + final UserImpl user = new UserImpl(); user.setFirstname("first"); assertEquals("First name mismatch", "first", user.getFirstname()); } @@ -75,7 +75,7 @@ public void testFirstname() { /** */ @Test public void testLastname() { - final User user = new User(); + final UserImpl user = new UserImpl(); user.setLastname("last"); assertEquals("Last name mismatch", "last", user.getLastname()); } @@ -83,7 +83,7 @@ public void testLastname() { /** */ @Test public void testEmail() { - final User user = new User(); + final UserImpl user = new UserImpl(); user.setEmail("test@test.com"); assertEquals("Email mismatch", "test@test.com", user.getEmail()); } @@ -91,7 +91,7 @@ public void testEmail() { /** */ @Test public void testPassword() { - final User user = new User(); + final UserImpl user = new UserImpl(); user.setPassword("password"); assertEquals("Password mismatch", "password", user.getPassword()); } @@ -99,7 +99,7 @@ public void testPassword() { /** */ @Test public void testOneRole() { - final User user = new User(); + final UserImpl user = new UserImpl(); user.addRole("USER"); assertEquals("Expected 1 role", 1, user.getRoles().length); } @@ -107,7 +107,7 @@ public void testOneRole() { /** */ @Test public void testTwoRoles() { - final User user = new User(); + final UserImpl user = new UserImpl(); user.addRole("USER"); user.addRole("ADMIN"); assertEquals("Expected 2 roles", 2, user.getRoles().length); @@ -116,7 +116,7 @@ public void testTwoRoles() { /** */ @Test public void testRoleSet() { - final User user = new User(); + final UserImpl user = new UserImpl(); user.addRole("USER"); user.addRole("USER"); assertEquals("Expected 1 role", 1, user.getRoles().length); @@ -125,7 +125,7 @@ public void testRoleSet() { /** */ @Test public void testOneRoleContent() { - final User user = new User(); + final UserImpl user = new UserImpl(); user.addRole("USER"); assertEquals("Mismatched role", "USER", user.getRoles()[0]); } @@ -133,7 +133,7 @@ public void testOneRoleContent() { /** */ @Test public void testHasRole() { - final User user = new User(); + final UserImpl user = new UserImpl(); user.addRole("USER"); user.addRole("ADMIN"); user.addRole("IDIOT"); @@ -143,7 +143,7 @@ public void testHasRole() { /** */ @Test public void testHasRoleNegative() { - final User user = new User(); + final UserImpl user = new UserImpl(); user.addRole("USER"); user.addRole("IDIOT"); assertFalse("Should not have admin role", user.hasRole("ADMIN")); @@ -152,7 +152,7 @@ public void testHasRoleNegative() { /** */ @Test public void testClearRoles() { - final User user = new User(); + final UserImpl user = new UserImpl(); user.addRole("USER"); user.addRole("IDIOT"); user.clearRoles(); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/WifeRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/WifeRendererTest.java index 317e4309..1f380894 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/WifeRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/WifeRendererTest.java @@ -5,9 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; import org.schoellerfamily.gedbrowser.datamodel.Wife; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.NullListItemRenderer; import org.schoellerfamily.gedbrowser.renderer.NullNameHtmlRenderer; @@ -16,6 +14,7 @@ import org.schoellerfamily.gedbrowser.renderer.RenderingContext; import org.schoellerfamily.gedbrowser.renderer.SimpleAttributeListOpenRenderer; import org.schoellerfamily.gedbrowser.renderer.WifeRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,10 +25,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfiguration.class }) public final class WifeRendererTest { - /** */ - @Autowired - private transient CalendarProvider provider; - /** */ @Autowired private transient ApplicationInfo appInfo; @@ -106,7 +101,7 @@ public void testPhraseRenderer() { private WifeRenderer createRenderer() { final WifeRenderer renderer = new WifeRenderer( new Wife(null, "Wife", null), new GedRendererFactory(), - anonymousContext, provider); + anonymousContext); return renderer; } } diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/MongoConfiguration.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/MongoConfiguration.java index 24bdf888..e544c6d7 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/MongoConfiguration.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/MongoConfiguration.java @@ -2,9 +2,9 @@ import java.net.UnknownHostException; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; -import org.schoellerfamily.gedbrowser.analytics.CalendarProviderImpl; -import org.schoellerfamily.gedbrowser.analytics.CalendarProviderStub; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProviderImpl; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProviderStub; import org.schoellerfamily.gedbrowser.controller.ApplicationInfoImpl; import org.schoellerfamily.gedbrowser.datamodel.finder.FinderStrategy; import org.schoellerfamily.gedbrowser.loader.GedFileLoader; @@ -28,7 +28,7 @@ import org.schoellerfamily.gedbrowser.persistence.mongo.repository. TrailerDocumentRepositoryMongo; import org.schoellerfamily.gedbrowser.reader.GedObjectCreator; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.schoellerfamily.geoservice.client.GeoServiceClient; import org.schoellerfamily.geoservice.client.GeoServiceClientImpl; import org.schoellerfamily.geoservice.keys.KeyManager; diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/Users.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/Users.java index ed6e9f6b..6225d720 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/Users.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/Users.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.Map; -import org.schoellerfamily.gedbrowser.renderer.User; +import org.schoellerfamily.gedbrowser.renderer.user.User; /** * @author Dick Schoeller diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/UsersConfiguration.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/UsersConfiguration.java index ed73abb9..083fc608 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/UsersConfiguration.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/UsersConfiguration.java @@ -6,7 +6,8 @@ import java.io.InputStreamReader; import java.io.Reader; -import org.schoellerfamily.gedbrowser.renderer.User; +import org.schoellerfamily.gedbrowser.renderer.user.User; +import org.schoellerfamily.gedbrowser.renderer.user.UserImpl; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -48,7 +49,7 @@ public Users readUserFile(final String userFile) { users.add(user); } } catch (IOException e) { - final User user = new User(); + final UserImpl user = new UserImpl(); user.setUsername("guest"); user.setPassword("guest"); user.addRole("USER"); @@ -63,7 +64,7 @@ public Users readUserFile(final String userFile) { */ @SuppressWarnings("PMD.UseVarargs") private User buildUser(final String[] userFields) { - final User user = new User(); + final UserImpl user = new UserImpl(); int i = 0; user.setUsername(userFields[i++]); user.setFirstname(userFields[i++]); diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/WebSecurityConfiguration.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/WebSecurityConfiguration.java index d861d9f1..11024d3c 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/WebSecurityConfiguration.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/WebSecurityConfiguration.java @@ -1,6 +1,6 @@ package org.schoellerfamily.gedbrowser; -import org.schoellerfamily.gedbrowser.renderer.User; +import org.schoellerfamily.gedbrowser.renderer.user.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/AbstractController.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/AbstractController.java index 1422afd1..1c40d4c7 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/AbstractController.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/AbstractController.java @@ -5,16 +5,17 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.schoellerfamily.gedbrowser.Users; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; import org.schoellerfamily.gedbrowser.controller.exception.DataSetNotFoundException; import org.schoellerfamily.gedbrowser.controller.exception.PersonNotFoundException; import org.schoellerfamily.gedbrowser.controller.exception.SourceNotFoundException; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.loader.GedFileLoader; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedResourceNotFoundRenderer; import org.schoellerfamily.gedbrowser.renderer.Renderer; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; -import org.schoellerfamily.gedbrowser.renderer.User; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.user.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.core.Authentication; @@ -43,6 +44,10 @@ public abstract class AbstractController { @Autowired private transient GedFileLoader loader; + /** */ + @Autowired + private transient CalendarProvider provider; + /** * @return the rendering context */ @@ -53,7 +58,7 @@ protected final RenderingContext createRenderingContext() { final User user = users.get(authentication.getName()); final RenderingContextBuilder contextBuilder = new RenderingContextBuilder( - authentication, user, applicationInfo); + authentication, user, applicationInfo, provider); return contextBuilder.build(); } diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/ApplicationInfoImpl.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/ApplicationInfoImpl.java index 81a72cae..330bd844 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/ApplicationInfoImpl.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/ApplicationInfoImpl.java @@ -1,7 +1,7 @@ package org.schoellerfamily.gedbrowser.controller; import org.schoellerfamily.gedbrowser.datamodel.GedObject; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Value; /** @@ -29,7 +29,7 @@ public final class ApplicationInfoImpl implements ApplicationInfo { * {@inheritDoc} */ @Override - public String getName() { + public String getApplicationName() { return "gedbrowser"; } diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/DatedDataController.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/DatedDataController.java index fa9763f1..c962bb4e 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/DatedDataController.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/DatedDataController.java @@ -1,6 +1,6 @@ package org.schoellerfamily.gedbrowser.controller; -import org.schoellerfamily.gedbrowser.analytics.CalendarProvider; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; import org.springframework.beans.factory.annotation.Autowired; /** diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/GeoDataController.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/GeoDataController.java index b4f0114e..d190dfca 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/GeoDataController.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/GeoDataController.java @@ -36,7 +36,7 @@ public abstract class GeoDataController extends DatedDataController { protected final List fetchPlaces(final Person person, final RenderingContext renderingContext) { final PlaceListRenderer pl = new PlaceListRenderer(person, client, - renderingContext, calendarProvider()); + renderingContext); final List places = pl.render(); logPlaces(places); return places; diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/IndexController.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/IndexController.java index 7f2fae64..61d35822 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/IndexController.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/IndexController.java @@ -3,9 +3,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.schoellerfamily.gedbrowser.datamodel.Root; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRenderer; import org.schoellerfamily.gedbrowser.renderer.IndexRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -53,7 +53,7 @@ public final String surnames( final Root root = fetchRoot(dbName); final GedRenderer gedRenderer = new IndexRenderer(root, letter, - createRenderingContext(), calendarProvider()); + createRenderingContext()); model.addAttribute("filename", gedbrowserHome + "/" + dbName + ".ged"); model.addAttribute("index", gedRenderer); diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/LivingController.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/LivingController.java index 28724e56..388f4dcf 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/LivingController.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/LivingController.java @@ -3,9 +3,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.schoellerfamily.gedbrowser.datamodel.Root; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRenderer; import org.schoellerfamily.gedbrowser.renderer.LivingRenderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -47,7 +47,7 @@ public final String living(@RequestParam(value = "db", final Root root = fetchRoot(dbName); final GedRenderer gedRenderer = new LivingRenderer(root, - createRenderingContext(), calendarProvider()); + createRenderingContext()); model.addAttribute("filename", gedbrowserHome + "/" + dbName + ".ged"); model.addAttribute("living", gedRenderer); diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/LoginController.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/LoginController.java index 73faf5c5..5d88f8a7 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/LoginController.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/LoginController.java @@ -5,7 +5,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/MyErrorController.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/MyErrorController.java index 12c721d1..8b927d7a 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/MyErrorController.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/MyErrorController.java @@ -2,9 +2,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.ErrorRenderer; import org.schoellerfamily.gedbrowser.renderer.Renderer; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.web.ErrorController; import org.springframework.stereotype.Controller; @@ -40,7 +40,7 @@ public final String error(final Model model) { * {@inheritDoc} */ @Override - public String getErrorPath() { + public final String getErrorPath() { return "/error"; } } diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/PersonController.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/PersonController.java index 4ea9802f..f0b41e83 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/PersonController.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/PersonController.java @@ -7,11 +7,11 @@ import org.schoellerfamily.gedbrowser.controller.exception.PersonNotFoundException; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Root; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; import org.schoellerfamily.gedbrowser.renderer.PlaceInfo; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -98,7 +98,7 @@ private Person fetchPerson(final String dbName, final String idString) { private GedRenderer personRenderer(final RenderingContext context, final Person person) { return new GedRendererFactory().create( - person, context, calendarProvider()); + person, context); } /** @@ -121,6 +121,6 @@ private String nameHtml(final RenderingContext context, private GedRenderer nameRenderer(final RenderingContext context, final Person person) { return new GedRendererFactory().create( - person.getName(), context, calendarProvider()); + person.getName(), context); } } diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/RenderingContextBuilder.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/RenderingContextBuilder.java index 9f8e7612..c188be29 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/RenderingContextBuilder.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/RenderingContextBuilder.java @@ -2,9 +2,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; +import org.schoellerfamily.gedbrowser.analytics.calendar.CalendarProvider; import org.schoellerfamily.gedbrowser.renderer.RenderingContext; -import org.schoellerfamily.gedbrowser.renderer.User; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.user.User; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; @@ -24,18 +25,24 @@ public final class RenderingContextBuilder { /** */ private final ApplicationInfo appInfo; + /** */ + private final CalendarProvider calendarProvider; + /** * Constructor. * * @param authentication the authentication object * @param user the associated user detail object * @param appInfo supports rendering information about the application + * @param calendarProvider the calendar provider to use */ public RenderingContextBuilder(final Authentication authentication, - final User user, final ApplicationInfo appInfo) { + final User user, final ApplicationInfo appInfo, + final CalendarProvider calendarProvider) { this.authentication = authentication; this.user = user; this.appInfo = appInfo; + this.calendarProvider = calendarProvider; } /** @@ -46,7 +53,8 @@ public RenderingContextBuilder(final Authentication authentication, public RenderingContext build() { logger.debug("Entering build"); if (authentication == null) { - return new RenderingContext(null, false, false, appInfo); + return new RenderingContext(null, false, false, appInfo, + calendarProvider); } final String name = authentication.getName(); boolean isUser = false; @@ -66,6 +74,7 @@ public RenderingContext build() { } } logger.debug("Exiting build"); - return new RenderingContext(user, isUser, isAdmin, appInfo); + return new RenderingContext(user, isUser, isAdmin, appInfo, + calendarProvider); } } diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/SourceController.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/SourceController.java index 8dbee9a9..b2a75b73 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/SourceController.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/controller/SourceController.java @@ -5,9 +5,9 @@ import org.schoellerfamily.gedbrowser.controller.exception.SourceNotFoundException; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.datamodel.Source; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; import org.schoellerfamily.gedbrowser.renderer.GedRenderer; import org.schoellerfamily.gedbrowser.renderer.GedRendererFactory; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -59,7 +59,7 @@ public final String source( } final GedRenderer sourceRenderer = new GedRendererFactory() - .create(source, createRenderingContext(), calendarProvider()); + .create(source, createRenderingContext()); model.addAttribute("filename", gedbrowserHome + "/" + dbName + ".ged"); model.addAttribute("sourceString", source.getString()); diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/endpoint/ApplicationHealthIndicator.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/endpoint/ApplicationHealthIndicator.java index 3f476d3c..b16c0370 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/endpoint/ApplicationHealthIndicator.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/endpoint/ApplicationHealthIndicator.java @@ -6,7 +6,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.schoellerfamily.gedbrowser.loader.GedFileLoader; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.Health.Builder; diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/endpoint/ApplicationInfoContributor.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/endpoint/ApplicationInfoContributor.java index 92faa949..82bb5b7b 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/endpoint/ApplicationInfoContributor.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/endpoint/ApplicationInfoContributor.java @@ -2,7 +2,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.info.Info.Builder; import org.springframework.boot.actuate.info.InfoContributor; diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/endpoint/SaveEndpoint.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/endpoint/SaveEndpoint.java index 538e09cd..f6319800 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/endpoint/SaveEndpoint.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/endpoint/SaveEndpoint.java @@ -20,7 +20,7 @@ public class SaveEndpoint implements Endpoint> { * {@inheritDoc} */ @Override - public String getId() { + public final String getId() { return "save"; } @@ -28,7 +28,7 @@ public String getId() { * {@inheritDoc} */ @Override - public List invoke() { + public final List invoke() { logger.info("Invoke save"); final List messages = new ArrayList<>(); messages.add("Currently a NO-OP"); @@ -39,7 +39,7 @@ public List invoke() { * {@inheritDoc} */ @Override - public boolean isEnabled() { + public final boolean isEnabled() { return true; } @@ -47,7 +47,7 @@ public boolean isEnabled() { * {@inheritDoc} */ @Override - public boolean isSensitive() { + public final boolean isSensitive() { return true; } } diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/loader/GedFileLoader.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/loader/GedFileLoader.java index 4324e419..b42edf7b 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/loader/GedFileLoader.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/loader/GedFileLoader.java @@ -30,7 +30,7 @@ * @author Dick Schoeller */ @SuppressWarnings("PMD.ExcessiveImports") -public class GedFileLoader { +public final class GedFileLoader { /** Logger. */ private final Log logger = LogFactory.getLog(getClass()); @@ -70,11 +70,10 @@ public GedFileLoader() { } /** - * @param dbName - * the name of the database to load + * @param dbName the name of the database to load * @return the root object of the database */ - public final GedObject load(final String dbName) { + public GedObject load(final String dbName) { final String filename = buildFileName(dbName); final RootDocument rootDocument = repositoryManager.getRootDocumentRepository() @@ -91,8 +90,7 @@ public final GedObject load(final String dbName) { } /** - * @param dbName - * the name of the DB + * @param dbName the name of the DB * @return the derived filename */ private String buildFileName(final String dbName) { @@ -100,8 +98,7 @@ private String buildFileName(final String dbName) { } /** - * @param dbName - * the name of the DB to load + * @param dbName the name of the DB to load * @return the root object loaded */ private Root loadRepository(final String dbName) { @@ -159,14 +156,14 @@ private void save(final Root root) { /** * Reset the data. */ - public final void reset() { + public void reset() { repositoryManager.reset(); } /** * Reload all of the data sets. */ - public final void reloadAll() { + public void reloadAll() { final List list = new ArrayList<>(); for (final RootDocument mongo : repositoryManager .getRootDocumentRepository().findAll()) { @@ -181,7 +178,7 @@ public final void reloadAll() { /** * @return list of name value pairs for the data sets currently loaded */ - public final List> details() { + public List> details() { final List> list = new ArrayList<>(); for (final RootDocument mongo : repositoryManager .getRootDocumentRepository().findAll()) { @@ -194,7 +191,7 @@ public final List> details() { * @param dbname name of a dataset * @return the name value pairs describing this dataset */ - public final Map details(final String dbname) { + public Map details(final String dbname) { final Map map = new HashMap<>(); final RootDocument doc = repositoryManager.getRootDocumentRepository() .findByFileAndString(buildFileName(dbname), "Root"); diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/loader/package-info.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/loader/package-info.java index fa343143..3d9d9a95 100644 --- a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/loader/package-info.java +++ b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/loader/package-info.java @@ -1,5 +1,5 @@ /** - * @author Dick Schoeller + * Copyright 2017 Richard Schoeller * Data loader for gedbrowser. */ package org.schoellerfamily.gedbrowser.loader; diff --git a/gedbrowser/src/main/resources/templates/dataSetNotFound.html b/gedbrowser/src/main/resources/templates/dataSetNotFound.html index 6a4699ef..609ade35 100644 --- a/gedbrowser/src/main/resources/templates/dataSetNotFound.html +++ b/gedbrowser/src/main/resources/templates/dataSetNotFound.html @@ -27,7 +27,7 @@

Dataset

Maintained by .
- Created with , version 2.0 on .
+ Created with , version 2.0 on .
Get the sources on GitHub

diff --git a/gedbrowser/src/main/resources/templates/error.html b/gedbrowser/src/main/resources/templates/error.html index 784b6aa6..52173e73 100644 --- a/gedbrowser/src/main/resources/templates/error.html +++ b/gedbrowser/src/main/resources/templates/error.html @@ -30,7 +30,7 @@

The page you were trying to reach was not found

Maintained by .
- Created with , version 2.0 on .
+ Created with , version 2.0 on .
Get the sources on GitHub

diff --git a/gedbrowser/src/main/resources/templates/exception.html b/gedbrowser/src/main/resources/templates/exception.html index 155df8b2..09811752 100644 --- a/gedbrowser/src/main/resources/templates/exception.html +++ b/gedbrowser/src/main/resources/templates/exception.html @@ -31,7 +31,7 @@

Unexpected exception

Maintained by .
- Created with , version 2.0 on .
+ Created with , version 2.0 on .
Get the sources on GitHub

diff --git a/gedbrowser/src/main/resources/templates/living.html b/gedbrowser/src/main/resources/templates/living.html index 2b8c08a8..b5098c78 100644 --- a/gedbrowser/src/main/resources/templates/living.html +++ b/gedbrowser/src/main/resources/templates/living.html @@ -39,7 +39,7 @@

A tabulation of people estimated to be li

Maintained by .
- Created with , version 2.0 on .
+ Created with , version 2.0 on .
Get the sources on GitHub

diff --git a/gedbrowser/src/main/resources/templates/login.html b/gedbrowser/src/main/resources/templates/login.html index e6977a19..03f36fbf 100644 --- a/gedbrowser/src/main/resources/templates/login.html +++ b/gedbrowser/src/main/resources/templates/login.html @@ -35,7 +35,7 @@

Maintained by .
- Created with , version 2.0 on .
+ Created with , version 2.0 on .
Get the sources on GitHub

diff --git a/gedbrowser/src/main/resources/templates/person.html b/gedbrowser/src/main/resources/templates/person.html index a53bbc84..5b4f5316 100644 --- a/gedbrowser/src/main/resources/templates/person.html +++ b/gedbrowser/src/main/resources/templates/person.html @@ -131,7 +131,7 @@

Ancestor tree

Maintained by .
- Created with , version 2.0 on .
+ Created with , version 2.0 on .
Get the sources on GitHub

diff --git a/gedbrowser/src/main/resources/templates/personNotFound.html b/gedbrowser/src/main/resources/templates/personNotFound.html index 67337da8..3b547d1d 100644 --- a/gedbrowser/src/main/resources/templates/personNotFound.html +++ b/gedbrowser/src/main/resources/templates/personNotFound.html @@ -31,7 +31,7 @@

I1 not foun

Maintained by .
- Created with , version 2.0 on .
+ Created with , version 2.0 on .
Get the sources on GitHub

diff --git a/gedbrowser/src/main/resources/templates/source.html b/gedbrowser/src/main/resources/templates/source.html index b629e299..8ccedd6c 100644 --- a/gedbrowser/src/main/resources/templates/source.html +++ b/gedbrowser/src/main/resources/templates/source.html @@ -38,7 +38,7 @@

Maintained by .
- Created with , version 2.0 on .
+ Created with , version 2.0 on .
Get the sources on GitHub

diff --git a/gedbrowser/src/main/resources/templates/sourceNotFound.html b/gedbrowser/src/main/resources/templates/sourceNotFound.html index 82832c1a..f7550a39 100644 --- a/gedbrowser/src/main/resources/templates/sourceNotFound.html +++ b/gedbrowser/src/main/resources/templates/sourceNotFound.html @@ -31,7 +31,7 @@

S1 not foun

Maintained by .
- Created with , version 2.0 on .
+ Created with , version 2.0 on .
Get the sources on GitHub

diff --git a/gedbrowser/src/main/resources/templates/surnames.html b/gedbrowser/src/main/resources/templates/surnames.html index ef2d3fd8..0109b5f7 100644 --- a/gedbrowser/src/main/resources/templates/surnames.html +++ b/gedbrowser/src/main/resources/templates/surnames.html @@ -41,7 +41,7 @@

Index of names b

Maintained by .
- Created with , version 2.0 on .
+ Created with , version 2.0 on .
Get the sources on GitHub

diff --git a/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/selenium/test/package-info.java b/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/selenium/test/package-info.java index c594de6f..4eb4e2a3 100644 --- a/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/selenium/test/package-info.java +++ b/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/selenium/test/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2015-2016 Richard Schoeller + * Copyright 2015-2017 Richard Schoeller * Selenium tests for gedbrowser. */ package org.schoellerfamily.gedbrowser.selenium.test; diff --git a/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/test/ApplicationInfoTest.java b/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/test/ApplicationInfoTest.java index b92ea56d..b2ff4f41 100644 --- a/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/test/ApplicationInfoTest.java +++ b/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/test/ApplicationInfoTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.schoellerfamily.gedbrowser.controller.ApplicationInfoImpl; -import org.schoellerfamily.gedbrowser.renderer.ApplicationInfo; +import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -66,7 +66,7 @@ public void testApplicationInfoMaintainerName() { @Test public void testApplicationInfoName() { assertEquals("Application name mismatch", - "gedbrowser", appInfo.getName()); + "gedbrowser", appInfo.getApplicationName()); } /** */ diff --git a/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/test/UsersConfigurationTest.java b/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/test/UsersConfigurationTest.java index 15b60e63..a4e8609b 100644 --- a/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/test/UsersConfigurationTest.java +++ b/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/test/UsersConfigurationTest.java @@ -7,7 +7,7 @@ import org.junit.runner.RunWith; import org.schoellerfamily.gedbrowser.Users; import org.schoellerfamily.gedbrowser.UsersConfiguration; -import org.schoellerfamily.gedbrowser.renderer.User; +import org.schoellerfamily.gedbrowser.renderer.user.User; import org.springframework.beans.factory.annotation.Value; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;