Skip to content

Commit

Permalink
Simplify code
Browse files Browse the repository at this point in the history
  • Loading branch information
@benfortuna
benfortuna committed Jun 22, 2020
1 parent 30602bf commit 62139c2
Show file tree
Hide file tree
Showing 19 changed files with 60 additions and 320 deletions.
39 changes: 5 additions & 34 deletions src/main/groovy/net/fortuna/ical4j/model/property/ActionFactory.groovy
View file
Expand Up @@ -32,6 +32,7 @@
package net.fortuna.ical4j.model.property

import net.fortuna.ical4j.model.Parameter
import net.fortuna.ical4j.model.ParameterList

/**
* $Id$
Expand All @@ -51,45 +52,15 @@ class ActionFactory extends AbstractPropertyFactory{
else {
String actionValue = attributes.remove('value')
if (actionValue != null) {
if (Action.AUDIO.getValue().equals(actionValue)) {
action = Action.AUDIO
}
else if (Action.DISPLAY.getValue().equals(actionValue)) {
action = Action.DISPLAY
}
else if (Action.EMAIL.getValue().equals(actionValue)) {
action = Action.EMAIL
}
else if (Action.PROCEDURE.getValue().equals(actionValue)) {
action = Action.PROCEDURE
}
else {
attributes.put('value', actionValue)
action = super.newInstance(builder, name, value, attributes)
}
}
else {
if (Action.AUDIO.getValue().equals(value)) {
action = Action.AUDIO
}
else if (Action.DISPLAY.getValue().equals(value)) {
action = Action.DISPLAY
}
else if (Action.EMAIL.getValue().equals(value)) {
action = Action.EMAIL
}
else if (Action.PROCEDURE.getValue().equals(value)) {
action = Action.PROCEDURE
}
else {
action = super.newInstance(builder, name, value, attributes)
}
action = new Action.Factory().createProperty(actionValue)
} else {
action = new Action.Factory().createProperty(value)
}
}
return action
}

protected Object newInstance(List<Parameter> parameters, String value) {
return new Action(parameters, value)
return new Action(new ParameterList(parameters), value)
}
}
33 changes: 5 additions & 28 deletions src/main/groovy/net/fortuna/ical4j/model/property/BusyTypeFactory.groovy
View file
Expand Up @@ -32,6 +32,7 @@
package net.fortuna.ical4j.model.property

import net.fortuna.ical4j.model.Parameter
import net.fortuna.ical4j.model.ParameterList

/**
* $Id$
Expand All @@ -51,39 +52,15 @@ class BusyTypeFactory extends AbstractPropertyFactory{
else {
String busyTypeValue = attributes.remove('value')
if (busyTypeValue != null) {
if (BusyType.BUSY.getValue().equals(busyTypeValue)) {
busyType = BusyType.BUSY
}
else if (BusyType.BUSY_TENTATIVE.getValue().equals(busyTypeValue)) {
busyType = BusyType.BUSY_TENTATIVE
}
else if (BusyType.BUSY_UNAVAILABLE.getValue().equals(busyTypeValue)) {
busyType = BusyType.BUSY_UNAVAILABLE
}
else {
attributes.put('value', busyTypeValue)
busyType = super.newInstance(builder, name, value, attributes)
}
}
else {
if (BusyType.BUSY.getValue().equals(value)) {
busyType = BusyType.BUSY
}
else if (BusyType.BUSY_TENTATIVE.getValue().equals(value)) {
busyType = BusyType.BUSY_TENTATIVE
}
else if (BusyType.BUSY_UNAVAILABLE.getValue().equals(value)) {
busyType = BusyType.BUSY_UNAVAILABLE
}
else {
busyType = super.newInstance(builder, name, value, attributes)
}
busyType = new BusyType.Factory().createProperty(busyTypeValue)
} else {
busyType = new BusyType.Factory().createProperty(value)
}
}
return busyType
}

protected Object newInstance(List<Parameter> parameters, String value) {
return new BusyType(parameters, value)
return new BusyType(new ParameterList(parameters), value)
}
}
18 changes: 3 additions & 15 deletions src/main/groovy/net/fortuna/ical4j/model/property/CalScaleFactory.groovy
View file
Expand Up @@ -52,21 +52,9 @@ class CalScaleFactory extends AbstractPropertyFactory{
else {
String calScaleValue = attributes.remove('value')
if (calScaleValue != null) {
if (CalScale.GREGORIAN.getValue().equals(calScaleValue)) {
calScale = CalScale.GREGORIAN
}
else {
attributes.put('value', calScaleValue)
calScale = super.newInstance(builder, name, value, attributes)
}
}
else {
if (CalScale.GREGORIAN.getValue().equals(value)) {
calScale = CalScale.GREGORIAN
}
else {
calScale = super.newInstance(builder, name, value, attributes)
}
calScale = new CalScale.Factory().createProperty(calScaleValue)
} else {
calScale = new CalScale.Factory().createProperty(value)
}
}
return calScale
Expand Down
30 changes: 3 additions & 27 deletions src/main/groovy/net/fortuna/ical4j/model/property/ClazzFactory.groovy
View file
Expand Up @@ -52,33 +52,9 @@ class ClazzFactory extends AbstractPropertyFactory{
else {
String clazzValue = attributes.remove('value')
if (clazzValue != null) {
if (Clazz.CONFIDENTIAL.getValue().equals(clazzValue)) {
clazz = Clazz.CONFIDENTIAL
}
else if (Clazz.PRIVATE.getValue().equals(clazzValue)) {
clazz = Clazz.PRIVATE
}
else if (Clazz.PUBLIC.getValue().equals(clazzValue)) {
clazz = Clazz.PUBLIC
}
else {
attributes.put('value', clazzValue)
clazz = super.newInstance(builder, name, value, attributes)
}
}
else {
if (Clazz.CONFIDENTIAL.getValue().equals(value)) {
clazz = Clazz.CONFIDENTIAL
}
else if (Clazz.PRIVATE.getValue().equals(value)) {
clazz = Clazz.PRIVATE
}
else if (Clazz.PUBLIC.getValue().equals(value)) {
clazz = Clazz.PUBLIC
}
else {
clazz = super.newInstance(builder, name, value, attributes)
}
clazz = new Clazz.Factory().createProperty(clazzValue)
} else {
clazz = new Clazz.Factory().createProperty(value)
}
}
return clazz
Expand Down
60 changes: 3 additions & 57 deletions src/main/groovy/net/fortuna/ical4j/model/property/MethodFactory.groovy
View file
Expand Up @@ -52,63 +52,9 @@ class MethodFactory extends AbstractPropertyFactory{
else {
String instanceValue = attributes.remove('value')
if (instanceValue != null) {
if (Method.ADD.getValue().equals(instanceValue)) {
instance = Method.ADD
}
else if (Method.CANCEL.getValue().equals(instanceValue)) {
instance = Method.CANCEL
}
else if (Method.COUNTER.getValue().equals(instanceValue)) {
instance = Method.COUNTER
}
else if (Method.DECLINE_COUNTER.getValue().equals(instanceValue)) {
instance = Method.DECLINE_COUNTER
}
else if (Method.PUBLISH.getValue().equals(instanceValue)) {
instance = Method.PUBLISH
}
else if (Method.REFRESH.getValue().equals(instanceValue)) {
instance = Method.REFRESH
}
else if (Method.REPLY.getValue().equals(instanceValue)) {
instance = Method.REPLY
}
else if (Method.REQUEST.getValue().equals(instanceValue)) {
instance = Method.REQUEST
}
else {
attributes.put('value', instanceValue)
instance = super.newInstance(builder, name, value, attributes)
}
}
else {
if (Method.ADD.getValue().equals(value)) {
instance = Method.ADD
}
else if (Method.CANCEL.getValue().equals(value)) {
instance = Method.CANCEL
}
else if (Method.COUNTER.getValue().equals(value)) {
instance = Method.COUNTER
}
else if (Method.DECLINE_COUNTER.getValue().equals(value)) {
instance = Method.DECLINE_COUNTER
}
else if (Method.PUBLISH.getValue().equals(value)) {
instance = Method.PUBLISH
}
else if (Method.REFRESH.getValue().equals(value)) {
instance = Method.REFRESH
}
else if (Method.REPLY.getValue().equals(value)) {
instance = Method.REPLY
}
else if (Method.REQUEST.getValue().equals(value)) {
instance = Method.REQUEST
}
else {
instance = super.newInstance(builder, name, value, attributes)
}
instance = new Method.Factory().createProperty(instanceValue)
} else {
instance = new Method.Factory().createProperty(value)
}
}
return instance
Expand Down
36 changes: 3 additions & 33 deletions src/main/groovy/net/fortuna/ical4j/model/property/PriorityFactory.groovy
View file
Expand Up @@ -52,39 +52,9 @@ class PriorityFactory extends AbstractPropertyFactory{
else {
String instanceValue = attributes.remove('value')
if (instanceValue != null) {
if (Priority.HIGH.getValue().equals(instanceValue)) {
instance = Priority.HIGH
}
else if (Priority.MEDIUM.getValue().equals(instanceValue)) {
instance = Priority.MEDIUM
}
else if (Priority.LOW.getValue().equals(instanceValue)) {
instance = Priority.LOW
}
else if (Priority.UNDEFINED.getValue().equals(instanceValue)) {
instance = Priority.UNDEFINED
}
else {
attributes.put('value', instanceValue)
instance = super.newInstance(builder, name, value, attributes)
}
}
else {
if (Priority.HIGH.getValue().equals(value)) {
instance = Priority.HIGH
}
else if (Priority.MEDIUM.getValue().equals(value)) {
instance = Priority.MEDIUM
}
else if (Priority.LOW.getValue().equals(value)) {
instance = Priority.LOW
}
else if (Priority.UNDEFINED.getValue().equals(value)) {
instance = Priority.UNDEFINED
}
else {
instance = super.newInstance(builder, name, value, attributes)
}
instance = new Priority.Factory().createProperty(instanceValue)
} else {
instance = new Priority.Factory().createProperty(value)
}
}
return instance
Expand Down
74 changes: 3 additions & 71 deletions src/main/groovy/net/fortuna/ical4j/model/property/StatusFactory.groovy
View file
Expand Up @@ -52,77 +52,9 @@ class StatusFactory extends AbstractPropertyFactory {
else {
String instanceValue = attributes.remove('value')
if (instanceValue != null) {
switch (instanceValue) {
case Status.VEVENT_CANCELLED.value:
instance = Status.VEVENT_CANCELLED
break
case Status.VEVENT_CONFIRMED.value:
instance = Status.VEVENT_CONFIRMED
break
case Status.VEVENT_TENTATIVE.value:
instance = Status.VEVENT_TENTATIVE
break
case Status.VJOURNAL_CANCELLED.value:
instance = Status.VJOURNAL_CANCELLED
break
case Status.VJOURNAL_DRAFT.value:
instance = Status.VJOURNAL_DRAFT
break
case Status.VJOURNAL_FINAL.value:
instance = Status.VJOURNAL_FINAL
break
case Status.VTODO_CANCELLED.value:
instance = Status.VTODO_CANCELLED
break
case Status.VTODO_COMPLETED.value:
instance = Status.VTODO_COMPLETED
break
case Status.VTODO_IN_PROCESS.value:
instance = Status.VTODO_IN_PROCESS
break
case Status.VTODO_NEEDS_ACTION.value:
instance = Status.VTODO_NEEDS_ACTION
break
default:
attributes.put('value', instanceValue)
instance = super.newInstance(builder, name, value, attributes)
}
}
else {
switch (value) {
case Status.VEVENT_CANCELLED.value:
instance = Status.VEVENT_CANCELLED
break
case Status.VEVENT_CONFIRMED.value:
instance = Status.VEVENT_CONFIRMED
break
case Status.VEVENT_TENTATIVE.value:
instance = Status.VEVENT_TENTATIVE
break
case Status.VJOURNAL_CANCELLED.value:
instance = Status.VJOURNAL_CANCELLED
break
case Status.VJOURNAL_DRAFT.value:
instance = Status.VJOURNAL_DRAFT
break
case Status.VJOURNAL_FINAL.value:
instance = Status.VJOURNAL_FINAL
break
case Status.VTODO_CANCELLED.value:
instance = Status.VTODO_CANCELLED
break
case Status.VTODO_COMPLETED.value:
instance = Status.VTODO_COMPLETED
break
case Status.VTODO_IN_PROCESS.value:
instance = Status.VTODO_IN_PROCESS
break
case Status.VTODO_NEEDS_ACTION.value:
instance = Status.VTODO_NEEDS_ACTION
break
default:
instance = super.newInstance(builder, name, value, attributes)
}
instance = new Status.Factory().createProperty(instanceValue)
} else {
instance = new Status.Factory().createProperty(value)
}
}
return instance
Expand Down
24 changes: 3 additions & 21 deletions src/main/groovy/net/fortuna/ical4j/model/property/TranspFactory.groovy
View file
Expand Up @@ -52,27 +52,9 @@ class TranspFactory extends AbstractPropertyFactory{
else {
String instanceValue = attributes.remove('value')
if (instanceValue != null) {
if (Transp.OPAQUE.getValue().equals(instanceValue)) {
instance = Transp.OPAQUE
}
else if (Transp.TRANSPARENT.getValue().equals(instanceValue)) {
instance = Transp.TRANSPARENT
}
else {
attributes.put('value', instanceValue)
instance = super.newInstance(builder, name, value, attributes)
}
}
else {
if (Transp.OPAQUE.getValue().equals(value)) {
instance = Transp.OPAQUE
}
else if (Transp.TRANSPARENT.getValue().equals(value)) {
instance = Transp.TRANSPARENT
}
else {
instance = super.newInstance(builder, name, value, attributes)
}
instance = new Transp.Factory().createProperty(instanceValue)
} else {
instance = new Transp.Factory().createProperty(value)
}
}
return instance
Expand Down

0 comments on commit 62139c2

Please sign in to comment.