summaryrefslogtreecommitdiff
path: root/sources/prefs
diff options
context:
space:
mode:
Diffstat (limited to 'sources/prefs')
-rw-r--r--sources/prefs/VSDefaultPrefs.java262
-rw-r--r--sources/prefs/VSDefaultPrefsDE.java249
-rw-r--r--sources/prefs/VSPrefs.java46
-rw-r--r--sources/prefs/editors/VSAbstractEditor.java28
-rw-r--r--sources/prefs/editors/VSColorChooser.java2
-rw-r--r--sources/prefs/editors/VSEditorFrame.java8
-rw-r--r--sources/prefs/editors/VSEditorTable.java4
-rw-r--r--sources/prefs/editors/VSProcessEditor.java16
-rw-r--r--sources/prefs/editors/VSSimulatorEditor.java16
9 files changed, 184 insertions, 447 deletions
diff --git a/sources/prefs/VSDefaultPrefs.java b/sources/prefs/VSDefaultPrefs.java
index cfa579c..aa41143 100644
--- a/sources/prefs/VSDefaultPrefs.java
+++ b/sources/prefs/VSDefaultPrefs.java
@@ -45,139 +45,139 @@ public class VSDefaultPrefs extends VSSerializablePrefs {
* Fill with default strings.
*/
public void fillDefaultStrings() {
- initString("lang.en.about", "About");
- initString("lang.en.about.info", "This program used to be the diploma thesis of Paul C. Buetow. Please contact vs-sim@dev.buetow.org, if you find any errors!");
- initString("lang.en.activate", "activate");
- initString("lang.en.activated", "activated");
- initString("lang.en.actualize", "Activation");
- initString("lang.en.all", "All");
- initString("lang.en.antialiasing", "Anti-Aliasing");
- initString("lang.en.cancel", "Abort");
- initString("lang.en.client", "Client");
- initString("lang.en.clientrequest.start", "Start client request");
- initString("lang.en.close", "Close");
- initString("lang.en.colorchooser", "Color chooser");
- initString("lang.en.colorchooser2", "Please select color");
- initString("lang.en.copy", "Copy");
- initString("lang.en.crashed", "Crashed");
- initString("lang.en.dat", "Simulation (.dat)");
- initString("lang.en.deactivate", "deactivate");
- initString("lang.en.deactivated", "deactivated");
- initString("lang.en.default", "Defaults");
- initString("lang.en.edit", "Edit");
- initString("lang.en.editor", "Editor");
- initString("lang.en.event", "Event");
- initString("lang.en.event.add.global", "Insert global event");
- initString("lang.en.event.add.local", "Insert local event");
- initString("lang.en.event.add.time", "at");
- initString("lang.en.events", "Events");
- initString("lang.en.events.process", "Process events");
- initString("lang.en.file", "File");
- initString("lang.en.filter", "Filter");
- initString("lang.en.loging.active", "Logging");
- initString("lang.en.loging.clear", "Delete logs");
- initString("lang.en.message", "Message");
- initString("lang.en.message.recv", "Message received");
- initString("lang.en.message.sent", "Message sent");
- initString("lang.en.mode.expert", "Expert mode");
- initString("lang.en.name", "VS-Simulator 1.1");
- initString("lang.en.ok", "OK");
- initString("lang.en.open", "Open");
- initString("lang.en.pause", "Paus");
- initString("lang.en.prefs", "Preferences");
- initString("lang.en.prefs.color", "Color preferences");
- initString("lang.en.prefs.diverse", "Diverse preferences");
- initString("lang.en.prefs.ext", "Extended preferences");
- initString("lang.en.prefs.message", "Message preferences");
- initString("lang.en.prefs.message.defaults", "Message prefs. for new processes");
- initString("lang.en.prefs.more", "More preferences");
- initString("lang.en.prefs.process", "Process preferences");
- initString("lang.en.prefs.process", "Standard process preferences");
- initString("lang.en.prefs.process.defaults", "Preferences for new processes");
- initString("lang.en.prefs.process.ext", "Extended process preferences");
- initString("lang.en.prefs.protocols", "Protocol preferences");
- initString("lang.en.prefs.simulator", "Simulator preferences");
- initString("lang.en.process", "Process");
- initString("lang.en.process.add.new", "Insert new process");
- initString("lang.en.process.crash", "Crash process");
- initString("lang.en.process.edit", "Edit process");
- initString("lang.en.process.id", "PID");
- initString("lang.en.process.new", "New process");
- initString("lang.en.process.not.selected", "No process selected");
- initString("lang.en.process.recover", "Recover process");
- initString("lang.en.process.remove", "Remove process");
- initString("lang.en.process.selected", "Selected process");
- initString("lang.en.process.time.local", "Local time");
- initString("lang.en.processes.all", "All processes");
- initString("lang.en.protocol", "Protocol");
- initString("lang.en.protocol.client", "Client side");
- initString("lang.en.protocol.editor", "Protocol editor");
- initString("lang.en.protocol.server", "Server side");
- initString("lang.en.protocol.tasks.activation", "Client-/Server protocol activation");
- initString("lang.en.protocol.tasks.client", "Client Task-Manager (Client request)");
- initString("lang.en.protocols", "Protocols");
- initString("lang.en.quit", "Quit");
- initString("lang.en.recovered", "Recovered");
- initString("lang.en.remove", "Remove");
- initString("lang.en.replay", "Repeat");
- initString("lang.en.reset", "Reset");
- initString("lang.en.save", "Save");
- initString("lang.en.saveas", "Save as");
- initString("lang.en.server", "Server");
- initString("lang.en.serverrequest.start", "Start server request");
- initString("lang.en.simulator", "Simulator");
- initString("lang.en.simulator.close", "Close simulation");
- initString("lang.en.simulator.finished", "Simulation closed");
- initString("lang.en.simulator.new", "New simulation");
- initString("lang.en.simulator.paused", "Simulation paused");
- initString("lang.en.simulator.resetted", "Simulation resetted");
- initString("lang.en.simulator.started", "Simulation started");
- initString("lang.en.start", "Start");
- initString("lang.en.stop", "Stop");
- initString("lang.en.takeover", "Take over");
- initString("lang.en.task", "Task");
- initString("lang.en.task.manager", "Event editor");
- initString("lang.en.tasks.fullfilled", "Fullfilled tasks");
- initString("lang.en.tasks.global", "GLobal tasks");
- initString("lang.en.tasks.local", "Local tasks");
- initString("lang.en.time", "Time");
- initString("lang.en.time.lamport", "Lamport time");
- initString("lang.en.time.vector", "Vector time");
- initString("lang.en.timed.global", "Global events");
- initString("lang.en.timed.local", "Local events");
- initString("lang.en.type", "Type");
- initString("lang.en.value", "Value");
- initString("lang.en.variable", "Variable");
- initString("lang.en.variables", "Variables");
- initString("lang.en.variables.global", "Global variables");
- initString("lang.en.window.close", "Close window");
- initString("lang.en.window.new", "New window");
+ initString("lang.about", "About");
+ initString("lang.about.info", "This program used to be the diploma thesis of Paul C. Buetow. Please contact vs-sim@dev.buetow.org, if you find any errors!");
+ initString("lang.activate", "activate");
+ initString("lang.activated", "activated");
+ initString("lang.actualize", "Activation");
+ initString("lang.all", "All");
+ initString("lang.antialiasing", "Anti-Aliasing");
+ initString("lang.cancel", "Abort");
+ initString("lang.client", "Client");
+ initString("lang.clientrequest.start", "Start client request");
+ initString("lang.close", "Close");
+ initString("lang.colorchooser", "Color chooser");
+ initString("lang.colorchooser2", "Please select color");
+ initString("lang.copy", "Copy");
+ initString("lang.crashed", "Crashed");
+ initString("lang.dat", "Simulation (.dat)");
+ initString("langactivate", "deactivate");
+ initString("langactivated", "deactivated");
+ initString("lang.default", "Defaults");
+ initString("lang.edit", "Edit");
+ initString("lang.editor", "Editor");
+ initString("lang.event", "Event");
+ initString("lang.event.add.global", "Insert global event");
+ initString("lang.event.add.local", "Insert local event");
+ initString("lang.event.add.time", "at");
+ initString("lang.events", "Events");
+ initString("lang.events.process", "Process events");
+ initString("lang.file", "File");
+ initString("lang.filter", "Filter");
+ initString("lang.loging.active", "Logging");
+ initString("lang.loging.clear", "Delete logs");
+ initString("lang.message", "Message");
+ initString("lang.message.recv", "Message received");
+ initString("lang.message.sent", "Message sent");
+ initString("lang.mode.expert", "Expert mode");
+ initString("lang.name", "VS-Simulator 1.1");
+ initString("lang.ok", "OK");
+ initString("lang.open", "Open");
+ initString("lang.pause", "Pause");
+ initString("lang.prefs", "Preferences");
+ initString("lang.prefs.color", "Color preferences");
+ initString("lang.prefs.diverse", "Diverse preferences");
+ initString("lang.prefs.ext", "Extended preferences");
+ initString("lang.prefs.message", "Message preferences");
+ initString("lang.prefs.message.defaults", "Message prefs. for new processes");
+ initString("lang.prefs.more", "More preferences");
+ initString("lang.prefs.process", "Process preferences");
+ initString("lang.prefs.process", "Standard process preferences");
+ initString("lang.prefs.process.defaults", "Preferences for new processes");
+ initString("lang.prefs.process.ext", "Extended process preferences");
+ initString("lang.prefs.protocols", "Protocol preferences");
+ initString("lang.prefs.simulator", "Simulator preferences");
+ initString("lang.process", "Process");
+ initString("lang.process.add.new", "Insert new process");
+ initString("lang.process.crash", "Crash process");
+ initString("lang.process.edit", "Edit process");
+ initString("lang.process.id", "PID");
+ initString("lang.process.new", "New process");
+ initString("lang.process.not.selected", "No process selected");
+ initString("lang.process.recover", "Recover process");
+ initString("lang.process.remove", "Remove process");
+ initString("lang.process.selected", "Selected process");
+ initString("lang.process.time.local", "Local time");
+ initString("lang.processes.all", "All processes");
+ initString("lang.protocol", "Protocol");
+ initString("lang.protocol.client", "Client side");
+ initString("lang.protocol.editor", "Protocol editor");
+ initString("lang.protocol.server", "Server side");
+ initString("lang.protocol.tasks.activation", "Client-/Server protocol activation");
+ initString("lang.protocol.tasks.client", "Client Task-Manager (Client request)");
+ initString("lang.protocols", "Protocols");
+ initString("lang.quit", "Quit");
+ initString("lang.recovered", "Recovered");
+ initString("lang.remove", "Remove");
+ initString("lang.replay", "Repeat");
+ initString("lang.reset", "Reset");
+ initString("lang.save", "Save");
+ initString("lang.saveas", "Save as");
+ initString("lang.server", "Server");
+ initString("lang.serverrequest.start", "Start server request");
+ initString("lang.simulator", "Simulator");
+ initString("lang.simulator.close", "Close simulation");
+ initString("lang.simulator.finished", "Simulation closed");
+ initString("lang.simulator.new", "New simulation");
+ initString("lang.simulator.paused", "Simulation paused");
+ initString("lang.simulator.resetted", "Simulation resetted");
+ initString("lang.simulator.started", "Simulation started");
+ initString("lang.start", "Start");
+ initString("lang.stop", "Stop");
+ initString("lang.takeover", "Take over");
+ initString("lang.task", "Task");
+ initString("lang.task.manager", "Event editor");
+ initString("lang.tasks.fullfilled", "Fullfilled tasks");
+ initString("lang.tasks.global", "GLobal tasks");
+ initString("lang.tasks.local", "Local tasks");
+ initString("lang.time", "Time");
+ initString("lang.time.lamport", "Lamport time");
+ initString("lang.time.vector", "Vector time");
+ initString("lang.timed.global", "Global events");
+ initString("lang.timed.local", "Local events");
+ initString("lang.type", "Type");
+ initString("lang.value", "Value");
+ initString("lang.variable", "Variable");
+ initString("lang.variables", "Variables");
+ initString("lang.variables.global", "Global variables");
+ initString("lang.window.close", "Close window");
+ initString("lang.window.new", "New window");
/* Protocol names */
- initString("lang.en.events.implementations.VSProcessCrashEvent", "Process Crash Event");
- initString("lang.en.events.implementations.VSProcessCrashEvent.short", "Process Crash");
- initString("lang.en.events.implementations.VSProcessRecoverEvent", "Process Recover Event");
- initString("lang.en.events.implementations.VSProcessRecoverEvent.short", "Process Recover");
- initString("lang.en.protocols.implementations.VSBasicMulticastProtocol", "Basic Multicast Protocol");
- initString("lang.en.protocols.implementations.VSBasicMulticastProtocol.short", "Basic Multicast");
- initString("lang.en.protocols.implementations.VSBerkelyTimeProtocol", "Berkley algorithm for internal sync.");
- initString("lang.en.protocols.implementations.VSBerkelyTimeProtocol.short", "Berkley Protocol");
- initString("lang.en.protocols.implementations.VSBroadcastProtocol", "Broadcast Protocol");
- initString("lang.en.protocols.implementations.VSBroadcastProtocol.short", "Broadcast");
- initString("lang.en.protocols.implementations.VSDummyProtocol", "Example/Dummy Protocol");
- initString("lang.en.protocols.implementations.VSDummyProtocol.short", "Example/Dummy");
- initString("lang.en.protocols.implementations.VSExternalTimeSyncProtocol", "Christians method for external sync.");
- initString("lang.en.protocols.implementations.VSExternalTimeSyncProtocol.short", "Christians");
- initString("lang.en.protocols.implementations.VSInternalTimeSyncProtocol", "Internal Synchronization Protocol");
- initString("lang.en.protocols.implementations.VSInternalTimeSyncProtocol.short", "Internal sync.");
- initString("lang.en.protocols.implementations.VSOnePhaseCommitProtocol", "One-Phase Commit Protocol");
- initString("lang.en.protocols.implementations.VSOnePhaseCommitProtocol.short", "1-Phase Commit");
- initString("lang.en.protocols.implementations.VSPingPongProtocol", "Ping-Pong Protocol");
- initString("lang.en.protocols.implementations.VSPingPongProtocol.short", "Ping-Pong");
- initString("lang.en.protocols.implementations.VSReliableMulticastProtocol", "Reliable Multicast Protocol");
- initString("lang.en.protocols.implementations.VSReliableMulticastProtocol.short", "Reliable Multicast");
- initString("lang.en.protocols.implementations.VSTwoPhaseCommitProtocol", "Two-Phase Commit");
- initString("lang.en.protocols.implementations.VSTwoPhaseCommitProtocol.short", "2-Phase Commit");
+ initString("lang.events.implementations.VSProcessCrashEvent", "Process Crash Event");
+ initString("lang.events.implementations.VSProcessCrashEvent.short", "Process Crash");
+ initString("lang.events.implementations.VSProcessRecoverEvent", "Process Recover Event");
+ initString("lang.events.implementations.VSProcessRecoverEvent.short", "Process Recover");
+ initString("lang.protocols.implementations.VSBasicMulticastProtocol", "Basic Multicast Protocol");
+ initString("lang.protocols.implementations.VSBasicMulticastProtocol.short", "Basic Multicast");
+ initString("lang.protocols.implementations.VSBerkelyTimeProtocol", "Berkley algorithm for internal sync.");
+ initString("lang.protocols.implementations.VSBerkelyTimeProtocol.short", "Berkley Protocol");
+ initString("lang.protocols.implementations.VSBroadcastProtocol", "Broadcast Protocol");
+ initString("lang.protocols.implementations.VSBroadcastProtocol.short", "Broadcast");
+ initString("lang.protocols.implementations.VSDummyProtocol", "Example/Dummy Protocol");
+ initString("lang.protocols.implementations.VSDummyProtocol.short", "Example/Dummy");
+ initString("lang.protocols.implementations.VSExternalTimeSyncProtocol", "Christians method for external sync.");
+ initString("lang.protocols.implementations.VSExternalTimeSyncProtocol.short", "Christians");
+ initString("lang.protocols.implementations.VSInternalTimeSyncProtocol", "Internal Synchronization Protocol");
+ initString("lang.protocols.implementations.VSInternalTimeSyncProtocol.short", "Internal sync.");
+ initString("lang.protocols.implementations.VSOnePhaseCommitProtocol", "One-Phase Commit Protocol");
+ initString("lang.protocols.implementations.VSOnePhaseCommitProtocol.short", "1-Phase Commit");
+ initString("lang.protocols.implementations.VSPingPongProtocol", "Ping-Pong Protocol");
+ initString("lang.protocols.implementations.VSPingPongProtocol.short", "Ping-Pong");
+ initString("lang.protocols.implementations.VSReliableMulticastProtocol", "Reliable Multicast Protocol");
+ initString("lang.protocols.implementations.VSReliableMulticastProtocol.short", "Reliable Multicast");
+ initString("lang.protocols.implementations.VSTwoPhaseCommitProtocol", "Two-Phase Commit");
+ initString("lang.protocols.implementations.VSTwoPhaseCommitProtocol.short", "2-Phase Commit");
}
/**
diff --git a/sources/prefs/VSDefaultPrefsDE.java b/sources/prefs/VSDefaultPrefsDE.java
deleted file mode 100644
index fb2eacb..0000000
--- a/sources/prefs/VSDefaultPrefsDE.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package prefs;
-
-import java.awt.Color;
-import java.awt.event.KeyEvent;
-
-/**
- * The class VSDefaultPrefsDE, makes sure that the simulator has its default
- * configuration values.
- *
- * @author Paul C. Buetow
- */
-public class VSDefaultPrefsDE extends VSSerializablePrefs {
- /**
- * Inits a prefs object with default values.
- *
- * @return the lang.process.removeprefs
- */
- public static VSPrefs init() {
- VSDefaultPrefsDE prefs = new VSDefaultPrefsDE();
- prefs.fillWithDefaults();
- return prefs;
- }
-
- /**
- * Fill everything with ts defaults.
- */
- public void fillWithDefaults() {
- super.clear();
- addWithDefaults();
- }
-
- /**
- * Adds default values if not existent.
- */
- public void addWithDefaults() {
- fillDefaultBooleans();
- fillDefaultColors();
- fillDefaultFloats();
- fillDefaultIntegers();
- fillDefaultLongs();
- fillDefaultStrings();
- }
-
- /**
- * Fill with default strings.
- */
- public void fillDefaultStrings() {
- initString("lang.de.about", "About");
- initString("lang.de.about.info", "Dieses Programm wurde von Paul Bütow im Rahmen der Diplomarbeit \"Objektorientierte Entwicklung eines GUI-basierten Tools für die ereignisbasierte Simulator verteilter Systeme\" bei Prof. Dr.-Ing. Oßmann als 1. Prüfer sowie Betreuer und Prof. Dr. rer. nat. Fassbender als 2. Prüfer erstellt. Bei Fehlern bitte eine kurze Mail mit Fehlerbeschreibung an paul at buetow punkt org schicken!");
- initString("lang.de.activate", "aktivieren");
- initString("lang.de.activated", "aktiviert");
- initString("lang.de.actualize", "Aktualisieren");
- initString("lang.de.all", "Alle");
- initString("lang.de.antialiasing", "Anti-Aliasing");
- initString("lang.de.cancel", "Abbrechen");
- initString("lang.de.client", "Client");
- initString("lang.de.clientrequest.start", "Clientanfrage starten");
- initString("lang.de.close", "Schliessen");
- initString("lang.de.colorchooser", "Farbauswahl");
- initString("lang.de.colorchooser2", "Bitte Farbe auswählen");
- initString("lang.de.copy", "Kopieren");
- initString("lang.de.crashed", "Abgestürzt");
- initString("lang.de.dat", "Simulation (.dat)");
- initString("lang.de.deactivate", "deaktivieren");
- initString("lang.de.deactivated", "deaktiviert");
- initString("lang.de.default", "Defaults");
- initString("lang.de.edit", "Editieren");
- initString("lang.de.editor", "Editor");
- initString("lang.de.event", "Ereignis");
- initString("lang.de.event.add.global", "Globales Ereignis einfügen");
- initString("lang.de.event.add.local", "Lokales Ereignis einfügen");
- initString("lang.de.event.add.time", "bei");
- initString("lang.de.events", "Ereignisse");
- initString("lang.de.events.process", "Prozessereignisse");
- initString("lang.de.file", "Datei");
- initString("lang.de.filter", "Filter");
- initString("lang.de.loging.active", "Logging");
- initString("lang.de.loging.clear", "Loggs löschen");
- initString("lang.de.message", "Nachricht");
- initString("lang.de.message.recv", "Nachricht erhalten");
- initString("lang.de.message.sent", "Nachricht versendet");
- initString("lang.de.mode.expert", "Expertenmodus");
- initString("lang.de.name", "VS-Simulator 1.0");
- initString("lang.de.ok", "OK");
- initString("lang.de.open", "Öffnen");
- initString("lang.de.pause", "Pausieren");
- initString("lang.de.prefs", "Einstellungen");
- initString("lang.de.prefs.color", "Farbeinstellungen");
- initString("lang.de.prefs.diverse", "Diverse Einstellungen");
- initString("lang.de.prefs.ext", "Erweiterte Einstellungen");
- initString("lang.de.prefs.message", "Nachrichteneinstellungen");
- initString("lang.de.prefs.message.defaults", "Nachrichteneinstellungen für neue Prozesse");
- initString("lang.de.prefs.more", "Mehr Einstellungen");
- initString("lang.de.prefs.process", "Prozesseinstellungen");
- initString("lang.de.prefs.process", "Prozessstandardeinstellungen");
- initString("lang.de.prefs.process.defaults", "Einstellungen für neue Prozesse");
- initString("lang.de.prefs.process.ext", "Erweiterte Prozesseinstellungen");
- initString("lang.de.prefs.protocols", "Protokolleinstellungen");
- initString("lang.de.prefs.simulator", "Simulationseinstellungen");
- initString("lang.de.process", "Prozess");
- initString("lang.de.process.add.new", "Neuen Prozess hinzufügen");
- initString("lang.de.process.crash", "Prozess abstürzen");
- initString("lang.de.process.edit", "Prozess editieren");
- initString("lang.de.process.id", "PID");
- initString("lang.de.process.new", "Neuer Prozess");
- initString("lang.de.process.not.selected", "Kein Prozess ausgewählt");
- initString("lang.de.process.recover", "Prozess wiederbeleben");
- initString("lang.de.process.remove", "Prozess entfernen");
- initString("lang.de.process.selected", "Aktuell ausgewählter Prozess");
- initString("lang.de.process.time.local", "Lokale Zeit");
- initString("lang.de.processes.all", "Alle Prozesse");
- initString("lang.de.protocol", "Protokoll");
- initString("lang.de.protocol.client", "Clientseite");
- initString("lang.de.protocol.editor", "Protokolleditor");
- initString("lang.de.protocol.server", "Serverseite");
- initString("lang.de.protocol.tasks.activation", "Client-/Serverprotokoll Aktivierung");
- initString("lang.de.protocol.tasks.client", "Client Task-Manager (Clientanfragen)");
- initString("lang.de.protocols", "Protokolle");
- initString("lang.de.quit", "Beenden");
- initString("lang.de.recovered", "Wiederbelebt");
- initString("lang.de.remove", "Entfernen");
- initString("lang.de.replay", "Wiederholen");
- initString("lang.de.reset", "Reset");
- initString("lang.de.save", "Speichern");
- initString("lang.de.saveas", "Speichern unter");
- initString("lang.de.server", "Server");
- initString("lang.de.serverrequest.start", "Serveranfrage starten");
- initString("lang.de.simulator", "Simulator");
- initString("lang.de.simulator.close", "Simulation schliessen");
- initString("lang.de.simulator.finished", "Simulation beendet");
- initString("lang.de.simulator.new", "Neue Simulation");
- initString("lang.de.simulator.paused", "Simulation pausiert");
- initString("lang.de.simulator.resetted", "Simulation zurückgesetzt");
- initString("lang.de.simulator.started", "Simulation gestartet");
- initString("lang.de.start", "Starten");
- initString("lang.de.stop", "Stoppen");
- initString("lang.de.takeover", "Übernehmen");
- initString("lang.de.task", "Aufgabe");
- initString("lang.de.task.manager", "Ereigniseditor");
- initString("lang.de.tasks.fullfilled", "Abgelaufene Aufgaben");
- initString("lang.de.tasks.global", "Globale Aufgaben");
- initString("lang.de.tasks.local", "Lokale Aufgaben");
- initString("lang.de.time", "Zeit");
- initString("lang.de.time.lamport", "Lamportzeit");
- initString("lang.de.time.vector", "Vektorzeit");
- initString("lang.de.timed.global", "Globale Ereignisse");
- initString("lang.de.timed.local", "Lokale Ereignisse");
- initString("lang.de.type", "Typ");
- initString("lang.de.value", "Wert");
- initString("lang.de.variable", "Variable");
- initString("lang.de.variables", "Variablen");
- initString("lang.de.variables.global", "Globale Variablen");
- initString("lang.de.window.close", "Fenster schliessen");
- initString("lang.de.window.new", "Neues Fenster");
- }
-
- /**
- * Fill with default integers.
- */
- public void fillDefaultIntegers() {
- /* Simulator prefs */
- initInteger("sim.process.num", 3, "Anzahl der Prozesse", 1, 6);
- initInteger("message.prob.outage", 0, "Nachrichtenverlustw'keit", 0, 100, "%");
- initInteger("process.prob.crash", 0, "Prozessausfallw'keit", 0, 100, "%");
- initInteger("sim.seconds", 15, "Dauer der Simulation", 5, 120, "s");
-
- /* Internal prefs */
- initInteger("keyevent.about", KeyEvent.VK_A, null, 0, 100);
- initInteger("keyevent.cancel", KeyEvent.VK_A, null, 0, 100);
- initInteger("keyevent.close", KeyEvent.VK_C, null, 0, 100);
- initInteger("keyevent.default", KeyEvent.VK_F, null, 0, 100);
- initInteger("keyevent.edit", KeyEvent.VK_E, null, 0, 100);
- initInteger("keyevent.file", KeyEvent.VK_D, null, 0, 100);
- initInteger("keyevent.new", KeyEvent.VK_N, null, 0, 100);
- initInteger("keyevent.actualize", KeyEvent.VK_A, null, 0, 100);
- initInteger("keyevent.takeover", KeyEvent.VK_B, null, 0, 100);
- initInteger("keyevent.ok", KeyEvent.VK_O, null, 0, 100);
- initInteger("keyevent.open", KeyEvent.VK_O, null, 0, 100);
- initInteger("keyevent.pause", KeyEvent.VK_P, null, 0, 100);
- initInteger("keyevent.prefs", KeyEvent.VK_P, null, 0, 100);
- initInteger("keyevent.prefs.ext", KeyEvent.VK_E, null, 0, 100);
- initInteger("keyevent.quit", KeyEvent.VK_B, null, 0, 100);
- initInteger("keyevent.replay", KeyEvent.VK_W, null, 0, 100);
- initInteger("keyevent.reset", KeyEvent.VK_R, null, 0, 100);
- initInteger("keyevent.save", KeyEvent.VK_S, null, 0, 100);
- initInteger("keyevent.saveas", KeyEvent.VK_V, null, 0, 100);
- initInteger("keyevent.simulator", KeyEvent.VK_S, null, 0, 100);
- initInteger("keyevent.start", KeyEvent.VK_S, null, 0, 100);
- initInteger("keyevent.stop", KeyEvent.VK_P, null, 0, 100);
-
- 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.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");
- }
-
- /**
- * Fill with default floats.
- */
- public void fillDefaultFloats() {
- /* Simulator prefs */
- initFloat("process.clock.variance", 0, "Uhrabweichung");
- initFloat("sim.clock.speed", 0.5f, "Abspielgeschwindigkeit der Simulation");
- }
-
- /**
- * Fill default longs.
- */
- public void fillDefaultLongs() {
- /* Simulator prefs */
- initLong("message.sendingtime.min", 500, "Minimale Übertragungszeit", "ms");
- initLong("message.sendingtime.max", 2000, "Maximale Übertragungszeit", "ms");
- }
-
- /**
- * Fill with default colors.
- */
- public void fillDefaultColors() {
- /* Internal prefs */
- initColor("col.background", new Color(0xFF, 0xFF, 0xFF));
- initColor("col.process.default", new Color(0x00, 0x00, 0x00));
- initColor("col.process.running", new Color(0x0D, 0xD8, 0x09));
- initColor("col.process.crashed", new Color(0xff, 0x00, 0x00));
- initColor("col.process.highlight", new Color(0xff, 0xA5, 0x00));
- initColor("col.process.line", new Color(0x00, 0x00, 0x00));
- initColor("col.process.secondline", new Color(0xAA, 0xAA, 0xAA));
- initColor("col.process.sepline", new Color(0xff, 0x00, 0x00));
- initColor("col.process.stopped", new Color(0x00, 0x00, 0x00));
- initColor("col.message.arrived", new Color(0x00, 0x85, 0xD2));
- initColor("col.message.sending", new Color(0x0D, 0xD8, 0x09));
- initColor("col.message.lost", new Color(0xFF, 0x00, 0x00));
- }
-
- /**
- * Fill with default booleans.
- */
- public void fillDefaultBooleans() {
- initBoolean("sim.mode.expert", false, "Expertenmodus aktivieren");
- initBoolean("sim.message.own.recv", false, "Prozesse empfangen eigene Nachrichten");
- initBoolean("sim.message.prob.mean", true, "Mittelwerte der Nachrichtverlustw'k. bilden");
- initBoolean("sim.message.sendingtime.mean", true, "Mittelwerte der Übertragungszeiten bilden");
- initBoolean("sim.messages.relevant", true, "Nur relevante Nachrichten anzeigen");
- initBoolean("sim.periodic", false, "Simulation periodisch wiederholen");
- initBoolean("sim.update.lamporttime.all", false, "Lamportzeiten betreffen alle Ereignisse");
- initBoolean("sim.update.vectortime.all", false, "Vektorzeiten betreffen alle Ereignisse");
- }
-}
diff --git a/sources/prefs/VSPrefs.java b/sources/prefs/VSPrefs.java
index ea128df..9209e55 100644
--- a/sources/prefs/VSPrefs.java
+++ b/sources/prefs/VSPrefs.java
@@ -210,8 +210,7 @@ public class VSPrefs {
Object val = objectPrefs.get(key);
if (val == null) {
- System.err.println("Fatal: No such object config value \""
- + key + "\"");
+ System.err.println("Fatal: No such object config value \"" + key + "\"");
System.exit(1);
}
@@ -531,8 +530,7 @@ public class VSPrefs {
Integer val = integerPrefs.get(key);
if (val == null) {
- System.err.println("Fatal: No such integer config value \""
- + key + "\"");
+ System.err.println("Fatal: No such integer config value \"" + key + "\"");
System.exit(1);
}
@@ -665,8 +663,7 @@ public class VSPrefs {
Vector<Integer> val = vectorPrefs.get(key);
if (val == null) {
- System.err.println("Fatal: No such integer config value \""
- + key + "\"");
+ System.err.println("Fatal: No such integer config value \"" + key + "\"");
System.exit(1);
}
@@ -752,8 +749,7 @@ public class VSPrefs {
Long val = longPrefs.get(key);
if (val == null) {
- System.err.println("Fatal: No such long config value \""
- + key + "\"");
+ System.err.println("Fatal: No such long config value \"" + key + "\"");
System.exit(1);
}
@@ -848,8 +844,8 @@ public class VSPrefs {
String val = stringPrefs.get(key);
if (val == null) {
- System.err.println("Fatal: No such string config value \""
- + key + "\"");
+ // TODO: Redirect all string keys with prefix "lang" to static lang map.
+ System.err.println("Fatal: No such string config value \"" + key + "\"");
System.exit(1);
}
@@ -936,26 +932,16 @@ public class VSPrefs {
/** For later backwards compatibility, to add more stuff */
objectInputStream.readObject();
- booleanPrefs = (HashMap<String,Boolean>)
- objectInputStream.readObject();
- colorPrefs = (HashMap<String,Color>)
- objectInputStream.readObject();
- descriptionPrefs = (HashMap<String,String>)
- objectInputStream.readObject();
- floatPrefs = (HashMap<String,Float>)
- objectInputStream.readObject();
- integerPrefs = (HashMap<String,Integer>)
- objectInputStream.readObject();
- longPrefs = (HashMap<String,Long>)
- objectInputStream.readObject();
- stringPrefs = (HashMap<String,String>)
- objectInputStream.readObject();
- units = (HashMap<String,String>)
- objectInputStream.readObject();
- vectorPrefs = (HashMap<String,Vector<Integer>>)
- objectInputStream.readObject();
- restrictions = (HashMap<String,VSPrefsRestriction>)
- objectInputStream.readObject();
+ booleanPrefs = (HashMap<String,Boolean>) objectInputStream.readObject();
+ colorPrefs = (HashMap<String,Color>) objectInputStream.readObject();
+ descriptionPrefs = (HashMap<String,String>) objectInputStream.readObject();
+ floatPrefs = (HashMap<String,Float>) objectInputStream.readObject();
+ integerPrefs = (HashMap<String,Integer>) objectInputStream.readObject();
+ longPrefs = (HashMap<String,Long>) objectInputStream.readObject();
+ stringPrefs = (HashMap<String,String>) objectInputStream.readObject();
+ units = (HashMap<String,String>) objectInputStream.readObject();
+ vectorPrefs = (HashMap<String,Vector<Integer>>) objectInputStream.readObject();
+ restrictions = (HashMap<String,VSPrefsRestriction>) objectInputStream.readObject();
/** For later backwards compatibility, to add more stuff */
objectInputStream.readObject();
diff --git a/sources/prefs/editors/VSAbstractEditor.java b/sources/prefs/editors/VSAbstractEditor.java
index e849a50..266b62c 100644
--- a/sources/prefs/editors/VSAbstractEditor.java
+++ b/sources/prefs/editors/VSAbstractEditor.java
@@ -244,7 +244,7 @@ public abstract class VSAbstractEditor implements ActionListener {
boolean expertMode = prefs.getBoolean("sim.mode.expert");
for (String elem : set) {
- if (!elem.startsWith("lang.en.") && !elem.startsWith("keyevent.")) {
+ if (!elem.startsWith("lang.") && !elem.startsWith("keyevent.")) {
if (expertMode)
filtered.add(elem);
else if (!elem.startsWith("col.") && (!elem.startsWith("div.")))
@@ -266,7 +266,7 @@ public abstract class VSAbstractEditor implements ActionListener {
addToButtonPanelFront(buttonPanel);
JButton resetButton = new JButton(
- prefs.getString("lang.en.reset"));
+ prefs.getString("lang.reset"));
resetButton.setMnemonic(prefs.getInteger("keyevent.reset"));
resetButton.addActionListener(this);
buttonPanel.add(resetButton);
@@ -401,7 +401,7 @@ public abstract class VSAbstractEditor implements ActionListener {
*/
protected VS3Tupel<String,Component,JCheckBox> createBooleanComponent(
String fullKey, String key, VSPrefs prefsToEdit) {
- final String activated = prefs.getString("lang.en.activated");
+ final String activated = prefs.getString("lang.activated");
String descr = prefs.getDescription(fullKey);
if (descr == null)
descr = prefsToEdit.getDescription(fullKey);
@@ -499,9 +499,9 @@ public abstract class VSAbstractEditor implements ActionListener {
public void mouseClicked(MouseEvent e) {
JFrame parentFrame = getFrame();
JFrame frame = new VSFrame(
- prefs.getString("lang.en.name") + " - " +
+ prefs.getString("lang.name") + " - " +
prefs.getString(
- "lang.en.colorchooser"),parentFrame);
+ "lang.colorchooser"),parentFrame);
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
JComponent colorChooserPane = new VSColorChooser(prefs,
@@ -639,7 +639,7 @@ public abstract class VSAbstractEditor implements ActionListener {
if (key.startsWith("sim.")) {
if (!flag) {
flag = true;
- addSeparator(prefs.getString("lang.en.prefs.simulator"));
+ addSeparator(prefs.getString("lang.prefs.simulator"));
}
addVariable(labels.get(fullKey), components.get(fullKey),
prefsToEdit);
@@ -653,10 +653,10 @@ public abstract class VSAbstractEditor implements ActionListener {
if (!flag) {
flag = true;
if (this instanceof VSProcessEditor)
- addSeparator(prefs.getString("lang.en.prefs.process"));
+ addSeparator(prefs.getString("lang.prefs.process"));
else
addSeparator(prefs.getString(
- "lang.en.prefs.process.defaults"));
+ "lang.prefs.process.defaults"));
}
addVariable(labels.get(fullKey), components.get(fullKey),
prefsToEdit);
@@ -671,10 +671,10 @@ public abstract class VSAbstractEditor implements ActionListener {
flag = true;
if (this instanceof VSProcessEditor)
addSeparator(prefs.getString(
- "lang.en.prefs.message"));
+ "lang.prefs.message"));
else
addSeparator(prefs.getString(
- "lang.en.prefs.message.defaults"));
+ "lang.prefs.message.defaults"));
}
addVariable(labels.get(fullKey), components.get(fullKey),
prefsToEdit);
@@ -687,7 +687,7 @@ public abstract class VSAbstractEditor implements ActionListener {
if (key.startsWith("col.")) {
if (!flag) {
flag = true;
- addSeparator(prefs.getString("lang.en.prefs.color"));
+ addSeparator(prefs.getString("lang.prefs.color"));
}
addVariable(labels.get(fullKey), components.get(fullKey),
prefsToEdit);
@@ -700,7 +700,7 @@ public abstract class VSAbstractEditor implements ActionListener {
if (key.startsWith("div.")) {
if (!flag) {
flag = true;
- addSeparator(prefs.getString("lang.en.prefs.diverse"));
+ addSeparator(prefs.getString("lang.prefs.diverse"));
}
addVariable(labels.get(fullKey), components.get(fullKey),
prefsToEdit);
@@ -1019,10 +1019,10 @@ public abstract class VSAbstractEditor implements ActionListener {
public void actionPerformed(ActionEvent e) {
String actionCommand = e.getActionCommand();
- if (actionCommand.equals(prefs.getString("lang.en.takeover"))) {
+ if (actionCommand.equals(prefs.getString("lang.takeover"))) {
savePrefs();
- } else if (actionCommand.equals(prefs.getString("lang.en.reset"))) {
+ } else if (actionCommand.equals(prefs.getString("lang.reset"))) {
resetPrefs();
}
}
diff --git a/sources/prefs/editors/VSColorChooser.java b/sources/prefs/editors/VSColorChooser.java
index 4f53fb4..ac67ace 100644
--- a/sources/prefs/editors/VSColorChooser.java
+++ b/sources/prefs/editors/VSColorChooser.java
@@ -45,7 +45,7 @@ public class VSColorChooser extends JPanel implements ChangeListener {
colorChooser.setColor(color);
colorChooser.getSelectionModel().addChangeListener(this);
colorChooser.setBorder(BorderFactory.createTitledBorder(
- prefs.getString("lang.en.colorchooser2")));
+ prefs.getString("lang.colorchooser2")));
add(colorChooser, BorderLayout.CENTER);
}
diff --git a/sources/prefs/editors/VSEditorFrame.java b/sources/prefs/editors/VSEditorFrame.java
index 650a619..e418801 100644
--- a/sources/prefs/editors/VSEditorFrame.java
+++ b/sources/prefs/editors/VSEditorFrame.java
@@ -63,13 +63,13 @@ public class VSEditorFrame extends VSFrame implements ActionListener {
*/
private void fillButtonPanel(JPanel buttonPanel) {
JButton okButton = new JButton(
- prefs.getString("lang.en.ok"));
+ prefs.getString("lang.ok"));
okButton.setMnemonic(prefs.getInteger("keyevent.ok"));
okButton.addActionListener(this);
buttonPanel.add(okButton, 0);
JButton cancelButton = new JButton(
- prefs.getString("lang.en.cancel"));
+ prefs.getString("lang.cancel"));
cancelButton.setMnemonic(prefs.getInteger("keyevent.cancel"));
cancelButton.addActionListener(this);
buttonPanel.add(cancelButton, 1);
@@ -83,11 +83,11 @@ public class VSEditorFrame extends VSFrame implements ActionListener {
public void actionPerformed(ActionEvent e) {
String actionCommand = e.getActionCommand();
- if (actionCommand.equals(prefs.getString("lang.en.ok"))) {
+ if (actionCommand.equals(prefs.getString("lang.ok"))) {
editor.actionPerformed(e);
dispose();
- } else if (actionCommand.equals(prefs.getString("lang.en.cancel"))) {
+ } else if (actionCommand.equals(prefs.getString("lang.cancel"))) {
editor.actionPerformed(e);
dispose();
diff --git a/sources/prefs/editors/VSEditorTable.java b/sources/prefs/editors/VSEditorTable.java
index 30ae30c..7be0dbf 100644
--- a/sources/prefs/editors/VSEditorTable.java
+++ b/sources/prefs/editors/VSEditorTable.java
@@ -105,7 +105,7 @@ public class VSEditorTable extends JTable {
* The class VSEditorTableModel, it is the model of a VSEditorTable.
*/
private class VSEditorTableModel extends AbstractTableModel
- implements TableCellRenderer {
+ implements TableCellRenderer {
/** The serial version uid */
private static final long serialVersionUID = 1L;
@@ -213,7 +213,7 @@ public class VSEditorTable extends JTable {
* The class VSTableCellEditor, is the editor of the VSEditorTable
*/
private class VSTableCellEditor extends AbstractCellEditor
- implements TableCellEditor {
+ implements TableCellEditor {
/** The serial version uid */
private static final long serialVersionUID = 1L;
diff --git a/sources/prefs/editors/VSProcessEditor.java b/sources/prefs/editors/VSProcessEditor.java
index 8035085..105152e 100644
--- a/sources/prefs/editors/VSProcessEditor.java
+++ b/sources/prefs/editors/VSProcessEditor.java
@@ -30,8 +30,8 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
* @param process the process
*/
public VSProcessEditor(VSPrefs prefs, VSInternalProcess process) {
- super(prefs, process, prefs.getString("lang.en.name") + " - " +
- prefs.getString("lang.en.prefs.process"));;
+ super(prefs, process, prefs.getString("lang.name") + " - " +
+ prefs.getString("lang.prefs.process"));;
this.process = process;
disposeFrameWithParentIfExists();
makeProtocolVariablesEditable();
@@ -43,7 +43,7 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
*/
protected void addToButtonPanelFront(JPanel buttonPanel) {
JButton takeoverButton = new JButton(
- prefs.getString("lang.en.takeover"));
+ prefs.getString("lang.takeover"));
takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover"));
takeoverButton.addActionListener(this);
buttonPanel.add(takeoverButton);
@@ -56,9 +56,9 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
ArrayList<String> editableProtocolsClassnames =
VSRegisteredEvents.getEditableProtocolsClassnames();
- //String protocolString = " " + prefs.getString("lang.en.protocol");
- String clientString = " " + prefs.getString("lang.en.client");
- String serverString = " " + prefs.getString("lang.en.server");
+ //String protocolString = " " + prefs.getString("lang.protocol");
+ String clientString = " " + prefs.getString("lang.client");
+ String serverString = " " + prefs.getString("lang.server");
for (String protocolClassname : editableProtocolsClassnames) {
String protocolShortname =
@@ -92,11 +92,11 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
public void actionPerformed(ActionEvent e) {
String actionCommand = e.getActionCommand();
- if (actionCommand.equals(prefs.getString("lang.en.ok"))) {
+ if (actionCommand.equals(prefs.getString("lang.ok"))) {
savePrefs();
process.updateFromPrefs();
- } else if (actionCommand.equals(prefs.getString("lang.en.takeover"))) {
+ } else if (actionCommand.equals(prefs.getString("lang.takeover"))) {
savePrefs();
process.updateFromPrefs();
diff --git a/sources/prefs/editors/VSSimulatorEditor.java b/sources/prefs/editors/VSSimulatorEditor.java
index 53eea0a..9ee0e58 100644
--- a/sources/prefs/editors/VSSimulatorEditor.java
+++ b/sources/prefs/editors/VSSimulatorEditor.java
@@ -45,8 +45,8 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
*/
public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame,
VSSimulator simulator) {
- super(prefs, prefs, prefs.getString("lang.en.name")
- + " - " + prefs.getString("lang.en.prefs"));
+ super(prefs, prefs, prefs.getString("lang.name")
+ + " - " + prefs.getString("lang.prefs"));
this.dontStartNewSimulator = true;//simulator != null;
this.simulatorFrame = simulatorFrame;
this.simulator = simulator;
@@ -60,8 +60,8 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
*/
public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame,
boolean openedNewWindow) {
- super(prefs, prefs, prefs.getString("lang.en.name")
- + " - " + prefs.getString("lang.en.prefs"));
+ super(prefs, prefs, prefs.getString("lang.name")
+ + " - " + prefs.getString("lang.prefs"));
this.simulatorFrame = simulatorFrame;
this.openedNewWindow = openedNewWindow;
}
@@ -74,7 +74,7 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
if (TAKEOVER_BUTTON) {
TAKEOVER_BUTTON = false;
JButton takeoverButton = new JButton(
- prefs.getString("lang.en.takeover"));
+ prefs.getString("lang.takeover"));
takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover"));
takeoverButton.addActionListener(this);
buttonPanel.add(takeoverButton);
@@ -88,7 +88,7 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
public void actionPerformed(ActionEvent e) {
String actionCommand = e.getActionCommand();
- if (actionCommand.equals(prefs.getString("lang.en.takeover"))) {
+ if (actionCommand.equals(prefs.getString("lang.takeover"))) {
savePrefs();
if (simulator != null) {
@@ -97,11 +97,11 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
simulator.updateFromPrefs();
}
- } else if (actionCommand.equals(prefs.getString("lang.en.cancel"))) {
+ } else if (actionCommand.equals(prefs.getString("lang.cancel"))) {
if (!dontStartNewSimulator && openedNewWindow)
simulatorFrame.dispose();
- } else if (actionCommand.equals(prefs.getString("lang.en.ok"))) {
+ } else if (actionCommand.equals(prefs.getString("lang.ok"))) {
savePrefs();
if (expertModeChanged()) {
if (simulator != null)