2222import java .awt .FlowLayout ;
2323import java .awt .event .ActionEvent ;
2424import java .awt .event .ActionListener ;
25- import java .awt .event .ComponentAdapter ;
26- import java .awt .event .ComponentEvent ;
2725import java .awt .event .WindowEvent ;
2826import java .awt .image .BufferedImage ;
2927import java .io .File ;
5048import tests .detailed .BrowserFrame ;
5149import tests .detailed .MainFrame ;
5250import tests .detailed .dialog .CookieManagerDialog ;
53- import tests .detailed .dialog .DevToolsDialog ;
5451import tests .detailed .dialog .DownloadDialog ;
5552import tests .detailed .dialog .SearchDialog ;
5653import tests .detailed .dialog .ShowTextDialog ;
6057@ SuppressWarnings ("serial" )
6158public class MenuBar extends JMenuBar {
6259 class SaveAs implements CefStringVisitor {
63- private PrintWriter fileWriter_ ;
60+ private final PrintWriter fileWriter_ ;
6461
6562 public SaveAs (String fName ) throws FileNotFoundException , UnsupportedEncodingException {
6663 fileWriter_ = new PrintWriter (fName , "UTF-8" );
@@ -365,15 +362,7 @@ public void actionPerformed(ActionEvent e) {
365362 showDevTools .addActionListener (new ActionListener () {
366363 @ Override
367364 public void actionPerformed (ActionEvent e ) {
368- DevToolsDialog devToolsDlg = new DevToolsDialog (owner_ , "DEV Tools" , browser_ );
369- devToolsDlg .addComponentListener (new ComponentAdapter () {
370- @ Override
371- public void componentHidden (ComponentEvent e ) {
372- showDevTools .setEnabled (true );
373- }
374- });
375- devToolsDlg .setVisible (true );
376- showDevTools .setEnabled (false );
365+ browser .openDevTools ();
377366 }
378367 });
379368 testMenu .add (showDevTools );
@@ -429,11 +418,14 @@ public void actionPerformed(ActionEvent e) {
429418 reparentButton .addActionListener (new ActionListener () {
430419 @ Override
431420 public void actionPerformed (ActionEvent e ) {
432- if (reparentPending_ ) return ;
421+ if (reparentPending_ ) {
422+ return ;
423+ }
433424 reparentPending_ = true ;
434425
435426 if (reparentButton .getText ().equals ("Reparent <" )) {
436427 owner_ .removeBrowser (new Runnable () {
428+ @ Override
437429 public void run () {
438430 newFrame .setBrowser (browser_ );
439431 reparentButton .setText ("Reparent >" );
@@ -442,6 +434,7 @@ public void run() {
442434 });
443435 } else {
444436 newFrame .removeBrowser (new Runnable () {
437+ @ Override
445438 public void run () {
446439 owner_ .setBrowser (browser_ );
447440 owner_ .revalidate ();
@@ -533,12 +526,16 @@ public void run() {
533526 }
534527
535528 public void addBookmark (String name , String URL ) {
536- if (bookmarkMenu_ == null ) return ;
529+ if (bookmarkMenu_ == null ) {
530+ return ;
531+ }
537532
538533 // Test if the bookmark already exists. If yes, update URL
539534 Component [] entries = bookmarkMenu_ .getMenuComponents ();
540535 for (Component itemEntry : entries ) {
541- if (!(itemEntry instanceof JMenuItem )) continue ;
536+ if (!(itemEntry instanceof JMenuItem )) {
537+ continue ;
538+ }
542539
543540 JMenuItem item = (JMenuItem ) itemEntry ;
544541 if (item .getText ().equals (name )) {
0 commit comments