Skip to content

Commit

Permalink
Fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
joniles committed Aug 22, 2024
1 parent 00c4023 commit 192427f
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/main/java/net/sf/mpxj/ActivityCode.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ private ActivityCode(Builder builder)
*
* @return unique ID
*/
public Integer getUniqueID()
@Override public Integer getUniqueID()
{
return m_uniqueID;
}
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/net/sf/mpxj/ManuallyScheduledTaskCalendar.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,56 +78,56 @@ public ManuallyScheduledTaskCalendar(ProjectCalendar calendar, ResourceAssignmen

if (date.equals(m_assignmentStartDate))
{
LocalTime assignment_start_time = m_assignment.getStart().toLocalTime();
LocalTime assignmentStartTime = m_assignment.getStart().toLocalTime();
LocalTime firstRangeStart = effectiveRanges.get(0).getStart();
if (assignment_start_time.isBefore(firstRangeStart))
if (assignmentStartTime.isBefore(firstRangeStart))
{
// Create a new temp ranges.
// First range is from assignment start to regular end of range.
ProjectCalendarHours newRanges = new ProjectCalendarHours();
newRanges.addAll(effectiveRanges);
LocalTime firstRangeEnd = effectiveRanges.get(0).getEnd();
newRanges.set(0, new LocalTimeRange(assignment_start_time, firstRangeEnd));
newRanges.set(0, new LocalTimeRange(assignmentStartTime, firstRangeEnd));
effectiveRanges = newRanges;
}
else
{
LocalTime lastRangeEnd = effectiveRanges.get(effectiveRanges.size() - 1).getEnd();
if (assignment_start_time.isAfter(lastRangeEnd))
if (assignmentStartTime.isAfter(lastRangeEnd))
{
// Create a new temp ranges.
// Only one range from assignment start to end of day.
ProjectCalendarHours newRanges = new ProjectCalendarHours();
newRanges.add(new LocalTimeRange(assignment_start_time, LocalTime.MIDNIGHT));
newRanges.add(new LocalTimeRange(assignmentStartTime, LocalTime.MIDNIGHT));
effectiveRanges = newRanges;
}
}
}

if (date.equals(m_assignmentEndDate))
{
LocalTime assignment_end_time = m_assignment.getFinish().toLocalTime();
LocalTime assignmentEndTime = m_assignment.getFinish().toLocalTime();
LocalTime firstRangeStart = effectiveRanges.get(0).getStart();

if (assignment_end_time.isBefore(firstRangeStart))
if (assignmentEndTime.isBefore(firstRangeStart))
{
// Create a new temp ranges.
// Only one range from start of day to assignment end.
ProjectCalendarHours newRanges = new ProjectCalendarHours();
newRanges.add(new LocalTimeRange(LocalTime.MIDNIGHT, assignment_end_time));
newRanges.add(new LocalTimeRange(LocalTime.MIDNIGHT, assignmentEndTime));
effectiveRanges = newRanges;
}
else
{
LocalTime lastRangeEnd = effectiveRanges.get(effectiveRanges.size() - 1).getEnd();
if (assignment_end_time.isAfter(lastRangeEnd))
if (assignmentEndTime.isAfter(lastRangeEnd))
{
// Create a new temp ranges.
// Last range is from regular range end to assignment end.
ProjectCalendarHours newRanges = new ProjectCalendarHours();
newRanges.addAll(effectiveRanges);
LocalTime lastRangeStart = effectiveRanges.get(effectiveRanges.size() - 1).getStart();
newRanges.set(effectiveRanges.size() - 1, new LocalTimeRange(lastRangeStart, assignment_end_time));
newRanges.set(effectiveRanges.size() - 1, new LocalTimeRange(lastRangeStart, assignmentEndTime));
effectiveRanges = newRanges;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/sf/mpxj/ProjectFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@ public void fixUniqueIdClashes()
* @param c target class
* @return ObjectSequence instance
*/
public ObjectSequence getUniqueIdObjectSequence(Class<?> c)
@Override public ObjectSequence getUniqueIdObjectSequence(Class<?> c)
{
return ProjectFileSharedData.contains(c) ? m_shared.getUniqueIdObjectSequence(c) : m_uniqueIdObjectSequences.computeIfAbsent(c.getName(), x -> new ObjectSequence(1));
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/sf/mpxj/primavera/PrimaveraReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ final class PrimaveraReader
/**
* Constructor.
*
* @param shared shared data container
* @param resourceFields resource field mapping
* @param wbsFields wbs field mapping
* @param taskFields task field mapping
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ private void testSegments(ProjectFile file)
* Common method used to test timephased assignment segments against expected data.
*
* @param assignment parent resource assignment
* @param assignmentIndex index number of current assignment
* @param startDate start date for segments
* @param segmentCount number of segments to create
* @param units units of duration for each segment
* @param complete flag indicating if planned or complete work is required
*/
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/net/sf/mpxj/mspdi/XsdDurationTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
*/
public class XsdDurationTest
{
/**
* Check that we're not in IKVM.
*/
@Before public void beforeMethod()
{
assumeJvm();
Expand Down

0 comments on commit 192427f

Please sign in to comment.