[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects/util JDBCTest.java,1.2,1.3 ModelMan.java,1.21,1.22 NOImageTransform.java,1.2,1.3 NOXMLFactory.java,1.9,1.10

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

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

Modified Files:
	JDBCTest.java ModelMan.java NOImageTransform.java 
	NOXMLFactory.java 
Log Message:
Optimize "save" function.
Small checkstyle optimization.


Index: JDBCTest.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util/JDBCTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JDBCTest.java	6 Apr 2003 14:19:28 -0000	1.2
--- JDBCTest.java	24 May 2003 18:50:47 -0000	1.3
***************
*** 9,13 ****
  import org.devaki.nextobjects.ui.main.NOLog;
  import org.devaki.nextobjects.workspace.models.BaseModel;
! import org.devaki.nextobjects.workspace.models.PhysicalModel;
  
  public class JDBCTest
--- 9,13 ----
  import org.devaki.nextobjects.ui.main.NOLog;
  import org.devaki.nextobjects.workspace.models.BaseModel;
! 
  
  public class JDBCTest

Index: ModelMan.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util/ModelMan.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ModelMan.java	4 May 2003 22:08:02 -0000	1.21
--- ModelMan.java	24 May 2003 18:50:47 -0000	1.22
***************
*** 18,21 ****
--- 18,25 ----
  
  */
+ // todo : if autoincrement default =''
+ // todo : id-table-parameters
+ // todo : auitoincrement=false <==> ''
+ 
  package org.devaki.nextobjects.util;
  
***************
*** 30,34 ****
  import javax.swing.JOptionPane;
  import javax.swing.JPanel;
- import javax.imageio.*;
  import org.jdom.Document;
  import org.apache.log4j.Category;
--- 34,37 ----
***************
*** 58,94 ****
  import org.devaki.nextobjects.workspace.models.objects.Table;
  
  /**
!  *
!  * <p>Title: ModelMan</p>
!  * <p>Description: </p>
!  * <p>Copyright: Copyright (c) 2002</p>
!  * <p>Company: devaki.org</p>get
   * @version 1.0
   */
  public class ModelMan
  {
!   /** Variables **/
!   // Reference to the current ModelMan object
!   private static ModelMan modelMan;
!   // Models/Frames
    private static Vector	models = new Vector();
  
    private static BaseModel currentModel;
    private static BaseObject draggedObject;
    private static BaseObject dropTargetObject;
    private static Vector currentObjects = new Vector();
  
  
!   // Others
!   private static JFileChooser chooser = new JFileChooser();
!   private static NOFileFilter filterImage = new NOFileFilter(
!                 new String[]{"png"}, "Images");
!   private static NOFileFilter filterModel = new NOFileFilter(
!                     new String[]{"xml","cdm","pdm"}, "Models");
  
  
    private static Category logger = Logger.getInstance(ModelMan.class.getName());
  
!   /**
     * Construct a new 'ModelMan' object
     */
--- 61,128 ----
  import org.devaki.nextobjects.workspace.models.objects.Table;
  
+ 
  /**
!  * ModelMan
!  * Manage all the objects,UIs around models 
!  * @author <a href="mailto:efl...@de...">Emmanuel Florent</a>
   * @version 1.0
   */
+ 
  public class ModelMan
  {
! 
!   /*
!    * Reference to the current ModelMan object
!    */
!      private static ModelMan modelMan;
!   
!   /*
!    * / All existings  models (asFrames)
!    */
    private static Vector	models = new Vector();
  
+ 	/*
+ 	 *  The current model
+ 	 */
    private static BaseModel currentModel;
+   
+   /*
+    *  The dragged objects
+    */
    private static BaseObject draggedObject;
+   
+   /*
+    *  The drop Target Object
+    */
    private static BaseObject dropTargetObject;
+   
+   /*
+    *  The selected objects
+    */
    private static Vector currentObjects = new Vector();
  
  
! /**
!  *  The file chooser
!  */
! private static JFileChooser chooser = new JFileChooser();
! /*
!  *  The file, filter (images)
!  */
! private static NOFileFilter filterImage =
! 	new NOFileFilter(new String[] { "png" }, "Images");
  
+ 	/*
+ 	 * The File filter (models)
+ 	 */
+ private static NOFileFilter filterModel =
+ 	new NOFileFilter(new String[] { "xml", "cdm", "pdm" }, "Models");
  
+  /*
+   *  Reference to the Log4J logger.
+   */
    private static Category logger = Logger.getInstance(ModelMan.class.getName());
  
!   /*
     * Construct a new 'ModelMan' object
     */
***************
*** 578,587 ****
        catch (Exception ioex)
        {
- 
          logger.error(" " + ioex.getMessage());
          logger.info("This doesn't look like valid XML for me. Giving up.");
- 
        }
        NORecentFile.add(in);
    }
  
--- 612,622 ----
        catch (Exception ioex)
        {
          logger.error(" " + ioex.getMessage());
          logger.info("This doesn't look like valid XML for me. Giving up.");
        }
        NORecentFile.add(in);
+       currentModel.setFileForSave(in.toString());
+       NOMenuBar.fixFileMenu();
+       NOToolBar1.fixIcons();     
    }
  
***************
*** 872,875 ****
--- 907,914 ----
      NextObjects.getReference().nOWorkspace.addPanel(view,type + pNOModel.getName());
      setCurrentModel(pNOModel);
+ 	NOMenuBar.fixFileMenu();
+ 	NOMenuBar.fixEditMenu();
+ 	NOToolBar1.fixIcons();
+ 	NOToolBar2.fixIcons();    
    }
  
***************
*** 915,918 ****
--- 954,961 ----
      NOTreeView.removeNode(pNOModel.getDynamicTreeNode());
      setCurrentModel(null);
+     NOMenuBar.fixFileMenu();
+ 	NOMenuBar.fixEditMenu();
+ 	NOToolBar1.fixIcons();
+ 	NOToolBar2.fixIcons();	
    }
  

Index: NOImageTransform.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util/NOImageTransform.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NOImageTransform.java	1 Mar 2003 10:52:24 -0000	1.2
--- NOImageTransform.java	24 May 2003 18:50:47 -0000	1.3
***************
*** 33,37 ****
  import org.apache.log4j.Category;
  import org.apache.log4j.Logger;
- import org.devaki.nextobjects.workspace.models.BaseModel;
  import org.devaki.nextobjects.workspace.models.PhysicalModel;
  import org.devaki.nextobjects.workspace.models.ConceptualModel;
--- 33,36 ----

Index: NOXMLFactory.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util/NOXMLFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NOXMLFactory.java	5 Apr 2003 14:14:23 -0000	1.9
--- NOXMLFactory.java	24 May 2003 18:50:47 -0000	1.10
***************
*** 138,143 ****
--- 138,147 ----
      tmpElementBaseClass.setAttribute("skipSql",new Boolean(pBaseClass.getSkipSql()).toString());
      tmpElementBaseClass.setAttribute("abstract",new Boolean(pBaseClass.getAbstractClass()).toString());
+     if (!pBaseClass.getBaseClass().equals("")) {
      tmpElementBaseClass.setAttribute("baseClass",pBaseClass.getBaseClass());
+     }
+     if (!pBaseClass.getBasePeer().equals("")) {
      tmpElementBaseClass.setAttribute("basePeer",pBaseClass.getBasePeer());
+     }
      tmpElementBaseClass.setAttribute("alias",pBaseClass.getAlias());
      tmpElementBaseClass.setAttribute("javaNamingMethod",pBaseClass.getJavaNamingMethod());