typos

22 files changed, 148 insertions, 148 deletions

diff --git a/sources/core/VSAbstractProcess.java b/sources/core/VSAbstractProcess.java
index c66e238..2587a1b 100644
--- a/sources/core/VSAbstractProcess.java
+++ b/sources/core/VSAbstractProcess.java
@@ -72,8 +72,8 @@ public abstract class VSAbstractProcess extends VSSerializablePrefs
     /** A temp. color. For internal usage. */
     protected Color tmpColor;
 
-    /** The logging object. */
-    protected VSLogging logging;
+    /** The loging object. */
+    protected VSLogging loging;
 
     /** The simulator's default prefs. */
     protected VSPrefs prefs;
@@ -197,12 +197,12 @@ public abstract class VSAbstractProcess extends VSSerializablePrefs
      * @param prefs the simulator's default prefs
      * @param processNum the process num
      * @param simulatorVisualization the simulator canvas
-     * @param logging the logging object
+     * @param loging the loging object
      */
     public VSAbstractProcess(VSPrefs prefs, int processNum,
                              VSSimulatorVisualization simulatorVisualization,
-                             VSLogging logging) {
-        init(prefs, processNum, simulatorVisualization, logging);
+                             VSLogging loging) {
+        init(prefs, processNum, simulatorVisualization, loging);
     }
 
     /**
@@ -211,10 +211,10 @@ public abstract class VSAbstractProcess extends VSSerializablePrefs
      * @param prefs the simulator's default prefs
      * @param processNum the process num
      * @param simulatorVisualization the simulator canvas
-     * @param logging the logging object
+     * @param loging the loging object
      */
     protected void init(VSPrefs prefs, int processNum,
-                        VSSimulatorVisualization simulatorVisualization, VSLogging logging) {
+                        VSSimulatorVisualization simulatorVisualization, VSLogging loging) {
         /* May be not null if called from deserialization */
         if (this.protocolsToReset == null)
             this.protocolsToReset = new ArrayList<VSAbstractProtocol>();
@@ -222,7 +222,7 @@ public abstract class VSAbstractProcess extends VSSerializablePrefs
         this.processNum = processNum;
         this.prefs = prefs;
         this.simulatorVisualization = simulatorVisualization;
-        this.logging = logging;
+        this.loging = loging;
 
         processID = simulatorVisualization.processIDCount();
         random = new VSRandom(processID*processNum+processID+processNum);
@@ -578,12 +578,12 @@ public abstract class VSAbstractProcess extends VSSerializablePrefs
     }
 
     /**
-     * Logg a message to the logging area.
+     * Logg a message to the loging area.
      *
-     * @param message the message to logg
+     * @param message the message to log
      */
-    public void logg(String message) {
-        logging.logg(toString() + "; " + message, globalTime);
+    public void log(String message) {
+        loging.log(toString() + "; " + message, globalTime);
     }
 
     /* (non-Javadoc)
diff --git a/sources/core/VSInternalProcess.java b/sources/core/VSInternalProcess.java
index 1da5f20..e672c13 100644
--- a/sources/core/VSInternalProcess.java
+++ b/sources/core/VSInternalProcess.java
@@ -49,12 +49,12 @@ public class VSInternalProcess extends VSAbstractProcess {
      * @param prefs the simulator's default prefs
      * @param processNum the process num
      * @param simulatorVisualization the simulator canvas
-     * @param logging the logging object
+     * @param loging the loging object
      */
     public VSInternalProcess(VSPrefs prefs, int processNum,
                              VSSimulatorVisualization simulatorVisualization,
-                             VSLogging logging) {
-        super(prefs, processNum, simulatorVisualization, logging);
+                             VSLogging loging) {
+        super(prefs, processNum, simulatorVisualization, loging);
     }
 
     /**
@@ -340,7 +340,7 @@ public class VSInternalProcess extends VSAbstractProcess {
         buffer.append(prefs.getString("lang.message.sent"));
         buffer.append("; ");
         buffer.append(message.toStringFull());
-        logg(buffer.toString());
+        log(buffer.toString());
         simulatorVisualization.sendMessage(message);
     }
 
diff --git a/sources/core/VSMessage.java b/sources/core/VSMessage.java
index 63ff57d..8703b6f 100644
--- a/sources/core/VSMessage.java
+++ b/sources/core/VSMessage.java
@@ -71,7 +71,7 @@ public class VSMessage extends VSPrefs {
      */
     private long lamportTime;
 
-    /** Each message has its own unique ID. The ID will show up in the logging
+    /** Each message has its own unique ID. The ID will show up in the loging
      * window of the simulator
      */
     private long messageID;
diff --git a/sources/core/VSTask.java b/sources/core/VSTask.java
index 3a16593..6fc56d7 100644
--- a/sources/core/VSTask.java
+++ b/sources/core/VSTask.java
@@ -349,10 +349,10 @@ public class VSTask implements Comparable, VSSerializable {
     /**
      * Logg a message.
      *
-     * @param message the message to logg
+     * @param message the message to log
      */
-    private void logg(String message) {
-        process.logg(message);
+    private void log(String message) {
+        process.log(message);
     }
 
     /* (non-Javadoc)
diff --git a/sources/events/VSAbstractEvent.java b/sources/events/VSAbstractEvent.java
index 444b12f..a944457 100644
--- a/sources/events/VSAbstractEvent.java
+++ b/sources/events/VSAbstractEvent.java
@@ -174,10 +174,10 @@ abstract public class VSAbstractEvent extends VSSerializablePrefs {
     /**
      * Logg a specific message.
      *
-     * @param message the logging message
+     * @param message the loging message
      */
-    public void logg(String message) {
-        process.logg(/*toString() + "; " + */message);
+    public void log(String message) {
+        process.log(/*toString() + "; " + */message);
     }
 
     /**
diff --git a/sources/events/implementations/VSProcessCrashEvent.java b/sources/events/implementations/VSProcessCrashEvent.java
index e5c99f5..ed92827 100644
--- a/sources/events/implementations/VSProcessCrashEvent.java
+++ b/sources/events/implementations/VSProcessCrashEvent.java
@@ -54,7 +54,7 @@ public class VSProcessCrashEvent extends VSAbstractEvent
     public void onStart() {
         if (!process.isCrashed()) {
             process.isCrashed(true);
-            logg(prefs.getString("lang.crashed"));
+            log(prefs.getString("lang.crashed"));
         }
     }
 }
diff --git a/sources/events/implementations/VSProcessRecoverEvent.java b/sources/events/implementations/VSProcessRecoverEvent.java
index 600fcf7..d8408af 100644
--- a/sources/events/implementations/VSProcessRecoverEvent.java
+++ b/sources/events/implementations/VSProcessRecoverEvent.java
@@ -55,7 +55,7 @@ public class VSProcessRecoverEvent extends VSAbstractEvent
     public void onStart() {
         if (process.isCrashed()) {
             process.isCrashed(false);
-            logg(prefs.getString("lang.recovered"));
+            log(prefs.getString("lang.recovered"));
         }
     }
 }
diff --git a/sources/events/internal/VSMessageReceiveEvent.java b/sources/events/internal/VSMessageReceiveEvent.java
index 825e500..6bedc76 100644
--- a/sources/events/internal/VSMessageReceiveEvent.java
+++ b/sources/events/internal/VSMessageReceiveEvent.java
@@ -84,7 +84,7 @@ public class VSMessageReceiveEvent extends VSAbstractInternalEvent
         buffer.append(prefs.getString("lang.message.recv"));
         buffer.append("; ");
         buffer.append(message);;
-        logg(buffer.toString());
+        log(buffer.toString());
 
         if (protocolObj != null)
             ((VSAbstractProtocol) protocolObj).onMessageRecvStart(message);
diff --git a/sources/events/internal/VSProtocolEvent.java b/sources/events/internal/VSProtocolEvent.java
index b33ad89..c2a603f 100644
--- a/sources/events/internal/VSProtocolEvent.java
+++ b/sources/events/internal/VSProtocolEvent.java
@@ -147,7 +147,7 @@ public class VSProtocolEvent extends VSAbstractInternalEvent
                       ? prefs.getString("lang.activated")
                       : prefs.getString("lang.deactivated"));
 
-        logg(buffer.toString());
+        log(buffer.toString());
     }
 
     /* (non-Javadoc)
diff --git a/sources/prefs/VSDefaultPrefs.java b/sources/prefs/VSDefaultPrefs.java
index 2a6b586..2cc7e39 100644
--- a/sources/prefs/VSDefaultPrefs.java
+++ b/sources/prefs/VSDefaultPrefs.java
@@ -101,8 +101,8 @@ public class VSDefaultPrefs extends VSSerializablePrefs {
         initString("lang.events.process", "Prozessereignisse");
         initString("lang.file", "Datei");
         initString("lang.filter", "Filter");
-        initString("lang.logging.active", "Logging");
-        initString("lang.logging.clear", "Loggs löschen");
+        initString("lang.loging.active", "Logging");
+        initString("lang.loging.clear", "Loggs löschen");
         initString("lang.message", "Nachricht");
         initString("lang.message.recv", "Nachricht erhalten");
         initString("lang.message.sent", "Nachricht versendet");
@@ -217,7 +217,7 @@ public class VSDefaultPrefs extends VSSerializablePrefs {
 
         initInteger("div.window.prefs.xsize", 400, "Einstellungsfenster X-Achse", 550, 3200, "px");
         initInteger("div.window.prefs.ysize", 400, "Einstellungsfenster Y-Achse", 640, 2400, "px");
-        initInteger("div.window.loggsize", 300, "Loggfenster Y-Achse", 100, 1000, "px");
+        initInteger("div.window.logsize", 300, "Loggfenster Y-Achse", 100, 1000, "px");
         initInteger("div.window.splitsize", 320, "Toolbar X-Achse", 100, 1000, "px");
         initInteger("div.window.xsize", 1024, "Hauptfenster X-Achse", 750, 3200, "px");
         initInteger("div.window.ysize", 768, "Hauptfenster Y-Achse", 600, 2400, "px");
diff --git a/sources/protocols/implementations/VSBasicMulticastProtocol.java b/sources/protocols/implementations/VSBasicMulticastProtocol.java
index 35bb319..76b13b5 100644
--- a/sources/protocols/implementations/VSBasicMulticastProtocol.java
+++ b/sources/protocols/implementations/VSBasicMulticastProtocol.java
@@ -94,7 +94,7 @@ public class VSBasicMulticastProtocol extends VSAbstractProtocol {
      */
     public void onServerRecv(VSMessage recvMessage) {
         if (recvMessage.getBoolean("isMulticast"))
-            logg("Multicast erhalten");
+            log("Multicast erhalten");
     }
 
     /* (non-Javadoc)
diff --git a/sources/protocols/implementations/VSBerkelyTimeProtocol.java b/sources/protocols/implementations/VSBerkelyTimeProtocol.java
index 382a470..1b8b6fc 100644
--- a/sources/protocols/implementations/VSBerkelyTimeProtocol.java
+++ b/sources/protocols/implementations/VSBerkelyTimeProtocol.java
@@ -208,7 +208,7 @@ public class VSBerkelyTimeProtocol extends VSAbstractProtocol {
             long timeDiff = recvMessage.getLong("timeDiff");
             long recvTime = process.getTime();
             long newTime = process.getTime() + timeDiff;
-            logg("Neue Zeit: " + newTime);
+            log("Neue Zeit: " + newTime);
 
             process.setTime(newTime);
         }
diff --git a/sources/protocols/implementations/VSDummyProtocol.java b/sources/protocols/implementations/VSDummyProtocol.java
index 86b461d..b06e256 100644
--- a/sources/protocols/implementations/VSDummyProtocol.java
+++ b/sources/protocols/implementations/VSDummyProtocol.java
@@ -54,14 +54,14 @@ public class VSDummyProtocol extends VSAbstractProtocol {
      * @see protocols.VSAbstractProtocol#onClientReset()
      */
     public void onClientReset() {
-        logg("onClientReset()");
+        log("onClientReset()");
     }
 
     /* (non-Javadoc)
      * @see protocols.VSAbstractProtocol#onClientStart()
      */
     public void onClientStart() {
-        logg("onClientStart()");
+        log("onClientStart()");
 
         VSMessage message = new VSMessage();
         message.setString("Greeting", "Hello World!");
@@ -75,7 +75,7 @@ public class VSDummyProtocol extends VSAbstractProtocol {
      * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage)
      */
     public void onClientRecv(VSMessage recvMessage) {
-        logg("onClientRecv("+recvMessage+")");
+        log("onClientRecv("+recvMessage+")");
 
         String s = recvMessage.getString("Greeting");
         int n = recvMessage.getInteger("A number");
@@ -99,14 +99,14 @@ public class VSDummyProtocol extends VSAbstractProtocol {
      * @see protocols.VSAbstractProtocol#onServerReset()
      */
     public void onServerReset() {
-        logg("onClientReset()");
+        log("onClientReset()");
     }
 
     /* (non-Javadoc)
      * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage)
      */
     public void onServerRecv(VSMessage recvMessage) {
-        logg("onServerRecv("+recvMessage+")");
+        log("onServerRecv("+recvMessage+")");
     }
 
     /* (non-Javadoc)
diff --git a/sources/protocols/implementations/VSExternalTimeSyncProtocol.java b/sources/protocols/implementations/VSExternalTimeSyncProtocol.java
index d8b792f..0e73ac3 100644
--- a/sources/protocols/implementations/VSExternalTimeSyncProtocol.java
+++ b/sources/protocols/implementations/VSExternalTimeSyncProtocol.java
@@ -92,7 +92,7 @@ public class VSExternalTimeSyncProtocol extends VSAbstractProtocol {
         long serverTime = recvMessage.getLong("time");
         long newTime = serverTime + (long) (roundTripTime / 2);
 
-        logg("Server Zeit: " + serverTime + "; RTT: " + roundTripTime +
+        log("Server Zeit: " + serverTime + "; RTT: " + roundTripTime +
              "; Alte Zeit: " + recvTime + "; Neue Zeit: " + newTime +
              "; Offset: " + (newTime - recvTime));
         process.setTime(newTime);
diff --git a/sources/protocols/implementations/VSInternalTimeSyncProtocol.java b/sources/protocols/implementations/VSInternalTimeSyncProtocol.java
index 21eda4a..6f82203 100644
--- a/sources/protocols/implementations/VSInternalTimeSyncProtocol.java
+++ b/sources/protocols/implementations/VSInternalTimeSyncProtocol.java
@@ -92,7 +92,7 @@ public class VSInternalTimeSyncProtocol extends VSAbstractProtocol {
         long serverTime = recvMessage.getLong("time");
         long newTime = serverTime + (long) ((tMax + tMin) / 2 );
 
-        logg("Server Zeit: " + serverTime + "; (t_min,t_max): (" + tMin +
+        log("Server Zeit: " + serverTime + "; (t_min,t_max): (" + tMin +
              "," + tMax + "); Alte Zeit: " + process.getTime() +
              "; Neue Zeit: " + newTime + "; Offset: " +
              (process.getTime() - newTime));
diff --git a/sources/protocols/implementations/VSOnePhaseCommitProtocol.java b/sources/protocols/implementations/VSOnePhaseCommitProtocol.java
index 51ac9c7..aa1f6ed 100644
--- a/sources/protocols/implementations/VSOnePhaseCommitProtocol.java
+++ b/sources/protocols/implementations/VSOnePhaseCommitProtocol.java
@@ -107,10 +107,10 @@ public class VSOnePhaseCommitProtocol extends VSAbstractProtocol {
             else
                 return;
 
-            logg("ACK von Prozess " + pid + " erhalten!");
+            log("ACK von Prozess " + pid + " erhalten!");
 
             if (pids.size() == 0) {
-                logg("ACKs von allen beteiligten Prozessen erhalten! " +
+                log("ACKs von allen beteiligten Prozessen erhalten! " +
                      "Festgeschrieben!");
 
                 /* Remove the active schedule which has been created in the
@@ -156,7 +156,7 @@ public class VSOnePhaseCommitProtocol extends VSAbstractProtocol {
         message.setInteger("pid", process.getProcessID());
         sendMessage(message);
         ackSent = true;
-        logg("Festgeschrieben");
+        log("Festgeschrieben");
     }
 
     /* (non-Javadoc)
diff --git a/sources/protocols/implementations/VSPingPongProtocol.java b/sources/protocols/implementations/VSPingPongProtocol.java
index 288e836..f82d991 100644
--- a/sources/protocols/implementations/VSPingPongProtocol.java
+++ b/sources/protocols/implementations/VSPingPongProtocol.java
@@ -79,7 +79,7 @@ public class VSPingPongProtocol extends VSAbstractProtocol {
         if (!recvMessage.getBoolean("fromServer"))
             return;
 
-        logg("message: " + recvMessage.getInteger("counter"));
+        log("message: " + recvMessage.getInteger("counter"));
 
         VSMessage message = new VSMessage();
         message.setBoolean("fromClient", true);
@@ -113,7 +113,7 @@ public class VSPingPongProtocol extends VSAbstractProtocol {
         if (!recvMessage.getBoolean("fromClient"))
             return;
 
-        logg("message: " + recvMessage.getInteger("counter"));
+        log("message: " + recvMessage.getInteger("counter"));
 
         VSMessage message = new VSMessage();
         message.setBoolean("fromServer", true);
diff --git a/sources/protocols/implementations/VSReliableMulticastProtocol.java b/sources/protocols/implementations/VSReliableMulticastProtocol.java
index 06e5c7b..9cfb04c 100644
--- a/sources/protocols/implementations/VSReliableMulticastProtocol.java
+++ b/sources/protocols/implementations/VSReliableMulticastProtocol.java
@@ -104,10 +104,10 @@ public class VSReliableMulticastProtocol extends VSAbstractProtocol {
             else
                 return;
 
-            logg("ACK von Prozess " + pid + " erhalten!");
+            log("ACK von Prozess " + pid + " erhalten!");
 
             if (pids.size() == 0) {
-                logg("ACKs von allen beteiligten Prozessen " +
+                log("ACKs von allen beteiligten Prozessen " +
                      "erhalten!");
 
                 /* Remove the active schedule which has been created in the
@@ -151,10 +151,10 @@ public class VSReliableMulticastProtocol extends VSAbstractProtocol {
             sendMessage(message);
 
             if (ackSent) {
-                logg("ACK erneut versendet");
+                log("ACK erneut versendet");
 
             } else {
-                logg("ACK versendet");
+                log("ACK versendet");
                 ackSent = true;
             }
         }
diff --git a/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java b/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java
index d4f1190..b783b53 100644
--- a/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java
+++ b/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java
@@ -128,14 +128,14 @@ public class VSTwoPhaseCommitProtocol extends VSAbstractProtocol {
                 return;
 
             boolean vote = recvMessage.getBoolean("vote");
-            logg("Abstimmung von Prozess " + pid +
+            log("Abstimmung von Prozess " + pid +
                  " erhalten! Ergebnis: " + vote);
 
             if (!vote)
                 voteResult = false;
 
             if (votePids.size() == 0) {
-                logg("Abstimmungen von allen beteiligten Prozessen " +
+                log("Abstimmungen von allen beteiligten Prozessen " +
                      "erhalten! Globales Ergebnis: " + voteResult);
 
                 /* Remove the active schedule which has been created in the
@@ -156,7 +156,7 @@ public class VSTwoPhaseCommitProtocol extends VSAbstractProtocol {
                 /* Remove the active schedule which has been created in the
                    onServerStart method */
                 removeSchedules();
-                logg("Alle Teilnehmer haben die Abstimmung erhalten");
+                log("Alle Teilnehmer haben die Abstimmung erhalten");
             }
         }
     }
@@ -202,11 +202,11 @@ public class VSTwoPhaseCommitProtocol extends VSAbstractProtocol {
             message.setInteger("pid", process.getProcessID());
             sendMessage(message);
 
-            logg("Abstimmung " + myVote + " versendet");
+            log("Abstimmung " + myVote + " versendet");
 
         } else if (recvMessage.getBoolean("isVoteResult")) {
             boolean voteResult = recvMessage.getBoolean("voteResult");
-            logg("Globales Abstimmungsergebnis erhalten. Ergebnis: " +
+            log("Globales Abstimmungsergebnis erhalten. Ergebnis: " +
                  voteResult);
 
             VSMessage message = new VSMessage();
diff --git a/sources/simulator/VSLogging.java b/sources/simulator/VSLogging.java
index e867c6b..2eb9ae7 100644
--- a/sources/simulator/VSLogging.java
+++ b/sources/simulator/VSLogging.java
@@ -30,8 +30,8 @@ import javax.swing.*;
 import utils.*;
 
 /**
- * The class VSLogging, an object of this class is responsible for the logging
- * of text messages into the simulator's logging window.
+ * The class VSLogging, an object of this class is responsible for the loging
+ * of text messages into the simulator's loging window.
  *
  * @author Paul C. Buetow
  */
@@ -39,27 +39,27 @@ public class VSLogging {
     /** The serial version uid */
     private static final long serialVersionUID = 1L;
 
-    /** The logging area. */
-    private JTextArea loggingArea;
+    /** The loging area. */
+    private JTextArea logingArea;
 
     /** The filter text. */
     private String filterText;
 
-    /** The pause lines. Used for cacheing the logging if the logging is
+    /** The pause lines. Used for cacheing the loging if the loging is
      * deactivated for a while
      */
     private ArrayList<StringBuffer> pauseLines;
 
-    /** The logging lines. */
-    private ArrayList<StringBuffer> loggingLines;
+    /** The loging lines. */
+    private ArrayList<StringBuffer> logingLines;
 
     /** The simulator canvas. */
     private VSSimulatorVisualization simulatorVisualization;
 
-    /** The logging messages are filtered. */
+    /** The loging messages are filtered. */
     private boolean isFiltered;
 
-    /** The logging is paused. */
+    /** The loging is paused. */
     private boolean isPaused;
 
     /** The filter pattern. */
@@ -69,11 +69,11 @@ public class VSLogging {
      * Instantiates a new VSLogging object.
      */
     public VSLogging() {
-        loggingArea = new JTextArea(0, 0);
-        loggingArea.setEditable(false);
-        loggingArea.setLineWrap(true);
-        loggingArea.setWrapStyleWord(true);
-        loggingLines = new ArrayList<StringBuffer>();
+        logingArea = new JTextArea(0, 0);
+        logingArea.setEditable(false);
+        logingArea.setLineWrap(true);
+        logingArea.setWrapStyleWord(true);
+        logingLines = new ArrayList<StringBuffer>();
         pauseLines = new ArrayList<StringBuffer>();
         filterText = "";
     }
@@ -88,12 +88,12 @@ public class VSLogging {
     }
 
     /**
-     * Gets the logging area.
+     * Gets the loging area.
      *
-     * @return the logging area
+     * @return the loging area
      */
     public JTextArea getLoggingArea() {
-        return loggingArea;
+        return logingArea;
     }
 
     /**
@@ -101,11 +101,11 @@ public class VSLogging {
      *
      * @param message the message
      */
-    public void logg(String message) {
+    public void log(String message) {
         if (simulatorVisualization == null)
-            logg(message, 0);
+            log(message, 0);
         else
-            logg(message, simulatorVisualization.getTime());
+            log(message, simulatorVisualization.getTime());
     }
 
     /**
@@ -114,7 +114,7 @@ public class VSLogging {
      * @param message the message
      * @param time the time
      */
-    public synchronized void logg(String message, long time) {
+    public synchronized void log(String message, long time) {
         StringBuffer buffer = new StringBuffer();
         buffer.append(VSTools.getTimeString(time));
         buffer.append(": ");
@@ -123,49 +123,49 @@ public class VSLogging {
         if (isPaused)
             pauseLines.add(buffer);
         else
-            loggFiltered(buffer);
+            logFiltered(buffer);
     }
 
     /**
-     * Sets if the logging is paused.
+     * Sets if the loging is paused.
      *
-     * @param isPaused true, if the logging is paused
+     * @param isPaused true, if the loging is paused
      */
     public synchronized void isPaused(boolean isPaused) {
         this.isPaused = isPaused;
 
         if (!isPaused) {
             for (StringBuffer buffer : pauseLines)
-                loggFiltered(buffer);
+                logFiltered(buffer);
 
             pauseLines.clear();
         }
     }
 
     /**
-     * If the logging is filtered, it's using the pattern matching.
+     * If the loging is filtered, it's using the pattern matching.
      *
-     * @param buffer the logging buffer to filter
+     * @param buffer the loging buffer to filter
      */
-    private void loggFiltered(StringBuffer buffer) {
-        loggingLines.add(buffer);
+    private void logFiltered(StringBuffer buffer) {
+        logingLines.add(buffer);
         if (!isFiltered) {
-            loggingArea.append(buffer.toString()+"\n");
-            loggingArea.setCaretPosition(
-                loggingArea.getDocument().getLength());
+            logingArea.append(buffer.toString()+"\n");
+            logingArea.setCaretPosition(
+                logingArea.getDocument().getLength());
 
         } else if (filterPattern != null &&
                    filterPattern.matcher(buffer).find()) {
-            loggingArea.append(buffer.toString()+"\n");
-            loggingArea.setCaretPosition(
-                loggingArea.getDocument().getLength());
+            logingArea.append(buffer.toString()+"\n");
+            logingArea.setCaretPosition(
+                logingArea.getDocument().getLength());
         }
     }
 
     /**
-     * Checks if the logging is filtered.
+     * Checks if the loging is filtered.
      *
-     * @param isFiltered true, if the logging is filtered
+     * @param isFiltered true, if the loging is filtered
      */
     public synchronized void isFiltered(boolean isFiltered) {
         this.isFiltered = isFiltered;
@@ -187,23 +187,23 @@ public class VSLogging {
     }
 
     /**
-     * Clears the logging.
+     * Clears the loging.
      */
     public synchronized void clear() {
-        loggingLines.clear();
+        logingLines.clear();
         pauseLines.clear();
-        loggingArea.setText("");
+        logingArea.setText("");
     }
 
     /**
-     * Filters the logging.
+     * Filters the loging.
      */
     private void filter() {
         try {
             filterPattern = Pattern.compile(filterText);
             StringBuffer buffer = new StringBuffer();
 
-            for (StringBuffer line : loggingLines) {
+            for (StringBuffer line : logingLines) {
                 if (isFiltered) {
                     Matcher matcher = filterPattern.matcher(line);
                     if (matcher.find()) {
@@ -215,11 +215,11 @@ public class VSLogging {
                     buffer.append("\n");
                 }
             }
-            loggingArea.setText(buffer.toString());
+            logingArea.setText(buffer.toString());
 
         } catch (Exception e) {
             filterPattern = null;
-            loggingArea.setText("");
+            logingArea.setText("");
         }
     }
 }
diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java
index 51236f4..d1603ff 100644
--- a/sources/simulator/VSSimulator.java
+++ b/sources/simulator/VSSimulator.java
@@ -87,8 +87,8 @@ public class VSSimulator extends JPanel implements VSSerializable {
     /** The local panel. */
     private JPanel localPanel;
 
-    /** The logging panel. */
-    private JPanel loggingPanel;
+    /** The loging panel. */
+    private JPanel logingPanel;
 
     /** The tools panel. */
     private JPanel toolsPanel;
@@ -105,8 +105,8 @@ public class VSSimulator extends JPanel implements VSSerializable {
     /** The tabbed pane. */
     private JTabbedPane tabbedPane;
 
-    /** The logging area. */
-    private JTextArea loggingArea;
+    /** The loging area. */
+    private JTextArea logingArea;
 
     /** The filter text field. */
     private JTextField filterTextField;
@@ -120,8 +120,8 @@ public class VSSimulator extends JPanel implements VSSerializable {
     /** The thread. */
     private Thread thread;
 
-    /** The logging. */
-    private VSLogging logging;
+    /** The loging. */
+    private VSLogging loging;
 
     /** The menu item states. */
     private VSMenuItemStates menuItemStates;
@@ -612,10 +612,10 @@ public class VSSimulator extends JPanel implements VSSerializable {
         this.globalTextFields = new ArrayList<String>();
 
         /* Not null if init has been called from the deserialization */
-        if (this.logging == null)
-            this.logging = new VSLogging();
+        if (this.loging == null)
+            this.loging = new VSLogging();
 
-        logging.logg(prefs.getString("lang.simulator.new"));
+        loging.log(prefs.getString("lang.simulator.new"));
 
         fillContentPane();
         updateFromPrefs();
@@ -625,7 +625,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
 
         splitPaneV.setDividerLocation(
             prefs.getInteger("div.window.ysize")
-            - prefs.getInteger("div.window.loggsize"));
+            - prefs.getInteger("div.window.logsize"));
 
         splitPane1.setDividerLocation((int) (getPaintSize()/2) - 20);
 
@@ -647,17 +647,17 @@ public class VSSimulator extends JPanel implements VSSerializable {
      * Fills the content pane.
      */
     private void fillContentPane() {
-        loggingArea = logging.getLoggingArea();
+        logingArea = loging.getLoggingArea();
 
         splitPaneH = new JSplitPane();
         splitPaneV = new JSplitPane();
 
         /* Not null if init has been called from the deserialization */
         if (this.simulatorVisualization == null)
-            simulatorVisualization = new VSSimulatorVisualization(prefs, this, logging);
+            simulatorVisualization = new VSSimulatorVisualization(prefs, this, loging);
 
         taskManager = simulatorVisualization.getTaskManager();
-        logging.setSimulatorCanvas(simulatorVisualization);
+        loging.setSimulatorCanvas(simulatorVisualization);
 
         JPanel canvasPanel = new JPanel();
         canvasPanel.setLayout(new GridLayout(1, 1, 3, 3));
@@ -665,10 +665,10 @@ public class VSSimulator extends JPanel implements VSSerializable {
         canvasPanel.setMinimumSize(new Dimension(0, 0));
         canvasPanel.setMaximumSize(new Dimension(0, 0));
 
-        loggingPanel = new JPanel(new BorderLayout());
-        loggingPanel.add(new JScrollPane(loggingArea), BorderLayout.CENTER);
-        loggingPanel.add(createToolsPanel(), BorderLayout.SOUTH);
-        loggingPanel.setPreferredSize(new Dimension(200, 1));
+        logingPanel = new JPanel(new BorderLayout());
+        logingPanel.add(new JScrollPane(logingArea), BorderLayout.CENTER);
+        logingPanel.add(createToolsPanel(), BorderLayout.SOUTH);
+        logingPanel.setPreferredSize(new Dimension(200, 1));
 
         splitPaneH.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
         splitPaneH.setLeftComponent(createProcessPanel());
@@ -678,7 +678,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
 
         splitPaneV.setOrientation(JSplitPane.VERTICAL_SPLIT);
         splitPaneV.setTopComponent(splitPaneH);
-        splitPaneV.setBottomComponent(loggingPanel);
+        splitPaneV.setBottomComponent(logingPanel);
         splitPaneV.setContinuousLayout(true);
 
         this.add(splitPaneV);
@@ -758,18 +758,18 @@ public class VSSimulator extends JPanel implements VSSerializable {
             toolsPanel.add(antiAliasing);
         }
 
-        JCheckBox loggingActiveCheckBox = new JCheckBox(
-            prefs.getString("lang.logging.active"));
-        loggingActiveCheckBox.setSelected(true);
-        loggingActiveCheckBox.addChangeListener(new ChangeListener() {
+        JCheckBox logingActiveCheckBox = new JCheckBox(
+            prefs.getString("lang.loging.active"));
+        logingActiveCheckBox.setSelected(true);
+        logingActiveCheckBox.addChangeListener(new ChangeListener() {
             public void stateChanged(ChangeEvent ce) {
                 AbstractButton abstractButton =
                     (AbstractButton) ce.getSource();
                 ButtonModel buttonModel = abstractButton.getModel();
-                logging.isPaused(!buttonModel.isSelected());
+                loging.isPaused(!buttonModel.isSelected());
             }
         });
-        toolsPanel.add(loggingActiveCheckBox);
+        toolsPanel.add(logingActiveCheckBox);
 
         if (expertMode) {
             filterActiveCheckBox = new JCheckBox(
@@ -780,9 +780,9 @@ public class VSSimulator extends JPanel implements VSSerializable {
                     AbstractButton abstractButton =
                         (AbstractButton) ce.getSource();
                     ButtonModel buttonModel = abstractButton.getModel();
-                    logging.isFiltered(buttonModel.isSelected());
+                    loging.isFiltered(buttonModel.isSelected());
                     if (buttonModel.isSelected())
-                        logging.setFilterText(filterTextField.getText());
+                        loging.setFilterText(filterTextField.getText());
                 }
             });
             toolsPanel.add(filterActiveCheckBox);
@@ -791,25 +791,25 @@ public class VSSimulator extends JPanel implements VSSerializable {
             filterTextField.getDocument().addDocumentListener(
             new DocumentListener() {
                 public void insertUpdate(DocumentEvent de) {
-                    logging.setFilterText(filterTextField.getText());
+                    loging.setFilterText(filterTextField.getText());
                 }
                 public void removeUpdate(DocumentEvent de) {
-                    logging.setFilterText(filterTextField.getText());
+                    loging.setFilterText(filterTextField.getText());
                 }
                 public void changedUpdate(DocumentEvent de) {
-                    logging.setFilterText(filterTextField.getText());
+                    loging.setFilterText(filterTextField.getText());
                 }
             });
             toolsPanel.add(filterTextField);
 
             JButton clearButton = new JButton(
-                prefs.getString("lang.logging.clear"));
+                prefs.getString("lang.loging.clear"));
             clearButton.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent ae) {
                     String command = ae.getActionCommand();
                     if (command.equals(
-                    prefs.getString("lang.logging.clear"))) {
-                        logging.clear();
+                    prefs.getString("lang.loging.clear"))) {
+                        loging.clear();
                     }
                 }
             });
@@ -1468,8 +1468,8 @@ public class VSSimulator extends JPanel implements VSSerializable {
         }
 
         /* Update the tools panel */
-        loggingPanel.remove(1);
-        loggingPanel.add(createToolsPanel(), BorderLayout.SOUTH);
+        logingPanel.remove(1);
+        logingPanel.add(createToolsPanel(), BorderLayout.SOUTH);
         updateUI();
     }
 
@@ -1522,7 +1522,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
             System.out.println("Deserializing: VSSimulator");
 
         serialize.setObject("simulator", this);
-        serialize.setObject("logging", logging);
+        serialize.setObject("loging", loging);
 
         /** For later backwards compatibility, to add more stuff */
         objectInputStream.readObject();
diff --git a/sources/simulator/VSSimulatorVisualization.java b/sources/simulator/VSSimulatorVisualization.java
index b1f7e45..aa92c00 100644
--- a/sources/simulator/VSSimulatorVisualization.java
+++ b/sources/simulator/VSSimulatorVisualization.java
@@ -64,8 +64,8 @@ public class VSSimulatorVisualization extends Canvas
     /** The prefs. */
     private VSPrefs prefs;
 
-    /** The logging. */
-    private VSLogging logging;
+    /** The loging. */
+    private VSLogging loging;
 
     /** The num processes. */
     private volatile int numProcesses;
@@ -472,11 +472,11 @@ public class VSSimulatorVisualization extends Canvas
      *
      * @param prefs the prefs
      * @param simulator the simulator
-     * @param logging the logging
+     * @param loging the loging
      */
     public VSSimulatorVisualization(VSPrefs prefs, VSSimulator simulator,
-                             VSLogging logging) {
-        init(prefs, simulator, logging);
+                             VSLogging loging) {
+        init(prefs, simulator, loging);
     }
 
     /**
@@ -484,13 +484,13 @@ public class VSSimulatorVisualization extends Canvas
      *
      * @param prefs the prefs
      * @param simulator the simulator
-     * @param logging the logging
+     * @param loging the loging
      */
     private void init(VSPrefs prefs, VSSimulator simulator,
-                      VSLogging logging) {
+                      VSLogging loging) {
         this.prefs = prefs;
         this.simulator = simulator;
-        this.logging = logging;
+        this.loging = loging;
         this.messageLines = new LinkedList<VSMessageLine>();
         this.messageLinesToRemove = new LinkedList<VSMessageLine>();
 
@@ -1300,7 +1300,7 @@ public class VSSimulatorVisualization extends Canvas
      * Starts/plays the simulator.
      */
     public void play() {
-        logging.logg(prefs.getString("lang.simulator.started"));
+        loging.log(prefs.getString("lang.simulator.started"));
         final long currentTime = System.currentTimeMillis();
 
         synchronized (processes) {
@@ -1338,7 +1338,7 @@ public class VSSimulatorVisualization extends Canvas
 
         simulator.finish();
         hasFinished = true;
-        logging.logg(prefs.getString("lang.simulator.finished"));
+        loging.log(prefs.getString("lang.simulator.finished"));
         paint();
 
         if (prefs.getBoolean("sim.periodic")) {
@@ -1359,7 +1359,7 @@ public class VSSimulatorVisualization extends Canvas
         }
 
         pauseTime = System.currentTimeMillis();
-        logging.logg(prefs.getString("lang.simulator.paused"));
+        loging.log(prefs.getString("lang.simulator.paused"));
         paint();
     }
 
@@ -1368,7 +1368,7 @@ public class VSSimulatorVisualization extends Canvas
      */
     public void reset() {
         if (!isResetted) {
-            logging.logg(prefs.getString("lang.simulator.resetted"));
+            loging.log(prefs.getString("lang.simulator.resetted"));
 
             isResetted = true;
             isPaused = false;
@@ -1402,7 +1402,7 @@ public class VSSimulatorVisualization extends Canvas
             }
 
             paint();
-            logging.clear();
+            loging.clear();
         }
     }
 
@@ -1677,8 +1677,8 @@ public class VSSimulatorVisualization extends Canvas
      */
     private VSInternalProcess createProcess(int processNum) {
         VSInternalProcess process =
-            new VSInternalProcess(prefs, processNum, this, logging);
-        logging.logg(prefs.getString("lang.process.new") + "; " + process);
+            new VSInternalProcess(prefs, processNum, this, loging);
+        loging.log(prefs.getString("lang.process.new") + "; " + process);
         return process;
     }
 
@@ -1799,7 +1799,7 @@ public class VSSimulatorVisualization extends Canvas
         processCounter = ((Integer) objectInputStream.readObject()).intValue();
 
         int num = ((Integer) objectInputStream.readObject()).intValue();
-        logging.clear();
+        loging.clear();
 
         if (num > numProcesses) {
             for (int i = numProcesses; i < num; ++i)