Refactoring toString for content

ical4j · Jan 6, 2022 · 158a3f4 · 158a3f4
1 parent d24bd7f
commit 158a3f4
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 107 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/model/Calendar.java b/src/main/java/net/fortuna/ical4j/model/Calendar.java
@@ -195,15 +195,7 @@ public Calendar(Calendar c) throws ParseException, IOException,
      */
     @Override
     public final String toString() {
-        return BEGIN +
-                ':' +
-                VCALENDAR +
-                Strings.LINE_SEPARATOR +
-                getProperties() +
-                getComponents() +
-                END +
-                ':' +
-                VCALENDAR +
+        return BEGIN + ':' + VCALENDAR + Strings.LINE_SEPARATOR + properties + components + END + ':' + VCALENDAR +
                 Strings.LINE_SEPARATOR;
     }
 

diff --git a/src/main/java/net/fortuna/ical4j/model/Component.java b/src/main/java/net/fortuna/ical4j/model/Component.java
@@ -169,15 +169,8 @@ protected Component(final String s, final PropertyList<Property> p, ComponentLis
      */
     @Override
 	public String toString() {
-        return BEGIN +
-                ':' +
-                getName() +
-                Strings.LINE_SEPARATOR +
-                getProperties() +
-                END +
-                ':' +
-                getName() +
-                Strings.LINE_SEPARATOR;
+        return BEGIN + ':' + name + Strings.LINE_SEPARATOR + properties + components + END + ':' + name
+                + Strings.LINE_SEPARATOR;
     }
 
     /**

diff --git a/src/main/java/net/fortuna/ical4j/model/component/VAvailability.java b/src/main/java/net/fortuna/ical4j/model/component/VAvailability.java
@@ -34,7 +34,6 @@
 import net.fortuna.ical4j.model.*;
 import net.fortuna.ical4j.model.property.DtStamp;
 import net.fortuna.ical4j.model.property.Method;
-import net.fortuna.ical4j.util.Strings;
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.Validator;
 import net.fortuna.ical4j.validate.component.VAvailabilityValidator;
@@ -138,23 +137,6 @@ public ComponentList<Available> getComponents() {
         return (ComponentList<Available>) components;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final String toString() {
-        return BEGIN +
-                ':' +
-                getName() +
-                Strings.LINE_SEPARATOR +
-                getProperties() +
-                getAvailable() +
-                END +
-                ':' +
-                getName() +
-                Strings.LINE_SEPARATOR;
-    }
-
     /**
      * {@inheritDoc}
      */

diff --git a/src/main/java/net/fortuna/ical4j/model/component/VEvent.java b/src/main/java/net/fortuna/ical4j/model/component/VEvent.java
@@ -36,7 +36,6 @@
 import net.fortuna.ical4j.model.property.*;
 import net.fortuna.ical4j.util.CompatibilityHints;
 import net.fortuna.ical4j.util.Dates;
-import net.fortuna.ical4j.util.Strings;
 import net.fortuna.ical4j.validate.*;
 import net.fortuna.ical4j.validate.component.VEventValidator;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -318,23 +317,6 @@ public ComponentList<Component> getComponents() {
         return (ComponentList<Component>) components;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final String toString() {
-        return BEGIN +
-                ':' +
-                getName() +
-                Strings.LINE_SEPARATOR +
-                getProperties() +
-                getAlarms() +
-                END +
-                ':' +
-                getName() +
-                Strings.LINE_SEPARATOR;
-    }
-
     /**
      * {@inheritDoc}
      */

diff --git a/src/main/java/net/fortuna/ical4j/model/component/VTimeZone.java b/src/main/java/net/fortuna/ical4j/model/component/VTimeZone.java
@@ -36,7 +36,6 @@
 import net.fortuna.ical4j.model.property.Method;
 import net.fortuna.ical4j.model.property.TzId;
 import net.fortuna.ical4j.model.property.TzUrl;
-import net.fortuna.ical4j.util.Strings;
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.Validator;
 import net.fortuna.ical4j.validate.component.VTimeZoneValidator;
@@ -155,23 +154,6 @@ public VTimeZone(final PropertyList properties, final ComponentList<Observance>
         super(VTIMEZONE, properties, observances);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final String toString() {
-        return BEGIN +
-                ':' +
-                getName() +
-                Strings.LINE_SEPARATOR +
-                getProperties() +
-                getObservances() +
-                END +
-                ':' +
-                getName() +
-                Strings.LINE_SEPARATOR;
-    }
-
     /**
      * {@inheritDoc}
      */

diff --git a/src/main/java/net/fortuna/ical4j/model/component/VToDo.java b/src/main/java/net/fortuna/ical4j/model/component/VToDo.java
@@ -33,7 +33,6 @@
 
 import net.fortuna.ical4j.model.*;
 import net.fortuna.ical4j.model.property.*;
-import net.fortuna.ical4j.util.Strings;
 import net.fortuna.ical4j.validate.ComponentValidator;
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.ValidationRule;
@@ -239,23 +238,6 @@ public ComponentList<Component> getComponents() {
         return (ComponentList<Component>) components;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final String toString() {
-        return BEGIN +
-                ':' +
-                getName() +
-                Strings.LINE_SEPARATOR +
-                getProperties() +
-                getAlarms() +
-                END +
-                ':' +
-                getName() +
-                Strings.LINE_SEPARATOR;
-    }
-
     /**
      * {@inheritDoc}
      */

diff --git a/src/main/java/net/fortuna/ical4j/model/component/VVenue.java b/src/main/java/net/fortuna/ical4j/model/component/VVenue.java
@@ -36,7 +36,6 @@
 import net.fortuna.ical4j.model.Content;
 import net.fortuna.ical4j.model.PropertyList;
 import net.fortuna.ical4j.model.property.Method;
-import net.fortuna.ical4j.util.Strings;
 import net.fortuna.ical4j.validate.ComponentValidator;
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.Validator;
@@ -110,22 +109,6 @@ public VVenue(final PropertyList properties) {
         super(VVENUE, properties);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final String toString() {
-        return BEGIN +
-                ':' +
-                getName() +
-                Strings.LINE_SEPARATOR +
-                getProperties() +
-                END +
-                ':' +
-                getName() +
-                Strings.LINE_SEPARATOR;
-    }
-
     /**
      * {@inheritDoc}
      */