Skip to content

Commit

Permalink
PMXML: add missing role codes
Browse files Browse the repository at this point in the history
  • Loading branch information
joniles committed Dec 12, 2024
1 parent c1f2495 commit 111549f
Show file tree
Hide file tree
Showing 172 changed files with 241 additions and 199 deletions.
12 changes: 6 additions & 6 deletions src/main/java/net/sf/mpxj/ActivityCode.java
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public Integer getScopeEpsUniqueID()
*
* @return sequence number
*/
public Integer getSequenceNumber()
@Override public Integer getSequenceNumber()
{
return m_sequenceNumber;
}
Expand All @@ -105,7 +105,7 @@ public Integer getSequenceNumber()
*
* @return name
*/
public String getName()
@Override public String getName()
{
return m_name;
}
Expand All @@ -115,7 +115,7 @@ public String getName()
*
* @return secure flag
*/
public boolean getSecure()
@Override public boolean getSecure()
{
return m_secure;
}
Expand All @@ -125,7 +125,7 @@ public boolean getSecure()
*
* @return max length
*/
public Integer getMaxLength()
@Override public Integer getMaxLength()
{
return m_maxLength;
}
Expand All @@ -136,7 +136,7 @@ public Integer getMaxLength()
*
* @return list of ActivityCodeValue instances
*/
public List<ActivityCodeValue> getValues()
@Override public List<ActivityCodeValue> getValues()
{
return m_values;
}
Expand All @@ -148,7 +148,7 @@ public List<ActivityCodeValue> getValues()
*
* @return list of ActivityCodeValue instances
*/
public List<ActivityCodeValue> getChildValues()
@Override public List<ActivityCodeValue> getChildValues()
{
return m_values.stream().filter(v -> v.getParentValue() == null).collect(Collectors.toList());
}
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/net/sf/mpxj/ActivityCodeValue.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public Integer getActivityCodeUniqueID()
*
* @return unique ID
*/
public Integer getUniqueID()
@Override public Integer getUniqueID()
{
return m_uniqueID;
}
Expand All @@ -94,7 +94,7 @@ public Integer getUniqueID()
*
* @return sequence number
*/
public Integer getSequenceNumber()
@Override public Integer getSequenceNumber()
{
return m_sequenceNumber;
}
Expand All @@ -104,7 +104,7 @@ public Integer getSequenceNumber()
*
* @return value name
*/
public String getName()
@Override public String getName()
{
return m_name;
}
Expand All @@ -114,7 +114,7 @@ public String getName()
*
* @return value description
*/
public String getDescription()
@Override public String getDescription()
{
return m_description;
}
Expand Down Expand Up @@ -166,7 +166,7 @@ public ActivityCodeValue getParentValue()
*
* @return parent ActivityCodeValue unique ID
*/
public Integer getParentValueUniqueID()
@Override public Integer getParentValueUniqueID()
{
return m_parentValue == null ? null : m_parentValue.getUniqueID();
}
Expand All @@ -176,7 +176,7 @@ public Integer getParentValueUniqueID()
*
* @return list of ActivityCodeValue instances
*/
public List<ActivityCodeValue> getChildValues()
@Override public List<ActivityCodeValue> getChildValues()
{
return m_activityCode.getValues().stream().filter(a -> a.m_parentValue == this).collect(Collectors.toList());
}
Expand Down
1 change: 0 additions & 1 deletion src/main/java/net/sf/mpxj/Code.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/


package net.sf.mpxj;

import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/sf/mpxj/ProjectCode.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ private ProjectCode(Builder builder)
return m_maxLength;
}

public List<ProjectCodeValue> getValues()
@Override public List<ProjectCodeValue> getValues()
{
return m_values;
}

public List<ProjectCodeValue> getChildValues()
@Override public List<ProjectCodeValue> getChildValues()
{
return m_values.stream().filter(v -> v.getParentValue() == null).collect(Collectors.toList());
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/sf/mpxj/ProjectCodeValue.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public Integer getProjectCodeUniqueID()
{
return m_description;
}

/**
* Retrieve the parent ProjectCodeValue.
*
Expand All @@ -100,7 +100,7 @@ public ProjectCodeValue getParentValue()
*
* @return parent ProjectCodeValue unique ID
*/
public Integer getParentValueUniqueID()
@Override public Integer getParentValueUniqueID()
{
return m_parentValue == null ? null : m_parentValue.getUniqueID();
}
Expand All @@ -110,7 +110,7 @@ public Integer getParentValueUniqueID()
*
* @return list of ProjectCodeValue instances
*/
public List<ProjectCodeValue> getChildValues()
@Override public List<ProjectCodeValue> getChildValues()
{
return m_projectCode.getValues().stream().filter(a -> a.m_parentValue == this).collect(Collectors.toList());
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/sf/mpxj/ResourceCode.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ private ResourceCode(Builder builder)
return m_maxLength;
}

public List<ResourceCodeValue> getValues()
@Override public List<ResourceCodeValue> getValues()
{
return m_values;
}

public List<ResourceCodeValue> getChildValues()
@Override public List<ResourceCodeValue> getChildValues()
{
return m_values.stream().filter(v -> v.getParentValue() == null).collect(Collectors.toList());
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/sf/mpxj/ResourceCodeValue.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public Integer getResourceCodeUniqueID()
{
return m_description;
}

/**
* Retrieve the parent ResourceCodeValue.
*
Expand All @@ -100,7 +100,7 @@ public ResourceCodeValue getParentValue()
*
* @return parent ResourceCodeValue unique ID
*/
public Integer getParentValueUniqueID()
@Override public Integer getParentValueUniqueID()
{
return m_parentValue == null ? null : m_parentValue.getUniqueID();
}
Expand All @@ -110,7 +110,7 @@ public Integer getParentValueUniqueID()
*
* @return list of ResourceCodeValue instances
*/
public List<ResourceCodeValue> getChildValues()
@Override public List<ResourceCodeValue> getChildValues()
{
return m_resourceCode.getValues().stream().filter(a -> a.m_parentValue == this).collect(Collectors.toList());
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/sf/mpxj/RoleCode.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ private RoleCode(Builder builder)
return m_maxLength;
}

public List<RoleCodeValue> getValues()
@Override public List<RoleCodeValue> getValues()
{
return m_values;
}

public List<RoleCodeValue> getChildValues()
@Override public List<RoleCodeValue> getChildValues()
{
return m_values.stream().filter(v -> v.getParentValue() == null).collect(Collectors.toList());
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/sf/mpxj/RoleCodeValue.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public Integer getRoleCodeUniqueID()
{
return m_description;
}

/**
* Retrieve the parent RoleCodeValue.
*
Expand All @@ -100,7 +100,7 @@ public RoleCodeValue getParentValue()
*
* @return parent RoleCodeValue unique ID
*/
public Integer getParentValueUniqueID()
@Override public Integer getParentValueUniqueID()
{
return m_parentValue == null ? null : m_parentValue.getUniqueID();
}
Expand All @@ -110,7 +110,7 @@ public Integer getParentValueUniqueID()
*
* @return list of RoleCodeValue instances
*/
public List<RoleCodeValue> getChildValues()
@Override public List<RoleCodeValue> getChildValues()
{
return m_roleCode.getValues().stream().filter(a -> a.m_parentValue == this).collect(Collectors.toList());
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/sf/mpxj/Task.java
Original file line number Diff line number Diff line change
Expand Up @@ -4866,7 +4866,7 @@ public void setPrimaryResource(Resource resource)
{
setPrimaryResourceUniqueID(resource == null ? null : resource.getUniqueID());
}

/**
* Set the activity ID.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public void loadFile(File file, ProjectFile projectFile)

MpxjTreeNode projectCodesFolder = new MpxjTreeNode("Project Codes");
projectNode.add(projectCodesFolder);
addCodes(projectCodesFolder,m_projectFile.getProjectCodes());
addCodes(projectCodesFolder, m_projectFile.getProjectCodes());

m_model.setRoot(projectNode);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,6 @@ private void processProjectProperties()
rows = getRows("projpcat", "proj_id", m_projectID);
m_reader.processProjectCodeAssignments(rows);


//
// Process XER-specific attributes
//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ private void writeResourceCodeValues()
*/
private void writeResourceCodeAssignments()
{
List<Map<String,Object>> assignments = m_file.getResources().stream()
List<Map<String, Object>> assignments = m_file.getResources().stream()
.sorted(Comparator.comparing(Resource::getUniqueID))
.map(r -> r.getResourceCodeValues().values().stream().sorted(Comparator.comparing(ResourceCodeValue::getResourceCodeUniqueID))
.map(v -> populateResourceCodeAssignment(r.getUniqueID(), v)).collect(Collectors.toList()))
Expand Down Expand Up @@ -1874,7 +1874,7 @@ interface ExportFunction<T>
private static final Map<String, ExportFunction<Map<String, Object>>> PROJECT_CODE_ASSIGNMENT_COLUMNS = new LinkedHashMap<>();
static
{
PROJECT_CODE_ASSIGNMENT_COLUMNS.put("proj_id", v -> v.get("proj_id")) ;
PROJECT_CODE_ASSIGNMENT_COLUMNS.put("proj_id", v -> v.get("proj_id"));
PROJECT_CODE_ASSIGNMENT_COLUMNS.put("proj_catg_type_id", v -> v.get("proj_catg_type_id"));
PROJECT_CODE_ASSIGNMENT_COLUMNS.put("proj_catg_id", v -> v.get("proj_catg_id"));
}
Expand Down Expand Up @@ -1902,7 +1902,7 @@ interface ExportFunction<T>
private static final Map<String, ExportFunction<Map<String, Object>>> RESOURCE_CODE_ASSIGNMENT_COLUMNS = new LinkedHashMap<>();
static
{
RESOURCE_CODE_ASSIGNMENT_COLUMNS.put("rsrc_id", v -> v.get("rsrc_id")) ;
RESOURCE_CODE_ASSIGNMENT_COLUMNS.put("rsrc_id", v -> v.get("rsrc_id"));
RESOURCE_CODE_ASSIGNMENT_COLUMNS.put("rsrc_catg_type_id", v -> v.get("rsrc_catg_type_id"));
RESOURCE_CODE_ASSIGNMENT_COLUMNS.put("rsrc_catg_id", v -> v.get("rsrc_catg_id"));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This file was generated by the Eclipse Implementation of JAXB, v3.0.2
// See https://eclipse-ee4j.github.io/jaxb-ri
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2024.04.25 at 10:03:41 AM BST
// Generated on: 2024.12.12 at 03:09:49 PM GMT
//

package net.sf.mpxj.primavera.schema;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This file was generated by the Eclipse Implementation of JAXB, v3.0.2
// See https://eclipse-ee4j.github.io/jaxb-ri
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2024.04.25 at 10:03:41 AM BST
// Generated on: 2024.12.12 at 03:09:49 PM GMT
//

package net.sf.mpxj.primavera.schema;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This file was generated by the Eclipse Implementation of JAXB, v3.0.2
// See https://eclipse-ee4j.github.io/jaxb-ri
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2024.04.25 at 10:03:41 AM BST
// Generated on: 2024.12.12 at 03:09:49 PM GMT
//

package net.sf.mpxj.primavera.schema;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This file was generated by the Eclipse Implementation of JAXB, v3.0.2
// See https://eclipse-ee4j.github.io/jaxb-ri
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2024.04.25 at 10:03:41 AM BST
// Generated on: 2024.12.12 at 03:09:49 PM GMT
//

package net.sf.mpxj.primavera.schema;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This file was generated by the Eclipse Implementation of JAXB, v3.0.2
// See https://eclipse-ee4j.github.io/jaxb-ri
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2024.04.25 at 10:03:41 AM BST
// Generated on: 2024.12.12 at 03:09:49 PM GMT
//

package net.sf.mpxj.primavera.schema;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This file was generated by the Eclipse Implementation of JAXB, v3.0.2
// See https://eclipse-ee4j.github.io/jaxb-ri
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2024.04.25 at 10:03:41 AM BST
// Generated on: 2024.12.12 at 03:09:49 PM GMT
//

package net.sf.mpxj.primavera.schema;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This file was generated by the Eclipse Implementation of JAXB, v3.0.2
// See https://eclipse-ee4j.github.io/jaxb-ri
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2024.04.25 at 10:03:41 AM BST
// Generated on: 2024.12.12 at 03:09:49 PM GMT
//

package net.sf.mpxj.primavera.schema;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This file was generated by the Eclipse Implementation of JAXB, v3.0.2
// See https://eclipse-ee4j.github.io/jaxb-ri
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2024.04.25 at 10:03:41 AM BST
// Generated on: 2024.12.12 at 03:09:49 PM GMT
//

package net.sf.mpxj.primavera.schema;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This file was generated by the Eclipse Implementation of JAXB, v3.0.2
// See https://eclipse-ee4j.github.io/jaxb-ri
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2024.04.25 at 10:03:41 AM BST
// Generated on: 2024.12.12 at 03:09:49 PM GMT
//

package net.sf.mpxj.primavera.schema;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This file was generated by the Eclipse Implementation of JAXB, v3.0.2
// See https://eclipse-ee4j.github.io/jaxb-ri
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2024.04.25 at 10:03:41 AM BST
// Generated on: 2024.12.12 at 03:09:49 PM GMT
//

package net.sf.mpxj.primavera.schema;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This file was generated by the Eclipse Implementation of JAXB, v3.0.2
// See https://eclipse-ee4j.github.io/jaxb-ri
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2024.04.25 at 10:03:41 AM BST
// Generated on: 2024.12.12 at 03:09:49 PM GMT
//

package net.sf.mpxj.primavera.schema;
Expand Down
Loading

0 comments on commit 111549f

Please sign in to comment.