[libbluray-devel] [cleanup][java] The static field Foo.bar should be accessed in a static way.

ace20022 git at videolan.org
Fri Nov 28 09:39:16 CET 2014


libbluray | branch: master | ace20022 <ace20022 at ymail.com> | Thu Nov 27 15:42:23 2014 +0100| [676effb59d467dabe80786a5aa7a3003ce883814] | committer: hpi1

[cleanup][java] The static field Foo.bar should be accessed in a static way.

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=676effb59d467dabe80786a5aa7a3003ce883814
---

 src/libbluray/bdj/java/java/io/BDFileSystem.java                 |    2 +-
 src/libbluray/bdj/java/java/io/FileInputStream.java              |    4 ++--
 src/libbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java |    2 +-
 src/libbluray/bdj/java/org/videolan/BDJSocketFactory.java        |    4 ++--
 src/libbluray/bdj/java/org/videolan/BDJSockets.java              |    4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libbluray/bdj/java/java/io/BDFileSystem.java b/src/libbluray/bdj/java/java/io/BDFileSystem.java
index 64c2f69..7716ff2 100644
--- a/src/libbluray/bdj/java/java/io/BDFileSystem.java
+++ b/src/libbluray/bdj/java/java/io/BDFileSystem.java
@@ -157,7 +157,7 @@ public abstract class BDFileSystem extends FileSystem {
         /* try to locate file in Xlet home directory */
         String home = BDJXletContext.getCurrentXletHome();
         if (home == null) {
-            logger.error("no home found for " + f.getPath() + " at " + logger.dumpStack());
+            logger.error("no home found for " + f.getPath() + " at " + Logger.dumpStack());
             return 0;
         }
 
diff --git a/src/libbluray/bdj/java/java/io/FileInputStream.java b/src/libbluray/bdj/java/java/io/FileInputStream.java
index 1e2252d..bd86acf 100644
--- a/src/libbluray/bdj/java/java/io/FileInputStream.java
+++ b/src/libbluray/bdj/java/java/io/FileInputStream.java
@@ -69,7 +69,7 @@ public class FileInputStream extends InputStream
                 if (logger == null) {
                     logger = Logger.getLogger(FileInputStream.class.getName());
                 }
-                logger.error("no home found for " + name + " at " + logger.dumpStack());
+                logger.error("no home found for " + name + " at " + Logger.dumpStack());
                 throw new FileNotFoundException(name);
             }
             open(home + name);
@@ -192,7 +192,7 @@ public class FileInputStream extends InputStream
 
     protected void finalize() throws IOException {
         if (fd != null) {
-            if (fd != fd.in) {
+            if (fd != FileDescriptor.in) {
                 close(false);
             }
         }
diff --git a/src/libbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java b/src/libbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java
index 12f3008..1c3bfd5 100644
--- a/src/libbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java
+++ b/src/libbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java
@@ -60,7 +60,7 @@ public abstract class FrameAccurateAnimation extends Component {
         if (context != null) {
             context.addFAA(this);
         } else {
-            logger.error("FrameAccurateAnimation created from wrong thread: " + logger.dumpStack());
+            logger.error("FrameAccurateAnimation created from wrong thread: " + Logger.dumpStack());
         }
 
         this.params = new AnimationParameters(params);
diff --git a/src/libbluray/bdj/java/org/videolan/BDJSocketFactory.java b/src/libbluray/bdj/java/org/videolan/BDJSocketFactory.java
index 876a9d9..43f9ab8 100644
--- a/src/libbluray/bdj/java/org/videolan/BDJSocketFactory.java
+++ b/src/libbluray/bdj/java/org/videolan/BDJSocketFactory.java
@@ -50,7 +50,7 @@ class BDJSocketFactory implements SocketImplFactory {
             constructor.setAccessible(true);
             return (SocketImpl) constructor.newInstance(new Object[0]);
         } catch (Exception e) {
-            logger.error("Failed to create socket: " + e + " at " + logger.dumpStack());
+            logger.error("Failed to create socket: " + e + " at " + Logger.dumpStack());
             throw new RuntimeException(e);
         }
     }
@@ -68,7 +68,7 @@ class BDJSocketFactory implements SocketImplFactory {
             logger.info("Xlet " + ctx + " created new socket");
             ctx.addSocket(socket);
         } else {
-            logger.error("New socket created outside of Xlet context: " + logger.dumpStack());
+            logger.error("New socket created outside of Xlet context: " + Logger.dumpStack());
         }
         return socket;
     }
diff --git a/src/libbluray/bdj/java/org/videolan/BDJSockets.java b/src/libbluray/bdj/java/org/videolan/BDJSockets.java
index 0395399..44673fc 100644
--- a/src/libbluray/bdj/java/org/videolan/BDJSockets.java
+++ b/src/libbluray/bdj/java/org/videolan/BDJSockets.java
@@ -38,7 +38,7 @@ class BDJSockets {
         }
 
         if (closed) {
-            logger.error("Terminated Xlet tried to create socket at " + logger.dumpStack());
+            logger.error("Terminated Xlet tried to create socket at " + Logger.dumpStack());
             throw new Error("Terminated Xlet can not create sockets");
         }
 
@@ -77,7 +77,7 @@ class BDJSockets {
             getSocket.setAccessible(true);
             return (Socket) getSocket.invoke(socketImpl, new Object[0]);
         } catch (Exception e) {
-            logger.error("Failed to get Socket: " + e + " at " + logger.dumpStack());
+            logger.error("Failed to get Socket: " + e + " at " + Logger.dumpStack());
             return null;
         }
     }



More information about the libbluray-devel mailing list