From fe93fd8bc7f891d55b01b80b6643086486571582 Mon Sep 17 00:00:00 2001
From: Ben Fortuna <bfortuna@odecee.com.au>
Date: Wed, 9 Mar 2022 13:02:23 +1100
Subject: [PATCH] fixed merge issues

---
 .../java/net/fortuna/ical4j/model/property/Acknowledged.java | 2 +-
 src/main/java/net/fortuna/ical4j/model/property/Action.java  | 5 +++--
 .../java/net/fortuna/ical4j/model/property/BusyType.java     | 2 +-
 .../java/net/fortuna/ical4j/model/property/CalScale.java     | 2 +-
 src/main/java/net/fortuna/ical4j/model/property/Clazz.java   | 2 +-
 src/main/java/net/fortuna/ical4j/model/property/Method.java  | 2 +-
 .../java/net/fortuna/ical4j/model/property/Priority.java     | 2 +-
 src/main/java/net/fortuna/ical4j/model/property/Status.java  | 2 +-
 src/main/java/net/fortuna/ical4j/model/property/Version.java | 2 +-
 9 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/net/fortuna/ical4j/model/property/Acknowledged.java b/src/main/java/net/fortuna/ical4j/model/property/Acknowledged.java
index 36dc4deed..efbdb6d9a 100644
--- a/src/main/java/net/fortuna/ical4j/model/property/Acknowledged.java
+++ b/src/main/java/net/fortuna/ical4j/model/property/Acknowledged.java
@@ -125,7 +125,7 @@ public Acknowledged createProperty(final ParameterList parameters, final String
 
         @Override
         public Acknowledged createProperty() {
-            return new Acknowledged(this);
+            return new Acknowledged();
         }
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/model/property/Action.java b/src/main/java/net/fortuna/ical4j/model/property/Action.java
index fa1f3ec37..c21999e37 100644
--- a/src/main/java/net/fortuna/ical4j/model/property/Action.java
+++ b/src/main/java/net/fortuna/ical4j/model/property/Action.java
@@ -190,7 +190,7 @@ public Factory() {
         @Override
         public Action createProperty(final ParameterList parameters, final String value) {
 
-            if (parameters.isEmpty()) {
+            if (parameters.getAll().isEmpty()) {
                 switch (value) {
                     case VALUE_AUDIO: return AUDIO;
                     case VALUE_DISPLAY: return DISPLAY;
@@ -198,11 +198,12 @@ public Action createProperty(final ParameterList parameters, final String value)
                     case VALUE_PROCEDURE: return PROCEDURE;
                 }
             }
+            return new Action(parameters, value);
         }
 
         @Override
         public Action createProperty() {
-            return new Action(this);
+            return new Action();
         }
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/model/property/BusyType.java b/src/main/java/net/fortuna/ical4j/model/property/BusyType.java
index 372464c14..d53e6ce0a 100644
--- a/src/main/java/net/fortuna/ical4j/model/property/BusyType.java
+++ b/src/main/java/net/fortuna/ical4j/model/property/BusyType.java
@@ -190,7 +190,7 @@ public Factory() {
         @Override
         public BusyType createProperty(final ParameterList parameters, final String value) {
 
-            if (parameters.isEmpty()) {
+            if (parameters.getAll().isEmpty()) {
                 switch (value) {
                     case VALUE_BUSY: return BUSY;
                     case VALUE_BUSY_UNAVAILABLE: return BUSY_UNAVAILABLE;
diff --git a/src/main/java/net/fortuna/ical4j/model/property/CalScale.java b/src/main/java/net/fortuna/ical4j/model/property/CalScale.java
index a10b5de3b..099f1f4f0 100644
--- a/src/main/java/net/fortuna/ical4j/model/property/CalScale.java
+++ b/src/main/java/net/fortuna/ical4j/model/property/CalScale.java
@@ -170,7 +170,7 @@ public Factory() {
         @Override
         public CalScale createProperty(final ParameterList parameters, final String value) {
 
-            if (parameters.isEmpty() && VALUE_GREGORIAN.equals(value)) {
+            if (parameters.getAll().isEmpty() && VALUE_GREGORIAN.equals(value)) {
                 return GREGORIAN;
             }
             return new CalScale(parameters, value);
diff --git a/src/main/java/net/fortuna/ical4j/model/property/Clazz.java b/src/main/java/net/fortuna/ical4j/model/property/Clazz.java
index da896bcff..7f425a5a6 100644
--- a/src/main/java/net/fortuna/ical4j/model/property/Clazz.java
+++ b/src/main/java/net/fortuna/ical4j/model/property/Clazz.java
@@ -219,7 +219,7 @@ public Factory() {
         @Override
         public Clazz createProperty(final ParameterList parameters, final String value) {
 
-            if (parameters.isEmpty()) {
+            if (parameters.getAll().isEmpty()) {
                 switch (value) {
                     case VALUE_PUBLIC: return PUBLIC;
                     case VALUE_PRIVATE: return PRIVATE;
diff --git a/src/main/java/net/fortuna/ical4j/model/property/Method.java b/src/main/java/net/fortuna/ical4j/model/property/Method.java
index ab49bf792..fde5c3994 100644
--- a/src/main/java/net/fortuna/ical4j/model/property/Method.java
+++ b/src/main/java/net/fortuna/ical4j/model/property/Method.java
@@ -209,7 +209,7 @@ public Factory() {
         @Override
         public Method createProperty(final ParameterList parameters, final String value) {
 
-            if (parameters.isEmpty()) {
+            if (parameters.getAll().isEmpty()) {
                 switch (value) {
                     case VALUE_PUBLISH: return PUBLISH;
                     case VALUE_REQUEST: return REQUEST;
diff --git a/src/main/java/net/fortuna/ical4j/model/property/Priority.java b/src/main/java/net/fortuna/ical4j/model/property/Priority.java
index b127574de..361ebfdcb 100644
--- a/src/main/java/net/fortuna/ical4j/model/property/Priority.java
+++ b/src/main/java/net/fortuna/ical4j/model/property/Priority.java
@@ -290,7 +290,7 @@ public Factory() {
         @Override
         public Priority createProperty(final ParameterList parameters, final String value) {
 
-            if (parameters.isEmpty()) {
+            if (parameters.getAll().isEmpty()) {
                 int level = Integer.parseInt(value);
                 switch (level) {
                     case VALUE_UNDEFINED: return UNDEFINED;
diff --git a/src/main/java/net/fortuna/ical4j/model/property/Status.java b/src/main/java/net/fortuna/ical4j/model/property/Status.java
index 768112496..533773895 100644
--- a/src/main/java/net/fortuna/ical4j/model/property/Status.java
+++ b/src/main/java/net/fortuna/ical4j/model/property/Status.java
@@ -283,7 +283,7 @@ public Factory() {
         @Override
         public Status createProperty(final ParameterList parameters, final String value) {
 
-            if (parameters.isEmpty()) {
+            if (parameters.getAll().isEmpty()) {
                 switch (value) {
                     case VALUE_TENTATIVE: return VEVENT_TENTATIVE;
                     case VALUE_CONFIRMED: return VEVENT_CONFIRMED;
diff --git a/src/main/java/net/fortuna/ical4j/model/property/Version.java b/src/main/java/net/fortuna/ical4j/model/property/Version.java
index 3a2e9ef7d..82523365f 100644
--- a/src/main/java/net/fortuna/ical4j/model/property/Version.java
+++ b/src/main/java/net/fortuna/ical4j/model/property/Version.java
@@ -239,7 +239,7 @@ public Factory() {
         @Override
         public Version createProperty(final ParameterList parameters, final String value) {
 
-            if (parameters.isEmpty() && VALUE_2_0.equals(value)) {
+            if (parameters.getAll().isEmpty() && VALUE_2_0.equals(value)) {
                 return VERSION_2_0;
             }
             return new Version(parameters, value);