From 8d486772af8cf497c20b8a980cade5760c343097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20Sch=C3=B6ttl?= Date: Tue, 20 Dec 2016 19:00:18 +0100 Subject: [PATCH] Extract Version class --- .../control/ActionLoadProject.java | 3 +- .../vadere/simulator/entrypoints/Version.java | 38 +++++++++++++++++++ .../projects/migration/IncidentDatabase.java | 4 +- .../migration/MigrationAssistant.java | 31 +-------------- .../incidents/VersionBumpIncident.java | 2 +- 5 files changed, 44 insertions(+), 34 deletions(-) create mode 100644 VadereSimulator/src/org/vadere/simulator/entrypoints/Version.java diff --git a/VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java b/VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java index b2782aa07..83887dee8 100644 --- a/VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java +++ b/VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java @@ -6,6 +6,7 @@ import org.vadere.gui.projectview.VadereApplication; import org.vadere.gui.projectview.model.ProjectViewModel; import org.vadere.gui.projectview.view.ProjectView; import org.vadere.gui.projectview.view.VDialogManager; +import org.vadere.simulator.entrypoints.Version; import org.vadere.simulator.projects.VadereProject; import org.vadere.simulator.projects.io.IOVadere; import org.vadere.simulator.projects.migration.MigrationAssistant; @@ -113,7 +114,7 @@ public class ActionLoadProject extends AbstractAction { String message = "The migration assistant analyzed the " + total + " scenarios in the scenarios and output " + "directories of this project and attempted to upgrade them to the latest version " - + MigrationAssistant.Version.latest().label() + ".\n" + + + Version.latest().label() + ".\n" + "Log-files have been created in legacy/scenarios and legacy/output.\n\n"; if (untouched > 0) diff --git a/VadereSimulator/src/org/vadere/simulator/entrypoints/Version.java b/VadereSimulator/src/org/vadere/simulator/entrypoints/Version.java new file mode 100644 index 000000000..040aca707 --- /dev/null +++ b/VadereSimulator/src/org/vadere/simulator/entrypoints/Version.java @@ -0,0 +1,38 @@ +package org.vadere.simulator.entrypoints; + +/** Versions in strict order from oldest to newest. */ +public enum Version { + + UNDEFINED("undefined"), + NOT_A_RELEASE("not a release"), + V0_1("0.1"), + V0_2("0.2"); + + private String label; + + Version(String label) { + this.label = label; + } + + public String label() { + return label; + } + + public static Version fromString(String versionStr) { + for (Version v : values()) { + if (v.label.equals(versionStr)) + return v; + } + return null; + } + + public static Version latest() { + return values()[values().length - 1]; + } + + @Override + public String toString() { + return label(); + } + +} diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/IncidentDatabase.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/IncidentDatabase.java index a9021626c..274e69b5a 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/IncidentDatabase.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/IncidentDatabase.java @@ -7,7 +7,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.vadere.simulator.projects.migration.MigrationAssistant.Version; +import org.vadere.simulator.entrypoints.Version; import org.vadere.simulator.projects.migration.incidents.AddTextNodeIncident; import org.vadere.simulator.projects.migration.incidents.DeletionIncident; import org.vadere.simulator.projects.migration.incidents.Incident; @@ -19,7 +19,7 @@ import org.vadere.simulator.projects.migration.incidents.specialized.AttributesP import org.vadere.simulator.projects.migration.incidents.specialized.MoveSpawnDelayIntoDistributionParametersIncident; import org.vadere.state.util.StateJsonConverter; -import static org.vadere.simulator.projects.migration.MigrationAssistant.Version.*; +import static org.vadere.simulator.entrypoints.Version.*; public class IncidentDatabase { diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/MigrationAssistant.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/MigrationAssistant.java index 94456edb9..977a79a65 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/MigrationAssistant.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/MigrationAssistant.java @@ -14,6 +14,7 @@ import java.util.stream.Collectors; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; +import org.vadere.simulator.entrypoints.Version; import org.vadere.simulator.projects.migration.incidents.ExceptionIncident; import org.vadere.simulator.projects.migration.incidents.Incident; import org.vadere.simulator.projects.migration.incidents.VersionBumpIncident; @@ -22,36 +23,6 @@ import org.vadere.util.io.IOUtils; public class MigrationAssistant { - // versions in strict order from oldest to newest - public enum Version { - UNDEFINED("undefined"), - NOT_A_RELEASE("not a release"), - V0_1("0.1"), - V0_2("0.2"); - - private String label; - - Version(String label) { - this.label = label; - } - - public String label() { - return label; - } - - static Version fromString(String versionStr) { - for (Version v : values()) { - if (v.label.equals(versionStr)) - return v; - } - return null; - } - - public static Version latest() { - return values()[values().length - 1]; - } - } - public static final String INCIDENT_ORDER_ERROR = "An incident that was found applicable couldn't be resolved. " + "That means, that a previously resolved incident rendered this one no longer applicable. " + "Check the order of the incidents in the IncidentDatabase for logical flaws."; diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/incidents/VersionBumpIncident.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/incidents/VersionBumpIncident.java index 3086451d3..886025847 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/incidents/VersionBumpIncident.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/incidents/VersionBumpIncident.java @@ -1,8 +1,8 @@ package org.vadere.simulator.projects.migration.incidents; import org.vadere.simulator.projects.migration.Tree; +import org.vadere.simulator.entrypoints.Version; import org.vadere.simulator.projects.migration.MigrationException; -import org.vadere.simulator.projects.migration.MigrationAssistant.Version; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; -- GitLab