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
d1a8a018
Commit
d1a8a018
authored
Jun 30, 2016
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing working with multiple HDL projects open simultaneously
parent
42184c25
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
SelectedResourceManager.java
src/com/elphel/vdt/ui/variables/SelectedResourceManager.java
+4
-2
DesignFlowView.java
src/com/elphel/vdt/ui/views/DesignFlowView.java
+7
-3
No files found.
src/com/elphel/vdt/ui/variables/SelectedResourceManager.java
View file @
d1a8a018
...
@@ -363,7 +363,9 @@ public class SelectedResourceManager implements IWindowListener, ISelectionListe
...
@@ -363,7 +363,9 @@ public class SelectedResourceManager implements IWindowListener, ISelectionListe
if
(
project
.
getFullPath
().
toPortableString
().
equals
(
rslt
.
getProject
().
getFullPath
().
toPortableString
())){
if
(
project
.
getFullPath
().
toPortableString
().
equals
(
rslt
.
getProject
().
getFullPath
().
toPortableString
())){
return
(
fChosenVerilogFile
!=
null
)?
fChosenVerilogFile:
fSelectedVerilogFile
;
return
(
fChosenVerilogFile
!=
null
)?
fChosenVerilogFile:
fSelectedVerilogFile
;
}
else
{
}
else
{
if
(
VerilogPlugin
.
getPreferenceBoolean
(
PreferenceStrings
.
DEBUG_OTHER
))
{
System
.
out
.
println
(
"Wrong getChosenVerilogFile="
+
rslt
+
" for project "
+
project
);
System
.
out
.
println
(
"Wrong getChosenVerilogFile="
+
rslt
+
" for project "
+
project
);
}
fChosenVerilogFile
=
null
;
// invalidate
fChosenVerilogFile
=
null
;
// invalidate
if
(
fSelectedVerilogFile
==
null
)
return
null
;
if
(
fSelectedVerilogFile
==
null
)
return
null
;
if
(
project
.
getFullPath
().
toPortableString
().
equals
(
fSelectedVerilogFile
.
getProject
().
getFullPath
().
toPortableString
())){
if
(
project
.
getFullPath
().
toPortableString
().
equals
(
fSelectedVerilogFile
.
getProject
().
getFullPath
().
toPortableString
())){
...
...
src/com/elphel/vdt/ui/views/DesignFlowView.java
View file @
d1a8a018
...
@@ -581,7 +581,7 @@ public class DesignFlowView extends ViewPart implements ISelectionListener {
...
@@ -581,7 +581,7 @@ public class DesignFlowView extends ViewPart implements ISelectionListener {
selectDesignMenuAction
=
new
Action
()
{
selectDesignMenuAction
=
new
Action
()
{
public
void
run
()
{
public
void
run
()
{
if
(
selectedResource
==
null
){
if
(
selectedResource
==
null
){
HdlEditor
editor
=
HdlEditor
.
current
();
HdlEditor
editor
=
HdlEditor
.
getCurrentEditor
();
if
((
editor
!=
null
)
&&
(
editor
.
getDocument
()
!=
null
)
&&
(
editor
.
getDocument
()
instanceof
HdlDocument
)
){
if
((
editor
!=
null
)
&&
(
editor
.
getDocument
()
!=
null
)
&&
(
editor
.
getDocument
()
instanceof
HdlDocument
)
){
selectedResource
=
((
HdlDocument
)
editor
.
getDocument
()).
getFile
();
selectedResource
=
((
HdlDocument
)
editor
.
getDocument
()).
getFile
();
}
else
{
}
else
{
...
@@ -1358,7 +1358,9 @@ public class DesignFlowView extends ViewPart implements ISelectionListener {
...
@@ -1358,7 +1358,9 @@ public class DesignFlowView extends ViewPart implements ISelectionListener {
if
(
VerilogPlugin
.
getPreferenceBoolean
(
PreferenceStrings
.
DEBUG_OTHER
))
if
(
VerilogPlugin
.
getPreferenceBoolean
(
PreferenceStrings
.
DEBUG_OTHER
))
System
.
out
.
println
(
"Setting HDL file to "
+
HDLFile
.
toString
());
System
.
out
.
println
(
"Setting HDL file to "
+
HDLFile
.
toString
());
}
else
{
}
else
{
System
.
out
.
println
(
"*** Wrong HDLFile "
+
HDLLocation
+
" for project "
+
project
.
getFullPath
().
toPortableString
());
if
(
VerilogPlugin
.
getPreferenceBoolean
(
PreferenceStrings
.
DEBUG_OTHER
))
{
System
.
out
.
println
(
"**** Wrong HDLFile "
+
HDLLocation
+
" for project "
+
project
.
getFullPath
().
toPortableString
());
}
}
}
}
}
}
}
...
@@ -1460,7 +1462,9 @@ public class DesignFlowView extends ViewPart implements ISelectionListener {
...
@@ -1460,7 +1462,9 @@ public class DesignFlowView extends ViewPart implements ISelectionListener {
if
(
VerilogPlugin
.
getPreferenceBoolean
(
PreferenceStrings
.
DEBUG_OTHER
))
if
(
VerilogPlugin
.
getPreferenceBoolean
(
PreferenceStrings
.
DEBUG_OTHER
))
System
.
out
.
println
(
"project.setPersistentProperty("
+
qn
.
toString
()+
","
+
HDLFile
.
getFullPath
().
toPortableString
()+
")"
);
System
.
out
.
println
(
"project.setPersistentProperty("
+
qn
.
toString
()+
","
+
HDLFile
.
getFullPath
().
toPortableString
()+
")"
);
}
else
{
}
else
{
if
(
VerilogPlugin
.
getPreferenceBoolean
(
PreferenceStrings
.
DEBUG_OTHER
))
{
System
.
out
.
println
(
"*** Wrong HDLFile "
+
HDLFile
+
" for project "
+
project
);
System
.
out
.
println
(
"*** Wrong HDLFile "
+
HDLFile
+
" for project "
+
project
);
}
return
;
return
;
}
}
}
}
...
...
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