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 ;
5250import tests .detailed .BrowserFrame ;
5351import tests .detailed .MainFrame ;
5452import tests .detailed .dialog .CookieManagerDialog ;
55- import tests .detailed .dialog .DevToolsDialog ;
5653import tests .detailed .dialog .DownloadDialog ;
5754import tests .detailed .dialog .SearchDialog ;
5855import tests .detailed .dialog .ShowTextDialog ;
6259@ SuppressWarnings ("serial" )
6360public class MenuBar extends JMenuBar {
6461 class SaveAs implements CefStringVisitor {
65- private PrintWriter fileWriter_ ;
62+ private final PrintWriter fileWriter_ ;
6663
6764 public SaveAs (String fName ) throws FileNotFoundException , UnsupportedEncodingException {
6865 fileWriter_ = new PrintWriter (fName , "UTF-8" );
@@ -367,15 +364,7 @@ public void actionPerformed(ActionEvent e) {
367364 showDevTools .addActionListener (new ActionListener () {
368365 @ Override
369366 public void actionPerformed (ActionEvent e ) {
370- DevToolsDialog devToolsDlg = new DevToolsDialog (owner_ , "DEV Tools" , browser_ );
371- devToolsDlg .addComponentListener (new ComponentAdapter () {
372- @ Override
373- public void componentHidden (ComponentEvent e ) {
374- showDevTools .setEnabled (true );
375- }
376- });
377- devToolsDlg .setVisible (true );
378- showDevTools .setEnabled (false );
367+ browser .openDevTools ();
379368 }
380369 });
381370 testMenu .add (showDevTools );
@@ -431,11 +420,14 @@ public void actionPerformed(ActionEvent e) {
431420 reparentButton .addActionListener (new ActionListener () {
432421 @ Override
433422 public void actionPerformed (ActionEvent e ) {
434- if (reparentPending_ ) return ;
423+ if (reparentPending_ ) {
424+ return ;
425+ }
435426 reparentPending_ = true ;
436427
437428 if (reparentButton .getText ().equals ("Reparent <" )) {
438429 owner_ .removeBrowser (new Runnable () {
430+ @ Override
439431 public void run () {
440432 newFrame .add (browser_ .getUIComponent (), BorderLayout .CENTER );
441433 newFrame .setBrowser (browser_ );
@@ -445,6 +437,7 @@ public void run() {
445437 });
446438 } else {
447439 newFrame .removeBrowser (new Runnable () {
440+ @ Override
448441 public void run () {
449442 JRootPane rootPane = (JRootPane ) owner_ .getComponent (0 );
450443 Container container = rootPane .getContentPane ();
@@ -540,12 +533,16 @@ public void run() {
540533 }
541534
542535 public void addBookmark (String name , String URL ) {
543- if (bookmarkMenu_ == null ) return ;
536+ if (bookmarkMenu_ == null ) {
537+ return ;
538+ }
544539
545540 // Test if the bookmark already exists. If yes, update URL
546541 Component [] entries = bookmarkMenu_ .getMenuComponents ();
547542 for (Component itemEntry : entries ) {
548- if (!(itemEntry instanceof JMenuItem )) continue ;
543+ if (!(itemEntry instanceof JMenuItem )) {
544+ continue ;
545+ }
549546
550547 JMenuItem item = (JMenuItem ) itemEntry ;
551548 if (item .getText ().equals (name )) {
0 commit comments