From 85f19c2551c6e0b8524ed85a7244d6871da095b5 Mon Sep 17 00:00:00 2001 From: Radek Oslejsek <oslejsek@fi.muni.cz> Date: Fri, 23 Oct 2020 09:25:20 +0200 Subject: [PATCH] Fixed image paths + typo findetis --- Comparison/pom.xml | 2 +- Comparison/src/main/nbm/manifest.mf | 2 +- .../comparison/Bundle.properties | 0 GUI/pom.xml | 9 ++- .../java/cz/fidentis/analyst/gui/Canvas.form | 22 +++--- .../java/cz/fidentis/analyst/gui/Canvas.java | 64 +++++++++--------- .../cz/fidentis/analyst/gui/Installer.java | 54 +++++++++++++++ .../fidentis/analyst/gui/SymmetryPanel.form | 16 ++--- .../fidentis/analyst/gui/SymmetryPanel.java | 40 +++++------ .../fidentis/analyst/gui/UserInterface.form | 32 ++++----- .../fidentis/analyst/gui/UserInterface.java | 60 ++++++++-------- GUI/src/main/nbm/manifest.mf | 7 +- .../analyst/gui => }/resources/angle.png | Bin .../analyst/gui => }/resources/backround.jpg | Bin .../gui => }/resources/batchProcessing.png | Bin .../resources/batchProcessingGreen.png | Bin .../resources/batchProcessingStart.png | Bin .../resources/blackBackroundCanvas.png | Bin .../resources/blackBackroundCanvasPressed.png | Bin .../analyst/gui => }/resources/bottom.png | Bin .../analyst/gui => }/resources/close.png | Bin .../analyst/gui => }/resources/compareTwo.png | Bin .../gui => }/resources/compareTwoFaces.svg | 0 .../gui => }/resources/compareTwoGreen.png | Bin .../gui => }/resources/compareTwoStart.png | Bin .../gui => }/resources/copareWithDatabase.png | Bin .../resources/copareWithDatabaseGreen.png | Bin .../resources/copareWithDatabaseStart.png | Bin .../analyst/gui => }/resources/curvature.png | Bin .../analyst/gui/Bundle.properties | 0 .../analyst/gui => }/resources/distance.png | Bin .../analyst/gui => }/resources/divide.png | Bin .../analyst/gui => }/resources/downButton.png | Bin .../gui => }/resources/downButtonPressed.png | Bin .../gui => }/resources/exportModel.png | Bin .../gui => }/resources/exportModelPressed.png | Bin .../gui => }/resources/exportedModel.png | Bin .../analyst/gui => }/resources/home.png | Bin .../analyst/gui => }/resources/info.png | Bin .../analyst/gui => }/resources/info2.png | Bin .../analyst/gui => }/resources/leftButton.png | Bin .../gui => }/resources/leftButtonPressed.png | Bin .../analyst/gui => }/resources/loadCanva.png | Bin .../gui => }/resources/loadCanvaClicked.png | Bin .../analyst/gui => }/resources/loadModel.png | Bin .../gui => }/resources/loadModelPressed.png | Bin .../analyst/gui => }/resources/logo.png | Bin .../analyst/gui => }/resources/logo2.png | Bin .../analyst/gui => }/resources/logo3.png | Bin .../analyst/gui => }/resources/maximize.png | Bin .../analyst/gui => }/resources/minimize.png | Bin .../analyst/gui => }/resources/minimize2.png | Bin .../analyst/gui => }/resources/minus.png | Bin .../gui => }/resources/minusPressed.png | Bin .../analyst/gui => }/resources/modelView.png | Bin .../gui => }/resources/modelViewMoved.png | Bin .../fidentis/analyst/gui => }/resources/n.png | Bin .../gui => }/resources/navigBackground.png | Bin .../resources/navigationBackground.png | Bin .../analyst/gui => }/resources/newP.png | Bin .../gui => }/resources/new_project.jpg | Bin .../gui => }/resources/new_project.png | Bin .../gui => }/resources/new_project_opened.png | Bin .../gui => }/resources/notLoadedModel.png | Bin .../gui => }/resources/originalModel.png | Bin .../resources/originalModelPressed.png | Bin .../analyst/gui => }/resources/plus.png | Bin .../gui => }/resources/plusPressed.png | Bin .../analyst/gui => }/resources/points.png | Bin .../gui => }/resources/resetButton.png | Bin .../gui => }/resources/resetButtonPressed.png | Bin .../gui => }/resources/rightBottom.png | Bin .../gui => }/resources/rightButton.png | Bin .../gui => }/resources/rightButtonPressed.png | Bin .../analyst/gui => }/resources/save.png | Bin .../gui => }/resources/selectPoints.png | Bin .../analyst/gui => }/resources/show.png | Bin .../analyst/gui => }/resources/show2.png | Bin .../analyst/gui => }/resources/showPlane.png | Bin .../gui => }/resources/showPlanePane.png | Bin .../gui => }/resources/showPlanePressed.png | Bin .../analyst/gui => }/resources/symetry.png | Bin .../gui => }/resources/symetryCount.png | Bin .../resources/symetryCountClicked.png | Bin .../gui => }/resources/symetryGreen.png | Bin .../gui => }/resources/symetryStart.png | Bin .../gui => }/resources/symetryStartMoved.png | Bin .../gui => }/resources/symetryStartP.png | Bin .../gui => }/resources/symetryStartPanel.png | Bin .../analyst/gui => }/resources/texture.png | Bin .../analyst/gui => }/resources/texture2.png | Bin .../analyst/gui => }/resources/upButton.png | Bin .../gui => }/resources/upButtonPressed.png | Bin .../resources/whiteBackroundCanvas.png | Bin .../resources/whiteBackroundCanvasPressed.png | Bin .../analyst/gui => }/resources/wireframe.png | Bin .../analyst/gui => }/resources/wireframe2.png | Bin MeshModel/pom.xml | 3 +- MeshModel/src/main/nbm/manifest.mf | 2 +- .../analyst/Bundle.properties | 0 Renderer/pom.xml | 2 +- Renderer/src/main/nbm/manifest.mf | 2 +- .../analyst/renderer/Bundle.properties | 0 application/pom.xml | 2 +- branding/pom.xml | 2 +- branding/src/main/nbm/manifest.mf | 2 +- .../analyst/branding/Bundle.properties | 0 pom.xml | 2 +- 108 files changed, 194 insertions(+), 131 deletions(-) rename Comparison/src/main/resources/cz/{findetis => fidentis}/comparison/Bundle.properties (100%) create mode 100644 GUI/src/main/java/cz/fidentis/analyst/gui/Installer.java rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/angle.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/backround.jpg (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/batchProcessing.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/batchProcessingGreen.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/batchProcessingStart.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/blackBackroundCanvas.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/blackBackroundCanvasPressed.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/bottom.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/close.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/compareTwo.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/compareTwoFaces.svg (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/compareTwoGreen.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/compareTwoStart.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/copareWithDatabase.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/copareWithDatabaseGreen.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/copareWithDatabaseStart.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/curvature.png (100%) rename GUI/src/main/resources/cz/{findetis => fidentis}/analyst/gui/Bundle.properties (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/distance.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/divide.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/downButton.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/downButtonPressed.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/exportModel.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/exportModelPressed.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/exportedModel.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/home.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/info.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/info2.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/leftButton.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/leftButtonPressed.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/loadCanva.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/loadCanvaClicked.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/loadModel.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/loadModelPressed.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/logo.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/logo2.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/logo3.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/maximize.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/minimize.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/minimize2.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/minus.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/minusPressed.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/modelView.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/modelViewMoved.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/n.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/navigBackground.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/navigationBackground.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/newP.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/new_project.jpg (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/new_project.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/new_project_opened.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/notLoadedModel.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/originalModel.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/originalModelPressed.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/plus.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/plusPressed.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/points.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/resetButton.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/resetButtonPressed.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/rightBottom.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/rightButton.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/rightButtonPressed.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/save.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/selectPoints.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/show.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/show2.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/showPlane.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/showPlanePane.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/showPlanePressed.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/symetry.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/symetryCount.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/symetryCountClicked.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/symetryGreen.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/symetryStart.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/symetryStartMoved.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/symetryStartP.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/symetryStartPanel.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/texture.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/texture2.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/upButton.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/upButtonPressed.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/whiteBackroundCanvas.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/whiteBackroundCanvasPressed.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/wireframe.png (100%) rename GUI/src/main/{java/cz/fidentis/analyst/gui => }/resources/wireframe2.png (100%) rename MeshModel/src/main/resources/cz/{findetis => fidentis}/analyst/Bundle.properties (100%) rename Renderer/src/main/resources/cz/{findetis => fidentis}/analyst/renderer/Bundle.properties (100%) rename branding/src/main/resources/cz/{findetis => fidentis}/analyst/branding/Bundle.properties (100%) diff --git a/Comparison/pom.xml b/Comparison/pom.xml index 9406c23b..9c715a63 100644 --- a/Comparison/pom.xml +++ b/Comparison/pom.xml @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>cz.findetis</groupId> + <groupId>cz.fidentis</groupId> <artifactId>FIDENTIS-Analyst-parent</artifactId> <version>2.0</version> </parent> diff --git a/Comparison/src/main/nbm/manifest.mf b/Comparison/src/main/nbm/manifest.mf index 316179fa..6e188e3d 100644 --- a/Comparison/src/main/nbm/manifest.mf +++ b/Comparison/src/main/nbm/manifest.mf @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -OpenIDE-Module-Localizing-Bundle: cz/findetis/comparison/Bundle.properties +OpenIDE-Module-Localizing-Bundle: cz/fidentis/comparison/Bundle.properties diff --git a/Comparison/src/main/resources/cz/findetis/comparison/Bundle.properties b/Comparison/src/main/resources/cz/fidentis/comparison/Bundle.properties similarity index 100% rename from Comparison/src/main/resources/cz/findetis/comparison/Bundle.properties rename to Comparison/src/main/resources/cz/fidentis/comparison/Bundle.properties diff --git a/GUI/pom.xml b/GUI/pom.xml index efeda357..3876851d 100644 --- a/GUI/pom.xml +++ b/GUI/pom.xml @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>cz.findetis</groupId> + <groupId>cz.fidentis</groupId> <artifactId>FIDENTIS-Analyst-parent</artifactId> <version>2.0</version> </parent> @@ -71,11 +71,15 @@ <artifactId>org-openide-dialogs</artifactId> <version>${netbeans.version}</version> </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-openide-modules</artifactId> + <version>${netbeans.version}</version> + </dependency> <dependency> <groupId>org.jogamp.jogl</groupId> <artifactId>jogl-all</artifactId> <version>2.3.2</version> - <type>jar</type> </dependency> <dependency> <groupId>org.jogamp.gluegen</groupId> @@ -101,4 +105,5 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> + <groupId>cz.fidentis</groupId> </project> \ No newline at end of file diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.form b/GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.form index 45e7ae46..7ab11194 100644 --- a/GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.form +++ b/GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.form @@ -46,7 +46,7 @@ <Component class="javax.swing.JLabel" name="resetButton"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/resetButton.png"/> + <Image iconType="3" name="/resetButton.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Reset position of model"/> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> @@ -67,7 +67,7 @@ <Component class="javax.swing.JButton" name="upNavigationButton"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/upButton.png"/> + <Image iconType="3" name="/upButton.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Rotate up"/> <Property name="borderPainted" type="boolean" value="false"/> @@ -92,7 +92,7 @@ <Component class="javax.swing.JButton" name="leftNavigationButton"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/leftButton.png"/> + <Image iconType="3" name="/leftButton.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Rotate left"/> <Property name="borderPainted" type="boolean" value="false"/> @@ -117,7 +117,7 @@ <Component class="javax.swing.JButton" name="minusNavigationButton"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/minus.png"/> + <Image iconType="3" name="/minus.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Zoom out"/> <Property name="borderPainted" type="boolean" value="false"/> @@ -142,7 +142,7 @@ <Component class="javax.swing.JButton" name="downNavigationButton"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/downButton.png"/> + <Image iconType="3" name="/downButton.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Rotate down"/> <Property name="borderPainted" type="boolean" value="false"/> @@ -167,7 +167,7 @@ <Component class="javax.swing.JButton" name="plusNavigationButton"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/plus.png"/> + <Image iconType="3" name="/plus.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Zoom in"/> <Property name="borderPainted" type="boolean" value="false"/> @@ -192,7 +192,7 @@ <Component class="javax.swing.JLabel" name="jLabel1"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/navigBackground.png"/> + <Image iconType="3" name="/navigBackground.png"/> </Property> </Properties> <Constraints> @@ -204,7 +204,7 @@ <Component class="javax.swing.JLabel" name="loadModelButton"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/loadCanva.png"/> + <Image iconType="3" name="/loadCanva.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value=""/> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> @@ -225,7 +225,7 @@ <Component class="javax.swing.JButton" name="rightNavigationButton1"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/rightButton.png"/> + <Image iconType="3" name="/rightButton.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Rotate right"/> <Property name="borderPainted" type="boolean" value="false"/> @@ -250,7 +250,7 @@ <Component class="javax.swing.JLabel" name="whiteBackroundButton"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/whiteBackroundCanvas.png"/> + <Image iconType="3" name="/whiteBackroundCanvas.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="White backround"/> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> @@ -269,7 +269,7 @@ <Component class="javax.swing.JLabel" name="blackBackroundButton"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/blackBackroundCanvas.png"/> + <Image iconType="3" name="/blackBackroundCanvas.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Dark background"/> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.java b/GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.java index d43db886..77c3949d 100644 --- a/GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.java +++ b/GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.java @@ -195,7 +195,7 @@ public class Canvas extends javax.swing.JPanel { } catch (Exception e) { System.out.println(e.getMessage()); JOptionPane.showMessageDialog(this, "File doesn't contain any model", "Model is not loaded.", - 0, new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/notLoadedModel.png"))); + 0, new ImageIcon(getClass().getResource("/notLoadedModel.png"))); System.out.println ("File doesn't contain any model"); loaded = false; } @@ -268,7 +268,7 @@ public class Canvas extends javax.swing.JPanel { } }); - resetButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/resetButton.png"))); // NOI18N + resetButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/resetButton.png"))); // NOI18N resetButton.setToolTipText("Reset position of model"); resetButton.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); resetButton.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { @@ -287,7 +287,7 @@ public class Canvas extends javax.swing.JPanel { jLayeredPane1.add(resetButton); resetButton.setBounds(60, 40, 30, 30); - upNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/upButton.png"))); // NOI18N + upNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/upButton.png"))); // NOI18N upNavigationButton.setToolTipText("Rotate up"); upNavigationButton.setBorderPainted(false); upNavigationButton.setContentAreaFilled(false); @@ -304,7 +304,7 @@ public class Canvas extends javax.swing.JPanel { jLayeredPane1.add(upNavigationButton); upNavigationButton.setBounds(60, 10, 30, 30); - leftNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/leftButton.png"))); // NOI18N + leftNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/leftButton.png"))); // NOI18N leftNavigationButton.setToolTipText("Rotate left"); leftNavigationButton.setBorderPainted(false); leftNavigationButton.setContentAreaFilled(false); @@ -321,7 +321,7 @@ public class Canvas extends javax.swing.JPanel { jLayeredPane1.add(leftNavigationButton); leftNavigationButton.setBounds(30, 40, 30, 30); - minusNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/minus.png"))); // NOI18N + minusNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/minus.png"))); // NOI18N minusNavigationButton.setToolTipText("Zoom out"); minusNavigationButton.setBorderPainted(false); minusNavigationButton.setContentAreaFilled(false); @@ -338,7 +338,7 @@ public class Canvas extends javax.swing.JPanel { jLayeredPane1.add(minusNavigationButton); minusNavigationButton.setBounds(90, 90, 30, 30); - downNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/downButton.png"))); // NOI18N + downNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/downButton.png"))); // NOI18N downNavigationButton.setToolTipText("Rotate down"); downNavigationButton.setBorderPainted(false); downNavigationButton.setContentAreaFilled(false); @@ -355,7 +355,7 @@ public class Canvas extends javax.swing.JPanel { jLayeredPane1.add(downNavigationButton); downNavigationButton.setBounds(60, 70, 30, 30); - plusNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/plus.png"))); // NOI18N + plusNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/plus.png"))); // NOI18N plusNavigationButton.setToolTipText("Zoom in"); plusNavigationButton.setBorderPainted(false); plusNavigationButton.setContentAreaFilled(false); @@ -372,11 +372,11 @@ public class Canvas extends javax.swing.JPanel { jLayeredPane1.add(plusNavigationButton); plusNavigationButton.setBounds(30, 90, 30, 30); - jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/navigBackground.png"))); // NOI18N + jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/navigBackground.png"))); // NOI18N jLayeredPane1.add(jLabel1); jLabel1.setBounds(30, 10, 90, 90); - loadModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/loadCanva.png"))); // NOI18N + loadModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/loadCanva.png"))); // NOI18N loadModelButton.setToolTipText(""); loadModelButton.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); loadModelButton.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { @@ -395,7 +395,7 @@ public class Canvas extends javax.swing.JPanel { jLayeredPane1.add(loadModelButton); loadModelButton.setBounds(200, 100, 210, 220); - rightNavigationButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/rightButton.png"))); // NOI18N + rightNavigationButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/rightButton.png"))); // NOI18N rightNavigationButton1.setToolTipText("Rotate right"); rightNavigationButton1.setBorderPainted(false); rightNavigationButton1.setContentAreaFilled(false); @@ -412,7 +412,7 @@ public class Canvas extends javax.swing.JPanel { jLayeredPane1.add(rightNavigationButton1); rightNavigationButton1.setBounds(90, 40, 30, 30); - whiteBackroundButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/whiteBackroundCanvas.png"))); // NOI18N + whiteBackroundButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/whiteBackroundCanvas.png"))); // NOI18N whiteBackroundButton.setToolTipText("White backround"); whiteBackroundButton.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); whiteBackroundButton.addMouseListener(new java.awt.event.MouseAdapter() { @@ -423,7 +423,7 @@ public class Canvas extends javax.swing.JPanel { jLayeredPane1.add(whiteBackroundButton); whiteBackroundButton.setBounds(50, 130, 56, 56); - blackBackroundButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/blackBackroundCanvas.png"))); // NOI18N + blackBackroundButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/blackBackroundCanvas.png"))); // NOI18N blackBackroundButton.setToolTipText("Dark background"); blackBackroundButton.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); blackBackroundButton.addMouseListener(new java.awt.event.MouseAdapter() { @@ -481,7 +481,7 @@ public class Canvas extends javax.swing.JPanel { } }; timer.schedule(task, 500, 100); - leftNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/leftButtonPressed.png"))); + leftNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/leftButtonPressed.png"))); }//GEN-LAST:event_leftNavigationButtonMousePressed /** @@ -498,7 +498,7 @@ public class Canvas extends javax.swing.JPanel { } }; timer.schedule(task, 500, 100); - upNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/upButtonPressed.png"))); + upNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/upButtonPressed.png"))); }//GEN-LAST:event_upNavigationButtonMousePressed /** @@ -515,7 +515,7 @@ public class Canvas extends javax.swing.JPanel { } }; timer.schedule(task, 500, 100); - downNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/downButtonPressed.png"))); + downNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/downButtonPressed.png"))); }//GEN-LAST:event_downNavigationButtonMousePressed /** @@ -532,7 +532,7 @@ public class Canvas extends javax.swing.JPanel { } }; timer.schedule(task, 500, 100); - plusNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/plusPressed.png"))); + plusNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/plusPressed.png"))); }//GEN-LAST:event_plusNavigationButtonMousePressed /** @@ -549,7 +549,7 @@ public class Canvas extends javax.swing.JPanel { } }; timer.schedule(task, 500, 100); - minusNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/minusPressed.png"))); + minusNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/minusPressed.png"))); }//GEN-LAST:event_minusNavigationButtonMousePressed /** @@ -562,7 +562,7 @@ public class Canvas extends javax.swing.JPanel { listener.rotateLeft(22.5); } startClickTime = 0; - leftNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/leftButton.png"))); + leftNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/leftButton.png"))); }//GEN-LAST:event_leftNavigationButtonMouseReleased /** @@ -575,7 +575,7 @@ public class Canvas extends javax.swing.JPanel { listener.rotateUp(22.5); } startClickTime = 0; - upNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/upButton.png"))); + upNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/upButton.png"))); }//GEN-LAST:event_upNavigationButtonMouseReleased /** @@ -588,7 +588,7 @@ public class Canvas extends javax.swing.JPanel { listener.rotateDown(22.5); } startClickTime = 0; - downNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/downButton.png"))); + downNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/downButton.png"))); }//GEN-LAST:event_downNavigationButtonMouseReleased /** @@ -601,7 +601,7 @@ public class Canvas extends javax.swing.JPanel { listener.zoomIn(30); } startClickTime = 0; - plusNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/plus.png"))); + plusNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/plus.png"))); }//GEN-LAST:event_plusNavigationButtonMouseReleased /** @@ -614,7 +614,7 @@ public class Canvas extends javax.swing.JPanel { listener.zoomOut(30); } startClickTime = 0; - minusNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/minus.png"))); + minusNavigationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/minus.png"))); }//GEN-LAST:event_minusNavigationButtonMouseReleased /** @@ -642,7 +642,7 @@ public class Canvas extends javax.swing.JPanel { * @param evt Design is reacting to mouse movement */ private void loadModelButtonMouseMoved(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_loadModelButtonMouseMoved - loadModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/loadCanvaClicked.png"))); + loadModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/loadCanvaClicked.png"))); }//GEN-LAST:event_loadModelButtonMouseMoved /** @@ -650,7 +650,7 @@ public class Canvas extends javax.swing.JPanel { * @param evt Design is reacting to mouse movement */ private void loadModelButtonMouseExited(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_loadModelButtonMouseExited - loadModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/loadCanva.png"))); + loadModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/loadCanva.png"))); }//GEN-LAST:event_loadModelButtonMouseExited /** @@ -667,7 +667,7 @@ public class Canvas extends javax.swing.JPanel { } }; timer.schedule(task, 500, 100); - rightNavigationButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/rightButtonPressed.png"))); + rightNavigationButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/rightButtonPressed.png"))); }//GEN-LAST:event_rightNavigationButton1MousePressed /** @@ -680,7 +680,7 @@ public class Canvas extends javax.swing.JPanel { listener.rotateRight(22.5); } startClickTime = 0; - rightNavigationButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/rightButton.png"))); + rightNavigationButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/rightButton.png"))); }//GEN-LAST:event_rightNavigationButton1MouseReleased /** @@ -696,7 +696,7 @@ public class Canvas extends javax.swing.JPanel { * @param evt Design is reacting to mouse movement */ private void resetButtonMouseMoved(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_resetButtonMouseMoved - resetButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/resetButtonPressed.png"))); + resetButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/resetButtonPressed.png"))); resetButton.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); }//GEN-LAST:event_resetButtonMouseMoved @@ -705,7 +705,7 @@ public class Canvas extends javax.swing.JPanel { * @param evt Design is reacting to mouse movement */ private void resetButtonMouseExited(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_resetButtonMouseExited - resetButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/resetButton.png"))); + resetButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/resetButton.png"))); }//GEN-LAST:event_resetButtonMouseExited /** @@ -714,8 +714,8 @@ public class Canvas extends javax.swing.JPanel { */ private void whiteBackroundButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_whiteBackroundButtonMouseClicked listener.setWhiteBackround(true); - whiteBackroundButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/whiteBackroundCanvasPressed.png"))); - blackBackroundButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/blackBackroundCanvas.png"))); + whiteBackroundButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/whiteBackroundCanvasPressed.png"))); + blackBackroundButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/blackBackroundCanvas.png"))); }//GEN-LAST:event_whiteBackroundButtonMouseClicked /** @@ -724,8 +724,8 @@ public class Canvas extends javax.swing.JPanel { */ private void blackBackroundButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_blackBackroundButtonMouseClicked listener.setWhiteBackround(false); - whiteBackroundButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/whiteBackroundCanvas.png"))); - blackBackroundButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/blackBackroundCanvasPressed.png"))); + whiteBackroundButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/whiteBackroundCanvas.png"))); + blackBackroundButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/blackBackroundCanvasPressed.png"))); }//GEN-LAST:event_blackBackroundButtonMouseClicked // Variables declaration - do not modify//GEN-BEGIN:variables diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/Installer.java b/GUI/src/main/java/cz/fidentis/analyst/gui/Installer.java new file mode 100644 index 00000000..6252ba99 --- /dev/null +++ b/GUI/src/main/java/cz/fidentis/analyst/gui/Installer.java @@ -0,0 +1,54 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package cz.fidentis.analyst.gui; + +import static cz.fidentis.analyst.gui.UserInterface.frameMain; +import java.awt.Color; +import javax.swing.JOptionPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import org.openide.modules.ModuleInstall; + +/** + * + * @author oslejsek + */ +public class Installer extends ModuleInstall { + + @Override + public void restored() { + try { + for (javax.swing.UIManager.LookAndFeelInfo info : javax.swing.UIManager.getInstalledLookAndFeels()) { + if ("Nimbus".equals(info.getName())) { + javax.swing.UIManager.setLookAndFeel(info.getClassName()); + break; + } + } + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | javax.swing.UnsupportedLookAndFeelException ex) { + java.util.logging.Logger.getLogger(UserInterface.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); + } + java.awt.EventQueue.invokeLater(() -> { + frameMain = new UserInterface(); + frameMain.setBackground(new Color(49,165,154)); + frameMain.pack(); + frameMain.setVisible(true); + //enables to use design of operating system + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + }catch(ClassNotFoundException | IllegalAccessException | InstantiationException | UnsupportedLookAndFeelException ex) { + } + }); + } + + @Override + public boolean closing() { + int answer = JOptionPane.showConfirmDialog(null, + "Do you really want to close the application?", "", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); + return answer == JOptionPane.YES_OPTION; + } + + +} diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.form b/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.form index 3af48b80..6080c1c1 100644 --- a/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.form +++ b/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.form @@ -305,7 +305,7 @@ <Component class="javax.swing.JLabel" name="symetryButton"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/symetryCount.png"/> + <Image iconType="3" name="/symetryCount.png"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Hand Cursor"/> @@ -372,7 +372,7 @@ <Component class="javax.swing.JLabel" name="originalModelButton"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/originalModel.png"/> + <Image iconType="3" name="/originalModel.png"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Hand Cursor"/> @@ -393,7 +393,7 @@ <Color blue="69" green="72" red="14" type="rgb"/> </Property> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/show2.png"/> + <Image iconType="3" name="/show2.png"/> </Property> <Property name="text" type="java.lang.String" value="Show plane"/> <Property name="toolTipText" type="java.lang.String" value="Show approximate plane of symmetry"/> @@ -426,7 +426,7 @@ <Component class="javax.swing.JLabel" name="infoPoints"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/info.png"/> + <Image iconType="3" name="/info.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Info "/> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> @@ -440,7 +440,7 @@ <Component class="javax.swing.JLabel" name="infoMinAngleCos"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/info.png"/> + <Image iconType="3" name="/info.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Info "/> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> @@ -454,7 +454,7 @@ <Component class="javax.swing.JLabel" name="infoRelDist"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/info.png"/> + <Image iconType="3" name="/info.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Info "/> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> @@ -468,7 +468,7 @@ <Component class="javax.swing.JLabel" name="infoNormalAngle"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/info.png"/> + <Image iconType="3" name="/info.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Info "/> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> @@ -482,7 +482,7 @@ <Component class="javax.swing.JLabel" name="infoMinCurv"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/info.png"/> + <Image iconType="3" name="/info.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Info "/> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.java b/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.java index cbb2d2bd..5f91a7ff 100644 --- a/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.java +++ b/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.java @@ -255,7 +255,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { significantPointLabel.setForeground(new java.awt.Color(20, 114, 105)); significantPointLabel.setText("Significant Points"); - symetryButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/symetryCount.png"))); // NOI18N + symetryButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/symetryCount.png"))); // NOI18N symetryButton.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); symetryButton.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { public void mouseMoved(java.awt.event.MouseEvent evt) { @@ -299,7 +299,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { minCurvatio8.setText("Averaging"); minCurvatio8.setToolTipText("Average planes with highest number of votes"); - originalModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/originalModel.png"))); // NOI18N + originalModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/originalModel.png"))); // NOI18N originalModelButton.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); originalModelButton.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { public void mouseMoved(java.awt.event.MouseEvent evt) { @@ -317,7 +317,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { showPlaneLabel.setFont(new java.awt.Font("Arial", 1, 16)); // NOI18N showPlaneLabel.setForeground(new java.awt.Color(20, 114, 105)); - showPlaneLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/show2.png"))); // NOI18N + showPlaneLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/show2.png"))); // NOI18N showPlaneLabel.setText("Show plane"); showPlaneLabel.setToolTipText("Show approximate plane of symmetry"); showPlaneLabel.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); @@ -338,7 +338,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { } }); - infoPoints.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/info.png"))); // NOI18N + infoPoints.setIcon(new javax.swing.ImageIcon(getClass().getResource("/info.png"))); // NOI18N infoPoints.setToolTipText("Info "); infoPoints.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); infoPoints.addMouseListener(new java.awt.event.MouseAdapter() { @@ -347,7 +347,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { } }); - infoMinAngleCos.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/info.png"))); // NOI18N + infoMinAngleCos.setIcon(new javax.swing.ImageIcon(getClass().getResource("/info.png"))); // NOI18N infoMinAngleCos.setToolTipText("Info "); infoMinAngleCos.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); infoMinAngleCos.addMouseListener(new java.awt.event.MouseAdapter() { @@ -356,7 +356,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { } }); - infoRelDist.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/info.png"))); // NOI18N + infoRelDist.setIcon(new javax.swing.ImageIcon(getClass().getResource("/info.png"))); // NOI18N infoRelDist.setToolTipText("Info "); infoRelDist.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); infoRelDist.addMouseListener(new java.awt.event.MouseAdapter() { @@ -365,7 +365,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { } }); - infoNormalAngle.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/info.png"))); // NOI18N + infoNormalAngle.setIcon(new javax.swing.ImageIcon(getClass().getResource("/info.png"))); // NOI18N infoNormalAngle.setToolTipText("Info "); infoNormalAngle.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); infoNormalAngle.addMouseListener(new java.awt.event.MouseAdapter() { @@ -374,7 +374,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { } }); - infoMinCurv.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/info.png"))); // NOI18N + infoMinCurv.setIcon(new javax.swing.ImageIcon(getClass().getResource("/info.png"))); // NOI18N infoMinCurv.setToolTipText("Info "); infoMinCurv.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); infoMinCurv.addMouseListener(new java.awt.event.MouseAdapter() { @@ -527,7 +527,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { */ private void showPlaneLabelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_showPlaneLabelMouseClicked JOptionPane.showMessageDialog(frameMain, "Approximate plane of symmetry: \n" + finalPlane.getNormal().x + "\n" + finalPlane.getNormal().y + "\n" + finalPlane.getNormal().z + "\n" + - finalPlane.getDistance() + "\n", "Final plane.", 0, new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/showPlanePane.png"))); + finalPlane.getDistance() + "\n", "Final plane.", 0, new ImageIcon(getClass().getResource("/showPlanePane.png"))); }//GEN-LAST:event_showPlaneLabelMouseClicked /** @@ -535,7 +535,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { * @param evt Changes button */ private void originalModelButtonMouseExited(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_originalModelButtonMouseExited - originalModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/originalModel.png"))); + originalModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/originalModel.png"))); }//GEN-LAST:event_originalModelButtonMouseExited /** @@ -552,7 +552,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { * @param evt Changes button */ private void originalModelButtonMouseMoved(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_originalModelButtonMouseMoved - originalModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/originalModelPressed.png"))); + originalModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/originalModelPressed.png"))); }//GEN-LAST:event_originalModelButtonMouseMoved /** @@ -572,7 +572,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { * @param evt Changes button */ private void symetryButtonMouseExited(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_symetryButtonMouseExited - symetryButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/symetryCount.png"))); + symetryButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/symetryCount.png"))); }//GEN-LAST:event_symetryButtonMouseExited /** @@ -583,7 +583,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { setConfigParams(); if (canvas.getModel().getFacets().isEmpty()){ JOptionPane.showMessageDialog(frameMain, "You have to load the model.", "Model not loaded", - 0, new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/notLoadedModel.png"))); + 0, new ImageIcon(getClass().getResource("/notLoadedModel.png"))); } else { try { countSymmetry(); @@ -599,7 +599,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { * @param evt Changes button */ private void symetryButtonMouseMoved(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_symetryButtonMouseMoved - symetryButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/symetryCountClicked.png"))); + symetryButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/symetryCountClicked.png"))); }//GEN-LAST:event_symetryButtonMouseMoved /** @@ -626,7 +626,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { + "Higher number → fewer pairs of vertices satisfy the criterion → shorter calculation, possibly less accurate result.\n" + "Lower number → more pairs of vertices satisfy the criterion → longer calculation, possibly more accurate result.", "Minimum curvature ratio", - 0, new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/curvature.png"))); + 0, new ImageIcon(getClass().getResource("/curvature.png"))); }//GEN-LAST:event_infoMinCurvMouseClicked /** @@ -642,7 +642,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { + "Higher number → more pairs of vertices satisfy the criterion → longer calculation, possibly more accurate result.\n" + "Lower number → fewer pairs of vertices satisfy the criterion → shorter calculation, possibly less accurate result.", "Maximum relative distance from plane", - 0, new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/distance.png"))); + 0, new ImageIcon(getClass().getResource("/distance.png"))); }//GEN-LAST:event_infoRelDistMouseClicked /** @@ -658,7 +658,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { + "Higher number → longer calculation, possibly more accurate result.\n" + "Lower number → shorter calculation, possibly less accurate result.", "Significant points", - 0, new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/points.png"))); + 0, new ImageIcon(getClass().getResource("/points.png"))); }//GEN-LAST:event_infoPointsMouseClicked /** @@ -674,7 +674,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { + "Higher number → fewer pairs of vertices satisfy the criterion → shorter calculation, possibly less accurate result.\n" + "Lower number → more pairs of vertices satisfy the criterion → longer calculation, possibly more accurate result.", "Minimum angle", - 0, new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/angle.png"))); + 0, new ImageIcon(getClass().getResource("/angle.png"))); }//GEN-LAST:event_infoMinAngleCosMouseClicked /** @@ -690,7 +690,7 @@ public final class SymmetryPanel extends javax.swing.JPanel { + "Higher number → fewer pairs of vertices satisfy the criterion → shorter calculation, possibly less accurate result.\n" + "Lower number → more pairs of vertices satisfy the criterion → longer calculation, possibly more accurate result.", "Minimum normal angle", - 0, new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/angle.png"))); + 0, new ImageIcon(getClass().getResource("/angle.png"))); }//GEN-LAST:event_infoNormalAngleMouseClicked @@ -724,4 +724,4 @@ public final class SymmetryPanel extends javax.swing.JPanel { private javax.swing.JTextField textFieldCurvature; private javax.swing.JTextField textFieldMinCos; // End of variables declaration//GEN-END:variables -} \ No newline at end of file +} diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/UserInterface.form b/GUI/src/main/java/cz/fidentis/analyst/gui/UserInterface.form index 7961bb6d..32e21d50 100644 --- a/GUI/src/main/java/cz/fidentis/analyst/gui/UserInterface.form +++ b/GUI/src/main/java/cz/fidentis/analyst/gui/UserInterface.form @@ -101,7 +101,7 @@ <Color blue="ff" green="ff" red="ff" type="rgb"/> </Property> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/newP.png"/> + <Image iconType="3" name="/newP.png"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Hand Cursor"/> @@ -120,7 +120,7 @@ <Color blue="69" green="72" red="14" type="rgb"/> </Property> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/wireframe2.png"/> + <Image iconType="3" name="/wireframe2.png"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Hand Cursor"/> @@ -137,7 +137,7 @@ <Color blue="69" green="72" red="14" type="rgb"/> </Property> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/home.png"/> + <Image iconType="3" name="/home.png"/> </Property> <Property name="toolTipText" type="java.lang.String" value="Home"/> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> @@ -235,7 +235,7 @@ <Properties> <Property name="horizontalAlignment" type="int" value="0"/> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/compareTwoStart.png"/> + <Image iconType="3" name="/compareTwoStart.png"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Default Cursor"/> @@ -271,7 +271,7 @@ <Properties> <Property name="horizontalAlignment" type="int" value="0"/> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/batchProcessingStart.png"/> + <Image iconType="3" name="/batchProcessingStart.png"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Default Cursor"/> @@ -313,7 +313,7 @@ <Properties> <Property name="horizontalAlignment" type="int" value="0"/> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/copareWithDatabaseStart.png"/> + <Image iconType="3" name="/copareWithDatabaseStart.png"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Default Cursor"/> @@ -360,7 +360,7 @@ <Properties> <Property name="horizontalAlignment" type="int" value="0"/> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/symetryStartP.png"/> + <Image iconType="3" name="/symetryStartP.png"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Hand Cursor"/> @@ -443,7 +443,7 @@ <Component class="javax.swing.JLabel" name="logo"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/logo3.png"/> + <Image iconType="3" name="/logo3.png"/> </Property> </Properties> <AuxValues> @@ -601,7 +601,7 @@ <Component class="javax.swing.JLabel" name="JLabel10"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/batchProcessingStart.png"/> + <Image iconType="3" name="/batchProcessingStart.png"/> </Property> </Properties> </Component> @@ -636,7 +636,7 @@ <Color blue="a3" green="ae" red="0" type="rgb"/> </Property> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/symetryStart.png"/> + <Image iconType="3" name="/symetryStart.png"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Hand Cursor"/> @@ -653,7 +653,7 @@ <Component class="javax.swing.JLabel" name="viewerButton"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/modelView.png"/> + <Image iconType="3" name="/modelView.png"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Hand Cursor"/> @@ -668,7 +668,7 @@ <Component class="javax.swing.JLabel" name="JLabel8"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/compareTwoStart.png"/> + <Image iconType="3" name="/compareTwoStart.png"/> </Property> </Properties> </Component> @@ -678,7 +678,7 @@ <Color blue="a3" green="ae" red="0" type="rgb"/> </Property> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/copareWithDatabaseStart.png"/> + <Image iconType="3" name="/copareWithDatabaseStart.png"/> </Property> </Properties> </Component> @@ -775,7 +775,7 @@ <Color blue="a3" green="ae" red="0" type="rgb"/> </Property> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/loadModel.png"/> + <Image iconType="3" name="/loadModel.png"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Hand Cursor"/> @@ -791,7 +791,7 @@ <Component class="javax.swing.JLabel" name="exportModelButton"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/exportModel.png"/> + <Image iconType="3" name="/exportModel.png"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Hand Cursor"/> @@ -888,7 +888,7 @@ <Color blue="a3" green="ae" red="0" type="rgb"/> </Property> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/cz/fidentis/analyst/gui/resources/loadModel.png"/> + <Image iconType="3" name="/loadModel.png"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Hand Cursor"/> diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/UserInterface.java b/GUI/src/main/java/cz/fidentis/analyst/gui/UserInterface.java index b28c86ae..738dfcad 100644 --- a/GUI/src/main/java/cz/fidentis/analyst/gui/UserInterface.java +++ b/GUI/src/main/java/cz/fidentis/analyst/gui/UserInterface.java @@ -171,7 +171,7 @@ public class UserInterface extends javax.swing.JFrame { newProject.setBackground(new java.awt.Color(20, 114, 105)); newProject.setFont(new java.awt.Font("Neue Haas Unica Pro", 0, 18)); // NOI18N newProject.setForeground(new java.awt.Color(255, 255, 255)); - newProject.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/newP.png"))); // NOI18N + newProject.setIcon(new javax.swing.ImageIcon(getClass().getResource("/newP.png"))); // NOI18N newProject.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); newProject.setOpaque(true); newProject.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { @@ -189,7 +189,7 @@ public class UserInterface extends javax.swing.JFrame { }); wiredModelButton.setBackground(new java.awt.Color(20, 114, 105)); - wiredModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/wireframe2.png"))); // NOI18N + wiredModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/wireframe2.png"))); // NOI18N wiredModelButton.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); wiredModelButton.setOpaque(true); wiredModelButton.addMouseListener(new java.awt.event.MouseAdapter() { @@ -199,7 +199,7 @@ public class UserInterface extends javax.swing.JFrame { }); homeButton.setBackground(new java.awt.Color(20, 114, 105)); - homeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/home.png"))); // NOI18N + homeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/home.png"))); // NOI18N homeButton.setToolTipText("Home"); homeButton.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); homeButton.setOpaque(true); @@ -244,7 +244,7 @@ public class UserInterface extends javax.swing.JFrame { compareTwo.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/compareTwoStart.png"))); // NOI18N + jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/compareTwoStart.png"))); // NOI18N jLabel1.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); javax.swing.GroupLayout compareTwoLayout = new javax.swing.GroupLayout(compareTwo); @@ -268,7 +268,7 @@ public class UserInterface extends javax.swing.JFrame { compareDB.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - jLabel3.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/batchProcessingStart.png"))); // NOI18N + jLabel3.setIcon(new javax.swing.ImageIcon(getClass().getResource("/batchProcessingStart.png"))); // NOI18N jLabel3.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); javax.swing.GroupLayout compareDBLayout = new javax.swing.GroupLayout(compareDB); @@ -286,7 +286,7 @@ public class UserInterface extends javax.swing.JFrame { batchProcessing.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - jLabel2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/copareWithDatabaseStart.png"))); // NOI18N + jLabel2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/copareWithDatabaseStart.png"))); // NOI18N jLabel2.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); javax.swing.GroupLayout batchProcessingLayout = new javax.swing.GroupLayout(batchProcessing); @@ -313,7 +313,7 @@ public class UserInterface extends javax.swing.JFrame { }); jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - jLabel4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/symetryStartP.png"))); // NOI18N + jLabel4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/symetryStartP.png"))); // NOI18N jLabel4.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); jLabel4.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { public void mouseMoved(java.awt.event.MouseEvent evt) { @@ -385,7 +385,7 @@ public class UserInterface extends javax.swing.JFrame { startingPanel.setPreferredSize(new java.awt.Dimension(1200, 800)); startingPanel.setRequestFocusEnabled(false); - logo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/logo3.png"))); // NOI18N + logo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/logo3.png"))); // NOI18N jPanel3.setBackground(new java.awt.Color(0, 174, 163)); jPanel3.setToolTipText(""); @@ -418,7 +418,7 @@ public class UserInterface extends javax.swing.JFrame { batchMain.setBackground(new java.awt.Color(0, 174, 163)); - JLabel10.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/batchProcessingStart.png"))); // NOI18N + JLabel10.setIcon(new javax.swing.ImageIcon(getClass().getResource("/batchProcessingStart.png"))); // NOI18N javax.swing.GroupLayout batchMainLayout = new javax.swing.GroupLayout(batchMain); batchMain.setLayout(batchMainLayout); @@ -440,7 +440,7 @@ public class UserInterface extends javax.swing.JFrame { symetryMain.setBackground(new java.awt.Color(0, 174, 163)); JLabel11.setBackground(new java.awt.Color(0, 174, 163)); - JLabel11.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/symetryStart.png"))); // NOI18N + JLabel11.setIcon(new javax.swing.ImageIcon(getClass().getResource("/symetryStart.png"))); // NOI18N JLabel11.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); JLabel11.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { public void mouseMoved(java.awt.event.MouseEvent evt) { @@ -469,7 +469,7 @@ public class UserInterface extends javax.swing.JFrame { .addComponent(JLabel11, javax.swing.GroupLayout.DEFAULT_SIZE, 167, Short.MAX_VALUE)) ); - viewerButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/modelView.png"))); // NOI18N + viewerButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/modelView.png"))); // NOI18N viewerButton.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); viewerButton.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { public void mouseMoved(java.awt.event.MouseEvent evt) { @@ -485,10 +485,10 @@ public class UserInterface extends javax.swing.JFrame { } }); - JLabel8.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/compareTwoStart.png"))); // NOI18N + JLabel8.setIcon(new javax.swing.ImageIcon(getClass().getResource("/compareTwoStart.png"))); // NOI18N JLabel9.setBackground(new java.awt.Color(0, 174, 163)); - JLabel9.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/copareWithDatabaseStart.png"))); // NOI18N + JLabel9.setIcon(new javax.swing.ImageIcon(getClass().getResource("/copareWithDatabaseStart.png"))); // NOI18N javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3); jPanel3.setLayout(jPanel3Layout); @@ -589,7 +589,7 @@ public class UserInterface extends javax.swing.JFrame { ); reloadModelButton.setBackground(new java.awt.Color(0, 174, 163)); - reloadModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/loadModel.png"))); // NOI18N + reloadModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/loadModel.png"))); // NOI18N reloadModelButton.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); reloadModelButton.setOpaque(true); reloadModelButton.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { @@ -606,7 +606,7 @@ public class UserInterface extends javax.swing.JFrame { } }); - exportModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/exportModel.png"))); // NOI18N + exportModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/exportModel.png"))); // NOI18N exportModelButton.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); exportModelButton.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { public void mouseMoved(java.awt.event.MouseEvent evt) { @@ -665,7 +665,7 @@ public class UserInterface extends javax.swing.JFrame { modelViewPanel.setPreferredSize(new java.awt.Dimension(1200, 800)); reloadModelButton1.setBackground(new java.awt.Color(0, 174, 163)); - reloadModelButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/loadModel.png"))); // NOI18N + reloadModelButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/loadModel.png"))); // NOI18N reloadModelButton1.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); reloadModelButton1.setOpaque(true); reloadModelButton1.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { @@ -777,7 +777,7 @@ public class UserInterface extends javax.swing.JFrame { * @param evt While moved with mouse, symmetry label changes */ private void jLabel4MouseMoved1(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel4MouseMoved1 - jLabel4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/symetryStartPanel.png"))); + jLabel4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/symetryStartPanel.png"))); }//GEN-LAST:event_jLabel4MouseMoved1 /** @@ -789,12 +789,12 @@ public class UserInterface extends javax.swing.JFrame { topPanel.setVisible(false); pressedNewProject = false; switchPanelOnMainPanel(actualPanel); - newProject.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/newP.png"))); + newProject.setIcon(new javax.swing.ImageIcon(getClass().getResource("/newP.png"))); }else{ topPanel.setVisible(true); topPanel.add(jPanel1); pressedNewProject = true; - newProject.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/new_project_opened.png"))); + newProject.setIcon(new javax.swing.ImageIcon(getClass().getResource("/new_project_opened.png"))); } }//GEN-LAST:event_newProjectMousePressed @@ -814,7 +814,7 @@ public class UserInterface extends javax.swing.JFrame { private void symetryEstimatorMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_symetryEstimatorMouseClicked switchPanelOnMainPanel(symetryPanel); topPanel.setVisible(false); - ImageIcon icon = new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/newP.png")); + ImageIcon icon = new ImageIcon(getClass().getResource("/newP.png")); newProject.setIcon(icon); resetLabelBackround(newProject); @@ -944,7 +944,7 @@ public class UserInterface extends javax.swing.JFrame { * @param evt Changes the backround of the symmetry button */ private void JLabel11MouseMoved(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_JLabel11MouseMoved - JLabel11.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/symetryStartMoved.png"))); + JLabel11.setIcon(new javax.swing.ImageIcon(getClass().getResource("/symetryStartMoved.png"))); }//GEN-LAST:event_JLabel11MouseMoved /** @@ -952,7 +952,7 @@ public class UserInterface extends javax.swing.JFrame { * @param evt Changes the backround of the viewer panel button */ private void viewerButtonMouseMoved(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_viewerButtonMouseMoved - viewerButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/modelViewMoved.png"))); + viewerButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/modelViewMoved.png"))); }//GEN-LAST:event_viewerButtonMouseMoved /** @@ -960,7 +960,7 @@ public class UserInterface extends javax.swing.JFrame { * @param evt Changes the backround of the viewer panel button */ private void viewerButtonMouseExited(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_viewerButtonMouseExited - viewerButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/modelView.png"))); + viewerButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/modelView.png"))); }//GEN-LAST:event_viewerButtonMouseExited /** @@ -968,7 +968,7 @@ public class UserInterface extends javax.swing.JFrame { * @param evt Changes the backround of the symmetry button */ private void JLabel11MouseExited(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_JLabel11MouseExited - JLabel11.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/symetryStart.png"))); + JLabel11.setIcon(new javax.swing.ImageIcon(getClass().getResource("/symetryStart.png"))); }//GEN-LAST:event_JLabel11MouseExited /** @@ -978,7 +978,7 @@ public class UserInterface extends javax.swing.JFrame { private void jLabel4MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel4MouseClicked switchPanelOnMainPanel(symetryPanel); topPanel.setVisible(false); - newProject.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/newP.png"))); + newProject.setIcon(new javax.swing.ImageIcon(getClass().getResource("/newP.png"))); resetLabelBackround(newProject); }//GEN-LAST:event_jLabel4MouseClicked @@ -987,7 +987,7 @@ public class UserInterface extends javax.swing.JFrame { * @param evt Changes the backround of the export button */ private void exportModelButtonMouseMoved(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_exportModelButtonMouseMoved - exportModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/exportModelPressed.png"))); + exportModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/exportModelPressed.png"))); }//GEN-LAST:event_exportModelButtonMouseMoved /** @@ -995,7 +995,7 @@ public class UserInterface extends javax.swing.JFrame { * @param evt Changes the backround of the export button */ private void exportModelButtonMouseExited(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_exportModelButtonMouseExited - exportModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/exportModel.png"))); + exportModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/exportModel.png"))); }//GEN-LAST:event_exportModelButtonMouseExited /** @@ -1005,7 +1005,7 @@ public class UserInterface extends javax.swing.JFrame { private void exportModelButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_exportModelButtonMouseClicked if (canvasSymmetryPanel.getModel().getFacets().isEmpty()){ JOptionPane.showMessageDialog(frameMain, "You have to load the model.", "Model not loaded", - 0, new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/notLoadedModel.png"))); + 0, new ImageIcon(getClass().getResource("/notLoadedModel.png"))); } else { JFileChooser chooser = new JFileChooser(); chooser.showSaveDialog(symetryPanel); @@ -1016,7 +1016,7 @@ public class UserInterface extends javax.swing.JFrame { exporter.exportModelToObj(chooser.getSelectedFile()); JOptionPane.showMessageDialog(frameMain, "Model exported into: " + chooser.getCurrentDirectory().toString() + "\\" + chooser.getSelectedFile().getName(), "Model exported", - 0, new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/exportedModel.png"))); + 0, new ImageIcon(getClass().getResource("/exportedModel.png"))); } } catch (IOException ex) { Logger.getLogger(UserInterface.class.getName()).log(Level.SEVERE, null, ex); @@ -1029,7 +1029,7 @@ public class UserInterface extends javax.swing.JFrame { * @param evt Changes the backround of the symmetry button */ private void jLabel4MouseExited(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel4MouseExited - jLabel4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/symetryStartP.png"))); + jLabel4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/symetryStartP.png"))); }//GEN-LAST:event_jLabel4MouseExited diff --git a/GUI/src/main/nbm/manifest.mf b/GUI/src/main/nbm/manifest.mf index f87b508b..cc2b72af 100644 --- a/GUI/src/main/nbm/manifest.mf +++ b/GUI/src/main/nbm/manifest.mf @@ -1,3 +1,6 @@ Manifest-Version: 1.0 -OpenIDE-Module-Localizing-Bundle: cz/findetis/analyst/gui/Bundle.properties - +OpenIDE-Module: cz.fidentis.analyst.gui +OpenIDE-Module-Install: cz/fidentis/analyst/gui/Installer.class +OpenIDE-Module-Localizing-Bundle: cz/fidentis/analyst/gui/Bundle.properties +OpenIDE-Module-Requires: org.openide.windows.WindowManager +OpenIDE-Module-Specification-Version: 1.0 diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/angle.png b/GUI/src/main/resources/angle.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/angle.png rename to GUI/src/main/resources/angle.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/backround.jpg b/GUI/src/main/resources/backround.jpg similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/backround.jpg rename to GUI/src/main/resources/backround.jpg diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/batchProcessing.png b/GUI/src/main/resources/batchProcessing.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/batchProcessing.png rename to GUI/src/main/resources/batchProcessing.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/batchProcessingGreen.png b/GUI/src/main/resources/batchProcessingGreen.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/batchProcessingGreen.png rename to GUI/src/main/resources/batchProcessingGreen.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/batchProcessingStart.png b/GUI/src/main/resources/batchProcessingStart.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/batchProcessingStart.png rename to GUI/src/main/resources/batchProcessingStart.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/blackBackroundCanvas.png b/GUI/src/main/resources/blackBackroundCanvas.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/blackBackroundCanvas.png rename to GUI/src/main/resources/blackBackroundCanvas.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/blackBackroundCanvasPressed.png b/GUI/src/main/resources/blackBackroundCanvasPressed.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/blackBackroundCanvasPressed.png rename to GUI/src/main/resources/blackBackroundCanvasPressed.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/bottom.png b/GUI/src/main/resources/bottom.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/bottom.png rename to GUI/src/main/resources/bottom.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/close.png b/GUI/src/main/resources/close.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/close.png rename to GUI/src/main/resources/close.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/compareTwo.png b/GUI/src/main/resources/compareTwo.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/compareTwo.png rename to GUI/src/main/resources/compareTwo.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/compareTwoFaces.svg b/GUI/src/main/resources/compareTwoFaces.svg similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/compareTwoFaces.svg rename to GUI/src/main/resources/compareTwoFaces.svg diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/compareTwoGreen.png b/GUI/src/main/resources/compareTwoGreen.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/compareTwoGreen.png rename to GUI/src/main/resources/compareTwoGreen.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/compareTwoStart.png b/GUI/src/main/resources/compareTwoStart.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/compareTwoStart.png rename to GUI/src/main/resources/compareTwoStart.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/copareWithDatabase.png b/GUI/src/main/resources/copareWithDatabase.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/copareWithDatabase.png rename to GUI/src/main/resources/copareWithDatabase.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/copareWithDatabaseGreen.png b/GUI/src/main/resources/copareWithDatabaseGreen.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/copareWithDatabaseGreen.png rename to GUI/src/main/resources/copareWithDatabaseGreen.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/copareWithDatabaseStart.png b/GUI/src/main/resources/copareWithDatabaseStart.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/copareWithDatabaseStart.png rename to GUI/src/main/resources/copareWithDatabaseStart.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/curvature.png b/GUI/src/main/resources/curvature.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/curvature.png rename to GUI/src/main/resources/curvature.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/Bundle.properties b/GUI/src/main/resources/cz/fidentis/analyst/gui/Bundle.properties similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/Bundle.properties rename to GUI/src/main/resources/cz/fidentis/analyst/gui/Bundle.properties diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/distance.png b/GUI/src/main/resources/distance.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/distance.png rename to GUI/src/main/resources/distance.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/divide.png b/GUI/src/main/resources/divide.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/divide.png rename to GUI/src/main/resources/divide.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/downButton.png b/GUI/src/main/resources/downButton.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/downButton.png rename to GUI/src/main/resources/downButton.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/downButtonPressed.png b/GUI/src/main/resources/downButtonPressed.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/downButtonPressed.png rename to GUI/src/main/resources/downButtonPressed.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/exportModel.png b/GUI/src/main/resources/exportModel.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/exportModel.png rename to GUI/src/main/resources/exportModel.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/exportModelPressed.png b/GUI/src/main/resources/exportModelPressed.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/exportModelPressed.png rename to GUI/src/main/resources/exportModelPressed.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/exportedModel.png b/GUI/src/main/resources/exportedModel.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/exportedModel.png rename to GUI/src/main/resources/exportedModel.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/home.png b/GUI/src/main/resources/home.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/home.png rename to GUI/src/main/resources/home.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/info.png b/GUI/src/main/resources/info.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/info.png rename to GUI/src/main/resources/info.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/info2.png b/GUI/src/main/resources/info2.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/info2.png rename to GUI/src/main/resources/info2.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/leftButton.png b/GUI/src/main/resources/leftButton.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/leftButton.png rename to GUI/src/main/resources/leftButton.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/leftButtonPressed.png b/GUI/src/main/resources/leftButtonPressed.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/leftButtonPressed.png rename to GUI/src/main/resources/leftButtonPressed.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/loadCanva.png b/GUI/src/main/resources/loadCanva.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/loadCanva.png rename to GUI/src/main/resources/loadCanva.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/loadCanvaClicked.png b/GUI/src/main/resources/loadCanvaClicked.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/loadCanvaClicked.png rename to GUI/src/main/resources/loadCanvaClicked.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/loadModel.png b/GUI/src/main/resources/loadModel.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/loadModel.png rename to GUI/src/main/resources/loadModel.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/loadModelPressed.png b/GUI/src/main/resources/loadModelPressed.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/loadModelPressed.png rename to GUI/src/main/resources/loadModelPressed.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/logo.png b/GUI/src/main/resources/logo.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/logo.png rename to GUI/src/main/resources/logo.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/logo2.png b/GUI/src/main/resources/logo2.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/logo2.png rename to GUI/src/main/resources/logo2.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/logo3.png b/GUI/src/main/resources/logo3.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/logo3.png rename to GUI/src/main/resources/logo3.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/maximize.png b/GUI/src/main/resources/maximize.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/maximize.png rename to GUI/src/main/resources/maximize.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/minimize.png b/GUI/src/main/resources/minimize.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/minimize.png rename to GUI/src/main/resources/minimize.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/minimize2.png b/GUI/src/main/resources/minimize2.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/minimize2.png rename to GUI/src/main/resources/minimize2.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/minus.png b/GUI/src/main/resources/minus.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/minus.png rename to GUI/src/main/resources/minus.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/minusPressed.png b/GUI/src/main/resources/minusPressed.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/minusPressed.png rename to GUI/src/main/resources/minusPressed.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/modelView.png b/GUI/src/main/resources/modelView.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/modelView.png rename to GUI/src/main/resources/modelView.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/modelViewMoved.png b/GUI/src/main/resources/modelViewMoved.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/modelViewMoved.png rename to GUI/src/main/resources/modelViewMoved.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/n.png b/GUI/src/main/resources/n.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/n.png rename to GUI/src/main/resources/n.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/navigBackground.png b/GUI/src/main/resources/navigBackground.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/navigBackground.png rename to GUI/src/main/resources/navigBackground.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/navigationBackground.png b/GUI/src/main/resources/navigationBackground.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/navigationBackground.png rename to GUI/src/main/resources/navigationBackground.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/newP.png b/GUI/src/main/resources/newP.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/newP.png rename to GUI/src/main/resources/newP.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/new_project.jpg b/GUI/src/main/resources/new_project.jpg similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/new_project.jpg rename to GUI/src/main/resources/new_project.jpg diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/new_project.png b/GUI/src/main/resources/new_project.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/new_project.png rename to GUI/src/main/resources/new_project.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/new_project_opened.png b/GUI/src/main/resources/new_project_opened.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/new_project_opened.png rename to GUI/src/main/resources/new_project_opened.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/notLoadedModel.png b/GUI/src/main/resources/notLoadedModel.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/notLoadedModel.png rename to GUI/src/main/resources/notLoadedModel.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/originalModel.png b/GUI/src/main/resources/originalModel.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/originalModel.png rename to GUI/src/main/resources/originalModel.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/originalModelPressed.png b/GUI/src/main/resources/originalModelPressed.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/originalModelPressed.png rename to GUI/src/main/resources/originalModelPressed.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/plus.png b/GUI/src/main/resources/plus.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/plus.png rename to GUI/src/main/resources/plus.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/plusPressed.png b/GUI/src/main/resources/plusPressed.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/plusPressed.png rename to GUI/src/main/resources/plusPressed.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/points.png b/GUI/src/main/resources/points.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/points.png rename to GUI/src/main/resources/points.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/resetButton.png b/GUI/src/main/resources/resetButton.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/resetButton.png rename to GUI/src/main/resources/resetButton.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/resetButtonPressed.png b/GUI/src/main/resources/resetButtonPressed.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/resetButtonPressed.png rename to GUI/src/main/resources/resetButtonPressed.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/rightBottom.png b/GUI/src/main/resources/rightBottom.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/rightBottom.png rename to GUI/src/main/resources/rightBottom.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/rightButton.png b/GUI/src/main/resources/rightButton.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/rightButton.png rename to GUI/src/main/resources/rightButton.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/rightButtonPressed.png b/GUI/src/main/resources/rightButtonPressed.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/rightButtonPressed.png rename to GUI/src/main/resources/rightButtonPressed.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/save.png b/GUI/src/main/resources/save.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/save.png rename to GUI/src/main/resources/save.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/selectPoints.png b/GUI/src/main/resources/selectPoints.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/selectPoints.png rename to GUI/src/main/resources/selectPoints.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/show.png b/GUI/src/main/resources/show.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/show.png rename to GUI/src/main/resources/show.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/show2.png b/GUI/src/main/resources/show2.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/show2.png rename to GUI/src/main/resources/show2.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/showPlane.png b/GUI/src/main/resources/showPlane.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/showPlane.png rename to GUI/src/main/resources/showPlane.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/showPlanePane.png b/GUI/src/main/resources/showPlanePane.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/showPlanePane.png rename to GUI/src/main/resources/showPlanePane.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/showPlanePressed.png b/GUI/src/main/resources/showPlanePressed.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/showPlanePressed.png rename to GUI/src/main/resources/showPlanePressed.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetry.png b/GUI/src/main/resources/symetry.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetry.png rename to GUI/src/main/resources/symetry.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryCount.png b/GUI/src/main/resources/symetryCount.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryCount.png rename to GUI/src/main/resources/symetryCount.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryCountClicked.png b/GUI/src/main/resources/symetryCountClicked.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryCountClicked.png rename to GUI/src/main/resources/symetryCountClicked.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryGreen.png b/GUI/src/main/resources/symetryGreen.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryGreen.png rename to GUI/src/main/resources/symetryGreen.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryStart.png b/GUI/src/main/resources/symetryStart.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryStart.png rename to GUI/src/main/resources/symetryStart.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryStartMoved.png b/GUI/src/main/resources/symetryStartMoved.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryStartMoved.png rename to GUI/src/main/resources/symetryStartMoved.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryStartP.png b/GUI/src/main/resources/symetryStartP.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryStartP.png rename to GUI/src/main/resources/symetryStartP.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryStartPanel.png b/GUI/src/main/resources/symetryStartPanel.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/symetryStartPanel.png rename to GUI/src/main/resources/symetryStartPanel.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/texture.png b/GUI/src/main/resources/texture.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/texture.png rename to GUI/src/main/resources/texture.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/texture2.png b/GUI/src/main/resources/texture2.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/texture2.png rename to GUI/src/main/resources/texture2.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/upButton.png b/GUI/src/main/resources/upButton.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/upButton.png rename to GUI/src/main/resources/upButton.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/upButtonPressed.png b/GUI/src/main/resources/upButtonPressed.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/upButtonPressed.png rename to GUI/src/main/resources/upButtonPressed.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/whiteBackroundCanvas.png b/GUI/src/main/resources/whiteBackroundCanvas.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/whiteBackroundCanvas.png rename to GUI/src/main/resources/whiteBackroundCanvas.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/whiteBackroundCanvasPressed.png b/GUI/src/main/resources/whiteBackroundCanvasPressed.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/whiteBackroundCanvasPressed.png rename to GUI/src/main/resources/whiteBackroundCanvasPressed.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/wireframe.png b/GUI/src/main/resources/wireframe.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/wireframe.png rename to GUI/src/main/resources/wireframe.png diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/resources/wireframe2.png b/GUI/src/main/resources/wireframe2.png similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/gui/resources/wireframe2.png rename to GUI/src/main/resources/wireframe2.png diff --git a/MeshModel/pom.xml b/MeshModel/pom.xml index 852d4a5a..f5e6d5f5 100644 --- a/MeshModel/pom.xml +++ b/MeshModel/pom.xml @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>cz.findetis</groupId> + <groupId>cz.fidentis</groupId> <artifactId>FIDENTIS-Analyst-parent</artifactId> <version>2.0</version> </parent> @@ -112,4 +112,5 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> + <groupId>cz.fidentis</groupId> </project> diff --git a/MeshModel/src/main/nbm/manifest.mf b/MeshModel/src/main/nbm/manifest.mf index 4e936ae8..acebfc43 100644 --- a/MeshModel/src/main/nbm/manifest.mf +++ b/MeshModel/src/main/nbm/manifest.mf @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -OpenIDE-Module-Localizing-Bundle: cz/findetis/analyst/Bundle.properties +OpenIDE-Module-Localizing-Bundle: cz/fidentis/analyst/Bundle.properties diff --git a/MeshModel/src/main/resources/cz/findetis/analyst/Bundle.properties b/MeshModel/src/main/resources/cz/fidentis/analyst/Bundle.properties similarity index 100% rename from MeshModel/src/main/resources/cz/findetis/analyst/Bundle.properties rename to MeshModel/src/main/resources/cz/fidentis/analyst/Bundle.properties diff --git a/Renderer/pom.xml b/Renderer/pom.xml index e0bc5e59..5ff6fdd5 100644 --- a/Renderer/pom.xml +++ b/Renderer/pom.xml @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>cz.findetis</groupId> + <groupId>cz.fidentis</groupId> <artifactId>FIDENTIS-Analyst-parent</artifactId> <version>2.0</version> </parent> diff --git a/Renderer/src/main/nbm/manifest.mf b/Renderer/src/main/nbm/manifest.mf index ee560af2..e5f84b50 100644 --- a/Renderer/src/main/nbm/manifest.mf +++ b/Renderer/src/main/nbm/manifest.mf @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -OpenIDE-Module-Localizing-Bundle: cz/findetis/analyst/renderer/Bundle.properties +OpenIDE-Module-Localizing-Bundle: cz/fidentis/analyst/renderer/Bundle.properties diff --git a/Renderer/src/main/resources/cz/findetis/analyst/renderer/Bundle.properties b/Renderer/src/main/resources/cz/fidentis/analyst/renderer/Bundle.properties similarity index 100% rename from Renderer/src/main/resources/cz/findetis/analyst/renderer/Bundle.properties rename to Renderer/src/main/resources/cz/fidentis/analyst/renderer/Bundle.properties diff --git a/application/pom.xml b/application/pom.xml index 1e63205f..07b682b0 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>cz.findetis</groupId> + <groupId>cz.fidentis</groupId> <artifactId>FIDENTIS-Analyst-parent</artifactId> <version>2.0</version> </parent> diff --git a/branding/pom.xml b/branding/pom.xml index 0defc724..6f60318f 100644 --- a/branding/pom.xml +++ b/branding/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>cz.findetis</groupId> + <groupId>cz.fidentis</groupId> <artifactId>FIDENTIS-Analyst-parent</artifactId> <version>2.0</version> </parent> diff --git a/branding/src/main/nbm/manifest.mf b/branding/src/main/nbm/manifest.mf index ecfcfb33..703cf6de 100644 --- a/branding/src/main/nbm/manifest.mf +++ b/branding/src/main/nbm/manifest.mf @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -OpenIDE-Module-Localizing-Bundle: cz/findetis/analyst/branding/Bundle.properties +OpenIDE-Module-Localizing-Bundle: cz/fidentis/analyst/branding/Bundle.properties AutoUpdate-Essential-Module: true diff --git a/branding/src/main/resources/cz/findetis/analyst/branding/Bundle.properties b/branding/src/main/resources/cz/fidentis/analyst/branding/Bundle.properties similarity index 100% rename from branding/src/main/resources/cz/findetis/analyst/branding/Bundle.properties rename to branding/src/main/resources/cz/fidentis/analyst/branding/Bundle.properties diff --git a/pom.xml b/pom.xml index 65923104..4e7abe09 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>cz.findetis</groupId> + <groupId>cz.fidentis</groupId> <artifactId>FIDENTIS-Analyst-parent</artifactId> <version>2.0</version> <packaging>pom</packaging> -- GitLab