on the good way making english language support working

5 files changed, 44 insertions, 8 deletions

diff --git a/sources/events/VSAbstractEvent.java b/sources/events/VSAbstractEvent.java
index a9399eb..ac9a61f 100644
--- a/sources/events/VSAbstractEvent.java
+++ b/sources/events/VSAbstractEvent.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2008 Paul C. Buetow, vs@dev.buetow.org
+ * VS-Simulator (http://vs-sim.buetow.org)
+ * Copyright (c) 2008 - 2009 by Dipl.-Inform. (FH) Paul C. Buetow
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -30,7 +31,6 @@ import core.VSInternalProcess;
 import exceptions.*;
 import prefs.*;
 import serialize.*;
-//import utils.*;
 
 /**
  * The class VSAbstractEvent. This abstract class defines the basic framework
@@ -202,6 +202,15 @@ abstract public class VSAbstractEvent extends VSSerializablePrefs {
      */
     abstract public void onStart();
 
+    /**
+     * Every event has to be able to set its own shortname
+     *
+     * @param shortName The saved short name. May be overwritten due wrong lang
+     *
+     * @return The event's shortname
+     */
+    abstract protected String createShortname(String savedShortname);
+
     /* (non-Javadoc)
      * @see serialize.VSSerializable#serialize(serialize.VSSerialize,
      *	java.io.ObjectOutputStream)
@@ -242,8 +251,9 @@ abstract public class VSAbstractEvent extends VSSerializablePrefs {
         objectInputStream.readObject();
 
         int id = ((Integer) objectInputStream.readObject()).intValue();
-        this.eventShortname = (String) objectInputStream.readObject();
+        String savedEventShortname = (String) objectInputStream.readObject();
         this.eventClassname = (String) objectInputStream.readObject();
+	this.eventShortname = createShortname(savedEventShortname);
 
         if (VSSerialize.DEBUG)
             System.out.println(eventClassname);
diff --git a/sources/events/implementations/VSProcessCrashEvent.java b/sources/events/implementations/VSProcessCrashEvent.java
index 1493b8c..382906b 100644
--- a/sources/events/implementations/VSProcessCrashEvent.java
+++ b/sources/events/implementations/VSProcessCrashEvent.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2008 Paul C. Buetow, vs@dev.buetow.org
+ * VS-Simulator (http://vs-sim.buetow.org)
+ * Copyright (c) 2008 - 2009 by Dipl.-Inform. (FH) Paul C. Buetow
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,6 +25,7 @@
 package events.implementations;
 
 import events.*;
+import simulator.*;
 
 /**
  * The class VSProcessCrashEvent. This event makes a process to crash.
@@ -49,6 +51,13 @@ public class VSProcessCrashEvent extends VSAbstractEvent
     }
 
     /* (non-Javadoc)
+     * @see events.VSAbstractEvent#createShortname()()
+     */
+    protected String createShortname(String savedShortname) {
+	return VSMain.prefs.getString("lang.en.process.crash");
+    }
+
+    /* (non-Javadoc)
      * @see events.VSAbstractEvent#onStart()
      */
     public void onStart() {
diff --git a/sources/events/implementations/VSProcessRecoverEvent.java b/sources/events/implementations/VSProcessRecoverEvent.java
index 0143bbb..e7c87db 100644
--- a/sources/events/implementations/VSProcessRecoverEvent.java
+++ b/sources/events/implementations/VSProcessRecoverEvent.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2008 Paul C. Buetow, vs@dev.buetow.org
+ * VS-Simulator (http://vs-sim.buetow.org)
+ * Copyright (c) 2008 - 2009 by Dipl.-Inform. (FH) Paul C. Buetow
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,6 +25,7 @@
 package events.implementations;
 
 import events.*;
+import simulator.*;
 
 /**
  * The class VSProcessRecoverEvent. This event makes a process to recover if
@@ -50,6 +52,13 @@ public class VSProcessRecoverEvent extends VSAbstractEvent
     }
 
     /* (non-Javadoc)
+     * @see events.VSAbstractEvent#createShortname()()
+     */
+    protected String createShortname(String savedShortname) {
+	return VSMain.prefs.getString("lang.en.process.recover");
+    }
+
+    /* (non-Javadoc)
      * @see events.VSAbstractEvent#onStart()
      */
     public void onStart() {
diff --git a/sources/events/internal/VSAbstractInternalEvent.java b/sources/events/internal/VSAbstractInternalEvent.java
index 5921945..ae0e2b8 100644
--- a/sources/events/internal/VSAbstractInternalEvent.java
+++ b/sources/events/internal/VSAbstractInternalEvent.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2008 Paul C. Buetow, vs@dev.buetow.org
+ * VS-Simulator (http://vs-sim.buetow.org)
+ * Copyright (c) 2008 - 2009 by Dipl.-Inform. (FH) Paul C. Buetow
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -39,6 +40,13 @@ abstract public class VSAbstractInternalEvent extends VSAbstractEvent {
     private static final long serialVersionUID = 1L;
 
     /* (non-Javadoc)
+     * @see events.VSAbstractEvent#createShortname()()
+     */
+    protected String createShortname(String savedShortname) {
+	return savedShortname;
+    }
+
+    /* (non-Javadoc)
      * @see serialize.VSSerializable#serialize(serialize.VSSerialize,
      *	java.io.ObjectOutputStream)
      */
diff --git a/sources/events/internal/VSProtocolEvent.java b/sources/events/internal/VSProtocolEvent.java
index b4a01ce..92af81e 100644
--- a/sources/events/internal/VSProtocolEvent.java
+++ b/sources/events/internal/VSProtocolEvent.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2008 Paul C. Buetow, vs@dev.buetow.org
+ * VS-Simulator (http://vs-sim.buetow.org)
+ * Copyright (c) 2008 - 2009 by Dipl.-Inform. (FH) Paul C. Buetow
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,7 +30,6 @@ import core.VSInternalProcess;
 import events.*;
 import protocols.VSAbstractProtocol;
 import serialize.VSSerialize;
-//import simulator.VSSimulatorVisualization;
 
 /**
  * The class VSProtocolEvent, this event is used if a protocol (server or