Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #313 - CalendarProvider in RenderingContext #322

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.schoellerfamily.gedbrowser.analytics;
package org.schoellerfamily.gedbrowser.analytics.calendar;

import java.util.Calendar;

Expand Down
Original file line number Diff line number Diff line change
@@ -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:
* <ul>
* <li>implements CalendarProviderFacade</li>
* <li>keeping an instance of a CalendarProvider</li>
* <li>providing the method getCalendarProvider to get at it</li>
* </ul>
*
* @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();
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.schoellerfamily.gedbrowser.analytics;
package org.schoellerfamily.gedbrowser.analytics.calendar;

import java.util.Calendar;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.schoellerfamily.gedbrowser.analytics;
package org.schoellerfamily.gedbrowser.analytics.calendar;

import java.util.Calendar;
import java.util.Locale;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/**
* Copyright 2017 Richard Schoeller
* Calendar handling for gedbrowser.
*/
package org.schoellerfamily.gedbrowser.analytics.calendar;
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.schoellerfamily.gedbrowser.renderer;

import org.schoellerfamily.gedbrowser.analytics.CalendarProvider;
import org.schoellerfamily.gedbrowser.datamodel.AbstractLink;

/**
Expand All @@ -14,12 +13,10 @@ public abstract class AbstractLinkRenderer<T extends AbstractLink> 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);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.schoellerfamily.gedbrowser.renderer;

import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo;

/**
* @author Dick Schoeller
*/
Expand All @@ -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();
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.schoellerfamily.gedbrowser.renderer;

import org.schoellerfamily.gedbrowser.analytics.CalendarProvider;
import org.schoellerfamily.gedbrowser.datamodel.Attribute;

/**
Expand All @@ -14,13 +13,11 @@ public final class AttributeRenderer extends GedRenderer<Attribute> {
* @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));
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.schoellerfamily.gedbrowser.renderer;

import org.schoellerfamily.gedbrowser.analytics.CalendarProvider;
import org.schoellerfamily.gedbrowser.datamodel.Child;

/**
Expand All @@ -14,12 +13,10 @@ public final class ChildRenderer extends AbstractLinkRenderer<Child> {
* @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);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.schoellerfamily.gedbrowser.renderer;

import org.schoellerfamily.gedbrowser.analytics.CalendarProvider;
import org.schoellerfamily.gedbrowser.datamodel.Date;

/**
Expand All @@ -14,13 +13,11 @@ public final class DateRenderer extends GedRenderer<Date> {
* @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));
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.schoellerfamily.gedbrowser.renderer;

import org.schoellerfamily.gedbrowser.analytics.CalendarProvider;
import org.schoellerfamily.gedbrowser.datamodel.GedObject;

/**
Expand All @@ -13,12 +12,10 @@ public final class DefaultRenderer extends GedRenderer<GedObject> {
* @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);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.schoellerfamily.gedbrowser.renderer;

import org.schoellerfamily.gedbrowser.renderer.application.ApplicationInfo;

/**
* @author Dick Schoeller
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.schoellerfamily.gedbrowser.renderer;

import org.schoellerfamily.gedbrowser.analytics.CalendarProvider;
import org.schoellerfamily.gedbrowser.datamodel.FamC;

/**
Expand All @@ -14,12 +13,10 @@ public final class FamCRenderer extends AbstractLinkRenderer<FamC> {
* @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);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.schoellerfamily.gedbrowser.renderer;

import org.schoellerfamily.gedbrowser.analytics.CalendarProvider;
import org.schoellerfamily.gedbrowser.datamodel.FamS;

/**
Expand All @@ -14,12 +13,10 @@ public final class FamSRenderer extends AbstractLinkRenderer<FamS> {
* @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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -23,13 +22,11 @@ public final class FamilyRenderer extends GedRenderer<Family> {
* @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);
}

/**
Expand Down
Loading