Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vdt-plugin
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
vdt-plugin
Commits
e85b768c
Commit
e85b768c
authored
Jan 22, 2016
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed tool sequencing bug
parent
3ecb9378
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
1 deletion
+10
-1
ToolSequence.java
src/com/elphel/vdt/core/tools/params/ToolSequence.java
+10
-1
No files found.
src/com/elphel/vdt/core/tools/params/ToolSequence.java
View file @
e85b768c
...
@@ -53,7 +53,6 @@ import com.elphel.vdt.ui.options.FilteredFileSelector;
...
@@ -53,7 +53,6 @@ import com.elphel.vdt.ui.options.FilteredFileSelector;
import
com.elphel.vdt.ui.variables.SelectedResourceManager
;
import
com.elphel.vdt.ui.variables.SelectedResourceManager
;
import
com.elphel.vdt.ui.views.DesignFlowView
;
import
com.elphel.vdt.ui.views.DesignFlowView
;
import
com.elphel.vdt.veditor.VerilogPlugin
;
import
com.elphel.vdt.veditor.VerilogPlugin
;
import
com.elphel.vdt.veditor.parser.OutlineDatabase
;
import
com.elphel.vdt.veditor.preference.PreferenceStrings
;
import
com.elphel.vdt.veditor.preference.PreferenceStrings
;
import
java.io.File
;
import
java.io.File
;
...
@@ -605,6 +604,16 @@ java.lang.NullPointerException
...
@@ -605,6 +604,16 @@ java.lang.NullPointerException
Map
<
String
,
String
>
openStates
=
new
ConcurrentHashMap
<
String
,
String
>();
Map
<
String
,
String
>
openStates
=
new
ConcurrentHashMap
<
String
,
String
>();
for
(
Tool
session:
sessions
){
for
(
Tool
session:
sessions
){
if
(
session
.
getOpenStateName
()
!=
null
)
openStates
.
put
(
session
.
getOpenStateName
(),
session
.
getOpenStateFile
());
if
(
session
.
getOpenStateName
()
!=
null
)
openStates
.
put
(
session
.
getOpenStateName
(),
session
.
getOpenStateFile
());
}
// Got open state that is now dirty
// Remove open states that correspond to dirty tools
for
(
String
state:
openStates
.
keySet
()){
for
(
Tool
tool:
ToolsCore
.
getConfig
().
getContextManager
().
getToolList
()){
// if ((tool.getStateLink().equals(state)) && tool.isDirty()){
if
(
state
.
equals
(
tool
.
getStateLink
())
&&
tool
.
isDirty
()){
openStates
.
remove
(
state
);
DEBUG_PRINT
(
"Removing state "
+
state
+
" as the tool "
+
tool
.
getName
()+
" is dirty."
);
}
}
}
}
if
(
openStates
.
size
()==
0
)
return
null
;
if
(
openStates
.
size
()==
0
)
return
null
;
for
(
Tool
tool:
ToolsCore
.
getConfig
().
getContextManager
().
getToolList
()){
for
(
Tool
tool:
ToolsCore
.
getConfig
().
getContextManager
().
getToolList
()){
...
...
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