[vlma-devel] commit: Typos. (Adrien Grand )

git version control git at videolan.org
Sat Apr 26 19:13:46 CEST 2008


vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Sat Apr 26 19:15:03 2008 +0200| [6db7be00ce34c180a4852dd88212e3ca68adaa16]

Typos.

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=6db7be00ce34c180a4852dd88212e3ca68adaa16
---

 README                                             |    6 +++---
 .../java/org/videolan/vlma/common/IVlData.java     |    2 +-
 .../videolan/vlma/daemon/VlServerMonitoring.java   |   18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README b/README
index 99ec515..3105eee 100644
--- a/README
+++ b/README
@@ -58,9 +58,9 @@ In your workspace, click right on vlma-core directory, then on "Run As" and
 first on "Maven Clean" and secondly on "Maven Install". This should compile
 the core and install it into your local Maven repository.
 
-Compile and launch the deamon :
-Do the same as for the core for the vlma-deamon directory. "Maven Install"
-function will this time also run the deamon.
+Compile and launch the daemon :
+Do the same as for the core for the vlma-daemon directory. "Maven Install"
+function will this time also run the daemon.
 
 Compile and launch the web aplication :
 Do again the same with the "vlma-web" directory.
diff --git a/core/src/main/java/org/videolan/vlma/common/IVlData.java b/core/src/main/java/org/videolan/vlma/common/IVlData.java
index 7c5669b..43b3fab 100644
--- a/core/src/main/java/org/videolan/vlma/common/IVlData.java
+++ b/core/src/main/java/org/videolan/vlma/common/IVlData.java
@@ -388,7 +388,7 @@ public interface IVlData {
     /**
      * Gets the VlOrderGiver of the deomon.
      * 
-     * @return the VlOrderGiver of the deamon
+     * @return the VlOrderGiver of the daemon
      */
     public IVlOrderGiver getOrderGiver();
 
diff --git a/daemon/src/main/java/org/videolan/vlma/daemon/VlServerMonitoring.java b/daemon/src/main/java/org/videolan/vlma/daemon/VlServerMonitoring.java
index 9f67204..0cc7884 100644
--- a/daemon/src/main/java/org/videolan/vlma/daemon/VlServerMonitoring.java
+++ b/daemon/src/main/java/org/videolan/vlma/daemon/VlServerMonitoring.java
@@ -50,7 +50,7 @@ public class VlServerMonitoring {
 
     private Thread updateSNMPDataThread;
 
-    private Thread serverMonitorDeamonThread;
+    private Thread serverMonitorDaemonThread;
 
     public boolean isCheckingVLC() {
         return (checkVLCThread != null) && (checkVLCThread.isAlive());
@@ -61,9 +61,9 @@ public class VlServerMonitoring {
                 && (updateSNMPDataThread.isAlive());
     }
 
-    public boolean isDeamonMonitoring() {
-        return (serverMonitorDeamonThread != null)
-                && (serverMonitorDeamonThread.isAlive());
+    public boolean isDaemonMonitoring() {
+        return (serverMonitorDaemonThread != null)
+                && (serverMonitorDaemonThread.isAlive());
     }
 
     /**
@@ -123,7 +123,7 @@ public class VlServerMonitoring {
      * This thread is the main thread which starts the VLC checker and the SNMP
      * data updater once before waiting and then looping.
      */
-    Runnable serverMonitorDeamon = new Runnable() {
+    Runnable serverMonitorDaemon = new Runnable() {
         public void run() {
             while (true) {
                 logger.log(Level.DEBUG, "Test");
@@ -140,10 +140,10 @@ public class VlServerMonitoring {
 
 
     public synchronized void startServerMonitoringDaemon() {
-        if (!isDeamonMonitoring()) {
-            serverMonitorDeamonThread = new Thread(serverMonitorDeamon);
-            serverMonitorDeamonThread.setName("serverMonitorThread");
-            serverMonitorDeamonThread.start();
+        if (!isDaemonMonitoring()) {
+            serverMonitorDaemonThread = new Thread(serverMonitorDaemon);
+            serverMonitorDaemonThread.setName("serverMonitorThread");
+            serverMonitorDaemonThread.start();
         }
     }
 



More information about the vlma-devel mailing list