Author: tfmorris
Date: 2008-11-23 22:21:10-0800
New Revision: 16166
Modified:
trunk/src/argouml-app/src/org/argouml/kernel/MemberList.java
trunk/src/argouml-app/src/org/argouml/ui/SystemInfoDialog.java
trunk/src/argouml-app/src/org/argouml/ui/targetmanager/TargetManager.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/layout/ClassdiagramLayouter.java
trunk/src/argouml-app/src/org/argouml/uml/reveng/ImporterManager.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java
Log:
Remove misc. deprecated methods
Modified: trunk/src/argouml-app/src/org/argouml/kernel/MemberList.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/MemberList.java?view=diff&rev=16166&p1=trunk/src/argouml-app/src/org/argouml/kernel/MemberList.java&p2=trunk/src/argouml-app/src/org/argouml/kernel/MemberList.java&r1=16165&r2=16166
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/MemberList.java (original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/MemberList.java 2008-11-23 22:21:10-0800
@@ -225,57 +225,6 @@
diagramMembers.clear();
}
- /**
- * @param type the type of the member
- * @return the member of the project
- * @deprecated by MVW in V0.25.2: no replacement needed since not used.
- * Rationale: this class should ONLY implement List, nothing more.
- */
- @Deprecated
- public synchronized ProjectMember getMember(Class type) {
- if (type == ProjectMemberModel.class) {
- return model;
- }
- if (type == ProjectMemberTodoList.class) {
- return todoList;
- }
- if (type == ProfileConfiguration.class) {
- return profileConfiguration;
- }
- throw new IllegalArgumentException(
- "There is no single instance of a " + type.getName() + " member");
- }
-
- /**
- * @param type the type of the member
- * @return the member of the project
- * @deprecated by MVW in V0.25.2: no replacement needed since not used.
- * Rationale: this class should ONLY implement List, nothing more.
- */
- @Deprecated
- public synchronized List getMembers(Class type) {
- if (type == ProjectMemberModel.class) {
- List<ProjectMember> temp = new ArrayList<ProjectMember>(1);
- temp.add(model);
- return temp;
- }
- if (type == ProjectMemberTodoList.class) {
- List<ProjectMember> temp = new ArrayList<ProjectMember>(1);
- temp.add(todoList);
- return temp;
- }
- if (type == ProjectMemberDiagram.class) {
- return diagramMembers;
- }
- if (type == ProfileConfiguration.class) {
- List<ProjectMember> temp = new ArrayList<ProjectMember>(1);
- temp.add(profileConfiguration);
- return temp;
- }
- throw new IllegalArgumentException(
- "There is no single instance of a " + type.getName() + " member");
- }
-
public synchronized ProjectMember get(int i) {
if (model != null) {
if (i == 0) {
@@ -374,24 +323,5 @@
throw new UnsupportedOperationException();
}
- /**
- * @return the project member
- * @deprecated by MVW in V0.25.2: no replacement needed since not used.
- * Rationale: this class should ONLY implement List, nothing more.
- */
- @Deprecated
- public AbstractProjectMember getProfileConfiguration() {
- return profileConfiguration;
- }
-
- /**
- * @param profileConfig the new profile configuration
- * @deprecated by MVW in V0.25.2: no replacement needed since not used.
- * Rationale: this class should ONLY implement List, nothing more.
- */
- @Deprecated
- public void setProfileConfiguration(AbstractProjectMember profileConfig) {
- profileConfiguration = profileConfig;
- }
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/SystemInfoDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/SystemInfoDialog.java?view=diff&rev=16166&p1=trunk/src/argouml-app/src/org/argouml/ui/SystemInfoDialog.java&p2=trunk/src/argouml-app/src/org/argouml/ui/SystemInfoDialog.java&r1=16165&r2=16166
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/SystemInfoDialog.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/SystemInfoDialog.java 2008-11-23 22:21:10-0800
@@ -69,19 +69,6 @@
/**
* The constructor.
- *
- * @param owner - ignored - for backward compatibility only
- * @param modal true if the dialog is modal
- * @deprecated for 0.25.1 by tfmorris. Use
- * {@link #SystemInfoDialog(boolean)}
- */
- @Deprecated
- public SystemInfoDialog(Frame owner, boolean modal) {
- this(modal);
- }
-
- /**
- * The constructor.
*
* @param modal true if the dialog is modal
*/
Modified: trunk/src/argouml-app/src/org/argouml/ui/targetmanager/TargetManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/targetmanager/TargetManager.java?view=diff&rev=16166&p1=trunk/src/argouml-app/src/org/argouml/ui/targetmanager/TargetManager.java&p2=trunk/src/argouml-app/src/org/argouml/ui/targetmanager/TargetManager.java&r1=16165&r2=16166
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/targetmanager/TargetManager.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/targetmanager/TargetManager.java 2008-11-23 22:21:10-0800
@@ -38,8 +38,6 @@
import javax.management.Notification;
import javax.management.NotificationEmitter;
import javax.management.NotificationListener;
-import javax.swing.AbstractAction;
-import javax.swing.Action;
import javax.swing.event.EventListenerList;
import org.apache.log4j.Logger;
@@ -828,74 +826,6 @@
}
/**
- * Get the Action for creating and adding a new attribute to the single
- * selected target (or its owner).
- *
- * @deprecated in 0.25.3 by Bob Tarling Use the
- * {@link org.argouml.uml.ui.foundation.core.ActionAddAttribute}
- * constructor instead.
- * @return null
- */
- @Deprecated
- public Action getAddAttributeAction() {
- return null;
- }
-
- /**
- * Get the Action for creating and adding a new operation to the single
- * selected target (or its owner).
- *
- * @deprecated in 0.25.3 by Bob Tarling. Instantiate the action
- * {@link org.argouml.uml.ui.foundation.core.ActionAddOperation}
- * directly instead.
- * @return null
- */
- @Deprecated
- public Action getAddOperationAction() {
- return null;
- }
-
- /**
- * Get the Action for creating and adding a new operation to the single
- * selected target (or its owner).
- *
- * @deprecated in 0.25.3 by Michiel. Instantiate the AddMessageAction
- * directly instead.
- * @return null
- */
- @Deprecated
- public Action getAddMessageAction() {
- return null;
- }
-
- /**
- * Get the Action for deleting the target list.
- *
- * @deprecated in 0.25.3 by Michiel. Instantiate the AddMessageAction
- * directly instead.
- * @return null
- */
- @Deprecated
- public AbstractAction getDeleteAction() {
- return null;
- }
-
- /**
- * Get the Action class for creating and adding a new EnumerationLiteral for
- * the single selected target (or its owner).
- *
- * @deprecated by tfmorris for 0.25.3 - use new
- * {@link org.argouml.uml.ui.foundation.core.ActionAddEnumerationLiteral}()
- * This was only introduced in 0.24, so it can be removed
- * quickly.
- * @return null
- */
- @Deprecated
- public Action getAddEnumerationLiteralAction() {
- return null;
- }
-
- /**
* Convenience method to return the target as fig. If the current
* target (retrieved by getTarget) is either a fig itself or the
* owner of a fig this fig will be returned. Otherwise null will
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/layout/ClassdiagramLayouter.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/layout/ClassdiagramLayouter.java?view=diff&rev=16166&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/layout/ClassdiagramLayouter.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/layout/ClassdiagramLayouter.java&r1=16165&r2=16166
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/layout/ClassdiagramLayouter.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/layout/ClassdiagramLayouter.java 2008-11-23 22:21:10-0800
@@ -170,16 +170,6 @@
/**
* @return Returns the nodes.
- * @deprecated for 0.25.1 by tfmorris - use {@link #getNodeList()}
- */
- @Deprecated
- public Vector<ClassdiagramNode> getNodes() {
- return new Vector<ClassdiagramNode>(nodes);
- }
-
-
- /**
- * @return Returns the nodes.
*/
public List<ClassdiagramNode> getNodeList() {
return nodes;
Modified: trunk/src/argouml-app/src/org/argouml/uml/reveng/ImporterManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/reveng/ImporterManager.java?view=diff&rev=16166&p1=trunk/src/argouml-app/src/org/argouml/uml/reveng/ImporterManager.java&p2=trunk/src/argouml-app/src/org/argouml/uml/reveng/ImporterManager.java&r1=16165&r2=16166
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/reveng/ImporterManager.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/reveng/ImporterManager.java 2008-11-23 22:21:10-0800
@@ -63,17 +63,6 @@
// private constructor to enforce singleton
}
- /**
- * Register a new source language importer.
- *
- * @param importer The ImportInterface object to register.
- * @deprecated for 0.25.3 by tfmorris. Use
- * {@link #addImporter(ImportInterface)} instead.
- */
- @Deprecated
- public void addimporter(ImportInterface importer) {
- addImporter(importer);
- }
/**
* Register a new source language importer.
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java?view=diff&rev=16166&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java&r1=16165&r2=16166
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java 2008-11-23 22:21:10-0800
@@ -72,6 +72,7 @@
* @see java.awt.event.ActionListener#actionPerformed(
* java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
@@ -130,26 +131,12 @@
* Utility function to create a collaboration.
*
* @return a new collaboration
- * @deprecated by MVW in V0.25.3. Replaced by createCollaboration(Object
- * namespace)
- */
- @Deprecated
- protected static Object createCollaboration() {
- Project p = ProjectManager.getManager().getCurrentProject();
- Object namespace = p.getRoot(); // the root model
- return createCollaboration(namespace);
- }
-
- /**
- * Utility function to create a collaboration.
- *
- * @return a new collaboration
* @param namespace the back-up namespace to put the collaboration in
*/
protected static Object createCollaboration(Object namespace) {
Object target = TargetManager.getInstance().getModelTarget();
- if (Model.getFacade().isAUMLElement(target)
- && Model.getModelManagementHelper().isReadOnly(target)) {
+ if (Model.getFacade().isAUMLElement(target)
+ && Model.getModelManagementHelper().isReadOnly(target)) {
target = namespace;
}
Object collaboration = null;
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.