diff --git a/MeshModel/MeshModel.iml b/MeshModel/MeshModel.iml
index a1df9e005bfd87c74b2a4189642b3e04bde57955..df0b22bf0cb8c1d360fe1d05711bbbd2a40697e7 100644
--- a/MeshModel/MeshModel.iml
+++ b/MeshModel/MeshModel.iml
@@ -6,6 +6,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../application/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
@@ -16,5 +17,20 @@
<orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-api-annotations-common:RELEASE82" level="project" />
<orderEntry type="library" name="Maven: com.github.mokiat:java-data-front:v2.0.0" level="project" />
<orderEntry type="library" name="Maven: javax.vecmath:vecmath:1.5.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.6.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.6.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.6.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:7.1.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.72" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: com.google.inject:guice:no_aop:4.1.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:19.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.21" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/MeshModel/pom.xml b/MeshModel/pom.xml
index 4c28f6b0dae16428553cbe893dcb0c11fd7b9dc6..92c90b6342765aac0057d74b7bb54d7d1288b85b 100644
--- a/MeshModel/pom.xml
+++ b/MeshModel/pom.xml
@@ -80,6 +80,18 @@
<artifactId>vecmath</artifactId>
<version>1.5.2</version>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>RELEASE</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>RELEASE</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTable.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTable.java
index bc942ea6da29f54e4423f759a9fedcf32b2257d4..62616d33e0d6e636e260d723800b1c44ac19c787 100644
--- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTable.java
+++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTable.java
@@ -20,8 +20,9 @@ public class CornerTable {
* @return index of corner
*/
public int getIndexOfFace(int index) {
- if (index < 0 || index > rows.size())
+ if (index < 0 || index > rows.size()) {
return -2;
+ }
return index / 3;
}
@@ -34,8 +35,9 @@ public class CornerTable {
* @return index of corner
*/
public int getIndexOfOppositeCorner(int index) {
- if (index < 0 || index > rows.size())
+ if (index < 0 || index > rows.size()) {
return -2;
+ }
return rows.get(index).getOppositeCornerIndex();
} // opposite
@@ -47,10 +49,12 @@ public class CornerTable {
* @return index of next corner
*/
public int getIndexOfNextCornerInFace(int index) {
- if (index < 0 || index > rows.size())
+ if (index < 0 || index > rows.size()) {
return -2;
- if ((index % 3) == 2)
+ }
+ if ((index % 3) == 2) {
return index - 1;
+ }
return index + 1;
}
@@ -62,8 +66,9 @@ public class CornerTable {
* @return index of previous corner
*/
public int getIndexOfPreviousCornerInFace(int index) {
- if (index < 0 || index > rows.size())
+ if (index < 0 || index > rows.size()) {
return -2;
+ }
return getIndexOfNextCornerInFace(getIndexOfNextCornerInFace(index));
}
@@ -75,8 +80,9 @@ public class CornerTable {
* @return index of corner
*/
public int getIndexOfTipCornerOnLeft(int index) {
- if (index < 0 || index > rows.size())
+ if (index < 0 || index > rows.size()) {
return -2;
+ }
return getIndexOfOppositeCorner(getIndexOfPreviousCornerInFace(index));
}
@@ -88,8 +94,9 @@ public class CornerTable {
* @return index of corner
*/
public int getIndexOfTipCornerOnRight(int index) {
- if (index < 0 || index > rows.size())
+ if (index < 0 || index > rows.size()) {
return -2;
+ }
return getIndexOfOppositeCorner(getIndexOfNextCornerInFace(index));
}
@@ -101,8 +108,9 @@ public class CornerTable {
* @return index of corner
*/
public int getNextAroundCorner(int index) {
- if (index < 0 || index > rows.size())
+ if (index < 0 || index > rows.size()) {
return -2;
+ }
return getIndexOfNextCornerInFace(getIndexOfTipCornerOnLeft(index));
}
diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTableRow.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTableRow.java
index c25f921e1d4cb311a2db194a96734e405f71415c..07deb873ae87123981d7e42c62b31e92f6a6427d 100644
--- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTableRow.java
+++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTableRow.java
@@ -39,7 +39,7 @@ public class CornerTableRow {
* sets index of the opposite corner
* @param index index of the opposite corner in corner table
*/
- public void setOppositeCornerIndex(int index) {
- this.oppositeCornerIndex = index;
- }
+ public void setOppositeCornerIndex(int index) {
+ this.oppositeCornerIndex = index;
+ }
}
diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacet.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacet.java
index 84ddab7cdee5ff91128018ff9538e3e3a04c5342..438af33a71d319bd2fdfd9f751bec35bffc09875 100644
--- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacet.java
+++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacet.java
@@ -17,7 +17,7 @@ public class MeshFacet {
* @param index index of vertex
* @return vertex
*/
- public MeshPoint GetVertex(int index) {
+ public MeshPoint getVertex(int index) {
return vertexes.get(index);
}
@@ -33,16 +33,16 @@ public class MeshFacet {
* returns number of vertexes in MeshFacet
* @return number of vertexes
*/
- public int getNumberOfVertexes() {
- return vertexes.size();
- }
+ public int getNumberOfVertexes() {
+ return vertexes.size();
+ }
/**
* returns Corner Table representing MeshFacet
* @return corner table
*/
- public CornerTable getCornerTable() {
- return cornerTable;
- }
+ public CornerTable getCornerTable() {
+ return cornerTable;
+ }
}
diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshPoint.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshPoint.java
index 7a70b1750f5e7c8f040ff956a14f855ec93f4791..4fdc8d9c212b45c4fdc3606da1dd1dddae138c01 100644
--- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshPoint.java
+++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshPoint.java
@@ -17,8 +17,9 @@ public class MeshPoint {
* @param texCoord coordinates in texture
*/
public MeshPoint(Vector3d position, Vector3d normal , Vector3d texCoord) {
- if (position == null || normal == null || texCoord == null)
+ if (position == null || normal == null || texCoord == null) {
throw new NullPointerException("position, normal and texCoord cannot be null");
+ }
this.position = position;
this.normal = normal;
@@ -52,8 +53,9 @@ public class MeshPoint {
*/
@Override
public boolean equals(Object obj) {
- if (!(obj instanceof MeshPoint))
+ if (!(obj instanceof MeshPoint)) {
return false;
+ }
MeshPoint meshPointObj = (MeshPoint) obj;
return this.position.equals(meshPointObj.position)