Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22311/src/net/sourceforge/bprocessor/gl
Modified Files:
GLView.java
Removed Files:
GLColorMenuActionListener.java
Log Message:
some refactoring
Index: GLView.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/GLView.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** GLView.java 27 Sep 2007 10:48:53 -0000 1.65
--- GLView.java 18 Nov 2007 20:25:27 -0000 1.66
***************
*** 17,21 ****
import net.sourceforge.bprocessor.gui.GUI;
! import java.awt.Component;
import java.awt.Cursor;
import java.awt.Dimension;
--- 17,21 ----
import net.sourceforge.bprocessor.gui.GUI;
! import java.awt.Color;
import java.awt.Cursor;
import java.awt.Dimension;
***************
*** 34,37 ****
--- 34,38 ----
import javax.swing.BorderFactory;
+ import javax.swing.JColorChooser;
import javax.swing.JComboBox;
import javax.swing.JSeparator;
***************
*** 90,94 ****
JPanel jp = new JPanel();
jp.setLayout(new BorderLayout());
! jp.add((Component) glc, BorderLayout.CENTER);
jp.setMinimumSize(new Dimension(320, 240));
jp.setPreferredSize(new Dimension(640, 480));
--- 91,95 ----
JPanel jp = new JPanel();
jp.setLayout(new BorderLayout());
! jp.add(glc, BorderLayout.CENTER);
jp.setMinimumSize(new Dimension(320, 240));
jp.setPreferredSize(new Dimension(640, 480));
***************
*** 137,141 ****
JMenu colorMenu = new JMenu("GL Colors");
! ActionListener colorMenuListener = new GLColorMenuActionListener(view);
JMenuItem gridItem = new JMenuItem("Grid Color");
gridItem.addActionListener(colorMenuListener);
--- 138,199 ----
JMenu colorMenu = new JMenu("GL Colors");
! ActionListener colorMenuListener = new ActionListener() {
! public void actionPerformed(ActionEvent e) {
! if (e.getActionCommand().equals("Grid Color")) {
! Color newColor = JColorChooser.showDialog(GUI.getInstance(),
! "Grid Color",
! new Color(View.getGridColor()[0],
! View.getGridColor()[1],
! View.getGridColor()[2]));
! if (newColor != null) {
! View.setGridColor(newColor.getRGBComponents(null));
! }
! } else if (e.getActionCommand().equals("Line Color")) {
! Color newColor = JColorChooser.showDialog(GUI.getInstance(),
! "Line Color",
! new Color(View.getLineColor()[0],
! View.getLineColor()[1],
! View.getLineColor()[2]));
! if (newColor != null) {
! View.setLineColor(newColor.getRGBComponents(null));
! }
! } else if (e.getActionCommand().equals("Constructor Line Color")) {
! Color newColor = JColorChooser.showDialog(GUI.getInstance(),
! "Constructor Line Color",
! new Color(View.getConstructorColor()[0],
! View.getConstructorColor()[1],
! View.getConstructorColor()[2]));
! if (newColor != null) {
! View.setConstructorColor(newColor.getRGBComponents(null));
! }
! } else if (e.getActionCommand().equals("Background Color")) {
! Color newColor = JColorChooser.showDialog(GUI.getInstance(),
! "Background Color",
! new Color(View.getBgColor()[0],
! View.getBgColor()[1],
! View.getBgColor()[2]));
! if (newColor != null) {
! View.setBGColor(newColor.getRGBComponents(null));
! }
! } else if (e.getActionCommand().equals("None Color")) {
! Color newColor = JColorChooser.showDialog(GUI.getInstance(),
! "None Color",
! new Color(View.getNoneColor()[0],
! View.getNoneColor()[1],
! View.getNoneColor()[2]));
! if (newColor != null) {
! View.setNoneColor(newColor.getRGBComponents(null));
! }
! } else if (e.getActionCommand().equals("Default")) {
! View.setBGColor(View.BACKGROUND_COLOR);
! View.setGridColor(View.GRID_COLOR);
! View.setLineColor(View.STD_LINE_COLOR);
! View.setNoneColor(View.NONE_COLOR);
! View.setConstructorColor(View.CONSTRUCTOR_COLOR);
! }
!
! }
!
! };
JMenuItem gridItem = new JMenuItem("Grid Color");
gridItem.addActionListener(colorMenuListener);
***************
*** 321,325 ****
public void popup(JPopupMenu pp, int x, int y) {
if (pp != null) {
! pp.show((Component) glc, x, y);
}
}
--- 379,383 ----
public void popup(JPopupMenu pp, int x, int y) {
if (pp != null) {
! pp.show(glc, x, y);
}
}
--- GLColorMenuActionListener.java DELETED ---
|
