svn commit: r17742 - trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram

Author: bobtarling
Date: 2010-01-09 19:50:17-0800
New Revision: 17742

Modified:
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigActivation.java
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigDestroy.java
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigHead.java
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigLifeLine.java

Log:
Delete a mass of deprecated methods/classes

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigActivation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigActivation.java?view=diff&pathrev=17742&r1=17741&r2=17742
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigActivation.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigActivation.java	2010-01-09 19:50:17-0800
@@ -1,3 +1,19 @@
+/* $Id$
+ *******************************************************************************
+ * Copyright (c) 2010 Contributors - see below
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Bob Tarling
+ *    Christian López Espínola
+ *******************************************************************************
+ *
+ * Some portions of this file were previously release using the BSD License:
+ */
+
 // $Id$
 // Copyright (c) 2007-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -47,33 +63,6 @@
     private FigMessage activatingMessage;
     
     /**
-     * TODO: Document
-     * 
-     * @param x
-     * @param y
-     * @param destroy 
-     * @deprecated for 0.28 by tfmorris.  
-     */
-    public FigActivation(int x, int y, boolean destroy) {
-        super();
-        initialize(new Rectangle(x, y, DEFAULT_HEIGHT, DEFAULT_WIDTH), destroy);
-    }
-
-    private void initialize(Rectangle bounds, boolean destroy) {
-        if (bounds.width == 0) {
-            bounds.width = DEFAULT_WIDTH;
-        }
-        if (bounds.height == 0) {
-            bounds.height = DEFAULT_HEIGHT;
-        }
-        rectFig = new FigRect(bounds.x - bounds.width / 2, bounds.y,
-                bounds.width, bounds.height, LINE_COLOR, FILL_COLOR);
-        rectFig.setLineWidth(LINE_WIDTH);
-        addFig(rectFig);
-        setDestroy(destroy);
-    }
-
-    /**
      * Create a new default activation fig (ie one without a destroy fig at the
      * end).
      * 
@@ -114,6 +103,21 @@
         initialize(bounds, destroy);
     }
     
+    private void initialize(Rectangle bounds, boolean destroy) {
+        if (bounds.width == 0) {
+            bounds.width = DEFAULT_WIDTH;
+        }
+        if (bounds.height == 0) {
+            bounds.height = DEFAULT_HEIGHT;
+        }
+        rectFig = new FigRect(bounds.x - bounds.width / 2, bounds.y,
+                bounds.width, bounds.height, LINE_COLOR, FILL_COLOR);
+        rectFig.setLineWidth(LINE_WIDTH);
+        addFig(rectFig);
+        setDestroy(destroy);
+    }
+
+    
     /**     
      * @param isDestroy 
      */

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigDestroy.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigDestroy.java?view=diff&pathrev=17742&r1=17741&r2=17742
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigDestroy.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigDestroy.java	2010-01-09 19:50:17-0800
@@ -1,3 +1,19 @@
+/* $Id$
+ *******************************************************************************
+ * Copyright (c) 2010 Contributors - see below
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Bob Tarling
+ *    Christian López Espínola
+ *******************************************************************************
+ *
+ * Some portions of this file were previously release using the BSD License:
+ */
+
 // $Id$
 // Copyright (c) 2007-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -38,14 +54,17 @@
 class FigDestroy extends ArgoFigGroup {
     
     /**
-     * @param x
-     * @param y
-     * @deprecated for 0.28 by tfmorris
+     * Create an X to mark the destruction of a lifeline
+     * @param owner owning UML element
+     * @param bounds position and size (X will be drawn from corner to corner)
+     * @param settings render settings
      */
-    FigDestroy(int x, int y) {
-        createCross(new Rectangle(x, y, 10, 10));
+    FigDestroy(Object owner, Rectangle bounds, DiagramSettings settings) {
+        super(owner, settings);
+        createCross(bounds);
+        setLineWidth(LINE_WIDTH);
     }
-
+    
     private void createCross(Rectangle bounds) {
         addFig(new FigLine(bounds.x,
                         bounds.y,
@@ -57,16 +76,4 @@
                         bounds.x + bounds.width,
                         bounds.y));
     }
-    
-    /**
-     * Create an X to mark the destruction of a lifeline
-     * @param owner owning UML element
-     * @param bounds position and size (X will be drawn from corner to corner)
-     * @param settings render settings
-     */
-    FigDestroy(Object owner, Rectangle bounds, DiagramSettings settings) {
-        super(owner, settings);
-        createCross(bounds);
-        setLineWidth(LINE_WIDTH);
-    }
 }

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigHead.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigHead.java?view=diff&pathrev=17742&r1=17741&r2=17742
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigHead.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigHead.java	2010-01-09 19:50:17-0800
@@ -1,3 +1,18 @@
+/* $Id$
+ *******************************************************************************
+ * Copyright (c) 2010 Contributors - see below
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Bob Tarling
+ *    Christian López Espínola
+ *******************************************************************************
+ *
+ * Some portions of this file were previously release using the BSD License:
+ */
 // $Id$
 // Copyright (c) 2007-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -45,16 +60,9 @@
     static final int DEFAULT_WIDTH = 150;
     static final int DEFAULT_HEIGHT = 50;
     
-    /**
-     * Constructor.
-     * 
-     * @param stereotypeFigure the stereotype fig
-     * @param nameFigure the name fig
-     * @deprecated for 0.28 by tfmorris. Use
-     *             {@link #FigHead(Object, DiagramSettings, Fig, FigText)}.
-     */
-    @Deprecated
-    FigHead(Fig stereotypeFigure, FigText nameFigure) {
+    FigHead(Object owner, DiagramSettings settings, Fig stereotypeFigure,
+            FigText nameFigure) {
+        super(owner, settings);
         initialize(stereotypeFigure, nameFigure);
     }
 
@@ -75,14 +83,6 @@
         addFig(nameFig);
         addFig(stereotypeFig);
     }
-    
-    FigHead(Object owner, DiagramSettings settings, Fig stereotypeFigure,
-            FigText nameFigure) {
-        super(owner, settings);
-        initialize(stereotypeFigure, nameFigure);
-    }
-
-
 
     /**
      * @param x The x coordinate.

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigLifeLine.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigLifeLine.java?view=diff&pathrev=17742&r1=17741&r2=17742
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigLifeLine.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigLifeLine.java	2010-01-09 19:50:17-0800
@@ -1,3 +1,19 @@
+/* $Id$
+ *******************************************************************************
+ * Copyright (c) 2010 Contributors - see below
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Bob Tarling
+ *    Christian López Espínola
+ *******************************************************************************
+ *
+ * Some portions of this file were previously release using the BSD License:
+ */
+
 // $Id$
 // Copyright (c) 2007-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -54,20 +70,11 @@
     static final int WIDTH = 150;
     static final int HEIGHT = 500;
 
-    /**
-     * Creates a FigLifeLine that starts in (x,y)
-     * @param x The x coordinate of the FigLifeLine
-     * @param y The y coordinate of the FigLifeLine
-     * @deprecated for 0.28 by tfmorris.  Use 
-     * {@link #FigLifeLine(Object, Rectangle, DiagramSettings)}.
-     */
-    @Deprecated
-    FigLifeLine(int x, int y) {
-        super();
-
-        initialize(x, y);
+    FigLifeLine(Object owner, Rectangle bounds, DiagramSettings settings) {
+        super(owner, settings);
+        initialize(bounds.x, bounds.y);
     }
-
+    
     private void initialize(int x, int y) {
         activations = new LinkedList<FigActivation>();
         stackedActivations = new LinkedList<FigActivation>();
@@ -84,11 +91,6 @@
         addFig(lineFig);
     }
     
-    FigLifeLine(Object owner, Rectangle bounds, DiagramSettings settings) {
-        super(owner, settings);
-        initialize(bounds.x, bounds.y);
-    }
-    
     // TODO: Does this still need to be synchronized? If so then explain why.
     synchronized void createActivations(final List<FigMessage> messages) {
         clearActivations();

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2436020

To unsubscribe from this discussion, e-mail: [[email protected]].