Subject:

Minor fix to JSDebugger
        Date:
             Wed, 28 Mar 2001 16:34:24 -0800
       From:
             Christopher Oliver <coliver@mminternet.com>
 Organization:
             Primary Interface LLC
         To:
             nboyd@atg.com




Hi Norris,

Attached is a minor fix to the JSDebugger GUI that causes the tool-bar buttons to all have the same width.
I checked out and modified a file from CVS today.  See the screenshot below.

Cheers,

Chris

js/rhino/org/mozilla/javascript/tools/debugger/JSDebugger.java

@@ -2203,37 +2203,57 @@ public class JSDebugger extends JFrame implements Debugger, ContextListener {
 	setJMenuBar(menubar = new Menubar(this));
 	toolBar = new JToolBar();
 	JButton button;
-	toolBar.add(button = new JButton("Break"));
+	JButton breakButton, goButton, stepIntoButton,
+	    stepOverButton, stepOutButton;
+	button = breakButton = new JButton("Break");
 	JButton focusButton = button;
 	button.setToolTipText("Break");
 	button.setActionCommand("Break");
 	button.addActionListener(menubar);
 	button.setEnabled(true);
-	toolBar.add(button = new JButton("Go"));
+	button = goButton = new JButton("Go");
 	button.setToolTipText("Go");
 	button.setActionCommand("Go");
 	button.addActionListener(menubar);
 	button.setEnabled(false);
-	toolBar.add(button = new JButton("Step Into"));
+	button = stepIntoButton = new JButton("Step Into");
 	button.setToolTipText("Step Into");
 	button.setActionCommand("Step Into");
 	button.addActionListener(menubar);
 	button.setEnabled(false);
-	toolBar.add(button = new JButton("Step Over"));
+	button = stepOverButton = new JButton("Step Over");
 	button.setToolTipText("Step Over");
 	button.setActionCommand("Step Over");
 	button.setEnabled(false);
 	button.addActionListener(menubar);
-	toolBar.add(button = new JButton("Step Out"));
+	button = stepOutButton = new JButton("Step Out");
 	button.setToolTipText("Step Out");
 	button.setActionCommand("Step Out");
 	button.setEnabled(false);
 	button.addActionListener(menubar);
-	//toolBar.add(button = new JButton(new String("Run to Cursor")));
-	//button.setToolTipText("Run to Cursor");
-	//button.setActionCommand("Run to Cursor");
-	//button.setEnabled(false);
-	//button.addActionListener(menubar);
+	Dimension dim = stepOverButton.getPreferredSize();
+	breakButton.setPreferredSize(dim);
+	breakButton.setMinimumSize(dim);
+	breakButton.setMaximumSize(dim);
+	breakButton.setSize(dim);
+	goButton.setPreferredSize(dim);
+	goButton.setMinimumSize(dim);
+	goButton.setMaximumSize(dim);
+	stepIntoButton.setPreferredSize(dim);
+	stepIntoButton.setMinimumSize(dim);
+	stepIntoButton.setMaximumSize(dim);
+	stepOverButton.setPreferredSize(dim);
+	stepOverButton.setMinimumSize(dim);
+	stepOverButton.setMaximumSize(dim);
+	stepOutButton.setPreferredSize(dim);
+	stepOutButton.setMinimumSize(dim);
+	stepOutButton.setMaximumSize(dim);
+	toolBar.add(breakButton);
+	toolBar.add(goButton);
+	toolBar.add(stepIntoButton);
+	toolBar.add(stepOverButton);
+	toolBar.add(stepOutButton);
+
 	JPanel contentPane = new JPanel();
 	contentPane.setLayout(new BorderLayout());
 	getContentPane().add(toolBar, BorderLayout.NORTH);

js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java

@@ -2203,37 +2203,57 @@ public class JSDebugger extends JFrame implements Debugger, ContextListener {
 	setJMenuBar(menubar = new Menubar(this));
 	toolBar = new JToolBar();
 	JButton button;
-	toolBar.add(button = new JButton("Break"));
+	JButton breakButton, goButton, stepIntoButton,
+	    stepOverButton, stepOutButton;
+	button = breakButton = new JButton("Break");
 	JButton focusButton = button;
 	button.setToolTipText("Break");
 	button.setActionCommand("Break");
 	button.addActionListener(menubar);
 	button.setEnabled(true);
-	toolBar.add(button = new JButton("Go"));
+	button = goButton = new JButton("Go");
 	button.setToolTipText("Go");
 	button.setActionCommand("Go");
 	button.addActionListener(menubar);
 	button.setEnabled(false);
-	toolBar.add(button = new JButton("Step Into"));
+	button = stepIntoButton = new JButton("Step Into");
 	button.setToolTipText("Step Into");
 	button.setActionCommand("Step Into");
 	button.addActionListener(menubar);
 	button.setEnabled(false);
-	toolBar.add(button = new JButton("Step Over"));
+	button = stepOverButton = new JButton("Step Over");
 	button.setToolTipText("Step Over");
 	button.setActionCommand("Step Over");
 	button.setEnabled(false);
 	button.addActionListener(menubar);
-	toolBar.add(button = new JButton("Step Out"));
+	button = stepOutButton = new JButton("Step Out");
 	button.setToolTipText("Step Out");
 	button.setActionCommand("Step Out");
 	button.setEnabled(false);
 	button.addActionListener(menubar);
-	//toolBar.add(button = new JButton(new String("Run to Cursor")));
-	//button.setToolTipText("Run to Cursor");
-	//button.setActionCommand("Run to Cursor");
-	//button.setEnabled(false);
-	//button.addActionListener(menubar);
+	Dimension dim = stepOverButton.getPreferredSize();
+	breakButton.setPreferredSize(dim);
+	breakButton.setMinimumSize(dim);
+	breakButton.setMaximumSize(dim);
+	breakButton.setSize(dim);
+	goButton.setPreferredSize(dim);
+	goButton.setMinimumSize(dim);
+	goButton.setMaximumSize(dim);
+	stepIntoButton.setPreferredSize(dim);
+	stepIntoButton.setMinimumSize(dim);
+	stepIntoButton.setMaximumSize(dim);
+	stepOverButton.setPreferredSize(dim);
+	stepOverButton.setMinimumSize(dim);
+	stepOverButton.setMaximumSize(dim);
+	stepOutButton.setPreferredSize(dim);
+	stepOutButton.setMinimumSize(dim);
+	stepOutButton.setMaximumSize(dim);
+	toolBar.add(breakButton);
+	toolBar.add(goButton);
+	toolBar.add(stepIntoButton);
+	toolBar.add(stepOverButton);
+	toolBar.add(stepOutButton);
+
 	JPanel contentPane = new JPanel();
 	contentPane.setLayout(new BorderLayout());
 	getContentPane().add(toolBar, BorderLayout.NORTH);