Thread: [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
From: Gerd W. <ger...@us...> - 2004-06-17 12:07:44
|
Update of /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4262 Modified Files: ConstraintGraph.java ConstraintView.java GraphComponent.java GraphDesktopPane.java Log Message: If folding points go outside then scrollbars are shown now. Index: GraphDesktopPane.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopPane.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GraphDesktopPane.java 31 May 2004 11:38:36 -0000 1.1 --- GraphDesktopPane.java 17 Jun 2004 12:07:34 -0000 1.2 *************** *** 11,14 **** --- 11,27 ---- { private Vector _graphComponents = new Vector(); + private ConstraintViewListener _constraintViewListener; + + public GraphDesktopPane() + { + _constraintViewListener = new ConstraintViewListener() + { + public void foldingPointMoved(ConstraintView source) + { + revalidate(); + } + }; + } + public void paint(Graphics g) *************** *** 31,34 **** --- 44,52 ---- if(false == _graphComponents.contains(graphComponents[i])) { + if(graphComponents[i] instanceof ConstraintView) + { + ((ConstraintView)graphComponents[i]).addConstraintViewListener(_constraintViewListener); + } + _graphComponents.add(graphComponents[i]); } *************** *** 46,48 **** --- 64,89 ---- } + + public Dimension getRequiredSize() + { + Dimension reqSize = super.getRequiredSize(); + for (int i = 0; i < _graphComponents.size(); i++) + { + GraphComponent graphComponent = (GraphComponent) _graphComponents.elementAt(i); + Dimension buf = graphComponent.getRequiredSize(); + + if(buf.width > reqSize.width) + { + reqSize.width = buf.width; + } + + if(buf.height > reqSize.height) + { + reqSize.height = buf.height; + } + } + + return reqSize; + + } } Index: ConstraintGraph.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/ConstraintGraph.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ConstraintGraph.java 15 Jun 2004 18:02:26 -0000 1.2 --- ConstraintGraph.java 17 Jun 2004 12:07:33 -0000 1.3 *************** *** 164,167 **** --- 164,177 ---- public void moveLastHitFoldingPointTo(Point point) { + if(point.x < 0) + { + point.x = 0; + } + if(point.y < 0) + { + point.y = 0; + } + + _foldingPoints.indexOf(_hitFoldingPoint); _foldingPoints.set(_foldingPoints.indexOf(_hitFoldingPoint), point); Index: GraphComponent.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/GraphComponent.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GraphComponent.java 31 May 2004 11:38:36 -0000 1.1 --- GraphComponent.java 17 Jun 2004 12:07:34 -0000 1.2 *************** *** 6,8 **** --- 6,10 ---- { void paint(Graphics g); + + Dimension getRequiredSize(); } Index: ConstraintView.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/ConstraintView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ConstraintView.java 15 Jun 2004 18:02:26 -0000 1.2 --- ConstraintView.java 17 Jun 2004 12:07:34 -0000 1.3 *************** *** 35,39 **** private ISession _session; private TableFrameController _pkFramePointingTo; ! private ConstraintViewListener _constraintViewListener; public ConstraintView(ConstraintData constraintData, GraphDesktopController desktopController, ISession session) --- 35,39 ---- private ISession _session; private TableFrameController _pkFramePointingTo; ! private Vector _constraintViewListeners = new Vector(); public ConstraintView(ConstraintData constraintData, GraphDesktopController desktopController, ISession session) *************** *** 192,196 **** { _pkFramePointingTo = pkFramePointingTo; ! _constraintViewListener = constraintViewListener; int fkCenterY = getCenterY(fkPoints.points); --- 192,196 ---- { _pkFramePointingTo = pkFramePointingTo; ! addConstraintViewListener(constraintViewListener); int fkCenterY = getCenterY(fkPoints.points); *************** *** 244,247 **** --- 244,271 ---- } + public Dimension getRequiredSize() + { + Dimension ret = new Dimension(); + for (int i = 0; i < _constraintGraph.getFoldingPoints().size(); i++) + { + Point fp =(Point) _constraintGraph.getFoldingPoints().get(i); + + if(fp.x > ret.width) + { + ret.width = fp.x; + } + + if(fp.y > ret.height) + { + ret.height = fp.y; + } + } + + ret.width += 5; + ret.height += 5; + + return ret; + } + private void paintArrow(Graphics g, int x1, int y1, int x2, int y2) { *************** *** 454,458 **** // hit is on folding point _constraintGraph.moveLastHitFoldingPointTo(e.getPoint()); ! _constraintViewListener.foldingPointMoved(this); } } --- 478,487 ---- // hit is on folding point _constraintGraph.moveLastHitFoldingPointTo(e.getPoint()); ! ! ConstraintViewListener[] listeners = (ConstraintViewListener[]) _constraintViewListeners.toArray(new ConstraintViewListener[_constraintViewListeners.size()]); ! for (int i = 0; i < listeners.length; i++) ! { ! listeners[i].foldingPointMoved(this); ! } } } *************** *** 477,479 **** --- 506,514 ---- _constraintData.replaceCopiedColsByReferences(colInfos); } + + public void addConstraintViewListener(ConstraintViewListener constraintViewListener) + { + _constraintViewListeners.remove(constraintViewListener); + _constraintViewListeners.add(constraintViewListener); + } } |