[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects NextObjects.java,1.11,1.12

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

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

Modified Files:
	NextObjects.java 
Log Message:
Checkstyle/refactor in MeriseTransform.java
+++ I get an error while refactoring causing large commit .+++

 Modified Files:
 	src/org/devaki/nextobjects/util/MeriseTransform.java 


Index: NextObjects.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/NextObjects.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** NextObjects.java	25 May 2003 08:02:36 -0000	1.11
--- NextObjects.java	28 May 2003 21:48:27 -0000	1.12
***************
*** 6,10 ****
  it under the terms of the GNU General Public License as published by the
  Free Software Foundation; either version 2 of the License, or (at your
! option) any later version.
  
  This program is distributed in the hope that it will
--- 6,10 ----
  it under the terms of the GNU General Public License as published by the
  Free Software Foundation; either version 2 of the License, or (at your
! option) any later version.56
  
  This program is distributed in the hope that it will
***************
*** 52,89 ****
  
  /*
!  *
   */
  
  public class NextObjects extends JFrame
  {
!   /** Variables **/
!   // Reference to the instantiated 'NextObjects' object
    private static NextObjects nextObjects;
! 
!   // Logger
    private static Category logger
        = Logger.getInstance(NextObjects.class.getName());
  
!   /** Components **/
!   // Labels
    private static JLabel jLabelStatus = new JLabel(" ");
!   // Menubars
    private NOMenuBar menuBar = new NOMenuBar();
!   // Toolbars
    private NOToolBar1 toolBar1 = new NOToolBar1();
    private NOToolBar2 toolBar2 = new NOToolBar2();
    // Panels
    private CustomSplitPane jSplitPane1 =
        new CustomSplitPane(JSplitPane.HORIZONTAL_SPLIT, 220);
    private CustomSplitPane jSplitPane2 =
        new CustomSplitPane(JSplitPane.VERTICAL_SPLIT, 0);
    private JPanel jPanelStatusBar = new JPanel(new GridBagLayout());
  
!   //piece of softwares.
    public NOWorkspace nOWorkspace;
    public static DataDictionaryEdit dataDictionaryEdit;
    static SplashScreen splash;
  
!   /**
     * Construct a new 'NextObjects' object
     */
--- 52,120 ----
  
  /*
!  * devaki-nextobjects is an Integrated Development Tool for Entreprise Applications.
!  * Nextobjects will help you choose database structure from system analysis
!  * and design, down to generating strongly designed data layer Object Model.
!  * @see http://www.devaki.org
!  * @author: efl...@de... 
   */
  
  public class NextObjects extends JFrame
  {
!   /*
!    *  Reference to the instantiated 'NextObjects' object
!    */
!    
    private static NextObjects nextObjects;
!   
!   /*
!    * Logger
!    */
    private static Category logger
        = Logger.getInstance(NextObjects.class.getName());
  
!   /*
!    *  Components 
!    */
    private static JLabel jLabelStatus = new JLabel(" ");
!   /*
!    *  Components 
!    */
    private NOMenuBar menuBar = new NOMenuBar();
!   /*
!    *  Components 
!    */
    private NOToolBar1 toolBar1 = new NOToolBar1();
+   /*
+    *  Components 
+    */
    private NOToolBar2 toolBar2 = new NOToolBar2();
    // Panels
    private CustomSplitPane jSplitPane1 =
        new CustomSplitPane(JSplitPane.HORIZONTAL_SPLIT, 220);
+ 	/*
+ 	 *  Components 
+ 	 */
    private CustomSplitPane jSplitPane2 =
        new CustomSplitPane(JSplitPane.VERTICAL_SPLIT, 0);
+ 	/*
+ 	 *  Components 
+ 	 */
    private JPanel jPanelStatusBar = new JPanel(new GridBagLayout());
  
!  
!   /*
!    *  Thetabbedpane
!    */
    public NOWorkspace nOWorkspace;
+   /*
+    *  The treeview
+    */
    public static DataDictionaryEdit dataDictionaryEdit;
+   /*
+    *  Component spl
+    */
    static SplashScreen splash;
  
!   /*
     * Construct a new 'NextObjects' object
     */
***************
*** 274,291 ****
    {
      jLabelStatus.setText(text);
-   }
- 
-   // not implemented.
-   public static void enableLogging() {
-     // open SplitPane
-     // start/resume chainsaw
-     // fix log.properties
-     // reload it.
-   }
- 
-   public static void disableLogging() {
-     // close JPanel
-     // stop chainsaw
-     // use null appender
    }
  
--- 305,308 ----