Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
V
vadere
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
110
Issues
110
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
3
Merge Requests
3
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vadere
vadere
Commits
8d486772
Commit
8d486772
authored
Dec 20, 2016
by
Jakob Schöttl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extract Version class
parent
0d45e3d1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
34 deletions
+44
-34
VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java
...org/vadere/gui/projectview/control/ActionLoadProject.java
+2
-1
VadereSimulator/src/org/vadere/simulator/entrypoints/Version.java
...mulator/src/org/vadere/simulator/entrypoints/Version.java
+38
-0
VadereSimulator/src/org/vadere/simulator/projects/migration/IncidentDatabase.java
...vadere/simulator/projects/migration/IncidentDatabase.java
+2
-2
VadereSimulator/src/org/vadere/simulator/projects/migration/MigrationAssistant.java
...dere/simulator/projects/migration/MigrationAssistant.java
+1
-30
VadereSimulator/src/org/vadere/simulator/projects/migration/incidents/VersionBumpIncident.java
...tor/projects/migration/incidents/VersionBumpIncident.java
+1
-1
No files found.
VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java
View file @
8d486772
...
...
@@ -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
)
...
...
VadereSimulator/src/org/vadere/simulator/entrypoints/Version.java
0 → 100644
View file @
8d486772
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
();
}
}
VadereSimulator/src/org/vadere/simulator/projects/migration/IncidentDatabase.java
View file @
8d486772
...
...
@@ -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
{
...
...
VadereSimulator/src/org/vadere/simulator/projects/migration/MigrationAssistant.java
View file @
8d486772
...
...
@@ -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."
;
...
...
VadereSimulator/src/org/vadere/simulator/projects/migration/incidents/VersionBumpIncident.java
View file @
8d486772
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment