add module-info

2026-02-12 10:49:01 -05:00
parent 7750cf3b83
commit cfb25f3775
7 changed files with 46 additions and 27 deletions
@@ -9,6 +9,7 @@ plugins {
 }

 java {
+    modularity.inferModulePath = true
    toolchain {
        languageVersion = JavaLanguageVersion.of(25)
    }
@@ -22,6 +23,10 @@ repositories {
    mavenCentral()
 }

+application {
+    mainClass = 'edu.addressbook.view.ApplicationView'
+}
+
 javafx {
  version = "25.0.1"
  modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.graphics', 'javafx.web' ]
@@ -42,14 +47,23 @@ dependencies {

 }

-// Apply a specific Java toolchain to ease working on different environments.
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(25)
-    }
+jar {
+  manifest {
+    attributes 'Automatic-Module-Name': group,
+               'Main-Class': application.mainClass,
+               'Class-Path': 'edu.addressbook.view edu.addressbook org.aspectj.runtime' 
+  }
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+  from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
 }

-application {
-    // Define the main class for the application.
-    mainClass = 'edu.addressbook.view.ApplicationView'
+tasks.named('jar') {
+    manifest {
+        attributes(
+                'Automatic-Module-Name':'edu.addressbook',
+                'Implementation-Title': 'edu.addressbook',
+                'Implementation-Version': 1.0,
+                'Main-Class': application.mainClass,
+                'Class-Path': 'edu.addressbook org.aspectj.runtime' )
+    }
 }
@@ -1,7 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
@@ -0,0 +1,14 @@
+module edu.addressbook.view {
+    requires java.desktop;
+    requires transitive javafx.graphics;
+    requires transitive javafx.web;
+    requires transitive javafx.controls;
+
+    opens edu.addressbook;
+
+    opens javafx.web;
+    opens javafx.controls;
+    opens javafx.graphics;
+
+    exports edu.addressbook.view;
+}
@@ -16,7 +16,7 @@
      <li><a href="index.html">Close</a></li>
    </ul>
    <div class="main-content" style="height: 600px; width: 400px;">
-      <table id="myTable" class="display">
+      <table id="contactTable" class="display">
        <thead>
          <tr>
            <th>Column 1</th>
@@ -25,12 +25,16 @@
        </thead>
        <tbody>
          <tr>
-            <td>Row 1 Data 1</td>
-            <td>Row 1 Data 2</td>
+            <td>Row 1 Col 1 Data 1</td>
+            <td>Row 1 Col 2 Data 2</td>
          </tr>
          <tr>
            <td>Row 2 Data 1</td>
-            <td>Row 2 Data 2</td>
+            <td>Row 2 Col 2 Data 2</td>
+          </tr>
+          <tr>
+            <td>Row 3 Data 1</td>
+            <td>Row 3 Col 2 Data 2</td>
          </tr>
        </tbody>
      </table>
@@ -40,6 +44,6 @@
 <script src="js/datatables.min.js"></script>
 <script>
  "use strict"
-  let table = new DataTable('#myTable');
+  let table = new DataTable('#contactTable');
 </script>
 </html>
@@ -6,7 +6,7 @@
  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
  <title>View</title>
  <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
-  <script src="js/jquery.js"></script>
+  <script src="js/jquery.min.js"></script>
 </head>

 <body>
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="bin/main" path="src/main/resources">
-		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="bin/main" path="src/main/java">
 		<attributes>
 			<attribute name="gradle_scope" value="main"/>