Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27078/src/net/sourceforge/bprocessor/gl
Modified Files:
GLColorMenuActionListener.java
Log Message:
Made it more functional, no exceptions when pressing cancel and the current color are shown in stead of white
Index: GLColorMenuActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/GLColorMenuActionListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GLColorMenuActionListener.java 6 Dec 2005 16:55:25 -0000 1.4
--- GLColorMenuActionListener.java 1 Aug 2006 08:30:17 -0000 1.5
***************
*** 55,84 ****
Color newColor = JColorChooser.showDialog(GUI.getInstance(),
"Grid Color",
! Color.white);
! view.setGridColor(newColor.getRGBComponents(null));
} else if (e.getActionCommand().equals("Line Color")) {
Color newColor = JColorChooser.showDialog(GUI.getInstance(),
"Line Color",
! Color.white);
! view.setLineColor(newColor.getRGBComponents(null));
} else if (e.getActionCommand().equals("Constructor Line Color")) {
Color newColor = JColorChooser.showDialog(GUI.getInstance(),
"Constructor Line Color",
! Color.white);
! view.setConstructorColor(newColor.getRGBComponents(null));
} else if (e.getActionCommand().equals("Background Color")) {
Color newColor = JColorChooser.showDialog(GUI.getInstance(),
"Background Color",
! Color.white);
! view.setBGColor(newColor.getRGBComponents(null));
} else if (e.getActionCommand().equals("None Color")) {
Color newColor = JColorChooser.showDialog(GUI.getInstance(),
"None Color",
! Color.white);
! 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);
}
--- 55,106 ----
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);
}
|
