small attempt to fix issue #41

DAINTINESS-Group · Sep 16, 2024 · f52fab7 · f52fab7
1 parent 2704f47
commit f52fab7
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/.classpath b/.classpath
@@ -17,11 +17,13 @@
 		<attributes>
 			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">

diff --git a/README.md b/README.md
@@ -165,7 +165,7 @@ Create a new [Issue][issues-url] to report any issues
 
 ## Authors
 
-v0.2: Dimitris Anyfantakis added a new java parser; Bill Dodis added the PlanUML extension as part of his Diploma Thesis in Univ. Ioannina.<br>
+v0.2: Dimitris Anyfantakis added a new java parser; Bill Dodis added the PlanUML extension as part of his Diploma Thesis in Univ. Ioannina. Vassilis Zafeiris solved bugs at the package diagrams<br>
 v0.1: Dimitris Anyfantakis has developed the first version of the tool as part of his Diploma Thesis in Univ. Ioannina; Panos Vassiliadis acted solely as code reviewer and co-designer.
 
 ## License

diff --git a/pom.xml b/pom.xml
@@ -75,21 +75,24 @@
             <artifactId>jung-visualization</artifactId>
             <version>2.1.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-controls</artifactId>
-            <version>18.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-fxml</artifactId>
-            <version>18.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-web</artifactId>
-            <version>18.0.1</version>
-        </dependency>
+<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-controls -->
+<dependency>
+    <groupId>org.openjfx</groupId>
+    <artifactId>javafx-controls</artifactId>
+    <version>22.0.2</version>
+</dependency>
+<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-fxml -->
+<dependency>
+    <groupId>org.openjfx</groupId>
+    <artifactId>javafx-fxml</artifactId>
+    <version>22.0.2</version>
+</dependency>
+<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-web -->
+<dependency>
+    <groupId>org.openjfx</groupId>
+    <artifactId>javafx-web</artifactId>
+    <version>22.0.2</version>
+</dependency>
         <dependency>
             <groupId>com.sirolf2009</groupId>
             <artifactId>fxgraph</artifactId>
@@ -207,6 +210,7 @@
                 </configuration>
             </plugin>
             <plugin>
+            <!-- https://mvnrepository.com/artifact/org.openjfx/javafx-maven-plugin -->
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>0.0.8</version>

diff --git a/src/main/java/model/diagram/PackageDiagram.java b/src/main/java/model/diagram/PackageDiagram.java
@@ -55,7 +55,8 @@ public List<PackageVertex> getChosenNodes(List<String> chosenPackagesNames)
         for (String chosenPackage : chosenPackagesNames)
         {
             Optional<PackageVertex> vertex = vertices.values().stream()
-                .filter(it -> it.getName().equals(chosenPackage))
+                //.filter(it -> it.getName().equals(chosenPackage))
+            	.filter(it -> it.getPath().toString().equals(chosenPackage))
                 .findFirst();
 
             vertex.ifPresent(chosenPackages::add);