diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 5abd26739c2497ff00f7da281ca9c3dbcf0c64b8..0000000000000000000000000000000000000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -FIDENTIS-Analyst-parent \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 6385d8e5c5ae840c182bd66200b7fa2f7019bff6..0000000000000000000000000000000000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="CompilerConfiguration"> - <annotationProcessing> - <profile name="Maven default annotation processors profile" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <module name="FIDENTIS-Analyst-app" /> - <module name="FIDENTIS-Analyst-branding" /> - <module name="GUI" /> - <module name="MeshModel" /> - <module name="Renderer" /> - </profile> - </annotationProcessing> - <bytecodeTargetLevel> - <module name="FIDENTIS-Analyst-app" target="1.7" /> - <module name="FIDENTIS-Analyst-branding" target="1.7" /> - <module name="FIDENTIS-Analyst-parent" target="1.5" /> - <module name="GUI" target="1.7" /> - <module name="MeshModel" target="1.7" /> - <module name="Renderer" target="1.7" /> - </bytecodeTargetLevel> - </component> -</project> \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index c0179a33d58348d9eae51952ef1e6cad4f516454..0000000000000000000000000000000000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="Encoding" addBOMForNewFiles="with NO BOM"> - <file url="file://$PROJECT_DIR$/GUI" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/MeshModel" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/Renderer" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/application" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/branding" charset="UTF-8" /> - </component> -</project> \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml deleted file mode 100644 index 30ff5cb79106a1706b39c305da86ff96a2d96118..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: aopalliance:aopalliance:1.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_beust_jcommander_1_72.xml b/.idea/libraries/Maven__com_beust_jcommander_1_72.xml deleted file mode 100644 index ad12dd9bbce7aca3767cd93f0f6401338dc381de..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_beust_jcommander_1_72.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.beust:jcommander:1.72"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.72/jcommander-1.72.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.72/jcommander-1.72-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.72/jcommander-1.72-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_mokiat_java_data_front_v2_0_0.xml b/.idea/libraries/Maven__com_github_mokiat_java_data_front_v2_0_0.xml deleted file mode 100644 index 315b7d577bbf4c8e7f79a49935c687bf9260956d..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_github_mokiat_java_data_front_v2_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.github.mokiat:java-data-front:v2.0.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/github/mokiat/java-data-front/v2.0.0/java-data-front-v2.0.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/github/mokiat/java-data-front/v2.0.0/java-data-front-v2.0.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/github/mokiat/java-data-front/v2.0.0/java-data-front-v2.0.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_19_0.xml b/.idea/libraries/Maven__com_google_guava_guava_19_0.xml deleted file mode 100644 index 68e23ccd00646751958b22e63211a5da6e79bdbc..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_guava_guava_19_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.guava:guava:19.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/19.0/guava-19.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/19.0/guava-19.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/19.0/guava-19.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_inject_guice_no_aop_4_1_0.xml b/.idea/libraries/Maven__com_google_inject_guice_no_aop_4_1_0.xml deleted file mode 100644 index d846de08cb2e85342052718853f5797a82e229b7..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_inject_guice_no_aop_4_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.inject:guice:no_aop:4.1.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/4.1.0/guice-4.1.0-no_aop.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/4.1.0/guice-4.1.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/4.1.0/guice-4.1.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__java3d_j3d_core_1_3_1.xml b/.idea/libraries/Maven__java3d_j3d_core_1_3_1.xml deleted file mode 100644 index 572b7db1d2802b3da2d8d19ef4916baf47f337d9..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__java3d_j3d_core_1_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: java3d:j3d-core:1.3.1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/java3d/j3d-core/1.3.1/j3d-core-1.3.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/java3d/j3d-core/1.3.1/j3d-core-1.3.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/java3d/j3d-core/1.3.1/j3d-core-1.3.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__java3d_j3d_core_utils_1_3_1.xml b/.idea/libraries/Maven__java3d_j3d_core_utils_1_3_1.xml deleted file mode 100644 index 08c7a218143824bbd097a95afc2aec0133293251..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__java3d_j3d_core_utils_1_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: java3d:j3d-core-utils:1.3.1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/java3d/j3d-core-utils/1.3.1/j3d-core-utils-1.3.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/java3d/j3d-core-utils/1.3.1/j3d-core-utils-1.3.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/java3d/j3d-core-utils/1.3.1/j3d-core-utils-1.3.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__java3d_vecmath_1_3_1.xml b/.idea/libraries/Maven__java3d_vecmath_1_3_1.xml deleted file mode 100644 index e6b4b12bfbd0e9c67ef8f04ab96a8c6b498f6181..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__java3d_vecmath_1_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: java3d:vecmath:1.3.1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/java3d/vecmath/1.3.1/vecmath-1.3.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/java3d/vecmath/1.3.1/vecmath-1.3.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/java3d/vecmath/1.3.1/vecmath-1.3.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml deleted file mode 100644 index 93cf65aba0780739b44f7a15b5fc6288feadf8b9..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: javax.inject:javax.inject:1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_vecmath_vecmath_1_5_2.xml b/.idea/libraries/Maven__javax_vecmath_vecmath_1_5_2.xml deleted file mode 100644 index f04d302bc378426ca68389f143b1894ade118d6f..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__javax_vecmath_vecmath_1_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: javax.vecmath:vecmath:1.5.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/vecmath/vecmath/1.5.2/vecmath-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/javax/vecmath/vecmath/1.5.2/vecmath-1.5.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/javax/vecmath/vecmath/1.5.2/vecmath-1.5.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml deleted file mode 100644 index d411041745b6e44356035cdd44538daca09388f6..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__junit_junit_4_12.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: junit:junit:4.12"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml deleted file mode 100644 index f854ab00fdbf2e7209bbdf678f7c45f3bb209378..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.apiguardian:apiguardian-api:1.1.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml deleted file mode 100644 index f58bbc11276f98bea2b6c82f21664c5a9f424fe3..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.hamcrest:hamcrest-core:1.3"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jogamp_jogl_jogl_all_2_0_rc11.xml b/.idea/libraries/Maven__org_jogamp_jogl_jogl_all_2_0_rc11.xml deleted file mode 100644 index 7d879d9eac5b96f5a9db0cda882f336557ecc5db..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_jogamp_jogl_jogl_all_2_0_rc11.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.jogamp.jogl:jogl-all:2.0-rc11"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/jogamp/jogl/jogl-all/2.0-rc11/jogl-all-2.0-rc11.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/jogamp/jogl/jogl-all/2.0-rc11/jogl-all-2.0-rc11-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/jogamp/jogl/jogl-all/2.0-rc11/jogl-all-2.0-rc11-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_0.xml deleted file mode 100644 index be380a526df7c09895eef32753332f5d4177e107..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.0/junit-jupiter-api-5.6.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.0/junit-jupiter-api-5.6.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.0/junit-jupiter-api-5.6.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_0.xml deleted file mode 100644 index 8e5d3f203a5730857fe7437b303128f2b51a6311..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.junit.platform:junit-platform-commons:1.6.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.0/junit-platform-commons-1.6.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.0/junit-platform-commons-1.6.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.0/junit-platform-commons-1.6.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_api_org_netbeans_api_annotations_common_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_api_org_netbeans_api_annotations_common_RELEASE82.xml deleted file mode 100644 index d273bff0d7310123b73b3ca6526861051d453bfa..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_api_org_netbeans_api_annotations_common_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.api:org-netbeans-api-annotations-common:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/api/org-netbeans-api-annotations-common/RELEASE82/org-netbeans-api-annotations-common-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/api/org-netbeans-api-annotations-common/RELEASE82/org-netbeans-api-annotations-common-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/api/org-netbeans-api-annotations-common/RELEASE82/org-netbeans-api-annotations-common-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_api_org_netbeans_libs_junit4_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_api_org_netbeans_libs_junit4_RELEASE82.xml deleted file mode 100644 index 8a83f5c214fe7b4cfc5c41f4b274c90ef7d2776e..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_api_org_netbeans_libs_junit4_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.api:org-netbeans-libs-junit4:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/api/org-netbeans-libs-junit4/RELEASE82/org-netbeans-libs-junit4-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/api/org-netbeans-libs-junit4/RELEASE82/org-netbeans-libs-junit4-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/api/org-netbeans-libs-junit4/RELEASE82/org-netbeans-libs-junit4-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_api_org_netbeans_modules_nbjunit_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_api_org_netbeans_modules_nbjunit_RELEASE82.xml deleted file mode 100644 index 8bdd7613ca5b81270314cc61f6e48c66aea6db0a..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_api_org_netbeans_modules_nbjunit_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.api:org-netbeans-modules-nbjunit:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/api/org-netbeans-modules-nbjunit/RELEASE82/org-netbeans-modules-nbjunit-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/api/org-netbeans-modules-nbjunit/RELEASE82/org-netbeans-modules-nbjunit-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/api/org-netbeans-modules-nbjunit/RELEASE82/org-netbeans-modules-nbjunit-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_external_asm_all_5_0_1_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_external_asm_all_5_0_1_RELEASE82.xml deleted file mode 100644 index 2a7ae75496b836d80c49aeec9dfa70965e88bb3f..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_external_asm_all_5_0_1_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.external:asm-all-5.0.1:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/asm-all-5.0.1/RELEASE82/asm-all-5.0.1-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/asm-all-5.0.1/RELEASE82/asm-all-5.0.1-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/asm-all-5.0.1/RELEASE82/asm-all-5.0.1-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_external_net_java_html_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_external_net_java_html_RELEASE82.xml deleted file mode 100644 index f0ddd0420a52ba06b99ba83078bf21104c756dfa..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_external_net_java_html_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.external:net-java-html:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html/RELEASE82/net-java-html-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html/RELEASE82/net-java-html-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html/RELEASE82/net-java-html-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_external_net_java_html_boot_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_external_net_java_html_boot_RELEASE82.xml deleted file mode 100644 index 9aae910dcb843ec152fe360b47eb5b212ba9d8a4..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_external_net_java_html_boot_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.external:net-java-html-boot:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-boot/RELEASE82/net-java-html-boot-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-boot/RELEASE82/net-java-html-boot-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-boot/RELEASE82/net-java-html-boot-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_external_net_java_html_boot_fx_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_external_net_java_html_boot_fx_RELEASE82.xml deleted file mode 100644 index c493ae7c389fb7fec3922261d371d15cfecda7d0..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_external_net_java_html_boot_fx_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.external:net-java-html-boot-fx:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-boot-fx/RELEASE82/net-java-html-boot-fx-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-boot-fx/RELEASE82/net-java-html-boot-fx-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-boot-fx/RELEASE82/net-java-html-boot-fx-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_external_net_java_html_boot_script_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_external_net_java_html_boot_script_RELEASE82.xml deleted file mode 100644 index be4a84e07234cb40dbfae8ae1d75c5f9bd58c09c..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_external_net_java_html_boot_script_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.external:net-java-html-boot-script:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-boot-script/RELEASE82/net-java-html-boot-script-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-boot-script/RELEASE82/net-java-html-boot-script-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-boot-script/RELEASE82/net-java-html-boot-script-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_external_net_java_html_geo_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_external_net_java_html_geo_RELEASE82.xml deleted file mode 100644 index e63ef7d0997da572bcdbe736fe6aa5b4c6dc9c60..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_external_net_java_html_geo_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.external:net-java-html-geo:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-geo/RELEASE82/net-java-html-geo-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-geo/RELEASE82/net-java-html-geo-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-geo/RELEASE82/net-java-html-geo-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_external_net_java_html_json_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_external_net_java_html_json_RELEASE82.xml deleted file mode 100644 index a23043510a73e17381cf6e5e8c76bbdabd13f7ce..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_external_net_java_html_json_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.external:net-java-html-json:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-json/RELEASE82/net-java-html-json-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-json/RELEASE82/net-java-html-json-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-json/RELEASE82/net-java-html-json-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_external_net_java_html_sound_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_external_net_java_html_sound_RELEASE82.xml deleted file mode 100644 index 0e579ed3d230985db225d1152d9fcd9fd4a76244..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_external_net_java_html_sound_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.external:net-java-html-sound:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-sound/RELEASE82/net-java-html-sound-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-sound/RELEASE82/net-java-html-sound-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/net-java-html-sound/RELEASE82/net-java-html-sound-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_external_org_netbeans_html_ko4j_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_external_org_netbeans_html_ko4j_RELEASE82.xml deleted file mode 100644 index 3cc80dbedd8795879fc9199d05648cb1fd156422..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_external_org_netbeans_html_ko4j_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.external:org-netbeans-html-ko4j:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/org-netbeans-html-ko4j/RELEASE82/org-netbeans-html-ko4j-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/org-netbeans-html-ko4j/RELEASE82/org-netbeans-html-ko4j-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/org-netbeans-html-ko4j/RELEASE82/org-netbeans-html-ko4j-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_external_org_netbeans_html_xhr4j_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_external_org_netbeans_html_xhr4j_RELEASE82.xml deleted file mode 100644 index e2739cc7f6475d83265b9d3427d1032dab75708a..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_external_org_netbeans_html_xhr4j_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.external:org-netbeans-html-xhr4j:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/org-netbeans-html-xhr4j/RELEASE82/org-netbeans-html-xhr4j-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/org-netbeans-html-xhr4j/RELEASE82/org-netbeans-html-xhr4j-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/external/org-netbeans-html-xhr4j/RELEASE82/org-netbeans-html-xhr4j-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_modules_org_netbeans_insane_RELEASE82.xml b/.idea/libraries/Maven__org_netbeans_modules_org_netbeans_insane_RELEASE82.xml deleted file mode 100644 index f9526157a77fe3f599696d3094d9167e5323980c..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_netbeans_modules_org_netbeans_insane_RELEASE82.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.netbeans.modules:org-netbeans-insane:RELEASE82"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/modules/org-netbeans-insane/RELEASE82/org-netbeans-insane-RELEASE82.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/modules/org-netbeans-insane/RELEASE82/org-netbeans-insane-RELEASE82-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/modules/org-netbeans-insane/RELEASE82/org-netbeans-insane-RELEASE82-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml deleted file mode 100644 index fbc1b1635a2c69174f8bea7d6306f5175015adc0..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.opentest4j:opentest4j:1.2.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_testng_testng_7_1_0.xml b/.idea/libraries/Maven__org_testng_testng_7_1_0.xml deleted file mode 100644 index 54dbda65b6148f458aba879d3ae1e46080ac5ec6..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_testng_testng_7_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.testng:testng:7.1.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/7.1.0/testng-7.1.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/7.1.0/testng-7.1.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/7.1.0/testng-7.1.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_21.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_21.xml deleted file mode 100644 index c86e780aa3bcf6c8117df2b5fb68fafd24691bea..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_21.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.yaml:snakeyaml:1.21"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.21/snakeyaml-1.21.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.21/snakeyaml-1.21-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.21/snakeyaml-1.21-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 7480bd80902afe7e85a8d00f2ac3977fbc4ba75e..0000000000000000000000000000000000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="MavenProjectsManager"> - <option name="originalFiles"> - <list> - <option value="$PROJECT_DIR$/pom.xml" /> - </list> - </option> - </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="12" project-jdk-type="JavaSDK"> - <output url="file://$PROJECT_DIR$/classes" /> - </component> -</project> \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index bafaac77f9fada4c6eb72e2368134a983f50e52f..0000000000000000000000000000000000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/application/FIDENTIS-Analyst-app.iml" filepath="$PROJECT_DIR$/application/FIDENTIS-Analyst-app.iml" /> - <module fileurl="file://$PROJECT_DIR$/branding/FIDENTIS-Analyst-branding.iml" filepath="$PROJECT_DIR$/branding/FIDENTIS-Analyst-branding.iml" /> - <module fileurl="file://$PROJECT_DIR$/FIDENTIS-Analyst-parent.iml" filepath="$PROJECT_DIR$/FIDENTIS-Analyst-parent.iml" /> - <module fileurl="file://$PROJECT_DIR$/GUI/GUI.iml" filepath="$PROJECT_DIR$/GUI/GUI.iml" /> - <module fileurl="file://$PROJECT_DIR$/MeshModel/MeshModel.iml" filepath="$PROJECT_DIR$/MeshModel/MeshModel.iml" /> - <module fileurl="file://$PROJECT_DIR$/Renderer/Renderer.iml" filepath="$PROJECT_DIR$/Renderer/Renderer.iml" /> - </modules> - </component> -</project> \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfbbc029bcab630581847471d7f238ec53..0000000000000000000000000000000000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="VcsDirectoryMappings"> - <mapping directory="" vcs="Git" /> - </component> -</project> \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 748969aad77d3c41349584b60ad12157f0f5eb01..0000000000000000000000000000000000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,522 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ChangeListManager"> - <list default="true" id="dd1d4179-bace-49d8-b3fd-a51317f8ae06" name="Default Changelist" comment=""> - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - </list> - <ignored path="$PROJECT_DIR$/target/" /> - <ignored path="$PROJECT_DIR$/MeshModel/target/" /> - <ignored path="$PROJECT_DIR$/GUI/target/" /> - <ignored path="$PROJECT_DIR$/application/target/" /> - <ignored path="$PROJECT_DIR$/branding/target/" /> - <ignored path="$PROJECT_DIR$/Renderer/target/" /> - <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> - <option name="SHOW_DIALOG" value="false" /> - <option name="HIGHLIGHT_CONFLICTS" value="true" /> - <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> - <option name="LAST_RESOLUTION" value="IGNORE" /> - </component> - <component name="FileEditorManager"> - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacet.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="170"> - <caret line="11" selection-start-line="11" selection-end-line="11" /> - <folding> - <element signature="e#775#776#0" expanded="true" /> - <element signature="e#813#814#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTableRow.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="119"> - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshPoint.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="153"> - <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="3315"> - <caret line="381" column="28" selection-start-line="381" selection-start-column="28" selection-end-line="381" selection-end-column="28" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/GUI/src/main/java/cz/fidentis/analyst/gui/GeneralGLEventListener.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="6426"> - <caret line="406" column="44" selection-start-line="406" selection-start-column="44" selection-end-line="406" selection-end-column="44" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/GUI/src/main/java/cz/fidentis/analyst/gui/Interface.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-221"> - <caret line="14" column="32" lean-forward="true" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" /> - <folding> - <element signature="imports" expanded="true" /> - <element signature="e#4076#4165#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/application/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableRowTest.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="289"> - <caret line="17" selection-start-line="17" selection-end-line="17" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/GUI/src/main/java/cz/fidentis/analyst/gui/ModelFileFilter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="306"> - <caret line="19" selection-start-line="19" selection-end-line="19" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTable.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="153"> - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> - </state> - </provider> - </entry> - </file> - </leaf> - </component> - <component name="FileTemplateManagerImpl"> - <option name="RECENT_TEMPLATES"> - <list> - <option value="Class" /> - </list> - </option> - </component> - <component name="Git.Settings"> - <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> - </component> - <component name="IdeDocumentHistory"> - <option name="CHANGED_PATHS"> - <list> - <option value="$PROJECT_DIR$/GUI/src/main/java/cz/fidentis/analyst/gui/ModelFileFilter.java" /> - <option value="$PROJECT_DIR$/GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.java" /> - <option value="$PROJECT_DIR$/GUI/src/main/java/cz/fidentis/analyst/gui/Interface.java" /> - <option value="$PROJECT_DIR$/GUI/src/main/java/cz/fidentis/analyst/gui/GeneralGLEventListener.java" /> - </list> - </option> - </component> - <component name="MavenProjectNavigator"> - <treeState> - <expand> - <path> - <item name="" type="16c1761:MavenProjectsStructure$RootNode" /> - <item name="application" type="9519ce18:MavenProjectsStructure$ProjectNode" /> - </path> - <path> - <item name="" type="16c1761:MavenProjectsStructure$RootNode" /> - <item name="application" type="9519ce18:MavenProjectsStructure$ProjectNode" /> - <item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" /> - </path> - <path> - <item name="" type="16c1761:MavenProjectsStructure$RootNode" /> - <item name="application" type="9519ce18:MavenProjectsStructure$ProjectNode" /> - <item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" /> - <item name="org.netbeans.cluster:platform:pom:RELEASE82" type="c0821a7e:MavenProjectsStructure$DependencyNode" /> - </path> - <path> - <item name="" type="16c1761:MavenProjectsStructure$RootNode" /> - <item name="application" type="9519ce18:MavenProjectsStructure$ProjectNode" /> - <item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" /> - <item name="org.netbeans.cluster:platform:pom:RELEASE82" type="c0821a7e:MavenProjectsStructure$DependencyNode" /> - <item name="org.netbeans.api:org-openide-filesystems-compat8:nbm-file:RELEASE82" type="c0821a7e:MavenProjectsStructure$DependencyNode" /> - </path> - <path> - <item name="" type="16c1761:MavenProjectsStructure$RootNode" /> - <item name="GUI" type="9519ce18:MavenProjectsStructure$ProjectNode" /> - </path> - <path> - <item name="" type="16c1761:MavenProjectsStructure$RootNode" /> - <item name="GUI" type="9519ce18:MavenProjectsStructure$ProjectNode" /> - <item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" /> - </path> - </expand> - <select /> - </treeState> - </component> - <component name="MavenRunner"> - <option name="delegateBuildToMaven" value="true" /> - </component> - <component name="ProjectFrameBounds" extendedState="6"> - <option name="x" value="-10" /> - <option name="y" value="-10" /> - <option name="width" value="980" /> - <option name="height" value="1050" /> - </component> - <component name="ProjectView"> - <navigator proportions="" version="1"> - <foldersAlwaysOnTop value="true" /> - </navigator> - <panes> - <pane id="Scope" /> - <pane id="ProjectPane"> - <subPane> - <expand> - <path> - <item name="FIDENTIS-Analyst-parent" type="b2602c69:ProjectViewProjectNode" /> - <item name="analyst2" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="FIDENTIS-Analyst-parent" type="b2602c69:ProjectViewProjectNode" /> - <item name="analyst2" type="462c0819:PsiDirectoryNode" /> - <item name="GUI" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="FIDENTIS-Analyst-parent" type="b2602c69:ProjectViewProjectNode" /> - <item name="analyst2" type="462c0819:PsiDirectoryNode" /> - <item name="GUI" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="FIDENTIS-Analyst-parent" type="b2602c69:ProjectViewProjectNode" /> - <item name="analyst2" type="462c0819:PsiDirectoryNode" /> - <item name="GUI" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="FIDENTIS-Analyst-parent" type="b2602c69:ProjectViewProjectNode" /> - <item name="analyst2" type="462c0819:PsiDirectoryNode" /> - <item name="GUI" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="java" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="FIDENTIS-Analyst-parent" type="b2602c69:ProjectViewProjectNode" /> - <item name="analyst2" type="462c0819:PsiDirectoryNode" /> - <item name="MeshModel" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="FIDENTIS-Analyst-parent" type="b2602c69:ProjectViewProjectNode" /> - <item name="analyst2" type="462c0819:PsiDirectoryNode" /> - <item name="MeshModel" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="FIDENTIS-Analyst-parent" type="b2602c69:ProjectViewProjectNode" /> - <item name="analyst2" type="462c0819:PsiDirectoryNode" /> - <item name="MeshModel" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="FIDENTIS-Analyst-parent" type="b2602c69:ProjectViewProjectNode" /> - <item name="analyst2" type="462c0819:PsiDirectoryNode" /> - <item name="MeshModel" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="java" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="FIDENTIS-Analyst-parent" type="b2602c69:ProjectViewProjectNode" /> - <item name="analyst2" type="462c0819:PsiDirectoryNode" /> - <item name="MeshModel" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="java" type="462c0819:PsiDirectoryNode" /> - <item name="mesh" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="FIDENTIS-Analyst-parent" type="b2602c69:ProjectViewProjectNode" /> - <item name="analyst2" type="462c0819:PsiDirectoryNode" /> - <item name="MeshModel" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="java" type="462c0819:PsiDirectoryNode" /> - <item name="mesh" type="462c0819:PsiDirectoryNode" /> - <item name="core" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="FIDENTIS-Analyst-parent" type="b2602c69:ProjectViewProjectNode" /> - <item name="analyst2" type="462c0819:PsiDirectoryNode" /> - <item name="MeshModel" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="java" type="462c0819:PsiDirectoryNode" /> - <item name="mesh" type="462c0819:PsiDirectoryNode" /> - <item name="io" type="462c0819:PsiDirectoryNode" /> - </path> - </expand> - <select /> - </subPane> - </pane> - <pane id="PackagesPane" /> - </panes> - </component> - <component name="PropertiesComponent"> - <property name="WebServerToolWindowFactoryState" value="false" /> - <property name="aspect.path.notification.shown" value="true" /> - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583613721619" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../J5" /> - <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> - <property name="nodejs_npm_path_reset_for_default_project" value="true" /> - <property name="project.structure.last.edited" value="Global Libraries" /> - <property name="project.structure.proportion" value="0.0" /> - <property name="project.structure.side.proportion" value="0.0" /> - <property name="settings.editor.selected.configurable" value="reference.settings.project.maven.runner" /> - </component> - <component name="RunDashboard"> - <option name="ruleStates"> - <list> - <RuleState> - <option name="name" value="ConfigurationTypeDashboardGroupingRule" /> - </RuleState> - <RuleState> - <option name="name" value="StatusDashboardGroupingRule" /> - </RuleState> - </list> - </option> - </component> - <component name="RunManager"> - <configuration name="Interface" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> - <option name="MAIN_CLASS_NAME" value="cz.fidentis.analyst.gui.Interface" /> - <module name="GUI" /> - <extension name="coverage"> - <pattern> - <option name="PATTERN" value="cz.fidentis.analyst.gui.*" /> - <option name="ENABLED" value="true" /> - </pattern> - </extension> - <method v="2"> - <option name="Make" enabled="true" /> - </method> - </configuration> - <recent_temporary> - <list> - <item itemvalue="Application.Interface" /> - </list> - </recent_temporary> - </component> - <component name="SvnConfiguration"> - <configuration /> - </component> - <component name="TaskManager"> - <task active="true" id="Default" summary="Default task"> - <changelist id="dd1d4179-bace-49d8-b3fd-a51317f8ae06" name="Default Changelist" comment="" /> - <created>1581874392617</created> - <option name="number" value="Default" /> - <option name="presentableId" value="Default" /> - <updated>1581874392617</updated> - <workItem from="1581874395966" duration="3968000" /> - <workItem from="1581883455177" duration="915000" /> - <workItem from="1582042575774" duration="3069000" /> - <workItem from="1582807369146" duration="1114000" /> - <workItem from="1582811692938" duration="1887000" /> - <workItem from="1583409089486" duration="2462000" /> - <workItem from="1583521284239" duration="2331000" /> - <workItem from="1584477266625" duration="1814000" /> - <workItem from="1584557414142" duration="72000" /> - </task> - <servers /> - </component> - <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="17632000" /> - </component> - <component name="ToolWindowManager"> - <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> - <layout> - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27919462" /> - <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> - <window_info id="Image Layers" order="2" /> - <window_info id="Designer" order="3" /> - <window_info id="UI Designer" order="4" /> - <window_info id="Capture Tool" order="5" /> - <window_info id="Favorites" order="6" side_tool="true" /> - <window_info anchor="bottom" id="Message" order="0" /> - <window_info anchor="bottom" id="Find" order="1" /> - <window_info anchor="bottom" id="Run" order="2" weight="0.3286119" /> - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> - <window_info anchor="bottom" id="TODO" order="6" /> - <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> - <window_info anchor="bottom" id="Version Control" order="8" /> - <window_info anchor="bottom" id="Database Changes" order="9" /> - <window_info anchor="bottom" id="Terminal" order="10" /> - <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> - <window_info anchor="bottom" id="Messages" order="12" weight="0.3286119" /> - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> - <window_info anchor="right" id="Palette" order="3" /> - <window_info anchor="right" id="Theme Preview" order="4" /> - <window_info anchor="right" id="Maven" order="5" visible="true" weight="0.094630875" /> - <window_info anchor="right" id="Capture Analysis" order="6" /> - <window_info anchor="right" id="Palette	" order="7" /> - <window_info anchor="right" id="Database" order="8" /> - </layout> - </component> - <component name="TypeScriptGeneratedFilesManager"> - <option name="version" value="1" /> - </component> - <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacet.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="170"> - <caret line="11" selection-start-line="11" selection-end-line="11" /> - <folding> - <element signature="e#775#776#0" expanded="true" /> - <element signature="e#813#814#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTableRow.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="119"> - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshPoint.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="153"> - <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="3315"> - <caret line="381" column="28" selection-start-line="381" selection-start-column="28" selection-end-line="381" selection-end-column="28" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/GUI/src/main/java/cz/fidentis/analyst/gui/GeneralGLEventListener.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="6426"> - <caret line="406" column="44" selection-start-line="406" selection-start-column="44" selection-end-line="406" selection-end-column="44" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/application/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableRowTest.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="289"> - <caret line="17" selection-start-line="17" selection-end-line="17" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/GUI/src/main/java/cz/fidentis/analyst/gui/ModelFileFilter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="306"> - <caret line="19" selection-start-line="19" selection-end-line="19" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTable.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="153"> - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/GUI/src/main/java/cz/fidentis/analyst/gui/Interface.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-221"> - <caret line="14" column="32" lean-forward="true" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" /> - <folding> - <element signature="imports" expanded="true" /> - <element signature="e#4076#4165#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </component> - <component name="masterDetails"> - <states> - <state key="GlobalLibrariesConfigurable.UI"> - <settings> - <last-edited>javafx11</last-edited> - <splitter-proportions> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </splitter-proportions> - </settings> - </state> - <state key="JdkListConfigurable.UI"> - <settings> - <last-edited>11</last-edited> - <splitter-proportions> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </splitter-proportions> - </settings> - </state> - <state key="ProjectJDKs.UI"> - <settings> - <last-edited>12</last-edited> - <splitter-proportions> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </splitter-proportions> - </settings> - </state> - <state key="ProjectLibrariesConfigurable.UI"> - <settings> - <splitter-proportions> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </splitter-proportions> - </settings> - </state> - </states> - </component> -</project> \ No newline at end of file diff --git a/Comparison/pom.xml b/Comparison/pom.xml index 3cdacc5a6610ab72dd823c0c313639edeae6518d..752ee12126e152228b3da9d34537fcfaa9e137cd 100644 --- a/Comparison/pom.xml +++ b/Comparison/pom.xml @@ -7,6 +7,33 @@ <groupId>groupId</groupId> <artifactId>Comparison</artifactId> <version>1.0-SNAPSHOT</version> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.6.0</version> + <configuration> + <source>8</source> + <target>8</target> + </configuration> + </plugin> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + </plugin> + </plugins> + </reporting> <dependencies> <dependency> <groupId>cz.findetis</groupId> @@ -20,5 +47,7 @@ <version>1.5.2</version> </dependency> </dependencies> - + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> </project> \ No newline at end of file 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 562ccac8b5adca783337e7f27863b40753e8e626..04bf2602ab9df74c5e13f3a037c85acded5ea39a 100644 --- a/Comparison/src/main/java/cz/fidentis/analyst/comparison/HausdorffDistance.java +++ b/Comparison/src/main/java/cz/fidentis/analyst/comparison/HausdorffDistance.java @@ -1,17 +1,22 @@ package cz.fidentis.analyst.comparison; -import cz.fidentis.analyst.mesh.core.CornerTable; import cz.fidentis.analyst.mesh.core.MeshFacet; import cz.fidentis.analyst.mesh.core.MeshPoint; import javax.vecmath.Vector3d; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; public class HausdorffDistance { + /** + * @param vertex a + * @param facet a + * @return a + */ public static ClosestVertices calculateNearestVertex(MeshPoint vertex, MeshFacet facet) { double minDistance = Double.MAX_VALUE; MeshPoint closestVertex = null; @@ -28,6 +33,11 @@ public class HausdorffDistance { return new ClosestVertices(vertex, closestVertex, minDistance); } + /** + * @param facet a + * @param comparedFacet a + * @return a + */ public static List<ClosestVertices> calculateHausdorffDistance(MeshFacet facet, MeshFacet comparedFacet) { int numberOfVertices = facet.getNumberOfVertexes(); List<Future<ClosestVertices>> closestVerticesFutures = new ArrayList<>(numberOfVertices); @@ -42,7 +52,11 @@ public class HausdorffDistance { executor.submit(() -> { while (true) { if (future.isDone()) { - closestVertices.add(future.get()); + try { + closestVertices.add(future.get()); + } catch (InterruptedException | ExecutionException e) { + e.printStackTrace(); + } break; } } @@ -52,13 +66,88 @@ public class HausdorffDistance { return closestVertices; } - public static MeshPoint makeProjectionToTrianglePlane(MeshPoint point, MeshFacet facet, int triangleIndex) { - Vector3d normal; + /** + * + * @param vertex a + * @param facet a + * @param triangleIndex a + * @return a + */ + public static MeshPoint makeProjectionToTrianglePlane(MeshPoint vertex, MeshFacet facet, int triangleIndex) { List<MeshPoint> vertices = facet.getVerticesOfTriangle(triangleIndex); - Vector3d ab = new Vector3d(); - ab.sub(vertices.get(0).getPosition(),vertices.get(1).getPosition()); - Vector3d ac = new Vector3d(); - ac.sub(vertices.get(0).getPosition(),vertices.get(2).getPosition()); - vertices.get(0). + Vector3d ab = vertices.get(0).subtractPosition(vertices.get(1)).getPosition(); + Vector3d ac = vertices.get(0).subtractPosition(vertices.get(2)).getPosition(); + Vector3d normal = new Vector3d(); + normal.cross(ab, ac); + normal.normalize(); + + Vector3d v = vertex.subtractPosition(vertices.get(0)).getPosition(); + double distance = v.dot(normal); + Vector3d projection = vertex.getPosition(); + v.scale(distance, normal); + projection.sub(v); + return new MeshPoint(projection, null, null); + } + + /** + * + * @param vertex a + * @param facet a + * @param triangleIndex a + * @return a + */ + public static boolean isPointInTriangle(MeshPoint vertex, MeshFacet facet, int triangleIndex) { + List<MeshPoint> vertices = facet.getVerticesOfTriangle(triangleIndex); + Vector3d p = vertex.getPosition(); + Vector3d p0 = vertices.get(1).getPosition(); + Vector3d p1 = vertices.get(1).getPosition(); + Vector3d p2 = vertices.get(2).getPosition(); + double dX = p.x - p2.x; + double dY = p.y - p2.y; + double dX21 = p2.x - p1.x; + double dY12 = p1.y - p2.y; + double D = dY12 * (p0.x - p2.x) + dX21 * (p0.y - p2.y); + double s = dY12 * dX + dX21 * dY; + double t = (p2.y - p0.y) * dX + (p0.x - p2.x) * dY; + if (D < 0) return s <= 0 && t <= 0 && s + t >= D; + return s >= 0 && t >= 0 && s + t <= D; + + + } + + /** + * + * @param point a + * @param facet a + * @param triangleIndex a + * @return a + */ + public static boolean isPointInTriangle2(MeshPoint point, MeshFacet facet, int triangleIndex) { + List<MeshPoint> vertices = facet.getVerticesOfTriangle(triangleIndex); + Vector3d p = point.getPosition(); + Vector3d p0 = vertices.get(1).getPosition(); + Vector3d p1 = vertices.get(1).getPosition(); + Vector3d p2 = vertices.get(2).getPosition(); + + Vector3d u = new Vector3d(p1.x - p0.x, //T1-T0 + p1.y - p0.y, + p1.z - p0.z); + Vector3d v = new Vector3d(p2.x - p0.x,//T2-T0 + p2.y - p0.y, + p2.z - p0.z); + + Vector3d w = new Vector3d(p.x - p0.x, //PI-T0 + p.y - p0.y, + p.z - p0.z); + + double uv = u.dot(v); + double uu = u.dot(u); + double vv = v.dot(v); + double wu = w.dot(u); + double wv = w.dot(v); + double s = (uv * wv - vv * wu) / (uv * uv - uu * vv); + double t = (uv * wu - uu * wv) / (uv * uv - uu * vv); + + return s >= 0 && t >= 0 && s + t <= 1; } } diff --git a/FIDENTIS-Analyst-parent.iml b/FIDENTIS-Analyst-parent.iml deleted file mode 100644 index 4fd5057cb905c9883efd97f2b04542e4458d711b..0000000000000000000000000000000000000000 --- a/FIDENTIS-Analyst-parent.iml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> \ No newline at end of file diff --git a/GUI/GUI.iml b/GUI/GUI.iml deleted file mode 100644 index 7f0272999279f7aa05497e365286b275c5bda024..0000000000000000000000000000000000000000 --- a/GUI/GUI.iml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <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$/src/test/java" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-api-annotations-common:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:2.0-rc11" level="project" /> - <orderEntry type="module" module-name="MeshModel" /> - <orderEntry type="library" name="Maven: java3d:j3d-core-utils:1.3.1" level="project" /> - <orderEntry type="library" name="Maven: java3d:vecmath:1.3.1" level="project" /> - <orderEntry type="library" name="Maven: java3d:j3d-core:1.3.1" 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" /> - </component> -</module> \ No newline at end of file diff --git a/GUI/pom.xml b/GUI/pom.xml index 02a7f01cab36638b5cdf51b59ad50d30980913af..0711bbfd80543829ad0dacb3eb0a22e487b198af 100644 --- a/GUI/pom.xml +++ b/GUI/pom.xml @@ -10,6 +10,11 @@ <packaging>nbm</packaging> <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>nbm-maven-plugin</artifactId> @@ -48,8 +53,25 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>8</source> + <target>8</target> + </configuration> + </plugin> </plugins> </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + </plugin> + </plugins> + </reporting> <dependencies> <dependency> <groupId>org.netbeans.api</groupId> @@ -62,6 +84,11 @@ <version>2.0-rc11</version> <type>jar</type> </dependency> + <dependency> + <groupId>org.jogamp.gluegen</groupId> + <artifactId>gluegen-rt-main</artifactId> + <version>2.3.2</version> + </dependency> <dependency> <groupId>cz.findetis</groupId> <artifactId>MeshModel</artifactId> diff --git a/MeshModel/MeshModel.iml b/MeshModel/MeshModel.iml deleted file mode 100644 index bed7d525a7bb9b5e261504e05dbac9640ec74e07..0000000000000000000000000000000000000000 --- a/MeshModel/MeshModel.iml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <content url="file://$MODULE_DIR$/../application/src/test/java" /> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: java3d:j3d-core-utils:1.3.1" level="project" /> - <orderEntry type="library" name="Maven: java3d:vecmath:1.3.1" level="project" /> - <orderEntry type="library" name="Maven: java3d:j3d-core:1.3.1" level="project" /> - <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.7.0-M1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.0-M1" 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.7.0-M1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.0-M1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.0-M1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.0-M1" 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 f9ee0adfca695550ce2f0329be3527e8d495ce75..89f72491a918539fad67c4d0994d06e329b0cc40 100644 --- a/MeshModel/pom.xml +++ b/MeshModel/pom.xml @@ -10,6 +10,11 @@ <packaging>nbm</packaging> <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>nbm-maven-plugin</artifactId> @@ -58,6 +63,15 @@ </plugin> </plugins> </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + </plugin> + </plugins> + </reporting> <repositories> <repository> <id>jitpack.io</id> @@ -90,18 +104,19 @@ </dependency> <dependency> <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter</artifactId> - <version>RELEASE</version> + <artifactId>junit-jupiter-api</artifactId> + <version>5.6.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>RELEASE</version> + <version>7.0.0</version> <scope>test</scope> </dependency> </dependencies> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> + </project> 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 a54607f5c9218ad3fe126cee9cf0b2db85ae94c0..02187ff8945fabb2d3a793468285fa824f02ea19 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 @@ -12,6 +12,27 @@ public class MeshFacet { private List<MeshPoint> vertices = new ArrayList<>(); private CornerTable cornerTable = new CornerTable(); + /** + * Constructor of MeshFacet + */ + public MeshFacet() { + cornerTable = new CornerTable(); + } + + /** + * Copy constructor of MeshFacet + * + * @param facet copied MeshFacet + */ + public MeshFacet(MeshFacet facet) { + for (MeshPoint vertex : + facet.vertices) { + vertices.add(new MeshPoint(vertex)); + } + cornerTable = new CornerTable(facet.cornerTable); + } + + /** * returns vertex of specified index * @@ -45,6 +66,14 @@ public class MeshFacet { return vertices; } + /** + * returns number of vertices in MeshFacet + * + * @return number of vertices + */ + public int getNumberOfVertices() { + return vertices.size(); + } /** * adds vertex to MeshFacet 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 f38c39c04774c5de043bc466574e2e53d98d22a0..c14f126e3eb7a18feebe9615b1b621f8b5676794 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 @@ -1,67 +1,75 @@ package cz.fidentis.analyst.mesh.core; + import javax.vecmath.Vector3d; /** - * * @author Matej Lukeš */ -//prerobenee public class MeshPoint { - protected Vector3d position, normal, texCoord; + private Vector3d position, normal, texCoord; - public MeshPoint(Vector3d position, Vector3d normal , Vector3d texCoord) { - if (position == null) + /** + * Constructor of MeshPoint + * + * @param position position of MeshPoint + * @param normal normal of MeshPoint + * @param texCoord texture coordinates of MeshPoint + */ + public MeshPoint(Vector3d position, Vector3d normal, Vector3d texCoord) { + if (position == null) { throw new NullPointerException("position cannot be null"); + } this.position = position; this.normal = normal; this.texCoord = texCoord; } + /** + * copy constructor of meshPoint + * + * @param meshPoint copied meshPoint + */ + public MeshPoint(MeshPoint meshPoint) { + this.position = new Vector3d(meshPoint.position); + if (meshPoint.normal != null) { + this.normal = new Vector3d(meshPoint.normal); + } + if (meshPoint.texCoord != null) { + this.texCoord = new Vector3d(meshPoint.texCoord); + } + } + /** * @return normal */ public Vector3d getNormal() { - return normal; + return new Vector3d(normal); } /** * @return position */ public Vector3d getPosition() { - return position; + return new Vector3d(position); } /** * @return texture coordinates */ public Vector3d getTexCoord() { - return texCoord; - } - - /** - * copy constructor of meshPoint - * @param meshPoint copied meshPoint - */ - public MeshPoint(MeshPoint meshPoint) { - this.position = new Vector3d(meshPoint.position); - if (meshPoint.normal != null) { - this.normal = new Vector3d(meshPoint.normal); - } - if (meshPoint.texCoord != null) { - this.texCoord = new Vector3d(meshPoint.texCoord); - } + return new Vector3d(texCoord); } - /** * @param obj compared object * @return true if positions, normals and texture coordinates are equal, false otherwise */ @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); @@ -69,9 +77,9 @@ public class MeshPoint { @Override public int hashCode() { - return position.hashCode(); - } - + return position.hashCode(); + } + /** * returns new instance of MeshPoint with subtracted position * @@ -92,12 +100,12 @@ public class MeshPoint { Vector3d newPosition = new Vector3d(position); newPosition.sub(subtrahend); if (normal != null) { - if (texCoord != null) + if (texCoord != null) { return new MeshPoint(new Vector3d(newPosition), new Vector3d(normal), new Vector3d(texCoord)); - else - return new MeshPoint(new Vector3d(newPosition), new Vector3d(normal), null); + } + return new MeshPoint(new Vector3d(newPosition), new Vector3d(normal), null); } - return new MeshPoint(new Vector3d(newPosition), null, null); + return new MeshPoint(new Vector3d(newPosition), null, null); } /** @@ -120,100 +128,96 @@ public class MeshPoint { Vector3d newPosition = new Vector3d(position); newPosition.add(addend); if (normal != null) { - if (texCoord != null) + if (texCoord != null) { return new MeshPoint(new Vector3d(newPosition), new Vector3d(normal), new Vector3d(texCoord)); - else - return new MeshPoint(new Vector3d(newPosition), new Vector3d(normal), null); + } + return new MeshPoint(new Vector3d(newPosition), new Vector3d(normal), null); } return new MeshPoint(new Vector3d(newPosition), null, null); } /** * returns new instance of MeshPoint with multiplied position by number - * + * * @param number Number for multiplying * @return multiplied MeshPoint */ public MeshPoint multiplyPosition(double number) { if (normal != null) { - if (texCoord != null) + if (texCoord != null) { return new MeshPoint(new Vector3d(this.getPosition().x * number, this.getPosition().y * number, this.getPosition().z * number), new Vector3d(normal), new Vector3d(texCoord)); - else - return new MeshPoint(new Vector3d(this.getPosition().x * number, - this.getPosition().y * number, this.getPosition().z * number), - new Vector3d(normal), null); + } + return new MeshPoint(new Vector3d(this.getPosition().x * number, + this.getPosition().y * number, this.getPosition().z * number), + new Vector3d(normal), null); } return new MeshPoint(new Vector3d(this.getPosition().x * number, - this.getPosition().y * number, this.getPosition().z * number), - null, null); + this.getPosition().y * number, this.getPosition().z * number), + null, null); } - + /** * returns new instance of MeshPoint with divided position by number - * + * * @param number Number for division * @return divided MeshPoint */ public MeshPoint dividePosition(double number) { if (normal != null) { - if (texCoord != null) + if (texCoord != null) { return new MeshPoint(new Vector3d(this.getPosition().x / number, this.getPosition().y / number, this.getPosition().z / number), new Vector3d(normal), new Vector3d(texCoord)); - else - return new MeshPoint(new Vector3d(this.getPosition().x / number, this.getPosition().y / number, - this.getPosition().z / number), new Vector3d(normal), null); + } + return new MeshPoint(new Vector3d(this.getPosition().x / number, this.getPosition().y / number, + this.getPosition().z / number), new Vector3d(normal), null); } return new MeshPoint(new Vector3d(this.getPosition().x / number, this.getPosition().y / number, this.getPosition().z / number), null, null); } - + /** * Returns the cross product of two points. - * + * * @param meshPoint Second argument of the cross product operation. * @return MeshPoint representing the resulting vector. */ public MeshPoint crossProduct(MeshPoint meshPoint) { - if (normal != null) { - if (texCoord != null) - return new MeshPoint(new Vector3d - (this.position.y * meshPoint.position.z - this.position.z * meshPoint.position.y, - this.position.z * meshPoint.position.x - this.position.x * meshPoint.position.z, - this.position.x * meshPoint.position.y - this.position.y * meshPoint.position.x), - new Vector3d(normal), new Vector3d(texCoord)); - else - return new MeshPoint(new Vector3d - (this.position.y * meshPoint.position.z - this.position.z * meshPoint.position.y, - this.position.z * meshPoint.position.x - this.position.x * meshPoint.position.z, - this.position.x * meshPoint.position.y - this.position.y * meshPoint.position.x), - new Vector3d(normal), null); - } - return new MeshPoint(new Vector3d - (this.position.y * meshPoint.position.z - this.position.z * meshPoint.position.y, - this.position.z * meshPoint.position.x - this.position.x * meshPoint.position.z, - this.position.x * meshPoint.position.y - this.position.y * meshPoint.position.x), - null, null); + Vector3d newPosition = new Vector3d(); + newPosition.cross(position, meshPoint.position); + + return new MeshPoint(newPosition, new Vector3d(normal), new Vector3d(texCoord)); } /** * returns the dot product of two points - * + * * @param meshPoint Second argument of the dot product operation - * @return dot product of two instances of MeshPoint + * @return dot product of two instances of MeshPoint */ public double dotProduct(MeshPoint meshPoint) { - return (this.position.x * meshPoint.position.x + this.position.y * meshPoint.position.y + this.position.z * meshPoint.position.z); + return position.dot(meshPoint.position); + } + + /** + * returns the dot product of two points + * + * @param vector Second argument of the dot product operation + * @return dot product of two instances of MeshPoint + */ + public double dotProduct(Vector3d vector) { + return position.dot(vector); } - + + /** * returns absolute value of MeshPoint - * + * * @return absolute value of MeshPoint */ public double abs() { - return Math.sqrt(this.getPosition().x * this.getPosition().x + + return Math.sqrt(this.getPosition().x * this.getPosition().x + this.getPosition().y * this.getPosition().y + this.getPosition().z * this.getPosition().z); } } diff --git a/application/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableRowTest.java b/MeshModel/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableRowTest.java similarity index 68% rename from application/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableRowTest.java rename to MeshModel/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableRowTest.java index ab3aed7d1cb229381767aa099b529ba07b9394ab..a080edf8c896e80391e19e1181b75bc2c0378bdf 100644 --- a/application/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableRowTest.java +++ b/MeshModel/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableRowTest.java @@ -1,17 +1,19 @@ package cz.fidentis.analyst.mesh.core; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit test for cornerTableRow */ -class CornerTableRowTest { +public class CornerTableRowTest { /** * unit test for getVertex */ - @org.junit.jupiter.api.Test - void getVertexIndex() { + @Test + public void getVertexIndex() { CornerTableRow row = new CornerTableRow(42, -1); assertEquals(42, row.getVertexIndex()); } @@ -19,8 +21,8 @@ class CornerTableRowTest { /** * Unit test for getOppositeCornerIndex */ - @org.junit.jupiter.api.Test - void getOppositeCornerIndex() { + @Test + public void getOppositeCornerIndex() { CornerTableRow row = new CornerTableRow(0, 42); assertEquals(42, row.getOppositeCornerIndex()); } @@ -28,8 +30,8 @@ class CornerTableRowTest { /** * Unit test for setOppositeCornerIndex */ - @org.junit.jupiter.api.Test - void setOppositeCornerIndex() { + @Test + public void setOppositeCornerIndex() { CornerTableRow row = new CornerTableRow(0, 42); assertEquals(42, row.getOppositeCornerIndex()); row.setOppositeCornerIndex(21); diff --git a/application/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableTest.java b/MeshModel/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableTest.java similarity index 85% rename from application/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableTest.java rename to MeshModel/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableTest.java index da59ff1cf648226b017b4a620a5825f0f052c129..2dcc4e13e51ad78f67a86906bcad9c2fa1349dc4 100644 --- a/application/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableTest.java +++ b/MeshModel/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableTest.java @@ -7,13 +7,13 @@ import static org.junit.jupiter.api.Assertions.*; /** * Unit tests for CornerTable */ -class CornerTableTest { +public class CornerTableTest { /** * Unit test for getIndexOfFace */ @Test - void getIndexOfFace() { + public void getIndexOfFace() { CornerTable table = new CornerTable(); for (int i = 0; i < 10; i++) { table.addRow(new CornerTableRow(i, -1)); @@ -28,7 +28,7 @@ class CornerTableTest { * Unit test for getIndexOfFaceNegativeIndex with negative index */ @Test - void getIndexOfFaceNegativeIndex() { + public void getIndexOfFaceNegativeIndex() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); assertEquals(-2, table.getIndexOfFace(-1)); @@ -38,7 +38,7 @@ class CornerTableTest { * Unit test for getIndexOfFaceNegativeIndex with index out of range */ @Test - void getIndexOfFaceIndexOutOfRange() { + public void getIndexOfFaceIndexOutOfRange() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); assertEquals(-2, table.getIndexOfFace(2)); @@ -48,7 +48,7 @@ class CornerTableTest { * Unit test for getIndexOfOppositeCorner */ @Test - void getIndexOfOppositeCorner() { + public void getIndexOfOppositeCorner() { CornerTable table = new CornerTable(); for (int i = 0; i < 10; i++) { table.addRow(new CornerTableRow(i, i - 1)); @@ -63,7 +63,7 @@ class CornerTableTest { * Unit test for getIndexOfOppositeCorner without opposite corner */ @Test - void getIndexOfOppositeCornerNoOppositeCorner() { + public void getIndexOfOppositeCornerNoOppositeCorner() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); assertEquals(-1, table.getIndexOfOppositeCorner(0)); @@ -73,7 +73,7 @@ class CornerTableTest { * Unit test for getIndexOfOppositeCorner with negative index of corner */ @Test - void getIndexOfOppositeCornerNegativeIndex() { + public void getIndexOfOppositeCornerNegativeIndex() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); assertEquals(-2, table.getIndexOfOppositeCorner(-1)); @@ -83,7 +83,7 @@ class CornerTableTest { * Unit test for getIndexOfOppositeCorner with index of corner out of range */ @Test - void getIndexOfOppositeCornerOutOfRange() { + public void getIndexOfOppositeCornerOutOfRange() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); assertEquals(-2, table.getIndexOfOppositeCorner(2)); @@ -93,7 +93,7 @@ class CornerTableTest { * Unit test for getIndexOfNextCornerInFace */ @Test - void getIndexOfNextCornerInFaceFirstTriangle() { + public void getIndexOfNextCornerInFaceFirstTriangle() { CornerTable table = new CornerTable(); for (int i = 0; i < 9; i++) { table.addRow(new CornerTableRow(i, -1)); @@ -108,7 +108,7 @@ class CornerTableTest { * Unit test for getIndexOfNextCornerInFace */ @Test - void getIndexOfNextCornerInFaceMiddleTriangle() { + public void getIndexOfNextCornerInFaceMiddleTriangle() { CornerTable table = new CornerTable(); for (int i = 0; i < 9; i++) { table.addRow(new CornerTableRow(i, -1)); @@ -123,7 +123,7 @@ class CornerTableTest { * Unit test for getIndexOfNextCornerInFace */ @Test - void getIndexOfNextCornerInFaceLastTriangle() { + public void getIndexOfNextCornerInFaceLastTriangle() { CornerTable table = new CornerTable(); for (int i = 0; i < 9; i++) { table.addRow(new CornerTableRow(i, -1)); @@ -138,7 +138,7 @@ class CornerTableTest { * Unit test for getIndexOfNextCornerInFace with negative index of corner */ @Test - void getIndexOfNextCornerInFaceNegativeIndex() { + public void getIndexOfNextCornerInFaceNegativeIndex() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); assertEquals(-2, table.getIndexOfNextCornerInFace(-1)); @@ -148,7 +148,7 @@ class CornerTableTest { * Unit test for getIndexOfNextCornerInFace with index of corner out of range */ @Test - void getIndexOfNextCornerInFaceOutOfRange() { + public void getIndexOfNextCornerInFaceOutOfRange() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); assertEquals(-2, table.getIndexOfNextCornerInFace(2)); @@ -158,7 +158,7 @@ class CornerTableTest { * Unit test for getIndexOfPreviousCornerInFace */ @Test - void getIndexOfPreviousCornerInFaceFirstTriangle() { + public void getIndexOfPreviousCornerInFaceFirstTriangle() { CornerTable table = new CornerTable(); for (int i = 0; i < 9; i++) { table.addRow(new CornerTableRow(i, -1)); @@ -173,7 +173,7 @@ class CornerTableTest { * Unit test for getIndexOfPreviousCornerInFace */ @Test - void getIndexOfPreviousCornerInFaceMiddleTriangle() { + public void getIndexOfPreviousCornerInFaceMiddleTriangle() { CornerTable table = new CornerTable(); for (int i = 0; i < 9; i++) { table.addRow(new CornerTableRow(i, -1)); @@ -188,7 +188,7 @@ class CornerTableTest { * Unit test for getIndexOfPreviousCornerInFace */ @Test - void getIndexOfPreviousCornerInFaceLastTriangle() { + public void getIndexOfPreviousCornerInFaceLastTriangle() { CornerTable table = new CornerTable(); for (int i = 0; i < 9; i++) { table.addRow(new CornerTableRow(i, -1)); @@ -203,7 +203,7 @@ class CornerTableTest { * Unit test for getIndexOfPreviousCornerInFace with negative index of corner */ @Test - void getIndexOfPreviousCornerInFaceNegativeIndex() { + public void getIndexOfPreviousCornerInFaceNegativeIndex() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); assertEquals(-2, table.getIndexOfPreviousCornerInFace(-1)); @@ -213,7 +213,7 @@ class CornerTableTest { * Unit test for getIndexOfPreviousCornerInFace with index of corner out of range */ @Test - void getIndexOfPreviousCornerInFaceOutOfRange() { + public void getIndexOfPreviousCornerInFaceOutOfRange() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); assertEquals(-2, table.getIndexOfPreviousCornerInFace(2)); @@ -223,7 +223,7 @@ class CornerTableTest { * Unit test for getIndexOfTipCornerOnLeft */ @Test - void getIndexOfTipCornerOnLeft() { + public void getIndexOfTipCornerOnLeft() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); table.addRow(new CornerTableRow(1, -1)); @@ -239,7 +239,7 @@ class CornerTableTest { * Unit test for getIndexOfTipCornerOnLeft with no left corner */ @Test - void getIndexOfTipCornerOnLeftNoLeftCorner() { + public void getIndexOfTipCornerOnLeftNoLeftCorner() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); table.addRow(new CornerTableRow(1, -1)); @@ -255,7 +255,7 @@ class CornerTableTest { * Unit test for getIndexOfTipCornerOnLeft with negative index of corner */ @Test - void getIndexOfTipCornerOnLeftNegativeIndex() { + public void getIndexOfTipCornerOnLeftNegativeIndex() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); table.addRow(new CornerTableRow(1, -1)); @@ -271,7 +271,7 @@ class CornerTableTest { * Unit test for getIndexOfTipCornerOnLeft with index of corner out of range */ @Test - void getIndexOfTipCornerOnLeftOutOfRange() { + public void getIndexOfTipCornerOnLeftOutOfRange() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); table.addRow(new CornerTableRow(1, -1)); @@ -287,7 +287,7 @@ class CornerTableTest { * Unit test for getIndexOfTipCornerOnRight */ @Test - void getIndexOfTipCornerOnRight() { + public void getIndexOfTipCornerOnRight() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); table.addRow(new CornerTableRow(1, -1)); @@ -303,7 +303,7 @@ class CornerTableTest { * Unit test for getIndexOfTipCornerOnRight with no right corner */ @Test - void getIndexOfTipCornerOnLeftNoRightCorner() { + public void getIndexOfTipCornerOnLeftNoRightCorner() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); table.addRow(new CornerTableRow(1, -1)); @@ -319,7 +319,7 @@ class CornerTableTest { * Unit test for getIndexOfTipCornerOnRight with negative index of corner */ @Test - void getIndexOfTipCornerOnRightNegativeIndex() { + public void getIndexOfTipCornerOnRightNegativeIndex() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); table.addRow(new CornerTableRow(1, -1)); @@ -335,7 +335,7 @@ class CornerTableTest { * Unit test for getIndexOfTipCornerOnRight with index of corner out of range */ @Test - void getIndexOfTipCornerOnRightOutOfRange() { + public void getIndexOfTipCornerOnRightOutOfRange() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); table.addRow(new CornerTableRow(1, -1)); @@ -351,7 +351,7 @@ class CornerTableTest { * Unit test for getNextAroundCorner */ @Test - void getNextAroundCorner() { + public void getNextAroundCorner() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); table.addRow(new CornerTableRow(1, -1)); @@ -367,7 +367,7 @@ class CornerTableTest { * Unit test for getNextAroundCorner with no corner on around position */ @Test - void getNextAroundCornerNoAroundCorner() { + public void getNextAroundCornerNoAroundCorner() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); table.addRow(new CornerTableRow(1, -1)); @@ -383,7 +383,7 @@ class CornerTableTest { * Unit test for getNextAroundCorner with negative index of corner */ @Test - void getNextAroundCornerNegativeIndex() { + public void getNextAroundCornerNegativeIndex() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); table.addRow(new CornerTableRow(1, -1)); @@ -399,7 +399,7 @@ class CornerTableTest { * Unit test for getNextAroundCorner with index of corner out of range */ @Test - void getNextAroundCornerOutOfRange() { + public void getNextAroundCornerOutOfRange() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); table.addRow(new CornerTableRow(1, -1)); @@ -415,7 +415,7 @@ class CornerTableTest { * Unit test for addRow */ @Test - void addRow() { + public void addRow() { CornerTable table = new CornerTable(); assertEquals(0, table.getSize()); table.addRow(new CornerTableRow(0, -1)); @@ -426,7 +426,7 @@ class CornerTableTest { * Unit test for replaceRow */ @Test - void replaceRow() { + public void replaceRow() { CornerTable table = new CornerTable(); table.addRow(new CornerTableRow(0, -1)); table.addRow(new CornerTableRow(1, -1)); @@ -446,7 +446,7 @@ class CornerTableTest { * Unit test for getSize */ @Test - void getSize() { + public void getSize() { CornerTable table = new CornerTable(); assertEquals(0, table.getSize()); @@ -462,7 +462,7 @@ class CornerTableTest { * Unit test for getRow */ @Test - void getRow() { + public void getRow() { CornerTable table = new CornerTable(); for (int i = 0; i < 9; i++) { table.addRow(new CornerTableRow(i, -1)); diff --git a/Renderer/pom.xml b/Renderer/pom.xml index e0bc5e591e0c9f2ccb4273e1d2fc6e11366a419e..89367df20b2b6fd132e64e4212c69b5c019b4ac6 100644 --- a/Renderer/pom.xml +++ b/Renderer/pom.xml @@ -10,6 +10,11 @@ <packaging>nbm</packaging> <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>nbm-maven-plugin</artifactId> @@ -50,6 +55,15 @@ </plugin> </plugins> </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + </plugin> + </plugins> + </reporting> <dependencies> <dependency> <groupId>org.netbeans.api</groupId> diff --git a/application/FIDENTIS-Analyst-app.iml b/application/FIDENTIS-Analyst-app.iml deleted file mode 100644 index b707721cb74b51b234aa61f39b0d6acc57a6f60c..0000000000000000000000000000000000000000 --- a/application/FIDENTIS-Analyst-app.iml +++ /dev/null @@ -1,111 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: org.netbeans.external:asm-all-5.0.1:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-filesystems:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-modules:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-util:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-util-lookup:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-bootstrap:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-util-ui:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-libs-asm:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-core-startup-base:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.ow2.asm:asm-all:5.0.1" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:net-java-html-boot-fx:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:net-java-html-boot-script:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:net-java-html-boot:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:net-java-html-geo:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:net-java-html-json:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:net-java-html-sound:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:net-java-html:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:swing-layout-1.0.4:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-libs-javafx:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-awt:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-dialogs:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-windows:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-api-intent:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-api-progress:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-api-progress-nb:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-modules-queries:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-swing-outline:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-actions:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-explorer:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-filesystems-nb:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-io:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-loaders:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-nodes:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-text:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-core:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-core-startup:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-execution:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-core-windows:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-modules-options-api:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-swing-tabcontrol:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-modules-editor-mimelookup:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-libs-jna:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-libs-jna-platform:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-libs-osgi:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-modules-keyring:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-openide-filesystems-compat8:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-api-io:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-modules-options-keymap:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-swing-plaf:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-modules-sampler:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-spi-quicksearch:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-modules-settings:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:org-netbeans-html-ko4j:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:org-netbeans-html-xhr4j:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.main:4.2.1" level="project" /> - <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.framework:4.2.1" level="project" /> - <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.2.2" level="project" /> - <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.2.2" level="project" /> - <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> - <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:osgi.core-5.0.0:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:osgi.cmpn-4.2:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:testng-6.8.1-dist:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-modules-autoupdate-services:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-modules-sendopts:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:updater:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-core-ui:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-libs-felix:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-modules-autoupdate-cli:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-modules-autoupdate-ui:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-modules-favorites:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-modules-masterfs:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-modules-print:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: javax.help:javahelp:2.0.05" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-modules-keyring-fallback:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-core-netigso:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.external:org.eclipse.osgi_3.9.1.v20140110-1610:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-api-htmlui:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-api-templates:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-lib-uihandler:RELEASE82" level="project" /> - <orderEntry type="module" module-name="FIDENTIS-Analyst-branding" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-api-annotations-common:RELEASE82" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.netbeans.api:org-netbeans-modules-nbjunit:RELEASE82" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.netbeans.modules:org-netbeans-insane:RELEASE82" level="project" /> - <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-libs-junit4:RELEASE82" level="project" /> - <orderEntry type="module" module-name="MeshModel" /> - <orderEntry type="library" name="Maven: java3d:j3d-core-utils:1.3.1" level="project" /> - <orderEntry type="library" name="Maven: java3d:vecmath:1.3.1" level="project" /> - <orderEntry type="library" name="Maven: java3d:j3d-core:1.3.1" 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="module" module-name="Renderer" /> - <orderEntry type="module" module-name="GUI" /> - <orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:2.0-rc11" 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" /> - </component> -</module> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5dc06f253cf09a905f46f590123644117c34b35c..3cb8410524f7d6b6806b0d012c2042b9d758ff17 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ <packaging>pom</packaging> <name>FIDENTIS-Analyst-2</name> - + <properties> <netbeans.version>RELEASE82</netbeans.version> <brandingToken>fidentisanalyst</brandingToken> @@ -77,6 +77,7 @@ <module>MeshModel</module> <module>Renderer</module> <module>GUI</module> + <module>Comparison</module> </modules> </project>