[Squirrel-sql-commits] sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph Constraint
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
Menu
▾
▴
[Squirrel-sql-commits] sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph ConstraintView.java,1.7,1.8 EdgesGraphComponent.java,1.1,1.2 GraphComponent.java,1.2,1.3 GraphDesktopController.java,1.5,1.6 GraphDesktopPane.java,1.6,1.7 TableFrame.java,1.4,1.5 TableFrameController.java,1.7,1.8 ZoomPrintController.java,1.3,1.4
|
From: Gerd W. <ger...@us...> - 2004-10-20 21:25:05
|
Update of /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13257 Modified Files: ConstraintView.java EdgesGraphComponent.java GraphComponent.java GraphDesktopController.java GraphDesktopPane.java TableFrame.java TableFrameController.java ZoomPrintController.java Log Message: Bug fixing Index: TableFrame.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/TableFrame.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TableFrame.java 18 Oct 2004 21:42:30 -0000 1.4 --- TableFrame.java 20 Oct 2004 21:24:53 -0000 1.5 *************** *** 166,170 **** selectedTextColor = Color.black; notSelectedTextColor = Color.black; - //setFont(new Font("Tahoma", Font.BOLD, 11)); setFont(new Font(getFont().getFontName(), Font.BOLD, getFont().getSize())); } --- 166,169 ---- *************** *** 209,213 **** if (r.x == 0) r.x = frame.getWidth() - frame.getInsets().right; titleX = menuBar.getX() + menuBar.getWidth() + 2; ! titleW = r.x - titleX - 3; title = getTitle(frame.getTitle(), fm, titleW); --- 208,212 ---- if (r.x == 0) r.x = frame.getWidth() - frame.getInsets().right; titleX = menuBar.getX() + menuBar.getWidth() + 2; ! titleW = (int)( (r.x - titleX - 3)/_zoomer.getZoom() + 0.5 ); title = getTitle(frame.getTitle(), fm, titleW); Index: GraphDesktopController.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GraphDesktopController.java 15 Oct 2004 04:00:13 -0000 1.5 --- GraphDesktopController.java 20 Oct 2004 21:24:53 -0000 1.6 *************** *** 207,215 **** { _desktopPane.putGraphComponents(constraintViews); - - for (int i = 0; i < constraintViews.length; i++) - { - constraintViews[i].setDesktopController(this); - } } --- 207,210 ---- *************** *** 220,224 **** for (int i = 0; i < constraintViews.length; i++) { ! constraintViews[i].setDesktopController(null); } } --- 215,219 ---- for (int i = 0; i < constraintViews.length; i++) { ! constraintViews[i].removeAllFoldingPoints(); } } Index: GraphDesktopPane.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopPane.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GraphDesktopPane.java 18 Oct 2004 21:42:30 -0000 1.6 --- GraphDesktopPane.java 20 Oct 2004 21:24:53 -0000 1.7 *************** *** 1,5 **** package net.sourceforge.squirrel_sql.plugins.graph; ! import net.sourceforge.squirrel_sql.client.gui.ScrollableDesktopPane; import javax.swing.*; --- 1,5 ---- package net.sourceforge.squirrel_sql.plugins.graph; ! import net.sourceforge.squirrel_sql.fw.gui.ScrollableDesktopPane; import javax.swing.*; *************** *** 59,70 **** } ! if(_isPrinting && comp instanceof EdgesGraphComponent) ! { ! // When printing edges are not painted ! } ! else ! { ! comp.paint(g); ! } } } --- 59,63 ---- } ! comp.paint(g, _isPrinting); } } Index: TableFrameController.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/TableFrameController.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TableFrameController.java 18 Oct 2004 22:43:50 -0000 1.7 --- TableFrameController.java 20 Oct 2004 21:24:53 -0000 1.8 *************** *** 52,55 **** --- 52,56 ---- private JCheckBoxMenuItem _mnuPksAndConstraintsOnTop; private JCheckBoxMenuItem _mnuDbOrder; + private JMenuItem _mnuClose; private AddTableListener _addTablelListener; private ConstraintViewListener _constraintViewListener; *************** *** 66,75 **** ! public TableFrameController(ISession session, GraphDesktopController paintManager, AddTableListener listener, String tableName, TableFrameControllerXmlBean xmlBean) { try { _session = session; ! _desktopController = paintManager; _addTablelListener = listener; --- 67,76 ---- ! public TableFrameController(ISession session, GraphDesktopController desktopController, AddTableListener listener, String tableName, TableFrameControllerXmlBean xmlBean) { try { _session = session; ! _desktopController = desktopController; _addTablelListener = listener; *************** *** 316,323 **** FontMetrics fm = _frame.txtColumsFactory.getGraphics().getFontMetrics(_frame.txtColumsFactory.getFont()); for (int i = 0; i < _colInfos.length; i++) { ! int unscrolledHeight = _colInfos[i].getIndex() * fm.getHeight(); ! if(unscrolledHeight <= point.y && point.y <= unscrolledHeight + fm.getHeight()) { return _colInfos[i]; --- 317,325 ---- FontMetrics fm = _frame.txtColumsFactory.getGraphics().getFontMetrics(_frame.txtColumsFactory.getFont()); + int zoomedFontHeight = (int)( fm.getHeight() * _desktopController.getZoomer().getZoom() + 0.5); for (int i = 0; i < _colInfos.length; i++) { ! int unscrolledHeight = _colInfos[i].getIndex() * zoomedFontHeight; ! if(unscrolledHeight <= point.y && point.y <= unscrolledHeight + zoomedFontHeight) { return _colInfos[i]; *************** *** 426,429 **** --- 428,442 ---- }); + _mnuClose = new JMenuItem("close"); + _mnuClose.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + onClose(); + _frame.setVisible(false); + _frame.dispose(); + } + }); + _popUp.add(_mnuAddTableForForeignKey); *************** *** 435,438 **** --- 448,454 ---- _popUp.add(_mnuOrderByName); _popUp.add(_mnuPksAndConstraintsOnTop); + _popUp.add(new JSeparator()); + _popUp.add(_mnuClose); + _frame.txtColumsFactory.addMouseListener(new MouseAdapter() { Index: ConstraintView.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/ConstraintView.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ConstraintView.java 13 Oct 2004 20:54:40 -0000 1.7 --- ConstraintView.java 20 Oct 2004 21:24:53 -0000 1.8 *************** *** 234,238 **** } ! public void paint(Graphics g) { GraphLine[] lines = _constraintGraph.getAllLines(); --- 234,238 ---- } ! public void paint(Graphics g, boolean isPrinting) { GraphLine[] lines = _constraintGraph.getAllLines(); *************** *** 257,263 **** Vector foldingPoints = _constraintGraph.getFoldingPoints(); ! for (int i = 0; i < foldingPoints.size(); i++) { ! drawFoldingPoint(g, (Point) foldingPoints.get(i)); } } --- 257,266 ---- Vector foldingPoints = _constraintGraph.getFoldingPoints(); ! if(false == isPrinting) { ! for (int i = 0; i < foldingPoints.size(); i++) ! { ! drawFoldingPoint(g, (Point) foldingPoints.get(i)); ! } } } *************** *** 548,559 **** } ! public void setDesktopController(GraphDesktopController desktopController) { ! _desktopController = desktopController; ! ! if (null == desktopController) ! { ! _constraintGraph.removeAllFoldingPoints(); ! } } --- 551,557 ---- } ! public void removeAllFoldingPoints() { ! _constraintGraph.removeAllFoldingPoints(); } Index: ZoomPrintController.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/ZoomPrintController.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ZoomPrintController.java 15 Oct 2004 04:00:13 -0000 1.3 --- ZoomPrintController.java 20 Oct 2004 21:24:53 -0000 1.4 *************** *** 121,125 **** _panel.btnPrint.setEnabled(_panel.chkShowEdges.isSelected()); ! fireEdgesGraphComponentChanged(_panel.chkShowEdges.isSelected()); } --- 121,125 ---- _panel.btnPrint.setEnabled(_panel.chkShowEdges.isSelected()); ! fireEdgesGraphComponentChanged(_panel.chkShowEdges.isSelected() && _panel.isVisible()); } *************** *** 258,261 **** --- 258,262 ---- _panel.setVisible(b); _zoomer.setEnabled(b); + fireEdgesGraphComponentChanged(b); onShowEdges(); Index: GraphComponent.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/GraphComponent.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GraphComponent.java 17 Jun 2004 12:07:34 -0000 1.2 --- GraphComponent.java 20 Oct 2004 21:24:53 -0000 1.3 *************** *** 5,9 **** public interface GraphComponent { ! void paint(Graphics g); Dimension getRequiredSize(); --- 5,9 ---- public interface GraphComponent { ! void paint(Graphics g, boolean isPrinting); Dimension getRequiredSize(); Index: EdgesGraphComponent.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/EdgesGraphComponent.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EdgesGraphComponent.java 13 Oct 2004 20:54:40 -0000 1.1 --- EdgesGraphComponent.java 20 Oct 2004 21:24:53 -0000 1.2 *************** *** 28,33 **** } ! public void paint(Graphics g) { int pixelByCm = (int) (Toolkit.getDefaultToolkit().getScreenResolution() * CM_BY_INCH + 0.5); --- 28,39 ---- } ! public void paint(Graphics g, boolean isPrinting) { + if(isPrinting) + { + return; + } + + int pixelByCm = (int) (Toolkit.getDefaultToolkit().getScreenResolution() * CM_BY_INCH + 0.5); |