@@ -89,16 +89,11 @@ private JPanel createDetailView() {
89
89
view .setLayout (new GridBagLayout ());
90
90
view .setBackground (Color .WHITE );
91
91
92
- if (result .getException () != null ) {
92
+ if (result .getException () != null || result . getMessage () != null ) {
93
93
view .add (Box .createVerticalStrut (16 ), gbc );
94
94
this .detailedMessageButton = new JButton (detailedMessageAction );
95
95
gbc .weighty = 1.0 ; // Leave it so for the detailed message
96
96
view .add (detailedMessageButton , gbc );
97
- } else if (result .getMessage () != null ) {
98
- view .add (Box .createVerticalStrut (16 ), gbc );
99
- this .detailedMessageButton = new JButton (valgrindAction );
100
- gbc .weighty = 1.0 ; // Leave it so for the detailed message
101
- view .add (detailedMessageButton , gbc );
102
97
} else {
103
98
this .detailedMessageButton = null ;
104
99
return null ;
@@ -201,25 +196,25 @@ public void finish() {
201
196
}
202
197
}
203
198
204
- private Action valgrindAction = new AbstractAction ("Show valgrind trace" ) {
205
-
206
- @ Override
207
- public void actionPerformed (final ActionEvent event ) {
208
-
209
- detailView .remove (detailedMessageButton );
210
-
211
- final DetailedMessageDisplay display = new DetailedMessageDisplay ();
212
- display .setBackground (Color .WHITE );
213
- display .setContent (result .getMessage ());
214
- display .finish ();
215
-
216
- detailView .add (display , gbc );
217
-
218
- resultCell .revalidate ();
219
- resultCell .repaint ();
220
- }
221
-
222
- };
199
+ // private Action valgrindAction = new AbstractAction("Show valgrind trace") {
200
+ //
201
+ // @Override
202
+ // public void actionPerformed(final ActionEvent event) {
203
+ //
204
+ // detailView.remove(detailedMessageButton);
205
+ //
206
+ // final DetailedMessageDisplay display = new DetailedMessageDisplay();
207
+ // display.setBackground(Color.WHITE);
208
+ // display.setContent(result.getMessage());
209
+ // display.finish();
210
+ //
211
+ // detailView.add(display, gbc);
212
+ //
213
+ // resultCell.revalidate();
214
+ // resultCell.repaint();
215
+ // }
216
+ //
217
+ // };
223
218
224
219
private Action detailedMessageAction = new AbstractAction ("Show detailed message" ) {
225
220
@@ -229,7 +224,15 @@ public void actionPerformed(ActionEvent event) {
229
224
detailView .remove (detailedMessageButton );
230
225
231
226
ExceptionDisplay display = new ExceptionDisplay ();
232
- addException (display , result .getException (), false );
227
+ ImmutableList <String > ex ;
228
+
229
+ if (result .getException () != null && result .getException ().size () > 0 ) {
230
+ ex = result .getException ();
231
+ } else {
232
+ ex = result .getDetailedMessage ();
233
+ }
234
+
235
+ addException (display , ex , false );
233
236
display .finish ();
234
237
235
238
detailView .add (display , gbc );
0 commit comments