From 0097802fce479914d7324014322ee1caa224a45f Mon Sep 17 00:00:00 2001 From: Radek Oslejsek <oslejsek@fi.muni.cz> Date: Fri, 23 Oct 2020 09:56:17 +0200 Subject: [PATCH] Stylecheck fixes --- .../analyst/comparison/HausdorffDistance.java | 9 +++---- .../cz/fidentis/analyst/gui/Installer.java | 2 +- .../cz/fidentis/analyst/mesh/HumanFace.java | 2 +- .../fidentis/analyst/mesh/core/MeshFacet.java | 2 +- .../analyst/mesh/core/MeshFacetImpl.java | 1 - .../analyst/mesh/io/MeshObjExporter.java | 24 +++++++++++-------- .../mesh/visitors/BoundingBoxVisitor.java | 3 +-- .../mesh/visitors/TriangleListVisitor.java | 3 +-- .../analyst/mesh/visitors/Visitor.java | 3 +-- 9 files changed, 25 insertions(+), 24 deletions(-) diff --git a/Comparison/src/main/java/cz/fidentis/analyst/comparison/HausdorffDistance.java b/Comparison/src/main/java/cz/fidentis/analyst/comparison/HausdorffDistance.java index 8939c600..f63122bd 100644 --- a/Comparison/src/main/java/cz/fidentis/analyst/comparison/HausdorffDistance.java +++ b/Comparison/src/main/java/cz/fidentis/analyst/comparison/HausdorffDistance.java @@ -332,17 +332,18 @@ public class HausdorffDistance { * * @param <K> key * @param <V> value + * @author Radek Oslejsek */ - private class Pair<K,V> { - private K key; - private V value; + private final class Pair<K,V> { + private final K key; + private final V value; /** * Constructor. * @param key key * @param value value */ - public Pair(K key, V value) { + private Pair(K key, V value) { this.key = key; this.value = value; } diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/Installer.java b/GUI/src/main/java/cz/fidentis/analyst/gui/Installer.java index 6252ba99..1e651ac1 100644 --- a/GUI/src/main/java/cz/fidentis/analyst/gui/Installer.java +++ b/GUI/src/main/java/cz/fidentis/analyst/gui/Installer.java @@ -14,7 +14,7 @@ import org.openide.modules.ModuleInstall; /** * - * @author oslejsek + * @author Radek Oslejsek */ public class Installer extends ModuleInstall { diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/HumanFace.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/HumanFace.java index 93c6511f..044448d1 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/HumanFace.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/HumanFace.java @@ -9,7 +9,7 @@ import java.io.InputStream; /** * This class encapsulates data for 3D scan of a single human face. * - * @author oslejsek + * @author Radek Oslejsek */ public class HumanFace { 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 8d70d622..1db7603b 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 @@ -62,5 +62,5 @@ public interface MeshFacet { * * @param visitor Visitor */ - public void accept(Visitor visitor); + void accept(Visitor visitor); } diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacetImpl.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacetImpl.java index 32ab10ea..d5079795 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacetImpl.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacetImpl.java @@ -1,6 +1,5 @@ package cz.fidentis.analyst.mesh.core; -import cz.fidentis.analyst.mesh.visitors.BoundingBox; import cz.fidentis.analyst.mesh.visitors.TriangleListVisitor; import cz.fidentis.analyst.mesh.visitors.Visitor; import java.util.ArrayList; diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjExporter.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjExporter.java index e518c9ad..2a6a5c83 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjExporter.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjExporter.java @@ -108,8 +108,12 @@ public class MeshObjExporter { out.write("#" + facet.getCornerTable().getSize() / 3 + " triangles"); out.newLine(); - /* - //computes triangles of facet + //writeTriangles(facet, out); + } + } + + /* + protected void writeTriangles(MeshFacet facet, BufferedWriter out) throws IOException { Triangle[] triangles = new Triangle[facet.getCornerTable().getSize() / 3]; for (int i = 0; i < facet.getCornerTable().getSize(); i += 3) { Triangle t = new Triangle(facet.getCornerTable().getRow(i).getVertexIndex(), @@ -124,18 +128,18 @@ public class MeshObjExporter { if (facet.getVertex(triangle.getVertex1()).getNormal() != null && hasAllNormals) { out.write((triangle.getVertex1() + 1) + "//" + (triangle.getVertex1() + 1) + " " + (triangle.getVertex2() + 1) + "//" + (triangle.getVertex2() + 1) + " " - + (triangle.getVertex3() + 1) + "//" + (triangle.getVertex3() + 1) + "\n"); + + (triangle.getVertex3() + 1) + "//" + (triangle.getVertex3() + 1)); + out.newLine(); } else { out.write((triangle.getVertex1() + 1) + " " + (triangle.getVertex2() + 1) + - " " + (triangle.getVertex3() + 1) + "\n"); + " " + (triangle.getVertex3() + 1)); + out.newLine(); } } - out.write("#" + triangles.length + " triangles" + "\n"); - out.write("\n"); - out.close(); - fstream.close(); - */ - } + out.write("#" + triangles.length + " triangles"); + out.newLine(); + out.newLine(); } + */ } diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/BoundingBoxVisitor.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/BoundingBoxVisitor.java index 7805d36f..4e138d06 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/BoundingBoxVisitor.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/BoundingBoxVisitor.java @@ -1,12 +1,11 @@ package cz.fidentis.analyst.mesh.visitors; import cz.fidentis.analyst.mesh.core.MeshFacet; -import cz.fidentis.analyst.mesh.core.MeshModel; /** * Visitor that computes a 3D bounding box (cube). * - * @author oslejsek + * @author Radek Oslejsek */ public class BoundingBoxVisitor implements Visitor { diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/TriangleListVisitor.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/TriangleListVisitor.java index 42cb05c0..8acb8c8b 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/TriangleListVisitor.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/TriangleListVisitor.java @@ -2,7 +2,6 @@ package cz.fidentis.analyst.mesh.visitors; import cz.fidentis.analyst.mesh.core.CornerTable; import cz.fidentis.analyst.mesh.core.MeshFacet; -import cz.fidentis.analyst.mesh.core.MeshModel; import cz.fidentis.analyst.mesh.core.MeshTriangle; import java.util.ArrayList; import java.util.List; @@ -10,7 +9,7 @@ import java.util.List; /** * Visitor that collects and returs list of triangles. * - * @author oslejsek + * @author Radek Oslejsek */ public class TriangleListVisitor implements Visitor { diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/Visitor.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/Visitor.java index cf8401b9..bc6d0a8a 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/Visitor.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/Visitor.java @@ -6,11 +6,10 @@ import cz.fidentis.analyst.mesh.core.MeshModel; /** * Visitor for the traversal of @code{MeshModel} and @code{MeshFacet}. * - * @author oslejsek + * @author Radek Oslejsek */ public interface Visitor { - /** * Visits a mesh model. * -- GitLab