From 0bd51a9500ef335b82cc46140828e2a4d1f1612f Mon Sep 17 00:00:00 2001 From: Ben Fortuna Date: Sun, 27 May 2018 23:25:04 +1000 Subject: [PATCH] Clean up code --- src/main/java/net/fortuna/ical4j/model/Component.java | 2 +- src/main/java/net/fortuna/ical4j/model/Property.java | 2 +- .../java/net/fortuna/ical4j/model/component/VEvent.java | 2 +- .../java/net/fortuna/ical4j/model/property/Attach.java | 7 +++---- .../fortuna/ical4j/model/property/DateListProperty.java | 2 +- .../net/fortuna/ical4j/model/property/DateProperty.java | 2 +- src/main/java/net/fortuna/ical4j/util/Calendars.java | 2 +- .../net/fortuna/ical4j/validate/CalendarValidatorImpl.java | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/fortuna/ical4j/model/Component.java b/src/main/java/net/fortuna/ical4j/model/Component.java index 7058b47d0..0be80c865 100644 --- a/src/main/java/net/fortuna/ical4j/model/Component.java +++ b/src/main/java/net/fortuna/ical4j/model/Component.java @@ -328,7 +328,7 @@ public final PeriodList calculateRecurrenceSet(final Period period) { List rDates = getProperties(Property.RDATE); // add recurrence dates.. for (RDate rdate : rDates) { - final Value rdateValue = (Value) rdate.getParameter(Parameter.VALUE); + final Value rdateValue = rdate.getParameter(Parameter.VALUE); if (Value.PERIOD.equals(rdateValue)) { for (final Period rdatePeriod : rdate.getPeriods()) { if (period.intersects(rdatePeriod)) { diff --git a/src/main/java/net/fortuna/ical4j/model/Property.java b/src/main/java/net/fortuna/ical4j/model/Property.java index 635cea493..89fa9fc57 100644 --- a/src/main/java/net/fortuna/ical4j/model/Property.java +++ b/src/main/java/net/fortuna/ical4j/model/Property.java @@ -423,7 +423,7 @@ public final String toString() { buffer.append(':'); boolean needsEscape = false; if (this instanceof XProperty) { - Value valParam = (Value) getParameter(Parameter.VALUE); + Value valParam = getParameter(Parameter.VALUE); if (valParam == null || valParam.equals(Value.TEXT)) { needsEscape = true; } diff --git a/src/main/java/net/fortuna/ical4j/model/component/VEvent.java b/src/main/java/net/fortuna/ical4j/model/component/VEvent.java index f20834646..4d761e88a 100644 --- a/src/main/java/net/fortuna/ical4j/model/component/VEvent.java +++ b/src/main/java/net/fortuna/ical4j/model/component/VEvent.java @@ -640,7 +640,7 @@ public final DtEnd getEndDate(final boolean deriveFromDuration) { } dtEnd = new DtEnd(Dates.getInstance(vEventDuration.getDuration() - .getTime(dtStart.getDate()), (Value) dtStart + .getTime(dtStart.getDate()), dtStart .getParameter(Parameter.VALUE))); if (dtStart.isUtc()) { dtEnd.setUtc(true); diff --git a/src/main/java/net/fortuna/ical4j/model/property/Attach.java b/src/main/java/net/fortuna/ical4j/model/property/Attach.java index 763bd3542..168626389 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Attach.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Attach.java @@ -125,11 +125,10 @@ public Attach() { /** * @param aList a list of parameters for this component * @param aValue a value string for this component - * @throws IOException when there is an error reading the binary stream * @throws URISyntaxException where the specified string is not a valid uri */ public Attach(final ParameterList aList, final String aValue) - throws IOException, URISyntaxException { + throws URISyntaxException { super(ATTACH, aList, new Factory()); setValue(aValue); } @@ -235,7 +234,7 @@ public final void setValue(final String aValue) throws try { final BinaryDecoder decoder = DecoderFactory.getInstance() .createBinaryDecoder( - (Encoding) getParameter(Parameter.ENCODING)); + getParameter(Parameter.ENCODING)); binary = decoder.decode(aValue.getBytes()); } catch (UnsupportedEncodingException uee) { Logger log = LoggerFactory.getLogger(Attach.class); @@ -262,7 +261,7 @@ public final String getValue() { try { final BinaryEncoder encoder = EncoderFactory.getInstance() .createBinaryEncoder( - (Encoding) getParameter(Parameter.ENCODING)); + getParameter(Parameter.ENCODING)); return new String(encoder.encode(getBinary())); } catch (UnsupportedEncodingException | EncoderException uee) { Logger log = LoggerFactory.getLogger(Attach.class); diff --git a/src/main/java/net/fortuna/ical4j/model/property/DateListProperty.java b/src/main/java/net/fortuna/ical4j/model/property/DateListProperty.java index 584dfda6b..5f1d1ab25 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/DateListProperty.java +++ b/src/main/java/net/fortuna/ical4j/model/property/DateListProperty.java @@ -108,7 +108,7 @@ public final DateList getDates() { * {@inheritDoc} */ public void setValue(final String aValue) throws ParseException { - dates = new DateList(aValue, (Value) getParameter(Parameter.VALUE), + dates = new DateList(aValue, getParameter(Parameter.VALUE), timeZone); } diff --git a/src/main/java/net/fortuna/ical4j/model/property/DateProperty.java b/src/main/java/net/fortuna/ical4j/model/property/DateProperty.java index d2d1e0842..35b97a840 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/DateProperty.java +++ b/src/main/java/net/fortuna/ical4j/model/property/DateProperty.java @@ -243,7 +243,7 @@ public void validate() throws ValidationException { getParameters()); } - final Value value = (Value) getParameter(Parameter.VALUE); + final Value value = getParameter(Parameter.VALUE); if (getDate() instanceof DateTime) { diff --git a/src/main/java/net/fortuna/ical4j/util/Calendars.java b/src/main/java/net/fortuna/ical4j/util/Calendars.java index a573c8288..81d3d6cab 100644 --- a/src/main/java/net/fortuna/ical4j/util/Calendars.java +++ b/src/main/java/net/fortuna/ical4j/util/Calendars.java @@ -161,7 +161,7 @@ public static Calendar[] split(final Calendar calendar) { } for (final Property p : c.getProperties()) { - final TzId tzid = (TzId) p.getParameter(Parameter.TZID); + final TzId tzid = p.getParameter(Parameter.TZID); if (tzid != null) { final VTimeZone timezone = timezones.getComponent(tzid.getValue()); if (!uidCal.getComponents().contains(timezone)) { diff --git a/src/main/java/net/fortuna/ical4j/validate/CalendarValidatorImpl.java b/src/main/java/net/fortuna/ical4j/validate/CalendarValidatorImpl.java index bd00f4786..5471ec525 100644 --- a/src/main/java/net/fortuna/ical4j/validate/CalendarValidatorImpl.java +++ b/src/main/java/net/fortuna/ical4j/validate/CalendarValidatorImpl.java @@ -60,7 +60,7 @@ public void validate(Calendar target) throws ValidationException { // if (!CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_VALIDATION)) { // validate method.. - final Method method = (Method) target.getProperty(Property.METHOD); + final Method method = target.getProperty(Property.METHOD); if (Method.PUBLISH.equals(method)) { if (target.getComponent(Component.VEVENT) != null) { ComponentValidator.assertNone(Component.VFREEBUSY, target.getComponents());