TAPAAL

Merge lp:~tapaal-contributor/tapaal/fix-1894106-LabelsWithConstantsAreNotShown into lp:tapaal

  1. fix-1894106-LabelsWithConstantsAreNotShown
  2. Merge into trunk
Proposed by Kenneth Yrke Jørgensen
Status: Merged
Approved by: Jiri Srba
Approved revision: 1095
Merged at revision: 1096
Proposed branch: lp:~tapaal-contributor/tapaal/fix-1894106-LabelsWithConstantsAreNotShown
Merge into: lp:tapaal
Diff against target: 25 lines (+2/-2)
2 files modified
src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java (+1/-1)
src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java (+1/-1)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/fix-1894106-LabelsWithConstantsAreNotShown
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+390536@code.launchpad.net

Description of the change

I fixed the two reported issues, but looking at the code the logic seems way off, so I'm guessing there will be more issues like this. I think we should have someone go through all the cases for this.

To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java'
2--- src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java 2020-08-11 12:18:11 +0000
3+++ src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java 2020-09-10 09:03:43 +0000
4@@ -129,7 +129,7 @@
5 focusedConstant = true;
6 }
7 if(((ConstantWeight) getWeight()).constant().getVisible()){
8- isvisible = false;
9+ focusedConstant = false;
10 }
11 }
12 if(focusedConstant){
13
14=== modified file 'src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java'
15--- src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java 2020-08-24 13:02:46 +0000
16+++ src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java 2020-09-10 09:03:43 +0000
17@@ -146,7 +146,7 @@
18 focusedConstant = true;
19 }
20 if(!((ConstantWeight) getWeight()).constant().hasFocus()){
21- isvisible = false;
22+ focusedConstant = false;
23 }
24 }
25 if(focusedConstant){

Subscribers

People subscribed via source and target branches