svn commit: r17741 - trunk/src/argouml-app/src/org/argouml: cognitive kernel uml/diagram/ui
Bob Tarling <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: bobtarling
Date: 2010-01-09 19:50:08-0800
New Revision: 17741
Removed:
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesCompartment.java
Modified:
trunk/src/argouml-app/src/org/argouml/cognitive/ToDoList.java
trunk/src/argouml-app/src/org/argouml/kernel/Project.java
trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java
trunk/src/argouml-app/src/org/argouml/kernel/ProjectSettings.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigTextGroup.java
Log:
Delete a mass of deprecated methods/classes
Modified: trunk/src/argouml-app/src/org/argouml/cognitive/ToDoList.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/cognitive/ToDoList.java?view=diff&pathrev=17741&r1=17740&r2=17741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/cognitive/ToDoList.java (original)
+++ trunk/src/argouml-app/src/org/argouml/cognitive/ToDoList.java 2010-01-09 19:50:08-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
+ *******************************************************************************
+ *
+ * Some portions of this file were previously release using the BSD License:
+ */
+
// $Id$
// Copyright (c) 1996-2008 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -656,12 +671,8 @@
/**
* @param item the todo item
- * @deprecated in 0.27.2 by Bob Tarling. ToDoList is not designed to be
- * extended so protected is not required. This method is not used with the
- * package so scope will become private in future.
*/
- @Deprecated
- protected void fireToDoItemChanged(ToDoItem item) {
+ void fireToDoItemChanged(ToDoItem item) {
Object[] listeners = listenerList.getListenerList();
ToDoListEvent e = null;
// Process the listeners last to first, notifying
Modified: trunk/src/argouml-app/src/org/argouml/kernel/Project.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/Project.java?view=diff&pathrev=17741&r1=17740&r2=17741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/Project.java (original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/Project.java 2010-01-09 19:50:08-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:
+ * Tom Morris
+ * Bob Tarling
+ *******************************************************************************
+ *
+ * Some portions of this file were previously release using the BSD License:
+ */
+
// $Id$
// Copyright (c) 2007-2008 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -412,15 +428,6 @@
public Object getInitialTarget();
/**
- * @return the VetoableChangeSupport object
- * @see VetoableChangeSupport
- * @deprecated for 0.27.3 by tfmorris. This appears to be unused anywhere in
- * ArgoUML. Speak up now if you need it.
- */
- @Deprecated
- public VetoableChangeSupport getVetoSupport();
-
- /**
* This is executed before a save.
*/
public void preSave();
@@ -550,20 +557,6 @@
public void setUUIDRefs(final Map<String, Object> uUIDRefs);
/**
- * Sets the VetoableChangeSupport object. This will be returned by
- * {@link #getVetoSupport()} but is otherwise unused.
- * <p>
- * TODO: Why is this here since it's never used? - tfm
- *
- * @param theVetoSupport The vetoSupport to set
- * @see VetoableChangeSupport
- * @deprecated for 0.27.3 by tfmorris. This appears to be unused anywhere in
- * ArgoUML. Speak up now if you need it.
- */
- @Deprecated
- public void setVetoSupport(VetoableChangeSupport theVetoSupport);
-
- /**
* Get the current viewed diagram.
* <p>
* Used by "argo.tee" to save the name of this diagram, so that the same
Modified: trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java?view=diff&pathrev=17741&r1=17740&r2=17741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java (original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java 2010-01-09 19:50:08-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:
+ * Tom Morris
+ * Bob Tarling
+ *******************************************************************************
+ *
+ * Some portions of this file were previously release using the BSD License:
+ */
+
// $Id$
// Copyright (c) 1996-2008 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -525,7 +541,16 @@
return Collections.unmodifiableCollection(result);
}
-
+ /**
+ * Return the model.<p>
+ *
+ * If there isn't exactly one model, <code>null</code> is returned.
+ *
+ * @return the model.
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #getUserDefinedModelList()} or {@link #getModels()}.
+ * @see org.argouml.kernel.Project#getModel()
+ */
@SuppressWarnings("deprecation")
@Deprecated
public Object getModel() {
@@ -763,24 +788,12 @@
return null;
}
-
- @SuppressWarnings("deprecation")
- @Deprecated
- public VetoableChangeSupport getVetoSupport() {
- if (vetoSupport == null) {
- vetoSupport = new VetoableChangeSupport(this);
- }
- return vetoSupport;
- }
-
-
public void preSave() {
for (ArgoDiagram diagram : diagrams) {
diagram.preSave();
}
}
-
public void postSave() {
for (ArgoDiagram diagram : diagrams) {
diagram.postSave();
@@ -788,7 +801,6 @@
setSaveEnabled(true);
}
-
public void postLoad() {
long startTime = System.currentTimeMillis();
for (ArgoDiagram diagram : diagrams) {
@@ -997,14 +1009,6 @@
uuidRefs = uUIDRefs;
}
-
- @SuppressWarnings("deprecation")
- @Deprecated
- public void setVetoSupport(VetoableChangeSupport theVetoSupport) {
- vetoSupport = theVetoSupport;
- }
-
-
@SuppressWarnings("deprecation")
@Deprecated
public ArgoDiagram getActiveDiagram() {
Modified: trunk/src/argouml-app/src/org/argouml/kernel/ProjectSettings.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/ProjectSettings.java?view=diff&pathrev=17741&r1=17740&r2=17741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/ProjectSettings.java (original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/ProjectSettings.java 2010-01-09 19:50:08-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:
+ * Michiel van der Wulp
+ * Bob Tarling
+ *******************************************************************************
+ *
+ * Some portions of this file were previously release using the BSD License:
+ */
+
// $Id$
// Copyright (c) 2006-2009 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -236,48 +252,7 @@
* @return Returns "true" if we show bold names.
*/
public String getShowBoldNames() {
- return Boolean.toString(getShowBoldNamesValue());
- }
-
- /**
- * @return Returns <code>true</code> if we show bold names.
- * @deprecated for 0.27.2 by tfmorris. Use {@link DiagramSettings}.
- */
- @Deprecated
- public boolean getShowBoldNamesValue() {
- return diaDefault.isShowBoldNames();
- }
-
- /**
- * @param showbold <code>true</code> if names are to be shown in bold font.
- * @deprecated for 0.27.2 by tfmorris. Use {@link DiagramSettings}.
- */
- @Deprecated
- public void setShowBoldNames(String showbold) {
- setShowBoldNames(Boolean.valueOf(showbold).booleanValue());
- }
-
- /**
- * @param showem <code>true</code> if names are to be shown in bold font.
- * @deprecated for 0.27.2 by tfmorris. Use {@link DiagramSettings}.
- */
- @Deprecated
- public void setShowBoldNames(final boolean showem) {
- if (diaDefault.isShowBoldNames() == showem) {
- return;
- }
-
- Memento memento = new Memento() {
-
- public void redo() {
- diaDefault.setShowBoldNames(showem);
- }
-
- public void undo() {
- diaDefault.setShowBoldNames(!showem);
- }
- };
- doUndoable(memento);
+ return Boolean.toString(diaDefault.isShowBoldNames());
}
/**
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java?view=diff&pathrev=17741&r1=17740&r2=17741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java 2010-01-09 19:50:08-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:
+ * Tom Morris
+ * Bob Tarling
+ *******************************************************************************
+ *
+ * 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
@@ -26,11 +41,10 @@
import java.awt.Color;
-import org.argouml.kernel.Project;
import org.argouml.uml.diagram.DiagramSettings;
/**
- * An interface that all ArgoUML Figs are required to interface. It provides a
+ * An interface that all ArgoUML Figs are required to implament. It provides a
* single place to specify behaviors that we want all Figs to have since we
* don't have access to the GEF class hierarchy (and it is made up of concrete
* classes instead of interfaces.
@@ -118,30 +132,6 @@
*/
static final Color DEBUG_COLOR = new Color(255, 0, 255, !DEBUG ? 0 : 255);
-
- /**
- * Set the owning project for this Fig. This is an optional operation which
- * may throw an {@link UnsupportedOperationException} if not implemented.
- *
- * @param project the project
- * @deprecated for 0.27.2 by tfmorris. This optional method has never been
- * implemented by any concrete class that implements this
- * interface and should not be used. Project ownership is
- * maintained at a coarser granularity level.
- */
- @Deprecated
- public void setProject(Project project);
-
- /**
- * Get the owning project for this fig.
- *
- * @return the owning project
- * @deprecated for 0.27.2 by tfmorris. Implementations should have all the
- * information that they require in the DiagramSettings object.
- */
- @Deprecated
- public Project getProject();
-
/**
* Rerender the entire fig.
* <p>
@@ -165,16 +155,4 @@
* @param settings the rendering settings to use
*/
public void setSettings(DiagramSettings settings);
-
- /**
- * Setting the owner of the Fig must be done in the constructor and
- * not changed afterwards for all ArgoUML figs.
- *
- * @param owner owning UML element
- * @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
- * @deprecated for 0.27.3 by tfmorris. Set owner in constructor.
- */
- @Deprecated
- public void setOwner(Object owner);
-
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java?view=diff&pathrev=17741&r1=17740&r2=17741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java 2010-01-09 19:50:08-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:
+ * Tom Morris
+ * Bob Tarling
+ *******************************************************************************
+ *
+ * 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
@@ -43,20 +58,10 @@
private static final Logger LOG = Logger.getLogger(ArgoFigGroup.class);
+ // TODO: Make this final asap.
private DiagramSettings settings;
/**
- * Default constructor.
- * @deprecated for 0.27.3 by tfmorris. Use
- * {@link #ArgoFigGroup(Object, DiagramSettings)}.
- */
- @Deprecated
- public ArgoFigGroup() {
- super();
- }
-
-
- /**
* Construct an empty FigGroup with the given DiagramSettings.
* object.
* @param owner owning UML element
@@ -69,19 +74,6 @@
}
/**
- * Construct a FigGroup which contains the listed figs.
- *
- * @param arg0 the Figs that make up the Group
- * @deprecated for 0.27.3 by tfmorris. Use
- * {@link #ArgoFigGroup(List, DiagramSettings)}.
- */
- @Deprecated
- public ArgoFigGroup(List<ArgoFig> arg0) {
- super(arg0);
- }
-
-
- /**
* This optional method is not implemented. It will throw an
* {@link UnsupportedOperationException} if used. Figs are
* added to a GraphModel which is, in turn, owned by a project.<p>
@@ -132,6 +124,11 @@
return settings;
}
+ /**
+ * @deprecated for 0.29.3 by Bob Tarling. The diagram settings are
+ * provided to the constructor and then should never change.
+ * When this method is removed the "settings" variable can become final.
+ */
public void setSettings(DiagramSettings renderSettings) {
settings = renderSettings;
renderingChanged();
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java?view=diff&pathrev=17741&r1=17740&r2=17741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java 2010-01-09 19:50:08-0800
@@ -86,22 +86,6 @@
private Fig externalSeparatorFig = new FigSeparator(X0, Y0, 11, LINE_WIDTH);
- /**
- * The constructor.
- *
- * @param x x
- * @param y y
- * @param w width
- * @param h height
- * @deprecated for 0.27.3 by tfmorris. Use
- * {@link #FigCompartment(Object, Rectangle, DiagramSettings)}.
- */
- @SuppressWarnings("deprecation")
- @Deprecated
- public FigCompartment(int x, int y, int w, int h) {
- constructFigs(x, y, w, h);
- }
-
private void constructFigs(int x, int y, int w, int h) {
bigPort = new FigPort(X0, Y0, w, h);
bigPort.setFilled(false);
Removed: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesCompartment.java?view=markup&pathrev=17740
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java?view=diff&pathrev=17741&r1=17740&r2=17741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java 2010-01-09 19:50:08-0800
@@ -101,26 +101,10 @@
private boolean hidingStereotypesWithIcon = false;
- /**
- * The constructor.
- *
- * @param x x
- * @param y y
- * @param w width
- * @param h height
- * @deprecated for 0.27.3 by tfmorris. Use
- * {@link #FigStereotypesGroup(Object, Rectangle, DiagramSettings)}.
- */
- @SuppressWarnings("deprecation")
- @Deprecated
- public FigStereotypesGroup(int x, int y, int w, int h) {
- super();
- constructFigs(x, y, w, h);
- }
-
private void constructFigs(int x, int y, int w, int h) {
bigPort = new FigRect(x, y, w, h, LINE_COLOR, FILL_COLOR);
addFig(bigPort);
+ bigPort.setFilled(false);
/* Do not show border line, make transparent: */
setLineWidth(0);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigTextGroup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigTextGroup.java?view=diff&pathrev=17741&r1=17740&r2=17741
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigTextGroup.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigTextGroup.java 2010-01-09 19:50:08-0800
@@ -1,3 +1,17 @@
+/* $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
+ *******************************************************************************
+ *
+ * Some portions of this file were previously release using the BSD License:
+ */
// $Id$
// Copyright (c) 2003-2008 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -46,16 +60,6 @@
private boolean supressCalcBounds = false;
/**
- * @deprecated for 0.27.3 by tfmorris. Use
- * {@link #FigTextGroup(Object, DiagramSettings)}.
- */
- @SuppressWarnings("deprecation")
- @Deprecated
- public FigTextGroup() {
- super();
- }
-
- /**
* Construct a FigGroup with the given render settings.
*
* @param owner owning UML element
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2436019
To unsubscribe from this discussion, e-mail: [[email protected]].