Skip to content

Commit

Permalink
small code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
danielnaber committed Jul 25, 2018
1 parent 14614b3 commit 927bd13
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 19 deletions.
Expand Up @@ -25,14 +25,11 @@
* @since 4.3 * @since 4.3
*/ */
class DateFilterHelper { class DateFilterHelper {
public DateFilterHelper() {
}


protected Calendar getCalendar() { protected Calendar getCalendar() {
return Calendar.getInstance(Locale.GERMANY); return Calendar.getInstance(Locale.GERMANY);
} }



@SuppressWarnings("ControlFlowStatementWithoutBraces") @SuppressWarnings("ControlFlowStatementWithoutBraces")
protected int getDayOfWeek(String dayStr) { protected int getDayOfWeek(String dayStr) {
String day = dayStr.toLowerCase(); String day = dayStr.toLowerCase();
Expand Down
Expand Up @@ -31,11 +31,11 @@ public class NewYearDateFilter extends AbstractNewYearDateFilter {


@Override @Override
protected int getMonth(String localizedMonth) { protected int getMonth(String localizedMonth) {
return dateFilterHelper.getMonth(localizedMonth); return dateFilterHelper.getMonth(localizedMonth);
} }


@Override @Override
protected Calendar getCalendar() { protected Calendar getCalendar() {
return dateFilterHelper.getCalendar(); return dateFilterHelper.getCalendar();
} }
} }
Expand Up @@ -30,14 +30,14 @@
*/ */
public class YMDDateCheckFilter extends DateCheckFilter { public class YMDDateCheckFilter extends DateCheckFilter {


private final org.languagetool.rules.YMDDateHelper YMDDateHelper = new YMDDateHelper(); private final YMDDateHelper ymdDateHelper = new YMDDateHelper();


@Override @Override
public RuleMatch acceptRuleMatch(RuleMatch match, Map<String, String> args, AnalyzedTokenReadings[] patternTokens) { public RuleMatch acceptRuleMatch(RuleMatch match, Map<String, String> args, AnalyzedTokenReadings[] patternTokens) {
if (args.containsKey("year") || args.containsKey("month") || args.containsKey("day")) { if (args.containsKey("year") || args.containsKey("month") || args.containsKey("day")) {
throw new RuntimeException("Set only 'weekDay' and 'date' for " + YMDDateCheckFilter.class.getSimpleName()); throw new RuntimeException("Set only 'weekDay' and 'date' for " + YMDDateCheckFilter.class.getSimpleName());
} }
return super.acceptRuleMatch(match, YMDDateHelper.parseDate(args), patternTokens); return super.acceptRuleMatch(match, ymdDateHelper.parseDate(args), patternTokens);
} }


} }
Expand Up @@ -31,15 +31,15 @@
*/ */
public class YMDNewYearDateFilter extends NewYearDateFilter { public class YMDNewYearDateFilter extends NewYearDateFilter {


private final org.languagetool.rules.YMDDateHelper YMDDateHelper = new YMDDateHelper(); private final YMDDateHelper ymdDateHelper = new YMDDateHelper();


@Override @Override
public RuleMatch acceptRuleMatch(RuleMatch match, Map<String, String> args, AnalyzedTokenReadings[] patternTokens) { public RuleMatch acceptRuleMatch(RuleMatch match, Map<String, String> args, AnalyzedTokenReadings[] patternTokens) {
if (args.containsKey("year") || args.containsKey("month") || args.containsKey("day")) { if (args.containsKey("year") || args.containsKey("month") || args.containsKey("day")) {
throw new RuntimeException("Set only 'weekDay' and 'date' for " + YMDDateCheckFilter.class.getSimpleName()); throw new RuntimeException("Set only 'weekDay' and 'date' for " + YMDDateCheckFilter.class.getSimpleName());
} }
args = YMDDateHelper.parseDate(args); args = ymdDateHelper.parseDate(args);
return super.acceptRuleMatch(YMDDateHelper.correctDate(match, args), args, patternTokens); return super.acceptRuleMatch(ymdDateHelper.correctDate(match, args), args, patternTokens);
} }


} }
Expand Up @@ -25,8 +25,6 @@
* @since 4.3 * @since 4.3
*/ */
class DateFilterHelper { class DateFilterHelper {
public DateFilterHelper() {
}


protected Calendar getCalendar() { protected Calendar getCalendar() {
return Calendar.getInstance(Locale.UK); return Calendar.getInstance(Locale.UK);
Expand Down
Expand Up @@ -30,14 +30,14 @@
*/ */
public class YMDDateCheckFilter extends DateCheckFilter { public class YMDDateCheckFilter extends DateCheckFilter {


private final org.languagetool.rules.YMDDateHelper YMDDateHelper = new YMDDateHelper(); private final YMDDateHelper ymdDateHelper = new YMDDateHelper();


@Override @Override
public RuleMatch acceptRuleMatch(RuleMatch match, Map<String, String> args, AnalyzedTokenReadings[] patternTokens) { public RuleMatch acceptRuleMatch(RuleMatch match, Map<String, String> args, AnalyzedTokenReadings[] patternTokens) {
if (args.containsKey("year") || args.containsKey("month") || args.containsKey("day")) { if (args.containsKey("year") || args.containsKey("month") || args.containsKey("day")) {
throw new RuntimeException("Set only 'weekDay' and 'date' for " + YMDDateCheckFilter.class.getSimpleName()); throw new RuntimeException("Set only 'weekDay' and 'date' for " + YMDDateCheckFilter.class.getSimpleName());
} }
return super.acceptRuleMatch(match, YMDDateHelper.parseDate(args), patternTokens); return super.acceptRuleMatch(match, ymdDateHelper.parseDate(args), patternTokens);
} }


} }
Expand Up @@ -30,15 +30,15 @@
*/ */
public class YMDNewYearDateFilter extends NewYearDateFilter { public class YMDNewYearDateFilter extends NewYearDateFilter {


private final org.languagetool.rules.YMDDateHelper YMDDateHelper = new YMDDateHelper(); private final YMDDateHelper ymdDateHelper = new YMDDateHelper();


@Override @Override
public RuleMatch acceptRuleMatch(RuleMatch match, Map<String, String> args, AnalyzedTokenReadings[] patternTokens) { public RuleMatch acceptRuleMatch(RuleMatch match, Map<String, String> args, AnalyzedTokenReadings[] patternTokens) {
if (args.containsKey("year") || args.containsKey("month") || args.containsKey("day")) { if (args.containsKey("year") || args.containsKey("month") || args.containsKey("day")) {
throw new RuntimeException("Set only 'weekDay' and 'date' for " + YMDDateCheckFilter.class.getSimpleName()); throw new RuntimeException("Set only 'weekDay' and 'date' for " + YMDDateCheckFilter.class.getSimpleName());
} }
args = YMDDateHelper.parseDate(args); args = ymdDateHelper.parseDate(args);
return super.acceptRuleMatch(YMDDateHelper.correctDate(match, args), args, patternTokens); return super.acceptRuleMatch(ymdDateHelper.correctDate(match, args), args, patternTokens);
} }


} }

0 comments on commit 927bd13

Please sign in to comment.