Como Criar uma Matriz de Botões em Java

import java.awt.GridBagConstraints;

import java.awt.GridLayout;

import java.awt.List;

import java.awt.event.ActionEvent;

import java.awt.event.ActionListener;

import java.util.ArrayList;

import javax.swing.JButton;

import javax.swing.JFrame;

import javax.swing.JPanel;

public class Matriz extends JFrame{

public Matriz(){

super(“Matriz”);

geraBotoes();

	//coisas do frame
	setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
	setSize(800, 500);
	setVisible(true);
	setResizable(false);
	setLocationRelativeTo(null);
}

int linha = 10;
int coluna = 10;
List<JButton> botoes = new ArrayList<JButton>();	
public void geraBotoes(){	

	GridBagConstraints gridBagConstraints;
	for (int i = 0; i < linha; i++) {
		for (int j = 0; j < coluna; i++) {
			JButton aux = new JButton();
			aux.setText(" ");
			aux.addActionListener(this);
			gridBagConstraints = new GridBagConstraints();
			gridBagConstraints.gridx = i;
			gridBagConstraints.gridy = j;
			JPanel2.add(aux,gridBagConstraints);
			botoes.add(aux);
		}
	}

}
public static void main(String[] args) {
	// TODO Auto-generated method stub
	new Matriz();
}