[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/graphics ConceptualView.java,1.14,1.15 ConstraintView.java,1.5,1.6 InheritanceLinkView.java,1.4,1.5 PhysicalView.java,1.15,1.16 TableView.java,1.5,1.6

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

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 ----