Skip to content

Commit 8aa6a7a

Browse files
jonilesjoniles
committed
Code inspections
1 parent 54d85cb commit 8aa6a7a

File tree

7 files changed

+23
-26
lines changed

7 files changed

+23
-26
lines changed

‎src/main/java/net/sf/mpxj/ProjectFile.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.util.Objects;
3636
import java.util.Set;
3737
import java.util.stream.Collectors;
38-
import java.util.stream.IntStream;
3938
import java.util.stream.Stream;
4039

4140
import net.sf.mpxj.common.NumberHelper;

‎src/main/java/net/sf/mpxj/explorer/ProjectExplorer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545

4646
import com.jgoodies.binding.beans.PropertyAdapter;
4747

48-
import net.sf.mpxj.MPXJException;
4948
import net.sf.mpxj.ProjectFile;
5049
import net.sf.mpxj.primavera.PrimaveraPMFileReader;
5150
import net.sf.mpxj.primavera.PrimaveraXERFileReader;
@@ -278,7 +277,7 @@ private void openAll(File file)
278277
{
279278
updateAndSaveRecents(file);
280279

281-
try (UniversalProjectReader.ProjectReaderProxy proxy = new UniversalProjectReader().getProjectReaderProxy(file);)
280+
try (UniversalProjectReader.ProjectReaderProxy proxy = new UniversalProjectReader().getProjectReaderProxy(file))
282281
{
283282
if (proxy == null)
284283
{

‎src/main/java/net/sf/mpxj/primavera/PrimaveraPMProjectWriter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.util.ArrayList;
3030
import java.util.Comparator;
3131

32-
import java.util.HashMap;
3332
import java.util.HashSet;
3433
import java.util.List;
3534
import java.util.Map;

‎src/test/java/net/sf/mpxj/junit/RateHelperTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ public class RateHelperTest
4242
ProjectFile file = new ProjectFile();
4343
file.setDefaultCalendar(file.addDefaultBaseCalendar());
4444

45-
Assert.assertEquals(RateHelper.convertToHours(file.getProjectProperties(), new Rate(1, TimeUnit.MINUTES)), 60, 0.0);
46-
Assert.assertEquals(RateHelper.convertToHours(file.getProjectProperties(), new Rate(1, TimeUnit.HOURS)), 1, 0.0);
47-
Assert.assertEquals(RateHelper.convertToHours(file.getProjectProperties(), new Rate(8, TimeUnit.DAYS)), 1, 0.0);
48-
Assert.assertEquals(RateHelper.convertToHours(file.getProjectProperties(), new Rate(40, TimeUnit.WEEKS)), 1, 0.0);
49-
Assert.assertEquals(RateHelper.convertToHours(file.getProjectProperties(), new Rate(160, TimeUnit.MONTHS)), 1, 0.0);
50-
Assert.assertEquals(RateHelper.convertToHours(file.getProjectProperties(), new Rate(2080, TimeUnit.YEARS)), 1, 0.0);
45+
Assert.assertEquals(60, RateHelper.convertToHours(file.getProjectProperties(), new Rate(1, TimeUnit.MINUTES)), 0.0);
46+
Assert.assertEquals(1, RateHelper.convertToHours(file.getProjectProperties(), new Rate(1, TimeUnit.HOURS)), 0.0);
47+
Assert.assertEquals(1, RateHelper.convertToHours(file.getProjectProperties(), new Rate(8, TimeUnit.DAYS)), 0.0);
48+
Assert.assertEquals(1, RateHelper.convertToHours(file.getProjectProperties(), new Rate(40, TimeUnit.WEEKS)), 0.0);
49+
Assert.assertEquals(1, RateHelper.convertToHours(file.getProjectProperties(), new Rate(160, TimeUnit.MONTHS)), 0.0);
50+
Assert.assertEquals(1, RateHelper.convertToHours(file.getProjectProperties(), new Rate(2080, TimeUnit.YEARS)), 0.0);
5151
}
5252

5353
/**
@@ -58,11 +58,11 @@ public class RateHelperTest
5858
ProjectFile file = new ProjectFile();
5959
file.setDefaultCalendar(file.addDefaultBaseCalendar());
6060

61-
Assert.assertEquals(RateHelper.convertFromHours(file.getProjectProperties(), new Rate(60, TimeUnit.HOURS), TimeUnit.MINUTES).getAmount(), 1, 0.0);
62-
Assert.assertEquals(RateHelper.convertFromHours(file.getProjectProperties(), new Rate(1, TimeUnit.HOURS), TimeUnit.HOURS).getAmount(), 1, 0.0);
63-
Assert.assertEquals(RateHelper.convertFromHours(file.getProjectProperties(), new Rate(1, TimeUnit.HOURS), TimeUnit.DAYS).getAmount(), 8, 0.0);
64-
Assert.assertEquals(RateHelper.convertFromHours(file.getProjectProperties(), new Rate(1, TimeUnit.HOURS), TimeUnit.WEEKS).getAmount(), 40, 0.0);
65-
Assert.assertEquals(RateHelper.convertFromHours(file.getProjectProperties(), new Rate(1, TimeUnit.HOURS), TimeUnit.MONTHS).getAmount(), 160, 0.0);
66-
Assert.assertEquals(RateHelper.convertFromHours(file.getProjectProperties(), new Rate(1, TimeUnit.HOURS), TimeUnit.YEARS).getAmount(), 2080, 0.0);
61+
Assert.assertEquals(1, RateHelper.convertFromHours(file.getProjectProperties(), new Rate(60, TimeUnit.HOURS), TimeUnit.MINUTES).getAmount(), 0.0);
62+
Assert.assertEquals(1, RateHelper.convertFromHours(file.getProjectProperties(), new Rate(1, TimeUnit.HOURS), TimeUnit.HOURS).getAmount(), 0.0);
63+
Assert.assertEquals(8, RateHelper.convertFromHours(file.getProjectProperties(), new Rate(1, TimeUnit.HOURS), TimeUnit.DAYS).getAmount(), 0.0);
64+
Assert.assertEquals(40, RateHelper.convertFromHours(file.getProjectProperties(), new Rate(1, TimeUnit.HOURS), TimeUnit.WEEKS).getAmount(), 0.0);
65+
Assert.assertEquals(160, RateHelper.convertFromHours(file.getProjectProperties(), new Rate(1, TimeUnit.HOURS), TimeUnit.MONTHS).getAmount(), 0.0);
66+
Assert.assertEquals(2080, RateHelper.convertFromHours(file.getProjectProperties(), new Rate(1, TimeUnit.HOURS), TimeUnit.YEARS).getAmount(), 0.0);
6767
}
6868
}

‎src/test/java/net/sf/mpxj/junit/XerRelationshipLagCalendarTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class XerRelationshipLagCalendarTest
4040
@Test public void testProjectDefaultCalendar() throws Exception
4141
{
4242
ProjectFile xml = new PrimaveraXERFileReader().read(MpxjTestData.filePath("ProjectDefaultCalendar.xer"));
43-
assertEquals(xml.getProjectProperties().getRelationshipLagCalendar(), RelationshipLagCalendar.PROJECT_DEFAULT);
43+
assertEquals(RelationshipLagCalendar.PROJECT_DEFAULT, xml.getProjectProperties().getRelationshipLagCalendar());
4444
}
4545

4646
/**
@@ -49,7 +49,7 @@ public class XerRelationshipLagCalendarTest
4949
@Test public void testPredecessorCalendar() throws Exception
5050
{
5151
ProjectFile xml = new PrimaveraXERFileReader().read(MpxjTestData.filePath("PredecessorCalendar.xer"));
52-
assertEquals(xml.getProjectProperties().getRelationshipLagCalendar(), RelationshipLagCalendar.PREDECESSOR);
52+
assertEquals(RelationshipLagCalendar.PREDECESSOR, xml.getProjectProperties().getRelationshipLagCalendar());
5353
}
5454

5555
/**
@@ -58,7 +58,7 @@ public class XerRelationshipLagCalendarTest
5858
@Test public void testSuccessorCalendar() throws Exception
5959
{
6060
ProjectFile xml = new PrimaveraXERFileReader().read(MpxjTestData.filePath("SuccessorCalendar.xer"));
61-
assertEquals(xml.getProjectProperties().getRelationshipLagCalendar(), RelationshipLagCalendar.SUCCESSOR);
61+
assertEquals(RelationshipLagCalendar.SUCCESSOR, xml.getProjectProperties().getRelationshipLagCalendar());
6262
}
6363

6464
/**
@@ -67,6 +67,6 @@ public class XerRelationshipLagCalendarTest
6767
@Test public void testTwentyFourHourCalendar() throws Exception
6868
{
6969
ProjectFile xml = new PrimaveraXERFileReader().read(MpxjTestData.filePath("TwentyFourHourCalendar.xer"));
70-
assertEquals(xml.getProjectProperties().getRelationshipLagCalendar(), RelationshipLagCalendar.TWENTY_FOUR_HOUR);
70+
assertEquals(RelationshipLagCalendar.TWENTY_FOUR_HOUR, xml.getProjectProperties().getRelationshipLagCalendar());
7171
}
7272
}

‎src/test/java/net/sf/mpxj/junit/XmlRelationshipLagCalendarTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class XmlRelationshipLagCalendarTest
4040
@Test public void testProjectDefaultCalendar() throws Exception
4141
{
4242
ProjectFile xml = new PrimaveraPMFileReader().read(MpxjTestData.filePath("ProjectDefaultCalendar.xml"));
43-
assertEquals(xml.getProjectProperties().getRelationshipLagCalendar(), RelationshipLagCalendar.PROJECT_DEFAULT);
43+
assertEquals(RelationshipLagCalendar.PROJECT_DEFAULT, xml.getProjectProperties().getRelationshipLagCalendar());
4444
}
4545

4646
/**
@@ -49,7 +49,7 @@ public class XmlRelationshipLagCalendarTest
4949
@Test public void testPredecessorCalendar() throws Exception
5050
{
5151
ProjectFile xml = new PrimaveraPMFileReader().read(MpxjTestData.filePath("PredecessorCalendar.xml"));
52-
assertEquals(xml.getProjectProperties().getRelationshipLagCalendar(), RelationshipLagCalendar.PREDECESSOR);
52+
assertEquals(RelationshipLagCalendar.PREDECESSOR, xml.getProjectProperties().getRelationshipLagCalendar());
5353
}
5454

5555
/**
@@ -58,7 +58,7 @@ public class XmlRelationshipLagCalendarTest
5858
@Test public void testSuccessorCalendar() throws Exception
5959
{
6060
ProjectFile xml = new PrimaveraPMFileReader().read(MpxjTestData.filePath("SuccessorCalendar.xml"));
61-
assertEquals(xml.getProjectProperties().getRelationshipLagCalendar(), RelationshipLagCalendar.SUCCESSOR);
61+
assertEquals(RelationshipLagCalendar.SUCCESSOR, xml.getProjectProperties().getRelationshipLagCalendar());
6262
}
6363

6464
/**
@@ -67,6 +67,6 @@ public class XmlRelationshipLagCalendarTest
6767
@Test public void testTwentyFourHourCalendar() throws Exception
6868
{
6969
ProjectFile xml = new PrimaveraPMFileReader().read(MpxjTestData.filePath("TwentyFourHourCalendar.xml"));
70-
assertEquals(xml.getProjectProperties().getRelationshipLagCalendar(), RelationshipLagCalendar.TWENTY_FOUR_HOUR);
70+
assertEquals(RelationshipLagCalendar.TWENTY_FOUR_HOUR, xml.getProjectProperties().getRelationshipLagCalendar());
7171
}
7272
}

‎src/test/java/net/sf/mpxj/junit/legacy/BasicTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,10 @@ public class BasicTest
255255

256256
task1.addTask();
257257
List<Task> children = task1.getChildTasks();
258-
assertEquals(children.size(), 2);
258+
assertEquals(2, children.size());
259259

260260
List<Task> toplevel = file.getChildTasks();
261-
assertEquals(toplevel.size(), 1);
261+
assertEquals(1, toplevel.size());
262262
}
263263

264264
/**

0 commit comments

Comments
 (0)