From 071fcbc5cca4e22e650bb459701f5fc9be701013 Mon Sep 17 00:00:00 2001 From: Ryan D. Brooks Date: Mon, 28 Sep 2015 11:49:18 -0700 Subject: refactor: Use type inference when invoking a generic constructor Change-Id: I5afeb235038dcf1dd0496930d15d6b42aeb46fec --- .../dsl/ui/integration/internal/ArtifactDataProviderImpl.java | 2 +- .../integration/internal/OseeDslArtifactUpdateOperation.java | 2 +- .../core/dsl/ui/integration/internal/OseeTypeModifier.java | 2 +- .../ui/integration/operations/OseeDslRoleContextProvider.java | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src') diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderImpl.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderImpl.java index 5221f86b298..882413d83f9 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderImpl.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderImpl.java @@ -88,7 +88,7 @@ public final class ArtifactDataProviderImpl implements ArtifactDataProvider { @Override public Collection getHierarchy() { - Collection hierarchy = new HashSet(); + Collection hierarchy = new HashSet<>(); try { Artifact artifactPtr = self.getParent(); while (artifactPtr != null) { diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java index 839ae398877..cd7f8155b44 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java @@ -54,7 +54,7 @@ public class OseeDslArtifactUpdateOperation extends AbstractOperation { double workPercentage = 0.80 * 1.0 / segments.size(); int workAmount = calculateWork(workPercentage); - Map transactionMap = new HashMap(); + Map transactionMap = new HashMap<>(); for (OseeDslSegment segment : segments) { int startAt = segment.start(); int endAt = segment.end(); diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeTypeModifier.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeTypeModifier.java index 97e4005f93a..e8687a0126b 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeTypeModifier.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeTypeModifier.java @@ -62,7 +62,7 @@ public class OseeTypeModifier implements AttributeModifier { OseeExceptions.wrapAndThrow(ex); } - Set uuids = new HashSet(); + Set uuids = new HashSet<>(); for (EObject object : oseeDsl.eContents()) { if (object instanceof OseeType) { addUuid(uuids, (OseeType) object); diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeDslRoleContextProvider.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeDslRoleContextProvider.java index 6e4342f1de2..d356c639893 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeDslRoleContextProvider.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeDslRoleContextProvider.java @@ -76,13 +76,13 @@ public class OseeDslRoleContextProvider implements RoleContextProvider { Set applicableRoles = getApplicableRoles(dsl.getRoleDeclarations(), applicableGuids); if (!applicableRoles.isEmpty()) { - Map accessContextMap = new HashMap(); + Map accessContextMap = new HashMap<>(); for (AccessContext ac : dsl.getAccessDeclarations()) { accessContextMap.put(ac.getName(), ac.getGuid()); } //now get the context id's - toReturn = new HashSet(); + toReturn = new HashSet<>(); for (Role role : applicableRoles) { for (ReferencedContext ref : role.getReferencedContexts()) { String contextName = ref.getAccessContextRef(); @@ -95,7 +95,7 @@ public class OseeDslRoleContextProvider implements RoleContextProvider { } private Set getApplicableRoles(List roles, List applicableGuids) { - Queue applicableRoles = new LinkedList(); + Queue applicableRoles = new LinkedList<>(); for (Role role : roles) { for (UsersAndGroups uag : role.getUsersAndGroups()) { if (applicableGuids.contains(uag.getUserOrGroupGuid()) && !applicableRoles.contains(role)) { @@ -105,13 +105,13 @@ public class OseeDslRoleContextProvider implements RoleContextProvider { } } - Set includesInherited = new HashSet(); + Set includesInherited = new HashSet<>(); getSuperRoles(includesInherited, applicableRoles); return includesInherited; } private List getApplicableGuids(Artifact user) { - List applicableGuids = new LinkedList(); + List applicableGuids = new LinkedList<>(); List groups = Collections.emptyList(); try { -- cgit v1.2.3