diff options
author | khussey | 2006-01-31 20:35:03 +0000 |
---|---|---|
committer | khussey | 2006-01-31 20:35:03 +0000 |
commit | 2a8413bfc7dcce80ce856aa0900806ba159a07b3 (patch) | |
tree | 573c80c22f69a72203e5c250b6c7a45e9f51c032 /deprecated | |
parent | 6b75e97ee1e02031b6fb61528c09da610c13408e (diff) | |
download | org.eclipse.uml2-2a8413bfc7dcce80ce856aa0900806ba159a07b3.tar.gz org.eclipse.uml2-2a8413bfc7dcce80ce856aa0900806ba159a07b3.tar.xz org.eclipse.uml2-2a8413bfc7dcce80ce856aa0900806ba159a07b3.zip |
[85176] Ensuring fast unique lists are being used.
Diffstat (limited to 'deprecated')
13 files changed, 52 insertions, 51 deletions
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/edit/internal/provider/UML2ItemPropertyDescriptor.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/edit/internal/provider/UML2ItemPropertyDescriptor.java index cb44e8d8a..83a44586c 100644 --- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/edit/internal/provider/UML2ItemPropertyDescriptor.java +++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/edit/internal/provider/UML2ItemPropertyDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2005 IBM Corporation and others. + * Copyright (c) 2004, 2006 IBM Corporation and others. * 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 @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: UML2ItemPropertyDescriptor.java,v 1.9 2005/06/03 19:53:28 khussey Exp $ + * $Id: UML2ItemPropertyDescriptor.java,v 1.10 2006/01/31 20:35:07 khussey Exp $ */ package org.eclipse.uml2.edit.internal.provider; @@ -202,7 +202,7 @@ public class UML2ItemPropertyDescriptor if (EObject.class.isInstance(object)) { if (null != parentReferences) { - Collection result = new UniqueEList(); + Collection result = new UniqueEList.FastCompare(); for (int i = 0; i < parentReferences.length; ++i) { result.addAll(getReferenceableObjectsOfType( diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ActivityOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ActivityOperations.java index 5af47f524..19fd0727e 100644 --- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ActivityOperations.java +++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ActivityOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation and others. * 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 @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: ActivityOperations.java,v 1.2 2005/10/26 20:59:34 khussey Exp $ + * $Id: ActivityOperations.java,v 1.3 2006/01/31 20:35:03 khussey Exp $ */ package org.eclipse.uml2.internal.operation; @@ -38,7 +38,7 @@ public final class ActivityOperations } public static EList getStructuredNodes(Activity activity) { - EList structuredNodes = new UniqueEList(); + EList structuredNodes = new UniqueEList.FastCompare(); if (activity != null) { diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/BehaviorOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/BehaviorOperations.java index 8bc6cde3c..ff2c29b38 100644 --- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/BehaviorOperations.java +++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/BehaviorOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation and others. * 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 @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: BehaviorOperations.java,v 1.1 2005/05/25 15:21:32 khussey Exp $ + * $Id: BehaviorOperations.java,v 1.2 2006/01/31 20:35:03 khussey Exp $ */ package org.eclipse.uml2.internal.operation; @@ -35,7 +35,7 @@ public final class BehaviorOperations } public static EList getFormalParameters(Behavior behavior) { - EList formalParameters = new UniqueEList(); + EList formalParameters = new UniqueEList.FastCompare(); if (behavior != null) { @@ -56,7 +56,7 @@ public final class BehaviorOperations } public static EList getReturnResults(Behavior behavior) { - EList returnResults = new UniqueEList(); + EList returnResults = new UniqueEList.FastCompare(); if (behavior != null) { diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ClassOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ClassOperations.java index 6a206dddd..74144cbfe 100644 --- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ClassOperations.java +++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ClassOperations.java @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: ClassOperations.java,v 1.12 2006/01/05 22:42:56 khussey Exp $ + * $Id: ClassOperations.java,v 1.13 2006/01/31 20:35:03 khussey Exp $ */ package org.eclipse.uml2.internal.operation; @@ -146,7 +146,7 @@ public class ClassOperations extends ClassifierOperations { } public static EList getSuperClasses(org.eclipse.uml2.Class class_) { - EList superClasses = new UniqueEList(); + EList superClasses = new UniqueEList.FastCompare(); if (class_ != null) { diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ComponentOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ComponentOperations.java index 8d8b26edf..672f18442 100644 --- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ComponentOperations.java +++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ComponentOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation and others. * 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 @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: ComponentOperations.java,v 1.7 2005/11/23 20:09:17 khussey Exp $ + * $Id: ComponentOperations.java,v 1.8 2006/01/31 20:35:03 khussey Exp $ */ package org.eclipse.uml2.internal.operation; @@ -164,7 +164,7 @@ public final class ComponentOperations } public static EList getProvideds(Component component) { - EList provideds = new UniqueEList(); + EList provideds = new UniqueEList.FastCompare(); if (component != null) { provideds.addAll(component.getImplementedInterfaces()); @@ -197,7 +197,7 @@ public final class ComponentOperations } public static EList getRequireds(Component component) { - EList requireds = new UniqueEList(); + EList requireds = new UniqueEList.FastCompare(); if (component != null) { requireds.addAll(component.getUsedInterfaces()); @@ -224,7 +224,7 @@ public final class ComponentOperations } public static EList getOwnedMembers(Component component) { - EList ownedMembers = new UniqueEList(); + EList ownedMembers = new UniqueEList.FastCompare(); if (component != null) { ownedMembers.addAll(component.getOwnedRules()); diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/DeploymentTargetOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/DeploymentTargetOperations.java index 0a0c0b934..81549cdba 100644 --- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/DeploymentTargetOperations.java +++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/DeploymentTargetOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation and others. * 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 @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: DeploymentTargetOperations.java,v 1.1 2005/05/25 15:21:32 khussey Exp $ + * $Id: DeploymentTargetOperations.java,v 1.2 2006/01/31 20:35:03 khussey Exp $ */ package org.eclipse.uml2.internal.operation; @@ -36,7 +36,7 @@ public final class DeploymentTargetOperations } public static EList getDeployedElements(DeploymentTarget deploymentTarget) { - EList deployedElements = new UniqueEList(); + EList deployedElements = new UniqueEList.FastCompare(); if (deploymentTarget != null) { diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PackageOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PackageOperations.java index c892d956d..5e11d4c1a 100644 --- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PackageOperations.java +++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PackageOperations.java @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: PackageOperations.java,v 1.17 2006/01/05 22:42:56 khussey Exp $ + * $Id: PackageOperations.java,v 1.18 2006/01/31 20:35:03 khussey Exp $ */ package org.eclipse.uml2.internal.operation; @@ -410,7 +410,7 @@ public class PackageOperations extends NamespaceOperations { * @deprecated */ public static EList getNestedPackages(org.eclipse.uml2.Package package_) { - EList nestedPackages = new UniqueEList(); + EList nestedPackages = new UniqueEList.FastCompare(); if (package_ != null) { @@ -432,7 +432,7 @@ public class PackageOperations extends NamespaceOperations { * @deprecated */ public static EList getOwnedTypes(org.eclipse.uml2.Package package_) { - EList ownedTypes = new UniqueEList(); + EList ownedTypes = new UniqueEList.FastCompare(); if (package_ != null) { @@ -451,7 +451,7 @@ public class PackageOperations extends NamespaceOperations { } public static EList getOwnedMembers(org.eclipse.uml2.Package package_) { - EList ownedMembers = new UniqueEList(); + EList ownedMembers = new UniqueEList.FastCompare(); if (package_ != null) { ownedMembers.addAll(package_.getOwnedRules()); diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PortOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PortOperations.java index 7fb4644e0..cddd5fdf8 100644 --- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PortOperations.java +++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PortOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation and others. * 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 @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: PortOperations.java,v 1.2 2005/08/26 14:50:36 khussey Exp $ + * $Id: PortOperations.java,v 1.3 2006/01/31 20:35:03 khussey Exp $ */ package org.eclipse.uml2.internal.operation; @@ -36,7 +36,7 @@ public final class PortOperations } public static EList getProvideds(Port port) { - EList provideds = new UniqueEList(); + EList provideds = new UniqueEList.FastCompare(); if (port != null) { Type type = port.getType(); @@ -53,7 +53,7 @@ public final class PortOperations } public static EList getRequireds(Port port) { - EList requireds = new UniqueEList(); + EList requireds = new UniqueEList.FastCompare(); if (port != null) { Type type = port.getType(); diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ProfileOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ProfileOperations.java index 1d496757c..fbd957bb5 100644 --- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ProfileOperations.java +++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ProfileOperations.java @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: ProfileOperations.java,v 1.34 2006/01/12 02:17:07 khussey Exp $ + * $Id: ProfileOperations.java,v 1.35 2006/01/31 20:35:03 khussey Exp $ */ package org.eclipse.uml2.internal.operation; @@ -1486,7 +1486,7 @@ public final class ProfileOperations * @deprecated */ public static EList getOwnedStereotypes(Profile profile) { - EList ownedStereotypes = new UniqueEList(); + EList ownedStereotypes = new UniqueEList.FastCompare(); if (profile != null) { diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ProtocolTransitionOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ProtocolTransitionOperations.java index 57731256e..6d199b429 100644 --- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ProtocolTransitionOperations.java +++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/ProtocolTransitionOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation and others. * 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 @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: ProtocolTransitionOperations.java,v 1.1 2005/05/25 15:21:32 khussey Exp $ + * $Id: ProtocolTransitionOperations.java,v 1.2 2006/01/31 20:35:03 khussey Exp $ */ package org.eclipse.uml2.internal.operation; @@ -35,7 +35,7 @@ public final class ProtocolTransitionOperations } public static EList getReferreds(ProtocolTransition protocolTransition) { - EList referreds = new UniqueEList(); + EList referreds = new UniqueEList.FastCompare(); if (protocolTransition != null) { diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/StateMachineOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/StateMachineOperations.java index 2806d6e22..a72ac851b 100644 --- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/StateMachineOperations.java +++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/StateMachineOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation and others. * 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 @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: StateMachineOperations.java,v 1.1 2005/05/25 15:21:32 khussey Exp $ + * $Id: StateMachineOperations.java,v 1.2 2006/01/31 20:35:03 khussey Exp $ */ package org.eclipse.uml2.internal.operation; @@ -34,7 +34,7 @@ public final class StateMachineOperations public static EList getRedefinitionContexts( RedefinableElement redefinableElement) { - EList redefinitionContexts = new UniqueEList(); + EList redefinitionContexts = new UniqueEList.FastCompare(); if (redefinableElement != null) { EObject eContainer = redefinableElement.eContainer(); diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/StructuredClassifierOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/StructuredClassifierOperations.java index 1220d0039..6b3e99936 100644 --- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/StructuredClassifierOperations.java +++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/StructuredClassifierOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation and others. * 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 @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: StructuredClassifierOperations.java,v 1.1 2005/05/25 15:21:32 khussey Exp $ + * $Id: StructuredClassifierOperations.java,v 1.2 2006/01/31 20:35:03 khussey Exp $ */ package org.eclipse.uml2.internal.operation; @@ -33,7 +33,7 @@ public final class StructuredClassifierOperations } public static EList getParts(StructuredClassifier structuredClassifier) { - EList parts = new UniqueEList(); + EList parts = new UniqueEList.FastCompare(); if (structuredClassifier != null) { diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Util.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Util.java index 74c6eb14e..5b9077489 100644 --- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Util.java +++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Util.java @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: UML2Util.java,v 1.57 2006/01/19 14:13:25 khussey Exp $ + * $Id: UML2Util.java,v 1.58 2006/01/31 20:35:03 khussey Exp $ */ package org.eclipse.uml2.util; @@ -3271,7 +3271,7 @@ public class UML2Util protected void processDuplicateOperations(Map options, DiagnosticChain diagnostics, Map context) { - List operationsToDuplicate = new UniqueEList(); + List operationsToDuplicate = new UniqueEList.FastCompare(); for (Iterator eModelElements = elementToEModelElementMap.values() .iterator(); eModelElements.hasNext();) { @@ -3524,8 +3524,8 @@ public class UML2Util protected void processDuplicateFeatures(Map options, DiagnosticChain diagnostics, Map context) { - List featuresToDuplicate = new UniqueEList(); - List featuresToRemove = new UniqueEList(); + List featuresToDuplicate = new UniqueEList.FastCompare(); + List featuresToRemove = new UniqueEList.FastCompare(); for (Iterator eModelElements = elementToEModelElementMap.values() .iterator(); eModelElements.hasNext();) { @@ -3910,7 +3910,8 @@ public class UML2Util Collections.sort(unspecifiedSuperClasses, eClassComparator); Collections.sort(mixinSuperClasses, eClassComparator); - List superClasses = new UniqueEList(extendSuperClasses); + List superClasses = new UniqueEList.FastCompare( + extendSuperClasses); superClasses.addAll(unspecifiedSuperClasses); superClasses.addAll(mixinSuperClasses); @@ -4919,7 +4920,7 @@ public class UML2Util if (null == mergedEObjects) { resultingToMergedEObjectMap.put(copyEObject, - mergedEObjects = new UniqueEList(1)); + mergedEObjects = new UniqueEList.FastCompare(1)); } mergedEObjects.add(eObject); @@ -4936,7 +4937,7 @@ public class UML2Util protected Collection getAllMergedPackages( org.eclipse.uml2.Package package_) { - return getAllMergedPackages(package_, new UniqueEList()); + return getAllMergedPackages(package_, new UniqueEList.FastCompare()); } /** @@ -5583,7 +5584,7 @@ public class UML2Util if (resultingEObject instanceof Association) { Association association = (Association) resultingEObject; - List generalAssociations = new UniqueEList(); + List generalAssociations = new UniqueEList.FastCompare(); for (Iterator memberEnds = association.getMemberEnds() .iterator(); memberEnds.hasNext();) { @@ -6009,7 +6010,7 @@ public class UML2Util int size = resources.size(); if (size > 0) { - EList namedElements = new UniqueEList(); + EList namedElements = new UniqueEList.FastCompare(); for (int i = 0; i < size; i++) { findNamedElements(((Resource) resources.get(i)) @@ -6044,7 +6045,7 @@ public class UML2Util EList contents = resource.getContents(); if (!contents.isEmpty()) { - EList namedElements = new UniqueEList(); + EList namedElements = new UniqueEList.FastCompare(); findNamedElements(contents, qualifiedName, ignoreCase, eClass, namedElements); @@ -6196,7 +6197,7 @@ public class UML2Util protected static Collection findValidRedefinitions( Feature redefiningFeature, String name) { - Collection redefinedFeatures = new UniqueEList(); + Collection redefinedFeatures = new UniqueEList.FastCompare(); for (Iterator redefinitionContexts = redefiningFeature .getRedefinitionContexts().iterator(); redefinitionContexts @@ -6273,7 +6274,7 @@ public class UML2Util protected static Collection findValidSubsets(Property subsettingProperty, String name) { - Collection subsettedProperties = new UniqueEList(); + Collection subsettedProperties = new UniqueEList.FastCompare(); for (Iterator subsettingContexts = subsettingProperty .subsettingContext().iterator(); subsettingContexts.hasNext();) { |