diff --git a/Simulator/src/main/java/simulator/events/CallCancelEvent.java b/Simulator/src/main/java/simulator/events/CallCancelEvent.java index 5fbb0e7..9aefbb4 100644 --- a/Simulator/src/main/java/simulator/events/CallCancelEvent.java +++ b/Simulator/src/main/java/simulator/events/CallCancelEvent.java @@ -35,13 +35,13 @@ public final class CallCancelEvent extends Event { * @param now Aktuelle Systemzeit * @param time Zeitpunkt, zu dem der Warteabbruch erfolgen soll */ - public final void init(long now, long time) { + public void init(long now, long time) { super.init(time); waitingStartTime=now; } @Override - public final void run(SimData data) { + public void run(SimData data) { SimulationData simData=(SimulationData)data; if (simData.loggingActive) simData.logEventExecution(Language.tr("Simulator.Log.CallCancelEvent"),-1," "+String.format(Language.tr("Simulator.Log.CallCancelEvent.Info"),SimData.formatSimTime(time-waitingStartTime))); diff --git a/Simulator/src/main/java/simulator/events/CallDone1Event.java b/Simulator/src/main/java/simulator/events/CallDone1Event.java index 4c1484a..312b7c0 100644 --- a/Simulator/src/main/java/simulator/events/CallDone1Event.java +++ b/Simulator/src/main/java/simulator/events/CallDone1Event.java @@ -28,7 +28,7 @@ */ public final class CallDone1Event extends Event { @Override - public final void run(SimData data) { + public void run(SimData data) { SimulationData simData=(SimulationData)data; if (data.loggingActive) data.logEventExecution(Language.tr("Simulator.Log.CallDone1Event"),-1," "+String.format(Language.tr("Simulator.Log.CallDone1Event.Info"),simData.runModel.batchWorking)); diff --git a/Simulator/src/main/java/simulator/events/CallEvent.java b/Simulator/src/main/java/simulator/events/CallEvent.java index bd1ac76..dff0b3a 100644 --- a/Simulator/src/main/java/simulator/events/CallEvent.java +++ b/Simulator/src/main/java/simulator/events/CallEvent.java @@ -37,7 +37,7 @@ public final class CallEvent extends Event { * @param simData SimulationData-Objekt * @param count Anzahl der Ankünfte (bei Batch >1) */ - private final void simCallCount(final SimulationData simData, final int count) { + private void simCallCount(final SimulationData simData, final int count) { /* Zählung des Anrufs in Bezug zu dem simData.runModel.callsToSimulate-Wert */ simData.runData.calls+=count; @@ -58,7 +58,7 @@ private final void simCallCount(final SimulationData simData, final int count) { } @Override - public final void run(SimData data) { + public void run(SimData data) { SimulationData simData=(SimulationData)data; if (data.loggingActive) data.logEventExecution(Language.tr("Simulator.Log.CallEvent"),-1," "+(isNewCall?Language.tr("Simulator.Log.CallEvent.FreshCall"):Language.tr("Simulator.Log.CallEvent.Retryer"))); diff --git a/Simulator/src/main/java/tools/ExportQSModel.java b/Simulator/src/main/java/tools/ExportQSModel.java index 57ac0a0..b0d58f5 100644 --- a/Simulator/src/main/java/tools/ExportQSModel.java +++ b/Simulator/src/main/java/tools/ExportQSModel.java @@ -625,7 +625,7 @@ public enum Mode { CONDITION, /** Zufällig verzweigen */ CHANCE - }; + } /** * Verzweigemodus diff --git a/Simulator/src/main/java/ui/EditorPanel.java b/Simulator/src/main/java/ui/EditorPanel.java index dac56e2..da53458 100644 --- a/Simulator/src/main/java/ui/EditorPanel.java +++ b/Simulator/src/main/java/ui/EditorPanel.java @@ -139,7 +139,7 @@ public EditorPanel() { * @param readOnly Gibt an, ob die Auswahl in der Auswahlbox geändert werden darf * @return Neu eingefügte Auswahlbox */ - public static final JComboBox addComboBoxLine(final JPanel parent, final String title, final String[] values, final boolean readOnly) { + public static JComboBox addComboBoxLine(final JPanel parent, final String title, final String[] values, final boolean readOnly) { addLabel(parent,title); JPanel p,p2; @@ -167,7 +167,7 @@ public static final JComboBox addComboBoxLine(final JPanel parent, final * @param title Beschriftung der Checkbox * @return Neu eingefügte Checkbox */ - public static final JCheckBox addCheckBox(final JPanel parent, final String title) { + public static JCheckBox addCheckBox(final JPanel parent, final String title) { final JPanel p; final JCheckBox checkBox; diff --git a/Simulator/src/main/java/ui/EditorPanelBase.java b/Simulator/src/main/java/ui/EditorPanelBase.java index 084b2a2..550bf54 100644 --- a/Simulator/src/main/java/ui/EditorPanelBase.java +++ b/Simulator/src/main/java/ui/EditorPanelBase.java @@ -48,6 +48,7 @@ import mathtools.distribution.swing.JDistributionPanel; import simulator.editmodel.EditModel; +import simulator.editmodel.EditModelBase; import systemtools.MsgBox; import xml.XMLTools; @@ -305,7 +306,7 @@ public final String loadModel(File file) { String s=newModel.loadFromFile(file); lastLoadTime=System.currentTimeMillis()-loadStart; if (s!=null) return s; - if (EditModel.isNewerVersionSystem(newModel.version,EditModel.systemVersion)) { + if (EditModelBase.isNewerVersionSystem(newModel.version,EditModel.systemVersion)) { MsgBox.warning(getOwnerWindow(),NEWER_VERSION_TITLE,String.format(NEWER_VERSION_INFO,newModel.version)); } @@ -328,7 +329,7 @@ public final String loadModelFromStream(final InputStream stream) { String s=newModel.loadFromStream(stream); lastLoadTime=System.currentTimeMillis()-loadStart; if (s!=null) return s; - if (EditModel.isNewerVersionSystem(newModel.version,EditModel.systemVersion)) { + if (EditModelBase.isNewerVersionSystem(newModel.version,EditModel.systemVersion)) { MsgBox.warning(getOwnerWindow(),NEWER_VERSION_TITLE,String.format(NEWER_VERSION_INFO,newModel.version)); } @@ -349,7 +350,7 @@ public final String loadModel(final Element root, final File fileName) { String s=newModel.loadFromXML(root); lastLoadTime=System.currentTimeMillis()-loadStart; if (s!=null) return s; - if (EditModel.isNewerVersionSystem(newModel.version,EditModel.systemVersion)) { + if (EditModelBase.isNewerVersionSystem(newModel.version,EditModel.systemVersion)) { MsgBox.warning(getOwnerWindow(),NEWER_VERSION_TITLE,String.format(NEWER_VERSION_INFO,newModel.version)); } diff --git a/Simulator/src/main/java/ui/MainPanel.java b/Simulator/src/main/java/ui/MainPanel.java index 37f2f48..0e75af6 100644 --- a/Simulator/src/main/java/ui/MainPanel.java +++ b/Simulator/src/main/java/ui/MainPanel.java @@ -69,6 +69,7 @@ import systemtools.MainPanelBase; import systemtools.MsgBox; import systemtools.commandline.CommandLineDialog; +import systemtools.help.HelpBase; import systemtools.statistics.StatisticsBasePanel; import tools.ExportQSModel; import tools.SetupData; @@ -1196,7 +1197,7 @@ private void reloadSetup() { /* Sprache neu laden? */ if (!setup.language.equals(Language.getCurrentLanguage())) { setup.resetLanguageWasAutomatically(); - Help.hideHelpFrame(); + HelpBase.hideHelpFrame(); if (reloadWindow!=null) SwingUtilities.invokeLater(reloadWindow); } else { invalidate(); diff --git a/Simulator/src/main/java/ui/commandline/AbstractSimulationCommand.java b/Simulator/src/main/java/ui/commandline/AbstractSimulationCommand.java index 971eeee..2839ce6 100644 --- a/Simulator/src/main/java/ui/commandline/AbstractSimulationCommand.java +++ b/Simulator/src/main/java/ui/commandline/AbstractSimulationCommand.java @@ -24,6 +24,7 @@ import mathtools.NumberTools; import simulator.Simulator; import simulator.editmodel.EditModel; +import simulator.editmodel.EditModelBase; import simulator.statistics.Statistics; import systemtools.commandline.AbstractCommand; import systemtools.commandline.BaseCommandLineSystem; @@ -121,7 +122,7 @@ protected final void waitForSimulationDone(Simulator simulator, boolean minimalO */ protected final Statistics singleSimulation(EditModel editModel, boolean minimalOutput, int maxThreads, PrintStream out) { /* Modell vorbereiten */ - if (EditModel.isNewerVersionSystem(editModel.version,EditModel.systemVersion)) { + if (EditModelBase.isNewerVersionSystem(editModel.version,EditModel.systemVersion)) { out.println(Language.tr("Dialog.Title.Warning").toUpperCase()+": "+Language.tr("Editor.NewerVersion.Info.Short")); } simulator=new Simulator(editModel,null); diff --git a/Simulator/src/main/java/ui/help/Help.java b/Simulator/src/main/java/ui/help/Help.java index a621516..3f2a841 100644 --- a/Simulator/src/main/java/ui/help/Help.java +++ b/Simulator/src/main/java/ui/help/Help.java @@ -101,7 +101,7 @@ public interface SpecialLinkListener { * Wird aufgerufen, wenn ein Link zu einem besonderen, internen Ziel angeklickt wurde * @param href Linkziel des angeklickten Links */ - public void specialLinkClicked(final String href); + void specialLinkClicked(final String href); } @Override