fixed merge issues

ical4j · Mar 9, 2022 · fe93fd8 · fe93fd8
1 parent 4a81aa0
commit fe93fd8
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 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
@@ -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
@@ -190,19 +190,20 @@ 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;
                     case VALUE_EMAIL: return EMAIL;
                     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);