Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
vadere
vadere
Commits
9af716b9
Commit
9af716b9
authored
Nov 13, 2016
by
Jakob Schöttl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor strange visualization callback
parent
be01f4c4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
9 deletions
+6
-9
VadereGui/src/org/vadere/gui/projectview/view/ScenarioJPanel.java
...i/src/org/vadere/gui/projectview/view/ScenarioJPanel.java
+1
-1
VadereSimulator/src/org/vadere/simulator/projects/VadereProject.java
...ator/src/org/vadere/simulator/projects/VadereProject.java
+5
-8
No files found.
VadereGui/src/org/vadere/gui/projectview/view/ScenarioJPanel.java
View file @
9af716b9
...
...
@@ -286,7 +286,7 @@ public class ScenarioJPanel extends JPanel implements IProjectChangeListener, Pr
@Override
public
void
projectChanged
(
final
VadereProject
project
)
{
clear
();
project
.
add
Visualization
(
onlineVisualization
);
project
.
set
Visualization
(
onlineVisualization
);
}
@Override
...
...
VadereSimulator/src/org/vadere/simulator/projects/VadereProject.java
View file @
9af716b9
...
...
@@ -9,8 +9,6 @@ import java.nio.file.Paths;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.HashSet
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.concurrent.BlockingQueue
;
import
java.util.concurrent.ConcurrentHashMap
;
...
...
@@ -30,7 +28,7 @@ public class VadereProject implements ScenarioFinishedListener {
private
String
name
;
private
Thread
currentScenarioThread
;
private
ScenarioRun
currentScenarioRun
;
private
final
List
<
PassiveCallback
>
visualization
=
new
LinkedList
<>()
;
private
PassiveCallback
visualization
;
private
final
ConcurrentMap
<
String
,
Scenario
>
scenarios
=
new
ConcurrentHashMap
<>();
private
final
BlockingQueue
<
ProjectFinishedListener
>
projectFinishedListener
=
new
LinkedBlockingQueue
<>();
private
final
BlockingQueue
<
SingleScenarioFinishedListener
>
singleScenarioFinishedListener
=
...
...
@@ -151,8 +149,8 @@ public class VadereProject implements ScenarioFinishedListener {
notifySingleScenarioFinishListener
(
nextScenario
);
if
(
!
visualization
.
isEmpty
()
)
{
nextScenario
.
addPassiveCallback
(
visualization
.
get
(
0
)
);
if
(
visualization
!=
null
)
{
nextScenario
.
addPassiveCallback
(
visualization
);
}
final
ScenarioRun
scenarioRun
=
new
ScenarioRun
(
nextScenario
);
scenarioRun
.
setOutputPaths
(
outputDirectory
);
...
...
@@ -215,9 +213,8 @@ public class VadereProject implements ScenarioFinishedListener {
singleScenarioFinishedListener
.
add
(
listener
);
}
public
void
addVisualization
(
PassiveCallback
pc
)
{
visualization
.
clear
();
visualization
.
add
(
pc
);
public
void
setVisualization
(
PassiveCallback
passiveCallback
)
{
visualization
=
passiveCallback
;
}
// Setter...
...
...
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