Add activity code value method (#736)

joniles · Aug 12, 2024 · be61e2d · be61e2d
1 parent cb6b728
commit be61e2d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 6 deletions.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -10,6 +10,7 @@
 			<action dev="joniles" type="update">Marked the `UserDefinedField` constructor as deprecated. Use the builder class instead.</action>
 			<action dev="joniles" type="update">Marked the `UserDefinedField.setDataType()` method as deprecated. Use the builder class instead.</action>
 			<action dev="joniles" type="update">Updated to address an issue when writing XER files where a project does not have an explicit Unique ID value, and there are project UDF values.</action>
+			<action dev="joniles" type="update">Added the convenience method `ActivityCode.addValue` to make it easier to add a value to an activity code.</action>
 		</release>
 		<release date="2024-07-26" version="13.1.0">
 			<action dev="joniles" type="update">Updated to POI 5.3.0</action>

diff --git a/src/main/java/net/sf/mpxj/ActivityCode.java b/src/main/java/net/sf/mpxj/ActivityCode.java
@@ -153,6 +153,16 @@ public List<ActivityCodeValue> getChildValues()
       return m_values.stream().filter(v -> v.getParent() == null).collect(Collectors.toList());
    }
 
+   /**
+    * Add a value to this activity code.
+    *
+    * @param value activity code value
+    */
+   public void addValue(ActivityCodeValue value)
+   {
+      m_values.add(value);
+   }
+
    private final Integer m_uniqueID;
    private final ActivityCodeScope m_scope;
    private final Integer m_scopeEpsUniqueID;

diff --git a/src/main/java/net/sf/mpxj/asta/AstaReader.java b/src/main/java/net/sf/mpxj/asta/AstaReader.java
@@ -2226,7 +2226,7 @@ public void processCodeLibraries(List<Row> types, List<Row> typeValues, List<Row
             .description(description)
             .parent(valueMap.get(row.getInteger("CODE_LIBRARY_ENTRY")))
             .build();
-         code.getValues().add(value);
+         code.addValue(value);
          valueMap.put(value.getUniqueID(), value);
       }
 

diff --git a/src/main/java/net/sf/mpxj/openplan/ActivityCodeReader.java b/src/main/java/net/sf/mpxj/openplan/ActivityCodeReader.java
@@ -81,7 +81,7 @@ public void read(Map<String, Code> map)
          {
             ActivityCodeValue acv = new ActivityCodeValue.Builder(m_file).type(ac).name(value.getID()).description(value.getDescription()).sequenceNumber(Integer.valueOf(valueSequence++)).build();
 
-            ac.getValues().add(acv);
+            ac.addValue(acv);
             valueMap.put(value.getUniqueID(), acv);
          }
 

diff --git a/src/main/java/net/sf/mpxj/phoenix/Phoenix4Reader.java b/src/main/java/net/sf/mpxj/phoenix/Phoenix4Reader.java
@@ -217,7 +217,7 @@ private void readActivityCode(Code code, Integer activityCodeSequence)
             .name(typeValue.getName())
             .description(typeValue.getName())
             .build();
-         activityCode.getValues().add(activityCodeValue);
+         activityCode.addValue(activityCodeValue);
 
          String name = typeValue.getName();
          UUID uuid = getValueUUID(codeUUID, typeValue.getUuid(), name);

diff --git a/src/main/java/net/sf/mpxj/phoenix/Phoenix5Reader.java b/src/main/java/net/sf/mpxj/phoenix/Phoenix5Reader.java
@@ -242,7 +242,7 @@ private void readActivityCode(Code code, Integer activityCodeSequence)
             .name(typeValue.getName())
             .description(typeValue.getName())
             .build();
-         activityCode.getValues().add(activityCodeValue);
+         activityCode.addValue(activityCodeValue);
 
          String name = typeValue.getName();
          UUID uuid = getValueUUID(codeUUID, typeValue.getUuid(), name);

diff --git a/src/main/java/net/sf/mpxj/primavera/PrimaveraPMFileReader.java b/src/main/java/net/sf/mpxj/primavera/PrimaveraPMFileReader.java
@@ -746,7 +746,7 @@ private void processActivityCodes(APIBusinessObjects apibo, List<ActivityCodeTyp
                .color(ColorHelper.parseHtmlColor(typeValue.getColor()))
                .parent(m_activityCodeMap.get(typeValue.getParentObjectId()))
                .build();
-            code.getValues().add(value);
+            code.addValue(value);
             m_activityCodeMap.put(value.getUniqueID(), value);
          }
       }

diff --git a/src/main/java/net/sf/mpxj/primavera/PrimaveraReader.java b/src/main/java/net/sf/mpxj/primavera/PrimaveraReader.java
@@ -336,7 +336,7 @@ public void processActivityCodes(List<Row> types, List<Row> typeValues, List<Row
                .color(ColorHelper.parseHexColor(row.getString("color")))
                .parent(m_activityCodeMap.get(row.getInteger("parent_actv_code_id")))
                .build();
-            code.getValues().add(value);
+            code.addValue(value);
             m_activityCodeMap.put(value.getUniqueID(), value);
          }
       }