Fixed merge issues

ical4j · Jul 24, 2021 · 4e67dfa · 4e67dfa
1 parent b2b4bb3
commit 4e67dfa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/data/DefaultContentHandler.java b/src/main/java/net/fortuna/ical4j/data/DefaultContentHandler.java
@@ -15,8 +15,6 @@
 
 public class DefaultContentHandler implements ContentHandler {
 
-    private final Supplier<List<ParameterFactory<? extends Parameter>>> parameterFactorySupplier;
-
     private final ContentHandlerContext context;
 
     private final TimeZoneRegistry tzRegistry;
@@ -146,7 +144,8 @@ public void parameter(String name, String value) throws URISyntaxException {
             Parameter parameter = new ParameterBuilder(context.getParameterFactorySupplier().get())
                     .name(name).value(value).build();
 
-        propertyBuilder.parameter(parameter);
+            propertyBuilder.parameter(parameter);
+        }
     }
 
     private void assertComponent(ComponentBuilder<?> component) {

diff --git a/src/main/java/net/fortuna/ical4j/model/ComponentBuilder.java b/src/main/java/net/fortuna/ical4j/model/ComponentBuilder.java
@@ -2,6 +2,7 @@
 
 import net.fortuna.ical4j.model.component.XComponent;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 

diff --git a/src/main/java/net/fortuna/ical4j/model/PropertyBuilder.java b/src/main/java/net/fortuna/ical4j/model/PropertyBuilder.java
@@ -7,7 +7,7 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;