[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects/ui/menus EditorPopupMenu.java,1.3,1.4 ModelPopupMenu.java,1.9,1.10 NOMenuBar.java,1.10,1.11

[<efl...@us...>]

Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/menus
In directory sc8-pr-cvs1:/tmp/cvs-serv28037/src/org/devaki/nextobjects/ui/menus

Modified Files:
	EditorPopupMenu.java ModelPopupMenu.java NOMenuBar.java 
Log Message:
Optimize "save" function.
Small checkstyle optimization.


Index: EditorPopupMenu.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/menus/EditorPopupMenu.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EditorPopupMenu.java	27 Apr 2003 17:05:26 -0000	1.3
--- EditorPopupMenu.java	24 May 2003 18:50:47 -0000	1.4
***************
*** 20,34 ****
  package org.devaki.nextobjects.ui.menus;
  
! import java.awt.event.MouseEvent;
  import javax.swing.JPopupMenu;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
  import org.devaki.nextobjects.constants.CstImages;
! import org.devaki.nextobjects.ui.components.CustomMenu;
  import org.devaki.nextobjects.ui.components.CustomMenuItem;
  import org.devaki.nextobjects.util.NOClipboard;
  import java.awt.event.KeyEvent;
  import javax.swing.JTextPane;
! import org.devaki.nextobjects.ui.editor.SqlEditor;
  
  public class EditorPopupMenu extends JPopupMenu {
--- 20,34 ----
  package org.devaki.nextobjects.ui.menus;
  
! 
  import javax.swing.JPopupMenu;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
  import org.devaki.nextobjects.constants.CstImages;
! 
  import org.devaki.nextobjects.ui.components.CustomMenuItem;
  import org.devaki.nextobjects.util.NOClipboard;
  import java.awt.event.KeyEvent;
  import javax.swing.JTextPane;
! 
  
  public class EditorPopupMenu extends JPopupMenu {
***************
*** 52,61 ****
      /** Listeners **/
      // Action Listeners
!     this.jMenuItemCopy.addActionListener(new ActionListener()
      {
        public void actionPerformed(ActionEvent e)
        {
          // JTextPane.get
!         clipboard.copy(textpane.getSelectedText());
              }
      });
--- 52,61 ----
      /** Listeners **/
      // Action Listeners
!     EditorPopupMenu.jMenuItemCopy.addActionListener(new ActionListener()
      {
        public void actionPerformed(ActionEvent e)
        {
          // JTextPane.get
!         NOClipboard.copy(textpane.getSelectedText());
              }
      });
***************
*** 71,75 ****
      this.add(this.jMenuItemSelectAll);
      this.addSeparator();
!     this.add(this.jMenuItemCopy);
  
    }
--- 71,75 ----
      this.add(this.jMenuItemSelectAll);
      this.addSeparator();
!     add(jMenuItemCopy);
  
    }

Index: ModelPopupMenu.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/menus/ModelPopupMenu.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ModelPopupMenu.java	27 Apr 2003 17:05:26 -0000	1.9
--- ModelPopupMenu.java	24 May 2003 18:50:47 -0000	1.10
***************
*** 116,120 ****
      /** Listeners **/
      // Action Listeners
!     this.jMenuItemResize.addActionListener(new ActionListener()
      {
        public void actionPerformed(ActionEvent e)
--- 116,120 ----
      /** Listeners **/
      // Action Listeners
!     jMenuItemResize.addActionListener(new ActionListener()
      {
        public void actionPerformed(ActionEvent e)
***************
*** 200,204 ****
        }
      });
!     this.jMenuItemStyleEdit.addActionListener(new ActionListener()
      {
        public void actionPerformed(ActionEvent e)
--- 200,204 ----
        }
      });
!    jMenuItemStyleEdit.addActionListener(new ActionListener()
      {
        public void actionPerformed(ActionEvent e)
***************
*** 341,350 ****
  
      /** Assembling components **/
!     // jMenuStyle
!     this.jMenuStyle.add(this.jMenuItemStyleEdit);
!     this.jMenuStyle.add(this.jMenuItemStyleCopy);
!     this.jMenuStyle.add(this.jMenuItemStylePaste);
!     // this
!     this.add(this.jMenuItemResize);
      this.add(this.jMenuItemNew);
      this.addSeparator();
--- 341,350 ----
  
      /** Assembling components **/
!     // jMenuStyle ( all statics! )
!     jMenuStyle.add(jMenuItemStyleEdit);
!     jMenuStyle.add(jMenuItemStyleCopy);
!     jMenuStyle.add(jMenuItemStylePaste);
!     // this one is static also.
!     add(jMenuItemResize);
      this.add(this.jMenuItemNew);
      this.addSeparator();
***************
*** 356,360 ****
      this.add(jMenuItemVerify);
      this.addSeparator();
!     this.add(this.jMenuStyle);
      this.addSeparator();
      this.add(this.jMenuItemProperties);
--- 356,360 ----
      this.add(jMenuItemVerify);
      this.addSeparator();
!     this.add(jMenuStyle);
      this.addSeparator();
      this.add(this.jMenuItemProperties);

Index: NOMenuBar.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/menus/NOMenuBar.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** NOMenuBar.java	4 May 2003 22:08:00 -0000	1.10
--- NOMenuBar.java	24 May 2003 18:50:47 -0000	1.11
***************
*** 26,30 ****
  import java.io.File;
  import java.util.ArrayList;
- import java.util.List;
  import java.util.ListIterator;
  import javax.swing.JCheckBoxMenuItem;
--- 26,29 ----
***************
*** 39,47 ****
  import org.devaki.nextobjects.ui.others.HelpNO;
  import org.devaki.nextobjects.ui.toolbars.NOToolBar1;
- import org.devaki.nextobjects.util.DatabaseLoader;
  import org.devaki.nextobjects.util.MeriseTransform;
  import org.devaki.nextobjects.util.ModelMan;
  import org.devaki.nextobjects.util.EditorFactory;
! import org.devaki.nextobjects.util.NORecentFile;
  import org.devaki.nextobjects.util.NOClipboard;
  import org.devaki.nextobjects.util.NOXMLFactory;
--- 38,45 ----
  import org.devaki.nextobjects.ui.others.HelpNO;
  import org.devaki.nextobjects.ui.toolbars.NOToolBar1;
  import org.devaki.nextobjects.util.MeriseTransform;
  import org.devaki.nextobjects.util.ModelMan;
  import org.devaki.nextobjects.util.EditorFactory;
! //import org.devaki.nextobjects.util.NORecentFile;
  import org.devaki.nextobjects.util.NOClipboard;
  import org.devaki.nextobjects.util.NOXMLFactory;
***************
*** 507,510 ****
--- 505,509 ----
      if(ModelMan.getCurrentModel() != null)
      {
+     	
        jMenuItemSave.setEnabled(ModelMan.getCurrentModel()
                                 .getFileForSave()!=null);