Merge pull request #7 from umjammer/0.2.13

0.2.13

Author: umjammer

.github/workflows/codeql-analysis.yml

@@ -7,10 +7,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [vavi]
+    branches: [main]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [vavi]
+    branches: [main]
 #  schedule:
 #    - cron: '0 0 * * 5'
 

.github/workflows/maven.yml

@@ -5,9 +5,9 @@ name: Java CI
 
 on:
   push:
-    branches: [ vavi ]
+    branches: [ main ]
   pull_request:
-    branches: [ vavi ]
+    branches: [ main ]
 
 jobs:
   build:

README.md

@@ -31,10 +31,10 @@ all formats are mounted by fuse also!
 | ibm (dmg:jfat(fat16))        | ✅    |        |          |      |      |     |       |       |       | partition                                             |
 | pc98 (jfat(fat16))           | ✅    |        |          |      |      |     |       |       |       | partition                                             |
 | raw (exfat)                  | ✅    |        |          |      |      |     |       |       |       | virtual partition                                     |
-| vdisk (nhd:pc98:fat16)       | ✅    |        |          |      |      |     |       |       |       | [virtual disk](vavi-nio-file-emu), partition          |
-| fuse (vdisk(nhd):pc98:fat16) | ✅    |        |          |      |      |     |       |       |       | [fuse](vavi-net-fuse), virtualDisk, partition         |
+| vdisk (nhd:pc98:fat16)       | ✅    |        |          |      |      |     |       |       |       | [virtual disk](https://github.com/umjammer/vavi-nio-file-emu), partition          |
+| fuse (vdisk(nhd):pc98:fat16) | ✅    |        |          |      |      |     |       |       |       | [fuse](https://github.com/umjammer/vavi-net-fuse), virtualDisk, partition         |
 | vdisk (d88:pc98:n88)         | 🚧   |        |          |      | | | | |       | not solid image is not supported by DeviceAPI         |
-| vdisk (fdi:pc98:fat12)       | ✅    |        |          |      | | | | |       | [virtual disk](vavi-nio-file-emu), partition          |
+| vdisk (fdi:pc98:fat12)       | ✅    |        |          |      | | | | |       | [virtual disk](https://github.com/umjammer/vavi-nio-file-emu), partition          |
 
 ## Install
 

core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>vavi</groupId>
     <artifactId>vavi-nio-file-jnode</artifactId>
-    <version>0.2.12</version>
+    <version>0.2.13</version>
   </parent>
 
   <artifactId>jnode-core</artifactId>

core/src/main/java/org/jnode/driver/ApiNotFoundException.java

@@ -27,30 +27,28 @@
  */
 public class ApiNotFoundException extends DeviceException {
 
-    /**
-     *
-     */
+    /** */
     public ApiNotFoundException() {
         super();
     }
 
     /**
-     * @param message
-     * @param cause
+     * @param message the message
+     * @param cause the cause
      */
     public ApiNotFoundException(String message, Throwable cause) {
         super(message, cause);
     }
 
     /**
-     * @param cause
+     * @param cause the cause
      */
     public ApiNotFoundException(Throwable cause) {
         super(cause);
     }
 
     /**
-     * @param s
+     * @param s the message
      */
     public ApiNotFoundException(String s) {
         super(s);

core/src/main/java/org/jnode/driver/Device.java

@@ -44,14 +44,12 @@ public class Device {
     /**
      * The API's implemented by this device
      */
-    private final HashMap<Class<? extends DeviceAPI>, DeviceAPI> apis =
-            new HashMap<>();
+    private final HashMap<Class<? extends DeviceAPI>, DeviceAPI> apis = new HashMap<>();
 
     /**
      * Create a new instance
      *
-     * @param bus
-     * @param id
+     * @param id the new id
      */
     public Device(String id) {
         this.id = id;
@@ -66,9 +64,9 @@ public final String getId() {
     }
 
     /**
-     * Change the id of this device, only called by devicemanager
+     * Change the id of this device, only called by device-manager
      *
-     * @param newId
+     * @param newId the new id
      */
     final void setId(String newId) {
         this.id = newId;
@@ -86,8 +84,8 @@ public final boolean isStarted() {
     /**
      * Add an API implementation to the list of API's implemented by this device.
      *
-     * @param apiInterface
-     * @param apiImplementation
+     * @param apiInterface the api interface
+     * @param apiImplementation the api implementation
      */
     @SuppressWarnings({"unchecked", "rawtypes"})
     public final <T extends DeviceAPI> void registerAPI(Class<T> apiInterface, T apiImplementation) {
@@ -113,7 +111,7 @@ public final <T extends DeviceAPI> void registerAPI(Class<T> apiInterface, T api
     /**
      * Remove an API implementation from the list of API's implemented by this device.
      *
-     * @param apiInterface
+     * @param apiInterface the api interface
      */
     public final void unregisterAPI(Class<? extends DeviceAPI> apiInterface) {
         apis.remove(apiInterface);
@@ -122,11 +120,11 @@ public final void unregisterAPI(Class<? extends DeviceAPI> apiInterface) {
     /**
      * Does this device implement the given API?
      *
-     * @param apiInterface
+     * @param apiInterface the api interface
      * @return boolean
      */
     public final boolean implementsAPI(Class<? extends DeviceAPI> apiInterface) {
-        //lookup is classname based to handle multi isolate uscases
+        // lookup is class name based to handle multi isolate use cases
         for (Class<?> clazz : apis.keySet()) {
             if (clazz.getName().equals(apiInterface.getName())) {
                 return true;
@@ -147,12 +145,12 @@ public final Set<Class<? extends DeviceAPI>> implementedAPIs() {
     /**
      * Gets the implementation of a given API.
      *
-     * @param apiInterface
+     * @param apiInterface the api interface
      * @return The api implementation (guaranteed not null)
      * @throws ApiNotFoundException The given api has not been found
      */
     public final <T extends DeviceAPI> T getAPI(Class<T> apiInterface) throws ApiNotFoundException {
-        //lookup is classname based to handle multi isolate uscases
+        // lookup is class name based to handle multi isolate use cases
         Class<?> apiInterface2 = null;
         for (Class<?> clazz : apis.keySet()) {
             if (clazz.getName().equals(apiInterface.getName())) {
@@ -169,7 +167,6 @@ public final <T extends DeviceAPI> T getAPI(Class<T> apiInterface) throws ApiNot
 
     /**
      * @return The short description
-     * @see org.jnode.system.resource.ResourceOwner#getShortDescription()
      */
     public String getShortDescription() {
         return getId();

core/src/main/java/org/jnode/driver/DeviceException.java

@@ -21,36 +21,34 @@
 package org.jnode.driver;
 
 /**
- * Generic exception of devices in the device framework.
+ * Generic exception to devices in the device framework.
  *
  * @author Ewout Prangsma ([email protected])
  */
 public class DeviceException extends RuntimeException {
 
-    /**
-     *
-     */
+    /** */
     public DeviceException() {
         super();
     }
 
     /**
-     * @param message
-     * @param cause
+     * @param message the message
+     * @param cause the cause
      */
     public DeviceException(String message, Throwable cause) {
         super(message, cause);
     }
 
     /**
-     * @param cause
+     * @param cause the cause
      */
     public DeviceException(Throwable cause) {
         super(cause);
     }
 
     /**
-     * @param s
+     * @param s the s
      */
     public DeviceException(String s) {
         super(s);