[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl Editor.java, 1.1, 1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29748/src/net/sourceforge/bprocessor/gl

Modified Files:
	Editor.java 
Log Message:
Small changes

Index: Editor.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/Editor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Editor.java	18 Nov 2007 20:32:48 -0000	1.1
--- Editor.java	19 Nov 2007 13:43:54 -0000	1.2
***************
*** 73,76 ****
--- 73,82 ----
    
    private JLabel tipLabel;
+   
+   private JPanel tipPanel;
+   
+   private JPanel bottomPanel;
+   
+   private JPanel jp;
  
    /**
***************
*** 78,122 ****
     */
    public Editor() {
-     GLCapabilities glCap = new GLCapabilities();
-     glCap.setDoubleBuffered(true);
-     glCap.setHardwareAccelerated(true);
-     ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
-     glc = new GLCanvas(glCap);
-     log.info("Using JOGL version official");
      Selection.primary().addObserver(this);
      Project.getInstance().addStaticObserver(this);
      
      GUI.getInstance().incrementPB();
      
!     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));
      GUI.getInstance().incrementPB();    
      
!     lengthPanel = new JPanel();
!     lengthPanel.setLayout(new BorderLayout());
!     lengthPanel.add(new JLabel("Length: "), BorderLayout.WEST);
!     lengthField = new LengthField();
!     lengthPanel.add(lengthField, BorderLayout.CENTER);
      factor = new FactorBox();
-     //lengthPanel.add(factor, BorderLayout.EAST);   
      
!     JPanel tipPanel = new JPanel();
!     tipPanel.setLayout(new BorderLayout());
!     tipPanel.add(new JLabel("Tip: "), BorderLayout.WEST);
!     tipLabel = new JLabel("Hello World!");
!     Font basicFont = tipLabel.getFont();
!     tipLabel.setFont(new Font(basicFont.getName(), Font.PLAIN, basicFont.getSize()));
!     tipPanel.add(tipLabel, BorderLayout.CENTER);
      
-     JPanel bottomPanel = new JPanel();
-     bottomPanel.setLayout(new BorderLayout());
-     bottomPanel.setBorder(BorderFactory.createEtchedBorder());
-     bottomPanel.add(lengthPanel, BorderLayout.NORTH);
-     bottomPanel.add(new JSeparator(), BorderLayout.CENTER);
-     bottomPanel.add(tipPanel, BorderLayout.SOUTH);
      jp.add(bottomPanel, BorderLayout.SOUTH);
      GUI.getInstance().incrementPB();
      
--- 84,145 ----
     */
    public Editor() {
      Selection.primary().addObserver(this);
      Project.getInstance().addStaticObserver(this);
+     ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
+     
+     
+     {
+       GLCapabilities glCap = new GLCapabilities();
+ 
+       glCap.setDoubleBuffered(true);
+       glCap.setHardwareAccelerated(true);
+       glc = new GLCanvas(glCap);
+       glc.setAutoSwapBufferMode(false);
+     }
+     
      
      GUI.getInstance().incrementPB();
      
!     {
!       jp = new JPanel();
!       jp.setLayout(new BorderLayout());
!       jp.add(glc, BorderLayout.CENTER);
!       jp.setMinimumSize(new Dimension(320, 240));
!       jp.setPreferredSize(new Dimension(640, 480));
!     }
!     
      GUI.getInstance().incrementPB();    
      
!     {
!       lengthPanel = new JPanel();
!       lengthPanel.setLayout(new BorderLayout());
!       lengthPanel.add(new JLabel("Length: "), BorderLayout.WEST);
!       lengthField = new LengthField();
!       lengthPanel.add(lengthField, BorderLayout.CENTER);
!     }
!     
      factor = new FactorBox();
      
!     {
!       tipPanel = new JPanel();
!       tipPanel.setLayout(new BorderLayout());
!       tipPanel.add(new JLabel("Tip: "), BorderLayout.WEST);
!       tipLabel = new JLabel("Hello World!");
!       Font basicFont = tipLabel.getFont();
!       tipLabel.setFont(new Font(basicFont.getName(), Font.PLAIN, basicFont.getSize()));
!       tipPanel.add(tipLabel, BorderLayout.CENTER);
!     }
!     
!     {
!       bottomPanel = new JPanel();
!       bottomPanel.setLayout(new BorderLayout());
!       bottomPanel.setBorder(BorderFactory.createEtchedBorder());
!       bottomPanel.add(lengthPanel, BorderLayout.NORTH);
!       bottomPanel.add(new JSeparator(), BorderLayout.CENTER);
!       bottomPanel.add(tipPanel, BorderLayout.SOUTH);
!     }
      
      jp.add(bottomPanel, BorderLayout.SOUTH);
+     
      GUI.getInstance().incrementPB();
      
***************
*** 125,128 ****
--- 148,152 ----
      
      view = new View(this);
+     
      (new ViewToolbarFactory()).registerToolbar(this);
      glc.addGLEventListener(view);
***************
*** 137,225 ****
      GUI.getInstance().incrementPB();
      
!     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);
!     JMenuItem lineItem = new JMenuItem("Line Color");
!     lineItem.addActionListener(colorMenuListener);
!     JMenuItem constructorItem = new JMenuItem("Constructor Line Color");
!     constructorItem.addActionListener(colorMenuListener);
!     JMenuItem bgItem = new JMenuItem("Background Color");
!     bgItem.addActionListener(colorMenuListener);
!     JMenuItem noneItem = new JMenuItem("None Color");
!     noneItem.addActionListener(colorMenuListener);
!     JMenuItem defaultItem = new JMenuItem("Default");
!     defaultItem.addActionListener(colorMenuListener);
!     GUI.getInstance().incrementPB();
!     
!     colorMenu.add(gridItem);
!     colorMenu.add(lineItem);
!     colorMenu.add(constructorItem);
!     colorMenu.add(bgItem);
!     colorMenu.add(noneItem);
!     colorMenu.add(defaultItem);
!     GUI.getInstance().incrementPB();
! 
!     GUI.getInstance().addMenu(colorMenu);
      GUI.getInstance().incrementPB();
- 
-     glc.setAutoSwapBufferMode(false);
      repaint();
      GUI.getInstance().incrementPB();
--- 161,243 ----
      GUI.getInstance().incrementPB();
      
!     {
!       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);
!       JMenuItem lineItem = new JMenuItem("Line Color");
!       lineItem.addActionListener(colorMenuListener);
!       JMenuItem constructorItem = new JMenuItem("Constructor Line Color");
!       constructorItem.addActionListener(colorMenuListener);
!       JMenuItem bgItem = new JMenuItem("Background Color");
!       bgItem.addActionListener(colorMenuListener);
!       JMenuItem noneItem = new JMenuItem("None Color");
!       noneItem.addActionListener(colorMenuListener);
!       JMenuItem defaultItem = new JMenuItem("Default");
!       defaultItem.addActionListener(colorMenuListener);
!       colorMenu.add(gridItem);
!       colorMenu.add(lineItem);
!       colorMenu.add(constructorItem);
!       colorMenu.add(bgItem);
!       colorMenu.add(noneItem);
!       colorMenu.add(defaultItem);
!       GUI.getInstance().addMenu(colorMenu);
!     }
      GUI.getInstance().incrementPB();
      repaint();
      GUI.getInstance().incrementPB();