#4 Fix javac warnings

amosshi · Sep 22, 2019 · 3c58000 · 3c58000
1 parent e2668bb
commit 3c58000
Show file tree

Hide file tree

Showing 11 changed files with 180 additions and 142 deletions.
diff --git a/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/FileDrop.java b/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/FileDrop.java
diff --git a/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/plugin/PluginManager.java b/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/plugin/PluginManager.java
@@ -79,7 +79,7 @@ private static void loadPlugins() {
     private static void loadPlugin(File pluginFile, String pluginDescClassName) throws Exception {
         URL url = pluginFile.toURI().toURL();
         ClassLoader loader = new URLClassLoader(new URL[]{url});
-        Class cls = loader.loadClass(pluginDescClassName);
+        Class<?> cls = loader.loadClass(pluginDescClassName);
         if (cls == null) {
             return;
         }
@@ -113,8 +113,8 @@ public static void initChooseFilters(JFileChooser chooser) {
     }
 
     public static FileFormat getFile(final File file) throws FileFormatException, Throwable {
-        Class fileFormatClass = null;
-        Constructor<FileFormat> c = null;
+        Class<? extends FileFormat> fileFormatClass = null;
+        Constructor<? extends FileFormat> c = null;
         FileFormat ff = null;
         String ext = file.getName().substring(file.getName().lastIndexOf('.') + 1);
 

diff --git a/CommonLib/src/main/java/org/freeinternals/biv/plugin/PluginDescriptor.java b/CommonLib/src/main/java/org/freeinternals/biv/plugin/PluginDescriptor.java
@@ -6,6 +6,8 @@
  */
 package org.freeinternals.biv.plugin;
 
+import org.freeinternals.commonlib.core.FileFormat;
+
 /**
  *
  * @author Amos Shi
@@ -16,5 +18,5 @@ public interface PluginDescriptor {
 
     String[] getExtensions();
 
-    Class getFileFormatClass();
+    Class<? extends FileFormat> getFileFormatClass();
 }
diff --git a/FormatBMP/src/main/java/org/freeinternals/biv/plugin/bmp/PluginDescriptorBMP.java b/FormatBMP/src/main/java/org/freeinternals/biv/plugin/bmp/PluginDescriptorBMP.java
@@ -8,6 +8,7 @@
 package org.freeinternals.biv.plugin.bmp;
 
 import org.freeinternals.biv.plugin.PluginDescriptor;
+import org.freeinternals.commonlib.core.FileFormat;
 import org.freeinternals.format.bmp.BMPFile;
 
 /**
@@ -16,15 +17,18 @@
  */
 public class PluginDescriptorBMP implements PluginDescriptor{
 
+    @Override
     public String getExtensionDescription() {
         return "Bitmap Images (*.bmp)";
     }
 
+    @Override
     public String[] getExtensions() {
         return new String[]{"bmp"};
     }
 
-    public Class getFileFormatClass() {
+    @Override
+    public Class<? extends FileFormat> getFileFormatClass() {
         return BMPFile.class;
     }
 

diff --git a/FormatDEX/src/main/java/org/freeinternals/biv/plugin/dex/PluginDescriptorDEX.java b/FormatDEX/src/main/java/org/freeinternals/biv/plugin/dex/PluginDescriptorDEX.java
@@ -8,6 +8,7 @@
 package org.freeinternals.biv.plugin.dex;
 
 import org.freeinternals.biv.plugin.PluginDescriptor;
+import org.freeinternals.commonlib.core.FileFormat;
 import org.freeinternals.format.dex.DexFile;
 
 
@@ -22,11 +23,13 @@ public String getExtensionDescription() {
         return "Android DEX File (*.dex)";
     }
 
+    @Override
     public String[] getExtensions() {
         return new String[]{"dex"};
     }
 
-    public Class getFileFormatClass() {
+    @Override
+    public Class<? extends FileFormat> getFileFormatClass() {
         return DexFile.class;
     }
 

diff --git a/FormatELF/src/main/java/org/freeinternals/biv/plugin/elf/PluginDescriptorELF.java b/FormatELF/src/main/java/org/freeinternals/biv/plugin/elf/PluginDescriptorELF.java
@@ -7,6 +7,7 @@
 package org.freeinternals.biv.plugin.elf;
 
 import org.freeinternals.biv.plugin.PluginDescriptor;
+import org.freeinternals.commonlib.core.FileFormat;
 import org.freeinternals.format.elf.ElfFile;
 
 /**
@@ -26,7 +27,7 @@ public String[] getExtensions() {
     }
 
     @Override
-    public Class getFileFormatClass() {
+    public Class<? extends FileFormat> getFileFormatClass() {
         return ElfFile.class;
     }
 

diff --git a/FormatJPEG/src/main/java/org/freeinternals/biv/plugin/jpeg/PluginDescriptorJPEG.java b/FormatJPEG/src/main/java/org/freeinternals/biv/plugin/jpeg/PluginDescriptorJPEG.java
@@ -8,6 +8,7 @@
 package org.freeinternals.biv.plugin.jpeg;
 
 import org.freeinternals.biv.plugin.PluginDescriptor;
+import org.freeinternals.commonlib.core.FileFormat;
 import org.freeinternals.format.jpeg.JPEGFile;
 
 /**
@@ -16,15 +17,18 @@
  */
 public class PluginDescriptorJPEG implements PluginDescriptor{
 
+    @Override
     public String getExtensionDescription() {
         return "JPEG Image (*.jpg,*jpeg)";
     }
 
+    @Override
     public String[] getExtensions() {
         return new String[]{"jpeg", "jpg"};
     }
 
-    public Class getFileFormatClass() {
+    @Override
+    public Class<? extends FileFormat> getFileFormatClass() {
         return JPEGFile.class;
     }
 

diff --git a/FormatPDF/src/main/java/org/freeinternals/biv/plugin/pdf/PluginDescriptorPDF.java b/FormatPDF/src/main/java/org/freeinternals/biv/plugin/pdf/PluginDescriptorPDF.java
@@ -7,6 +7,7 @@
 package org.freeinternals.biv.plugin.pdf;
 
 import org.freeinternals.biv.plugin.PluginDescriptor;
+import org.freeinternals.commonlib.core.FileFormat;
 import org.freeinternals.format.pdf.PDFFile;
 
 /**
@@ -26,7 +27,7 @@ public String[] getExtensions() {
     }
 
     @Override
-    public Class getFileFormatClass() {
+    public Class<? extends FileFormat> getFileFormatClass() {
         return PDFFile.class;
     }
 }
diff --git a/FormatPE/src/main/java/org/freeinternals/biv/plugin/pe/PluginDescriptorPE.java b/FormatPE/src/main/java/org/freeinternals/biv/plugin/pe/PluginDescriptorPE.java
@@ -7,6 +7,7 @@
 package org.freeinternals.biv.plugin.pe;
 
 import org.freeinternals.biv.plugin.PluginDescriptor;
+import org.freeinternals.commonlib.core.FileFormat;
 import org.freeinternals.format.pe.PeFile;
 
 /**
@@ -26,7 +27,7 @@ public String[] getExtensions() {
     }
 
     @Override
-    public Class getFileFormatClass() {
+    public Class<? extends FileFormat> getFileFormatClass() {
         return PeFile.class;
     }
 

diff --git a/FormatPNG/src/main/java/org/freeinternals/biv/plugin/png/PluginDescriptorPNG.java b/FormatPNG/src/main/java/org/freeinternals/biv/plugin/png/PluginDescriptorPNG.java
@@ -8,6 +8,7 @@
 package org.freeinternals.biv.plugin.png;
 
 import org.freeinternals.biv.plugin.PluginDescriptor;
+import org.freeinternals.commonlib.core.FileFormat;
 import org.freeinternals.format.png.PNGFile;
 
 /**
@@ -27,7 +28,7 @@ public String[] getExtensions() {
     }
 
     @Override
-    public Class getFileFormatClass() {
+    public Class<? extends FileFormat> getFileFormatClass() {
         return PNGFile.class;
     }
 

diff --git a/FormatZIP/src/main/java/org/freeinternals/biv/plugin/zip/PluginDescriptorZIP.java b/FormatZIP/src/main/java/org/freeinternals/biv/plugin/zip/PluginDescriptorZIP.java
@@ -8,6 +8,7 @@
 package org.freeinternals.biv.plugin.zip;
 
 import org.freeinternals.biv.plugin.PluginDescriptor;
+import org.freeinternals.commonlib.core.FileFormat;
 import org.freeinternals.format.zip.ZIPFile;
 
 /**
@@ -16,15 +17,18 @@
  */
 public class PluginDescriptorZIP implements PluginDescriptor{
 
+    @Override
     public String getExtensionDescription() {
         return "ZIP file (*.zip)";
     }
 
+    @Override
     public String[] getExtensions() {
         return new String[]{"zip"};
     }
 
-    public Class getFileFormatClass() {
+    @Override
+    public Class<? extends FileFormat> getFileFormatClass() {
         return ZIPFile.class;
     }