nextobjects-devel Mailing List for devaki-nextobjects (Page 4)
Status: Alpha
Brought to you by:
eflorent
You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(41) |
Jun
(41) |
Jul
(8) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|
Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/graphics In directory sc8-pr-cvs1:/tmp/cvs-serv12214/src/org/devaki/nextobjects/workspace/models/graphics Modified Files: ConceptualView.java ConstraintView.java InheritanceLinkView.java PhysicalView.java TableView.java Log Message: Fixed major bug in merise transform. Index: ConceptualView.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/graphics/ConceptualView.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ConceptualView.java 5 May 2003 21:01:30 -0000 1.14 --- ConceptualView.java 25 May 2003 08:02:36 -0000 1.15 *************** *** 27,38 **** import java.awt.Graphics2D; import java.awt.Color; - import java.awt.Point; import java.awt.Polygon; - import java.awt.Rectangle; - import java.awt.event.MouseEvent; - import java.awt.event.KeyAdapter; - import java.awt.event.KeyEvent; import java.awt.event.MouseMotionAdapter; import javax.swing.JPanel; --- 27,33 ---- *************** *** 45,49 **** import org.devaki.nextobjects.util.EditorFactory; import org.devaki.nextobjects.util.NOTools; - import org.devaki.nextobjects.util.NORedoLog; import org.devaki.nextobjects.workspace.models.BaseModel; import org.devaki.nextobjects.workspace.models.ConceptualModel; --- 40,43 ---- *************** *** 266,270 **** } ! if (e.getButton() == e.BUTTON1) { // Make different things according to the current tool --- 260,264 ---- } ! if (e.getButton() == MouseEvent.BUTTON1) { // Make different things according to the current tool *************** *** 334,338 **** } // Right Button released actions ! else if (e.getButton() == e.BUTTON3) { // Stop drawing entities or associations if it was the current tool --- 328,332 ---- } // Right Button released actions ! else if (e.getButton() == MouseEvent.BUTTON3) { // Stop drawing entities or associations if it was the current tool Index: ConstraintView.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/graphics/ConstraintView.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ConstraintView.java 6 Apr 2003 14:19:28 -0000 1.5 --- ConstraintView.java 25 May 2003 08:02:36 -0000 1.6 *************** *** 24,28 **** import java.awt.Font; import javax.swing.UIManager; - import org.devaki.nextobjects.util.NOTools; import org.devaki.nextobjects.workspace.models.objects.BaseLine; import org.devaki.nextobjects.workspace.models.objects.Constraint; --- 24,27 ---- Index: InheritanceLinkView.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/graphics/InheritanceLinkView.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** InheritanceLinkView.java 6 Apr 2003 14:19:28 -0000 1.4 --- InheritanceLinkView.java 25 May 2003 08:02:36 -0000 1.5 *************** *** 22,29 **** package org.devaki.nextobjects.workspace.models.graphics; - import java.awt.Graphics; - import java.awt.Point; - import org.devaki.nextobjects.workspace.models.objects.BaseLine; import org.devaki.nextobjects.workspace.models.objects.InheritanceLink; import org.devaki.nextobjects.workspace.models.styles.InheritanceLinkStyle; --- 22,26 ---- Index: PhysicalView.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/graphics/PhysicalView.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** PhysicalView.java 5 May 2003 21:01:32 -0000 1.15 --- PhysicalView.java 25 May 2003 08:02:36 -0000 1.16 *************** *** 310,314 **** // Right Button released actions ! if (e.getButton() == e.BUTTON3) { // Stop drawing entities or associations if it was the current tool --- 310,314 ---- // Right Button released actions ! if (e.getButton() == MouseEvent.BUTTON3) { // Stop drawing entities or associations if it was the current tool Index: TableView.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/graphics/TableView.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TableView.java 6 Apr 2003 14:19:28 -0000 1.5 --- TableView.java 25 May 2003 08:02:36 -0000 1.6 *************** *** 21,30 **** import java.io.Serializable; - import java.awt.Font; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.Shape; - import javax.swing.UIManager; import org.devaki.nextobjects.constants.CstGraphics; import org.devaki.nextobjects.workspace.models.objects.Table; --- 21,28 ---- |
From: <efl...@us...> - 2003-05-25 08:02:40
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/main In directory sc8-pr-cvs1:/tmp/cvs-serv12214/src/org/devaki/nextobjects/ui/main Modified Files: SplashScreen.java Log Message: Fixed major bug in merise transform. Index: SplashScreen.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/main/SplashScreen.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SplashScreen.java 24 May 2003 18:50:47 -0000 1.5 --- SplashScreen.java 25 May 2003 08:02:36 -0000 1.6 *************** *** 55,64 **** // Define the size of the window ! this.setSize(new Dimension(550, 370)); // Center the window int x = (tk.getScreenSize().width - 550) / 2; ! int y = (tk.getScreenSize().height - 370) / 2; this.setLocation(x, y); ! this.setLocationRelativeTo(null); /** Components **/ --- 55,64 ---- // Define the size of the window ! this.setSize(new Dimension(550, 355)); // Center the window int x = (tk.getScreenSize().width - 550) / 2; ! int y = (tk.getScreenSize().height - 355) / 2; this.setLocation(x, y); ! // this.setLocationRelativeTo(null); /** Components **/ |
From: <efl...@us...> - 2003-05-24 19:08:32
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/icons In directory sc8-pr-cvs1:/tmp/cvs-serv1293 Added Files: icon.png Log Message: Added Files: icon.png --- NEW FILE: icon.png --- (This appears to be a binary file; contents omitted.) |
From: <efl...@us...> - 2003-05-24 18:50:51
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/others In directory sc8-pr-cvs1:/tmp/cvs-serv28037/src/org/devaki/nextobjects/ui/others Modified Files: HelpNO.java Log Message: Optimize "save" function. Small checkstyle optimization. Index: HelpNO.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/others/HelpNO.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** HelpNO.java 23 Feb 2003 17:39:40 -0000 1.3 --- HelpNO.java 24 May 2003 18:50:47 -0000 1.4 *************** *** 23,33 **** import javax.swing.JFrame; import java.awt.Dimension; - - import javax.swing.SwingConstants; import javax.swing.WindowConstants; - import org.devaki.nextobjects.constants.CstImages; - import org.devaki.nextobjects.ui.components.CustomButton; - import org.devaki.nextobjects.ui.components.CustomSplitPane; - import org.devaki.nextobjects.ui.components.CustomTextField; --- 23,27 ---- |
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()); |
From: <efl...@us...> - 2003-05-24 18:50:51
|
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); |
From: <efl...@us...> - 2003-05-24 18:50:51
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects In directory sc8-pr-cvs1:/tmp/cvs-serv28037 Modified Files: build.xml Log Message: Optimize "save" function. Small checkstyle optimization. Index: build.xml =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/build.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** build.xml 5 May 2003 22:05:38 -0000 1.8 --- build.xml 24 May 2003 18:50:46 -0000 1.9 *************** *** 18,21 **** --- 18,22 ---- <!-- The base directory for distribution targets --> + <property name="dist.home" value="target/distributions/${component.name}-${component.version}"/> <property name="dist.dest" value="target/distributions"/> |
From: <efl...@us...> - 2003-05-24 18:50:51
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/editor In directory sc8-pr-cvs1:/tmp/cvs-serv28037/src/org/devaki/nextobjects/ui/editor Modified Files: SqlEditor.java Log Message: Optimize "save" function. Small checkstyle optimization. Index: SqlEditor.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/editor/SqlEditor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SqlEditor.java 20 Feb 2003 19:59:27 -0000 1.3 --- SqlEditor.java 24 May 2003 18:50:46 -0000 1.4 *************** *** 39,44 **** import java.awt.Insets; import java.awt.event.MouseEvent; - import java.awt.event.ActionEvent; - import java.awt.event.ActionListener; import javax.swing.JPanel; import javax.swing.JScrollPane; --- 39,42 ---- *************** *** 88,92 **** // Text Panes document = new HighLightedDocument(); ! this.jTextPane = new JTextPane(document); popupmenu = new EditorPopupMenu(jTextPane); jTextPane.addMouseListener(new MouseInputAdapter() { --- 86,90 ---- // Text Panes document = new HighLightedDocument(); ! SqlEditor.jTextPane = new JTextPane(document); popupmenu = new EditorPopupMenu(jTextPane); jTextPane.addMouseListener(new MouseInputAdapter() { |
From: <efl...@us...> - 2003-05-24 18:50:51
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/components In directory sc8-pr-cvs1:/tmp/cvs-serv28037/src/org/devaki/nextobjects/ui/components Modified Files: CustomTable.java Log Message: Optimize "save" function. Small checkstyle optimization. Index: CustomTable.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/components/CustomTable.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CustomTable.java 11 Feb 2003 12:04:41 -0000 1.2 --- CustomTable.java 24 May 2003 18:50:46 -0000 1.3 *************** *** 40,44 **** if(!autoResize) { ! this.setAutoResizeMode(this.AUTO_RESIZE_OFF); } // Define the selection mode for the rows --- 40,44 ---- if(!autoResize) { ! this.setAutoResizeMode(CustomTable.AUTO_RESIZE_OFF); } // Define the selection mode for the rows |
From: <efl...@us...> - 2003-05-24 18:50:51
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects In directory sc8-pr-cvs1:/tmp/cvs-serv28037/src/org/devaki/nextobjects Modified Files: NextObjects.java Log Message: Optimize "save" function. Small checkstyle optimization. Index: NextObjects.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/NextObjects.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** NextObjects.java 4 May 2003 22:04:07 -0000 1.9 --- NextObjects.java 24 May 2003 18:50:46 -0000 1.10 *************** *** 46,53 **** import org.devaki.nextobjects.ui.toolbars.NOToolBar2; import org.devaki.nextobjects.util.ModelMan; - import org.devaki.nextobjects.util.EditorFactory; import org.devaki.nextobjects.util.NOTools; import org.devaki.nextobjects.ui.workspace.models.objects.DataDictionaryEdit; /* * --- 46,54 ---- import org.devaki.nextobjects.ui.toolbars.NOToolBar2; import org.devaki.nextobjects.util.ModelMan; import org.devaki.nextobjects.util.NOTools; + import org.devaki.nextobjects.util.EditorFactory; import org.devaki.nextobjects.ui.workspace.models.objects.DataDictionaryEdit; + /* * *************** *** 99,102 **** --- 100,107 ---- NOTools nOTools = new NOTools(); splash.jProgressBar1.setValue(5); + + + + |
From: <efl...@us...> - 2003-05-24 18:50:51
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models In directory sc8-pr-cvs1:/tmp/cvs-serv28037/src/org/devaki/nextobjects/workspace/models Modified Files: BaseModel.java ConceptualModel.java PhysicalModel.java Log Message: Optimize "save" function. Small checkstyle optimization. Index: BaseModel.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/BaseModel.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** BaseModel.java 3 May 2003 12:50:49 -0000 1.8 --- BaseModel.java 24 May 2003 18:50:47 -0000 1.9 *************** *** 21,25 **** import java.io.Serializable; - import java.awt.Dimension; import java.awt.Rectangle; import java.util.Vector; --- 21,24 ---- *************** *** 58,68 **** private boolean heavyIndexing = false; // Object Model ! private String packageName = "com.myapp.om"; ! private String baseClass = "com.myapp.om.BaseClass"; ! private String basePeer = "com.myapp.om.BassePeer"; private String defaultJavaNamingMethod = "underscore"; private String defaultJavaType = "primitive"; // Others ! private String fileForSave; // Status public boolean isSaved = false; --- 57,67 ---- private boolean heavyIndexing = false; // Object Model ! private String packageName = "org.devaki.nomodels.om"; ! private String baseClass = ""; ! private String basePeer = "org.apache.util.BasePeer"; private String defaultJavaNamingMethod = "underscore"; private String defaultJavaType = "primitive"; // Others ! private String fileForSave=null; // Status public boolean isSaved = false; Index: ConceptualModel.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/ConceptualModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ConceptualModel.java 1 Mar 2003 10:45:44 -0000 1.3 --- ConceptualModel.java 24 May 2003 18:50:47 -0000 1.4 *************** *** 23,27 **** import java.io.Serializable; import java.util.Vector; - import javax.imageio.*; import org.devaki.nextobjects.workspace.models.graphics.ConceptualView; import org.devaki.nextobjects.workspace.models.graphics.LineView; --- 23,26 ---- Index: PhysicalModel.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/PhysicalModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PhysicalModel.java 1 Mar 2003 10:45:44 -0000 1.3 --- PhysicalModel.java 24 May 2003 18:50:47 -0000 1.4 *************** *** 21,29 **** import java.io.Serializable; - import java.io.FileOutputStream; - import java.io.ObjectInputStream; - import java.io.ObjectOutputStream; - import java.io.FileInputStream; - import java.io.File; import java.util.Vector; import org.devaki.nextobjects.workspace.models.graphics.PhysicalView; --- 21,24 ---- *************** *** 31,35 **** import org.devaki.nextobjects.workspace.models.objects.Constraint; import org.devaki.nextobjects.workspace.models.objects.Table; ! import org.devaki.nextobjects.util.NOTools; public class PhysicalModel extends BaseModel implements Serializable --- 26,30 ---- import org.devaki.nextobjects.workspace.models.objects.Constraint; import org.devaki.nextobjects.workspace.models.objects.Table; ! public class PhysicalModel extends BaseModel implements Serializable |
From: <efl...@us...> - 2003-05-24 18:50:51
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/main In directory sc8-pr-cvs1:/tmp/cvs-serv28037/src/org/devaki/nextobjects/ui/main Modified Files: NOLog.java NOTreeView.java NOWorkspace.java SplashScreen.java Log Message: Optimize "save" function. Small checkstyle optimization. Index: NOLog.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/main/NOLog.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NOLog.java 5 Apr 2003 10:37:17 -0000 1.5 --- NOLog.java 24 May 2003 18:50:47 -0000 1.6 *************** *** 72,79 **** // 'jTabbedPane' ! this.jTabbedPane.add("Log ",scrollPane); ! this.jTabbedPane.add("SQL Viewer ",new SqlEditor()); // Content panel ! this.add(this.jTabbedPane, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, --- 72,79 ---- // 'jTabbedPane' ! NOLog.jTabbedPane.add("Log ",scrollPane); ! NOLog.jTabbedPane.add("SQL Viewer ",new SqlEditor()); // Content panel ! this.add(NOLog.jTabbedPane, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, Index: NOTreeView.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/main/NOTreeView.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NOTreeView.java 27 Apr 2003 17:05:26 -0000 1.6 --- NOTreeView.java 24 May 2003 18:50:47 -0000 1.7 *************** *** 25,29 **** import java.awt.Insets; import java.awt.event.MouseEvent; - import java.util.Vector; import javax.swing.JPanel; import javax.swing.JScrollPane; --- 25,28 ---- *************** *** 42,46 **** import org.devaki.nextobjects.util.ModelMan; import org.devaki.nextobjects.util.EditorFactory; - import org.devaki.nextobjects.workspace.models.BaseModel; import org.devaki.nextobjects.workspace.models.ConceptualModel; import org.devaki.nextobjects.workspace.models.PhysicalModel; --- 41,44 ---- *************** *** 53,57 **** import org.devaki.nextobjects.workspace.models.objects.Table; import org.devaki.nextobjects.workspace.models.objects.InheritanceLink; - import org.devaki.nextobjects.workspace.models.objects.BaseLine; /** --- 51,54 ---- Index: NOWorkspace.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/main/NOWorkspace.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NOWorkspace.java 5 Apr 2003 10:37:17 -0000 1.5 --- NOWorkspace.java 24 May 2003 18:50:47 -0000 1.6 *************** *** 31,34 **** --- 31,38 ---- import org.devaki.nextobjects.util.ModelMan; import org.devaki.nextobjects.workspace.models.BaseModel; + import org.devaki.nextobjects.ui.menus.NOMenuBar; + import org.devaki.nextobjects.ui.toolbars.NOToolBar1; + import org.devaki.nextobjects.ui.toolbars.NOToolBar2; + /** * A JTabbedPane which has a close ('X') icon on each tab. *************** *** 77,80 **** --- 81,88 ---- } } + NOMenuBar.fixFileMenu(); + NOMenuBar.fixEditMenu(); + NOToolBar1.fixIcons(); + NOToolBar2.fixIcons(); } Index: SplashScreen.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/main/SplashScreen.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SplashScreen.java 27 Apr 2003 17:05:26 -0000 1.4 --- SplashScreen.java 24 May 2003 18:50:47 -0000 1.5 *************** *** 25,31 **** import java.awt.Frame; import java.awt.Toolkit; - import java.awt.GridBagConstraints; import java.awt.BorderLayout; - import java.awt.Insets; import java.awt.Window; import javax.swing.BorderFactory; --- 25,29 ---- |
From: <efl...@us...> - 2003-05-24 18:50:51
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/workspace/models/objects In directory sc8-pr-cvs1:/tmp/cvs-serv28037/src/org/devaki/nextobjects/ui/workspace/models/objects Modified Files: ConstraintEdit.java EntityEdit.java Log Message: Optimize "save" function. Small checkstyle optimization. Index: ConstraintEdit.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/workspace/models/objects/ConstraintEdit.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ConstraintEdit.java 8 Mar 2003 12:57:21 -0000 1.3 --- ConstraintEdit.java 24 May 2003 18:50:47 -0000 1.4 *************** *** 43,47 **** import org.devaki.nextobjects.ui.components.CustomTextArea; import org.devaki.nextobjects.ui.components.CustomTextField; - import org.devaki.nextobjects.workspace.models.PhysicalModel; import org.devaki.nextobjects.workspace.models.objects.Constraint; import org.devaki.nextobjects.workspace.models.objects.Table; --- 43,46 ---- Index: EntityEdit.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/workspace/models/objects/EntityEdit.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EntityEdit.java 5 Apr 2003 10:34:24 -0000 1.6 --- EntityEdit.java 24 May 2003 18:50:47 -0000 1.7 *************** *** 78,82 **** "Name of the entity in the schema", true); ! private static CustomTextField jTextFieldEntityCode = new CustomTextField("", "Name of the entity in the database", true); --- 78,82 ---- "Name of the entity in the schema", true); ! private CustomTextField jTextFieldEntityCode = new CustomTextField("", "Name of the entity in the database", true); *************** *** 199,203 **** } }); ! this.jTextFieldEntityCode.addFocusListener(new FocusAdapter() { // Select the content of 'jTextFieldCode' when it gained focus --- 199,203 ---- } }); ! jTextFieldEntityCode.addFocusListener(new FocusAdapter() { // Select the content of 'jTextFieldCode' when it gained focus *************** *** 260,264 **** } }); ! this.jTextFieldEntityCode.getDocument().addDocumentListener(new DocumentListener() { // Not implemented --- 260,264 ---- } }); ! jTextFieldEntityCode.getDocument().addDocumentListener(new DocumentListener() { // Not implemented *************** *** 362,366 **** GridBagConstraints.NONE, new Insets(5, 0, 0, 0), 0, 0)); ! this.jPanelGeneralProperties.add(this.jTextFieldEntityCode, new GridBagConstraints(4, 0, 1, 1, 1.0, 0.0, --- 362,366 ---- GridBagConstraints.NONE, new Insets(5, 0, 0, 0), 0, 0)); ! this.jPanelGeneralProperties.add(jTextFieldEntityCode, new GridBagConstraints(4, 0, 1, 1, 1.0, 0.0, *************** *** 545,549 **** { if((this.jTextFieldName.getText().length() != 0) ! && (this.jTextFieldEntityCode.getText().length() != 0)) { // Both text fields length are different from zero, so enable 'jButtonOK' --- 545,549 ---- { if((this.jTextFieldName.getText().length() != 0) ! && (jTextFieldEntityCode.getText().length() != 0)) { // Both text fields length are different from zero, so enable 'jButtonOK' |
From: <efl...@us...> - 2003-05-06 20:19:57
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util In directory sc8-pr-cvs1:/tmp/cvs-serv7803 Modified Files: MeriseTransform.java Log Message: Well sorry as you can see I did it ... cvs -j 1.13 -j 1.12 MeriseTransform.java Sorry, committing in . Modified Files: MeriseTransform.java Index: MeriseTransform.java =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util/MeriseTransform.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MeriseTransform.java 3 May 2003 20:46:28 -0000 1.13 --- MeriseTransform.java 6 May 2003 20:19:52 -0000 1.14 *************** *** 342,352 **** /* Rule 3 */ Column newField; ! Constraint newCst=new Constraint(theDatabase, ! pAsso.getEntityAt(0).getSubsequentTable(), ! pAsso.getEntityAt(1).getSubsequentTable()); ! if (pAsso.getCardAt(0)==ConceptualModel._0N_ ! && pAsso.getCardAt(0)==ConceptualModel._1N_) { // ... newField=new Column(pAsso.getEntityAt(1).getIdentifier()); newField.setAutoIncrement(false); // always in that case! --- 342,353 ---- /* Rule 3 */ Column newField; ! Constraint newCst=null; ! if (pAsso.getCardAt(1)==ConceptualModel._0N_ ! || pAsso.getCardAt(1)==ConceptualModel._1N_) { // ... + newCst=new Constraint(theDatabase, + pAsso.getEntityAt(1).getSubsequentTable(), + pAsso.getEntityAt(0).getSubsequentTable()); newField=new Column(pAsso.getEntityAt(1).getIdentifier()); newField.setAutoIncrement(false); // always in that case! *************** *** 367,370 **** --- 368,374 ---- } else { // ... + newCst=new Constraint(theDatabase, + pAsso.getEntityAt(0).getSubsequentTable(), + pAsso.getEntityAt(1).getSubsequentTable()); newField=new Column(pAsso.getEntityAt(0).getIdentifier()); newField.setAutoIncrement(false); *************** *** 439,441 **** ModelMan.addTable(theDatabase,newTable); } ! } \ No newline at end of file --- 443,445 ---- ModelMan.addTable(theDatabase,newTable); } ! } |
From: <ro...@us...> - 2003-05-05 22:05:43
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects In directory sc8-pr-cvs1:/tmp/cvs-serv24832 Modified Files: build.xml Log Message: changed javadoc task Index: build.xml =================================================================== RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** build.xml 13 Apr 2003 20:05:43 -0000 1.7 --- build.xml 5 May 2003 22:05:38 -0000 1.8 *************** *** 108,112 **** classpathref="compile.classpath" destdir="${doc.home}" ! packagenames="nextobjects.*" author="true" private="false" --- 108,112 ---- classpathref="compile.classpath" destdir="${doc.home}" ! packagenames="org.devaki.nextobjects.*" author="true" private="false" *************** *** 203,205 **** </target> ! </project> \ No newline at end of file --- 203,205 ---- </target> ! </project> |