Tidy up

src/main/java/net/sf/mpxj/CostRateTableEntry.java

@@ -64,9 +64,10 @@ public CostRateTableEntry(LocalDateTime startDate, LocalDateTime endDate, Number
    /**
     * Constructor.
     *
-    * @param startDate    start date
-    * @param endDate      end date
-    * @param costPerUse   cost per use
+    * @param startDate start date
+    * @param endDate end date
+    * @param costPerUse cost per use
+    * @param shiftPeriod shift period
     * @param rates Rate instances
     */
    public CostRateTableEntry(LocalDateTime startDate, LocalDateTime endDate, Number costPerUse, ShiftPeriod shiftPeriod, Rate... rates)

src/main/java/net/sf/mpxj/Shift.java

@@ -29,7 +29,7 @@
 /**
  * Represents a Resource Shift.
  */
-public class Shift implements ProjectEntityWithUniqueID
+public final class Shift implements ProjectEntityWithUniqueID
 {
    /**
     * Private constructor.
@@ -47,7 +47,7 @@ private Shift(Builder builder)
     *
     * @return shift unique ID
     */
-   public Integer getUniqueID()
+   @Override public Integer getUniqueID()
    {
       return m_uniqueID;
    }

src/main/java/net/sf/mpxj/ShiftPeriod.java

@@ -28,7 +28,7 @@
 /**
  * Represents a Resource Shift Period.
  */
-public class ShiftPeriod implements ProjectEntityWithUniqueID, Comparable<ShiftPeriod>
+public final class ShiftPeriod implements ProjectEntityWithUniqueID, Comparable<ShiftPeriod>
 {
    /**
     * Private constructor.
@@ -58,7 +58,7 @@ public Shift getParentShift()
     *
     * @return unique ID
     */
-   public Integer getUniqueID()
+   @Override public Integer getUniqueID()
    {
       return m_uniqueID;
    }

src/main/java/net/sf/mpxj/openplan/ProjectDirectoryReader.java

@@ -56,7 +56,7 @@ public ProjectFile read(String name)
    {
       /*
          Project Directory Contents
-
+      
          ACT - Activity
          ASG - Resource Assignment
          BSA - Baseline Activity

src/main/java/net/sf/mpxj/openplan/ResourceDirectoryReader.java

@@ -124,27 +124,27 @@ public void read(String name)
       // Resource Structure
       System.out.println("RDS");
       new TableReader(dir, "RDS").read().forEach(System.out::println);
-
+      
       // Resource Cost Escalation
       System.out.println("RSL");
       new TableReader(dir, "RSL").read().forEach(System.out::println);
-
+      
       // Skill Assignment
       System.out.println("SKL");
       new TableReader(dir, "SKL").read().forEach(System.out::println);
-
+      
       // Explorer Folders
       System.out.println("EXF");
       new TableReader(dir, "EXF").read().forEach(System.out::println);
-
+      
       // Project Summary Usage
       System.out.println("PSU");
       new TableReader(dir, "PSU").read().forEach(System.out::println);
-
+      
       // Explorer Folder Items
       System.out.println("EXI");
       new TableReader(dir, "EXI").read().forEach(System.out::println);
-
+      
       // Code Structure Association
       // Not populated for any resources in the sample data
       System.out.println("SCA");

src/main/java/net/sf/mpxj/phoenix/Phoenix4Reader.java

@@ -178,7 +178,7 @@ private void readProjectProperties(Project phoenixProject, Storepoint storepoint
       mpxjProperties.setDefaultDurationUnits(phoenixSettings.getBaseunit());
       mpxjProperties.setStatusDate(storepoint.getDataDate());
       mpxjProperties.setStartDate(storepoint.getStart());
-      mpxjProperties.setSchedulingProgressedActivities(activeLayout.isRetainedLogic().booleanValue()? SchedulingProgressedActivities.RETAINED_LOGIC : (activeLayout.isProgressOverride().booleanValue() ? SchedulingProgressedActivities.PROGRESS_OVERRIDE : SchedulingProgressedActivities.ACTUAL_DATES));
+      mpxjProperties.setSchedulingProgressedActivities(activeLayout.isRetainedLogic().booleanValue() ? SchedulingProgressedActivities.RETAINED_LOGIC : (activeLayout.isProgressOverride().booleanValue() ? SchedulingProgressedActivities.PROGRESS_OVERRIDE : SchedulingProgressedActivities.ACTUAL_DATES));
    }
 
    /**

src/main/java/net/sf/mpxj/phoenix/schema/phoenix5/Adapter1.java

@@ -5,23 +5,24 @@
 // Generated on: 2024.09.08 at 11:22:53 AM BST
 //
 
-
 package net.sf.mpxj.phoenix.schema.phoenix5;
 
 import java.time.LocalDateTime;
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class Adapter1
-    extends XmlAdapter<String, LocalDateTime>
+         extends
+            XmlAdapter<String, LocalDateTime>
 {
 
+   @Override public LocalDateTime unmarshal(String value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.parseDateTime(value));
+   }
 
-    @Override public LocalDateTime unmarshal(String value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.parseDateTime(value));
-    }
-
-    @Override public String marshal(LocalDateTime value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.printDateTime(value));
-    }
+   @Override public String marshal(LocalDateTime value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.printDateTime(value));
+   }
 
 }

src/main/java/net/sf/mpxj/phoenix/schema/phoenix5/Adapter2.java

@@ -5,22 +5,23 @@
 // Generated on: 2024.09.08 at 11:22:53 AM BST
 //
 
-
 package net.sf.mpxj.phoenix.schema.phoenix5;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class Adapter2
-    extends XmlAdapter<String, Integer>
+         extends
+            XmlAdapter<String, Integer>
 {
 
+   @Override public Integer unmarshal(String value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.parseInteger(value));
+   }
 
-    @Override public Integer unmarshal(String value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.parseInteger(value));
-    }
-
-    @Override public String marshal(Integer value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.printInteger(value));
-    }
+   @Override public String marshal(Integer value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.printInteger(value));
+   }
 
 }

src/main/java/net/sf/mpxj/phoenix/schema/phoenix5/Adapter3.java

@@ -5,23 +5,24 @@
 // Generated on: 2024.09.08 at 11:22:53 AM BST
 //
 
-
 package net.sf.mpxj.phoenix.schema.phoenix5;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import net.sf.mpxj.Duration;
 
 public class Adapter3
-    extends XmlAdapter<String, Duration>
+         extends
+            XmlAdapter<String, Duration>
 {
 
+   @Override public Duration unmarshal(String value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.parseDuration(value));
+   }
 
-    @Override public Duration unmarshal(String value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.parseDuration(value));
-    }
-
-    @Override public String marshal(Duration value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.printDuration(value));
-    }
+   @Override public String marshal(Duration value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.printDuration(value));
+   }
 
 }

src/main/java/net/sf/mpxj/phoenix/schema/phoenix5/Adapter4.java

@@ -5,23 +5,24 @@
 // Generated on: 2024.09.08 at 11:22:53 AM BST
 //
 
-
 package net.sf.mpxj.phoenix.schema.phoenix5;
 
 import java.util.UUID;
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class Adapter4
-    extends XmlAdapter<String, UUID>
+         extends
+            XmlAdapter<String, UUID>
 {
 
+   @Override public UUID unmarshal(String value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.parseUUID(value));
+   }
 
-    @Override public UUID unmarshal(String value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.parseUUID(value));
-    }
-
-    @Override public String marshal(UUID value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.printUUID(value));
-    }
+   @Override public String marshal(UUID value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.printUUID(value));
+   }
 
 }

src/main/java/net/sf/mpxj/phoenix/schema/phoenix5/Adapter5.java

@@ -5,23 +5,24 @@
 // Generated on: 2024.09.08 at 11:22:53 AM BST
 //
 
-
 package net.sf.mpxj.phoenix.schema.phoenix5;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import net.sf.mpxj.RelationType;
 
 public class Adapter5
-    extends XmlAdapter<String, RelationType>
+         extends
+            XmlAdapter<String, RelationType>
 {
 
+   @Override public RelationType unmarshal(String value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.parseRelationType(value));
+   }
 
-    @Override public RelationType unmarshal(String value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.parseRelationType(value));
-    }
-
-    @Override public String marshal(RelationType value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.printRelationType(value));
-    }
+   @Override public String marshal(RelationType value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.printRelationType(value));
+   }
 
 }

src/main/java/net/sf/mpxj/phoenix/schema/phoenix5/Adapter6.java

@@ -5,23 +5,24 @@
 // Generated on: 2024.09.08 at 11:22:53 AM BST
 //
 
-
 package net.sf.mpxj.phoenix.schema.phoenix5;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import net.sf.mpxj.TimeUnit;
 
 public class Adapter6
-    extends XmlAdapter<String, TimeUnit>
+         extends
+            XmlAdapter<String, TimeUnit>
 {
 
+   @Override public TimeUnit unmarshal(String value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.parseTimeUnits(value));
+   }
 
-    @Override public TimeUnit unmarshal(String value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.parseTimeUnits(value));
-    }
-
-    @Override public String marshal(TimeUnit value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.printTimeUnits(value));
-    }
+   @Override public String marshal(TimeUnit value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.printTimeUnits(value));
+   }
 
 }

src/main/java/net/sf/mpxj/phoenix/schema/phoenix5/Adapter7.java

@@ -5,23 +5,24 @@
 // Generated on: 2024.09.08 at 11:22:53 AM BST
 //
 
-
 package net.sf.mpxj.phoenix.schema.phoenix5;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import net.sf.mpxj.ResourceType;
 
 public class Adapter7
-    extends XmlAdapter<String, ResourceType>
+         extends
+            XmlAdapter<String, ResourceType>
 {
 
+   @Override public ResourceType unmarshal(String value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.parseResourceType(value));
+   }
 
-    @Override public ResourceType unmarshal(String value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.parseResourceType(value));
-    }
-
-    @Override public String marshal(ResourceType value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.printResourceType(value));
-    }
+   @Override public String marshal(ResourceType value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.printResourceType(value));
+   }
 
 }

src/main/java/net/sf/mpxj/phoenix/schema/phoenix5/Adapter8.java

@@ -5,23 +5,24 @@
 // Generated on: 2024.09.08 at 11:22:53 AM BST
 //
 
-
 package net.sf.mpxj.phoenix.schema.phoenix5;
 
 import java.time.DayOfWeek;
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class Adapter8
-    extends XmlAdapter<String, DayOfWeek>
+         extends
+            XmlAdapter<String, DayOfWeek>
 {
 
+   @Override public DayOfWeek unmarshal(String value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.parseDay(value));
+   }
 
-    @Override public DayOfWeek unmarshal(String value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.parseDay(value));
-    }
-
-    @Override public String marshal(DayOfWeek value) {
-        return (net.sf.mpxj.phoenix.DatatypeConverter.printDay(value));
-    }
+   @Override public String marshal(DayOfWeek value)
+   {
+      return (net.sf.mpxj.phoenix.DatatypeConverter.printDay(value));
+   }
 
 }