TAPAAL

Merge lp:~yrke/tapaal/fix-1894109-NullPointerOnOpeningInhibArcDialog into lp:tapaal

  1. fix-1894109-NullPointerOnOpeningInhibArcDialog
  2. Merge into trunk
Proposed by Kenneth Yrke Jørgensen
Status: Merged
Approved by: Jiri Srba
Approved revision: 1095
Merged at revision: 1095
Proposed branch: lp:~yrke/tapaal/fix-1894109-NullPointerOnOpeningInhibArcDialog
Merge into: lp:tapaal
Diff against target: 15 lines (+2/-3)
1 file modified
src/pipe/gui/widgets/GuardDialogue.java (+2/-3)
To merge this branch: bzr merge lp:~yrke/tapaal/fix-1894109-NullPointerOnOpeningInhibArcDialog
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+390535@code.launchpad.net
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
=== modified file 'src/pipe/gui/widgets/GuardDialogue.java'
--- src/pipe/gui/widgets/GuardDialogue.java 2020-08-10 09:34:06 +0000
+++ src/pipe/gui/widgets/GuardDialogue.java 2020-09-10 08:48:18 +0000
@@ -74,9 +74,8 @@
74 myRootPane = rootPane;74 myRootPane = rootPane;
75 setLayout(new GridBagLayout());75 setLayout(new GridBagLayout());
7676
77 if(objectToBeEdited instanceof TimedInputArcComponent && !(objectToBeEdited instanceof TimedInhibitorArcComponent)){77 initTimeGuardPanel();
78 initTimeGuardPanel();78
79 }
80 if(!objectToBeEdited.isTimed() ){79 if(!objectToBeEdited.isTimed() ){
81 guardEditPanel.setVisible(false);80 guardEditPanel.setVisible(false);
82 }81 }

Subscribers

People subscribed via source and target branches