Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2017-07-25 16:36:54 -0400
committerdonald.g.dunne2017-08-03 11:22:09 -0400
commitc3b7427776a42864862212b605adc7679031fe0c (patch)
treef7b39de831e4756284113215524b0764a66e6adb
parentea39d7d759a6cfc24c90f2b0f60a722e65cf9817 (diff)
downloadorg.eclipse.osee-c3b7427776a42864862212b605adc7679031fe0c.tar.gz
org.eclipse.osee-c3b7427776a42864862212b605adc7679031fe0c.tar.xz
org.eclipse.osee-c3b7427776a42864862212b605adc7679031fe0c.zip
refactor: Consolidate TeamDefinition and ActionableItem
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IAttributeResolver.java2
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientImpl.java22
-rw-r--r--plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionServiceImplRulesTest.java2
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItem.java110
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItem2.java108
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinition.java37
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinition2.java347
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java2
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AbstractAtsAttributeResolverService.java14
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/TeamWorkflow.java15
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConfigJsonWriter.java2
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsRelationResolverServiceImpl.java13
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperation.java4
15 files changed, 139 insertions, 547 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IAttributeResolver.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IAttributeResolver.java
index 735ae5c139..284ba56d03 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IAttributeResolver.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IAttributeResolver.java
@@ -102,4 +102,6 @@ public interface IAttributeResolver {
ArtifactId getSoleArtifactIdReference(ArtifactToken art, AttributeTypeToken artifactReferencedAttributeType, ArtifactId defaultValue);
+ Collection<ArtifactId> getArtifactIdReferences(ArtifactToken artifact, AttributeTypeToken artifactReferencedAttributeType);
+
}
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java
index e6b435d904..821233a27d 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java
@@ -514,7 +514,9 @@ public class AtsTestUtil {
for (IAtsConfigObject config : Arrays.asList(teamDef, testAi, testAi2, testAi3, testAi4)) {
if (config != null) {
Artifact art = AtsClientService.get().getArtifact(config);
- art.deleteAndPersist(transaction);
+ if (art != null) {
+ art.deleteAndPersist(transaction);
+ }
}
}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientImpl.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientImpl.java
index 24494ca040..477c295fac 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientImpl.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientImpl.java
@@ -12,6 +12,7 @@ package org.eclipse.osee.ats.core.client.internal;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -61,10 +62,10 @@ import org.eclipse.osee.ats.core.client.util.IArtifactMembersCache;
import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil;
import org.eclipse.osee.ats.core.client.workflow.transition.TransitionListeners;
-import org.eclipse.osee.ats.core.config.ActionableItem2;
+import org.eclipse.osee.ats.core.config.ActionableItem;
import org.eclipse.osee.ats.core.config.IActionableItemFactory;
import org.eclipse.osee.ats.core.config.ITeamDefinitionFactory;
-import org.eclipse.osee.ats.core.config.TeamDefinition2;
+import org.eclipse.osee.ats.core.config.TeamDefinition;
import org.eclipse.osee.ats.core.util.ActionFactory;
import org.eclipse.osee.ats.core.util.AtsCoreFactory;
import org.eclipse.osee.ats.core.util.AtsCoreServiceImpl;
@@ -167,7 +168,18 @@ public class AtsClientImpl extends AtsCoreServiceImpl implements IAtsClient {
@Override
public List<Artifact> getConfigArtifacts(Collection<? extends IAtsObject> atsObjects) throws OseeCoreException {
- return Collections.castAll(AtsObjects.getArtifacts(atsObjects));
+ List<Artifact> results = new LinkedList<>();
+ for (ArtifactId artId : AtsObjects.getArtifacts(atsObjects)) {
+ if (artId instanceof Artifact) {
+ results.add((Artifact) artId);
+ } else {
+ Artifact artifact = AtsClientService.get().getArtifact(artId);
+ if (artifact != null) {
+ results.add(artifact);
+ }
+ }
+ }
+ return results;
}
@Override
@@ -228,14 +240,14 @@ public class AtsClientImpl extends AtsCoreServiceImpl implements IAtsClient {
}
private void cacheTeamDefinitions(JaxTeamDefinition jaxTeamDef) {
- atsCache.cacheAtsObject(new TeamDefinition2(getLogger(), client, jaxTeamDef));
+ atsCache.cacheAtsObject(new TeamDefinition(getLogger(), client, jaxTeamDef));
for (Long childId : jaxTeamDef.getChildren()) {
cacheTeamDefinitions(configProvider.getConfigurations().getIdToTeamDef().get(childId));
}
}
private void cacheActionableItems(JaxActionableItem jaxAi) {
- atsCache.cacheAtsObject(new ActionableItem2(getLogger(), client, jaxAi));
+ atsCache.cacheAtsObject(new ActionableItem(getLogger(), client, jaxAi));
for (Long child : jaxAi.getChildren()) {
cacheActionableItems(configProvider.getConfigurations().getIdToAi().get(child));
}
diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionServiceImplRulesTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionServiceImplRulesTest.java
index a86770b83e..eee8b774d8 100644
--- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionServiceImplRulesTest.java
+++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionServiceImplRulesTest.java
@@ -98,7 +98,7 @@ public class AtsWorkDefinitionServiceImplRulesTest {
TeamDefinition teamDef = new TeamDefinition(logger, services, teamDefArt);
when(teamWf.getTeamDefinition()).thenReturn(teamDef);
when(services.getAttributeResolver()).thenReturn(attrResolver);
- when(attrResolver.getAttributeValues(teamDefArt, AtsAttributeTypes.RuleDefinition)).thenReturn(
+ when(attrResolver.getAttributesToStringList(teamDef, AtsAttributeTypes.RuleDefinition)).thenReturn(
Arrays.asList(RuleDefinitionOption.AllowPrivilegedEditToTeamMember.name(),
RuleDefinitionOption.AllowPrivilegedEditToTeamMemberAndOriginator.name()));
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItem.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItem.java
index e6c9ee03ca..92a7f2d680 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItem.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013 Boeing.
+ * Copyright (c) 2017 Boeing.
* 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
@@ -12,41 +12,73 @@ package org.eclipse.osee.ats.core.config;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.LinkedList;
+import java.util.List;
import org.eclipse.osee.ats.api.IAtsServices;
import org.eclipse.osee.ats.api.ai.IAtsActionableItem;
+import org.eclipse.osee.ats.api.config.JaxActionableItem;
import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
import org.eclipse.osee.ats.api.data.AtsRelationTypes;
import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
import org.eclipse.osee.ats.core.model.impl.AtsConfigObject;
-import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.logger.Log;
/**
- * @author Donald G Dunne
+ * @author Donald G. Dunne
*/
public class ActionableItem extends AtsConfigObject implements IAtsActionableItem {
+ private JaxActionableItem jaxAI;
+
+ public ActionableItem(Log logger, IAtsServices services, JaxActionableItem jaxAI) {
+ super(logger, services, ArtifactToken.valueOf(jaxAI.getUuid(), jaxAI.getGuid(), jaxAI.getName(),
+ services.getAtsBranch(), AtsArtifactTypes.ActionableItem));
+ this.jaxAI = jaxAI;
+ }
+
public ActionableItem(Log logger, IAtsServices services, ArtifactToken artifact) {
- super(logger, services, artifact);
+ super(logger, services, ArtifactToken.valueOf(artifact.getUuid(), artifact.getGuid(), artifact.getName(),
+ services.getAtsBranch(), AtsArtifactTypes.ActionableItem));
}
@Override
- public Collection<IAtsActionableItem> getChildrenActionableItems() {
- Set<IAtsActionableItem> children = new HashSet<>();
+ public String getTypeName() {
+ return "Actionable Item";
+ }
+
+ @Override
+ public Collection<String> getRules() throws OseeCoreException {
+ Collection<String> rules = new ArrayList<>();
try {
- for (ArtifactId childArt : services.getRelationResolver().getChildren(artifact,
- AtsArtifactTypes.ActionableItem)) {
- IAtsActionableItem childTeamDef = services.getConfigItemFactory().getActionableItem(childArt);
- children.add(childTeamDef);
- }
+ rules = services.getAttributeResolver().getAttributeValues(artifact, AtsAttributeTypes.RuleDefinition);
} catch (OseeCoreException ex) {
- getLogger().error(ex, "Error getting Children Actionable Items");
+ getLogger().error(ex, "Error getting rules");
+ }
+ return rules;
+ }
+
+ @Override
+ public boolean hasRule(String rule) throws OseeCoreException {
+ return getRules().contains(rule);
+ }
+
+ @Override
+ public Collection<IAtsActionableItem> getChildrenActionableItems() {
+ List<IAtsActionableItem> children = new LinkedList<>();
+ if (jaxAI != null) {
+ for (Long aiId : jaxAI.getChildren()) {
+ children.add(new ActionableItem(logger, services, services.getConfigurations().getIdToAi().get(aiId)));
+ }
+ } else {
+ for (ArtifactToken artifact : services.getRelationResolver().getChildren(artifact)) {
+ if (services.getStoreService().isOfType(artifact, AtsArtifactTypes.ActionableItem)) {
+ children.add(new ActionableItem(logger, services, artifact));
+ }
+ }
}
return children;
}
@@ -55,10 +87,14 @@ public class ActionableItem extends AtsConfigObject implements IAtsActionableIte
public IAtsActionableItem getParentActionableItem() {
IAtsActionableItem parent = null;
try {
- Collection<ArtifactToken> related =
- services.getRelationResolver().getRelated(artifact, CoreRelationTypes.Default_Hierarchical__Parent);
- if (!related.isEmpty()) {
- parent = services.getConfigItemFactory().getActionableItem(related.iterator().next());
+ if (jaxAI != null && jaxAI.getParentId() != null) {
+ parent = services.getConfigItemFactory().getActionableItem(services.getArtifact(jaxAI.getParentId()));
+ } else {
+ ArtifactToken art = services.getRelationResolver().getRelatedOrNull(artifact,
+ CoreRelationTypes.Default_Hierarchical__Parent);
+ if (art != null) {
+ parent = services.getConfigItemFactory().getActionableItem(art);
+ }
}
} catch (OseeCoreException ex) {
getLogger().error(ex, "Error getParentActionableItem");
@@ -70,10 +106,14 @@ public class ActionableItem extends AtsConfigObject implements IAtsActionableIte
public IAtsTeamDefinition getTeamDefinition() {
IAtsTeamDefinition teamDef = null;
try {
- ArtifactToken related =
- services.getRelationResolver().getRelatedOrNull(artifact, AtsRelationTypes.TeamActionableItem_Team);
- if (related != null) {
- teamDef = services.getConfigItemFactory().getTeamDef(related);
+ if (jaxAI != null && jaxAI.getTeamDefId() != null) {
+ teamDef = services.getConfigItemFactory().getTeamDef(services.getArtifact(jaxAI.getTeamDefId()));
+ } else {
+ ArtifactToken art =
+ services.getRelationResolver().getRelatedOrNull(artifact, AtsRelationTypes.TeamActionableItem_Team);
+ if (art != null) {
+ teamDef = services.getConfigItemFactory().getTeamDef(art);
+ }
}
} catch (OseeCoreException ex) {
getLogger().error(ex, "Error getTeamDefinition");
@@ -87,35 +127,9 @@ public class ActionableItem extends AtsConfigObject implements IAtsActionableIte
}
@Override
- public void setActionable(boolean actionable) {
- throw new UnsupportedOperationException("Error ActionableItem.setActionable not implemented");
- }
-
- @Override
- public String getTypeName() {
- return "Actionable Item";
- }
-
- @Override
public boolean isAllowUserActionCreation() {
return services.getAttributeResolver().getSoleAttributeValue(artifact, AtsAttributeTypes.AllowUserActionCreation,
true);
}
- @Override
- public Collection<String> getRules() {
- Collection<String> rules = new ArrayList<>();
- try {
- rules = services.getAttributeResolver().getAttributeValues(artifact, AtsAttributeTypes.RuleDefinition);
- } catch (OseeCoreException ex) {
- getLogger().error(ex, "Error getting rules");
- }
- return rules;
- }
-
- @Override
- public boolean hasRule(String rule) {
- return getRules().contains(rule);
- }
-
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItem2.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItem2.java
deleted file mode 100644
index 213fdbe766..0000000000
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItem2.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.core.config;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.osee.ats.api.IAtsServices;
-import org.eclipse.osee.ats.api.ai.IAtsActionableItem;
-import org.eclipse.osee.ats.api.config.JaxActionableItem;
-import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
-import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
-import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
-import org.eclipse.osee.ats.core.model.impl.AtsConfigObject;
-import org.eclipse.osee.framework.core.data.ArtifactToken;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Donald G. Dunne
- */
-public class ActionableItem2 extends AtsConfigObject implements IAtsActionableItem {
-
- private final JaxActionableItem jaxAI;
-
- public ActionableItem2(Log logger, IAtsServices services, JaxActionableItem jaxAI) {
- super(logger, services, ArtifactToken.valueOf(jaxAI.getUuid(), jaxAI.getGuid(), jaxAI.getName(),
- services.getAtsBranch(), AtsArtifactTypes.ActionableItem));
- this.jaxAI = jaxAI;
- }
-
- @Override
- public String getTypeName() {
- return "Actionable Item";
- }
-
- @Override
- public Collection<String> getRules() throws OseeCoreException {
- Collection<String> rules = new ArrayList<>();
- try {
- rules = services.getAttributeResolver().getAttributeValues(artifact, AtsAttributeTypes.RuleDefinition);
- } catch (OseeCoreException ex) {
- getLogger().error(ex, "Error getting rules");
- }
- return rules;
- }
-
- @Override
- public boolean hasRule(String rule) throws OseeCoreException {
- return getRules().contains(rule);
- }
-
- @Override
- public Collection<IAtsActionableItem> getChildrenActionableItems() {
- List<IAtsActionableItem> children = new LinkedList<>();
- for (Long childId : jaxAI.getChildren()) {
- children.add(new ActionableItem2(logger, services, services.getConfigurations().getIdToAi().get(childId)));
- }
- return children;
- }
-
- @Override
- public IAtsActionableItem getParentActionableItem() {
- IAtsActionableItem parent = null;
- try {
- if (jaxAI.getParentId() != null) {
- parent = services.getConfigItemFactory().getActionableItem(services.getArtifact(jaxAI.getParentId()));
- }
- } catch (OseeCoreException ex) {
- getLogger().error(ex, "Error getParentActionableItem");
- }
- return parent;
- }
-
- @Override
- public IAtsTeamDefinition getTeamDefinition() {
- IAtsTeamDefinition teamDef = null;
- try {
- if (jaxAI.getTeamDefId() != null) {
- teamDef = services.getConfigItemFactory().getTeamDef(services.getArtifact(jaxAI.getTeamDefId()));
- }
- } catch (OseeCoreException ex) {
- getLogger().error(ex, "Error getTeamDefinition");
- }
- return teamDef;
- }
-
- @Override
- public IAtsTeamDefinition getTeamDefinitionInherited() {
- return TeamDefinitions.getImpactedTeamDef(this);
- }
-
- @Override
- public boolean isAllowUserActionCreation() {
- return services.getAttributeResolver().getSoleAttributeValue(artifact, AtsAttributeTypes.AllowUserActionCreation,
- true);
- }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinition.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinition.java
index 1e16e56484..8b34f30eb2 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinition.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinition.java
@@ -13,9 +13,13 @@ package org.eclipse.osee.ats.core.config;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
import java.util.Set;
import org.eclipse.osee.ats.api.IAtsServices;
import org.eclipse.osee.ats.api.ai.IAtsActionableItem;
+import org.eclipse.osee.ats.api.config.JaxTeamDefinition;
+import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
import org.eclipse.osee.ats.api.data.AtsRelationTypes;
import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
@@ -37,11 +41,17 @@ import org.eclipse.osee.logger.Log;
*/
public class TeamDefinition extends AtsConfigObject implements IAtsTeamDefinition {
- private final IAtsServices services;
+ private JaxTeamDefinition jaxTeamDef;
+
+ public TeamDefinition(Log logger, IAtsServices services, JaxTeamDefinition jaxTeamDef) {
+ super(logger, services, ArtifactToken.valueOf(jaxTeamDef.getUuid(), jaxTeamDef.getGuid(), jaxTeamDef.getName(),
+ services.getAtsBranch(), AtsArtifactTypes.ActionableItem));
+ this.jaxTeamDef = jaxTeamDef;
+ }
public TeamDefinition(Log logger, IAtsServices services, ArtifactToken artifact) {
- super(logger, services, artifact);
- this.services = services;
+ super(logger, services, ArtifactToken.valueOf(artifact.getUuid(), artifact.getGuid(), artifact.getName(),
+ services.getAtsBranch(), AtsArtifactTypes.ActionableItem));
}
@Override
@@ -51,17 +61,20 @@ public class TeamDefinition extends AtsConfigObject implements IAtsTeamDefinitio
@Override
public Collection<IAtsActionableItem> getActionableItems() {
- Set<IAtsActionableItem> ais = new HashSet<>();
- try {
- for (ArtifactId aiArt : services.getRelationResolver().getRelated(artifact,
+ List<IAtsActionableItem> children = new LinkedList<>();
+ if (jaxTeamDef != null) {
+ for (Long aiId : jaxTeamDef.getAis()) {
+ children.add(new ActionableItem(logger, services, services.getConfigurations().getIdToAi().get(aiId)));
+ }
+ } else {
+ for (ArtifactToken artifact : services.getRelationResolver().getRelated(artifact,
AtsRelationTypes.TeamActionableItem_ActionableItem)) {
- IAtsActionableItem ai = services.getConfigItemFactory().getActionableItem(aiArt);
- ais.add(ai);
+ if (services.getStoreService().isOfType(artifact, AtsArtifactTypes.ActionableItem)) {
+ children.add(new ActionableItem(logger, services, artifact));
+ }
}
- } catch (OseeCoreException ex) {
- getLogger().error(ex, "Error getActionableItems");
}
- return ais;
+ return children;
}
@Override
@@ -326,7 +339,7 @@ public class TeamDefinition extends AtsConfigObject implements IAtsTeamDefinitio
public Collection<String> getRules() {
Collection<String> rules = new ArrayList<>();
try {
- rules = services.getAttributeResolver().getAttributeValues(artifact, AtsAttributeTypes.RuleDefinition);
+ rules = services.getAttributeResolver().getAttributesToStringList(this, AtsAttributeTypes.RuleDefinition);
} catch (OseeCoreException ex) {
getLogger().error(ex, "Error getting rules");
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinition2.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinition2.java
deleted file mode 100644
index 3262380789..0000000000
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinition2.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.core.config;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.osee.ats.api.IAtsServices;
-import org.eclipse.osee.ats.api.ai.IAtsActionableItem;
-import org.eclipse.osee.ats.api.config.JaxTeamDefinition;
-import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
-import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
-import org.eclipse.osee.ats.api.data.AtsRelationTypes;
-import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
-import org.eclipse.osee.ats.api.user.IAtsUser;
-import org.eclipse.osee.ats.api.version.IAtsVersion;
-import org.eclipse.osee.ats.api.version.VersionLockedType;
-import org.eclipse.osee.ats.api.version.VersionReleaseType;
-import org.eclipse.osee.ats.core.model.impl.AtsConfigObject;
-import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.ArtifactToken;
-import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.util.Result;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Donald G Dunne
- */
-public class TeamDefinition2 extends AtsConfigObject implements IAtsTeamDefinition {
-
- private final JaxTeamDefinition jaxTeamDef;
-
- public TeamDefinition2(Log logger, IAtsServices services, JaxTeamDefinition jaxTeamDef) {
- super(logger, services, ArtifactToken.valueOf(jaxTeamDef.getUuid(), jaxTeamDef.getGuid(), jaxTeamDef.getName(),
- services.getAtsBranch(), AtsArtifactTypes.ActionableItem));
- this.jaxTeamDef = jaxTeamDef;
- }
-
- @Override
- public String getTypeName() {
- return "Team Definition";
- }
-
- @Override
- public Collection<IAtsActionableItem> getActionableItems() {
- List<IAtsActionableItem> children = new LinkedList<>();
- for (Long aiId : jaxTeamDef.getAis()) {
- children.add(new ActionableItem2(logger, services, services.getConfigurations().getIdToAi().get(aiId)));
- }
- return children;
- }
-
- @Override
- public IAtsTeamDefinition getParentTeamDef() {
- IAtsTeamDefinition parent = null;
- try {
- Collection<ArtifactToken> related =
- services.getRelationResolver().getRelated(artifact, CoreRelationTypes.Default_Hierarchical__Parent);
- if (!related.isEmpty()) {
- parent = services.getConfigItemFactory().getTeamDef(related.iterator().next());
- }
- } catch (OseeCoreException ex) {
- getLogger().error(ex, "Error getParentTeamDef");
- }
- return parent;
- }
-
- @Override
- public Collection<IAtsTeamDefinition> getChildrenTeamDefinitions() {
- Set<IAtsTeamDefinition> children = new HashSet<>();
- try {
- for (ArtifactId childArt : services.getRelationResolver().getRelated(artifact,
- CoreRelationTypes.Default_Hierarchical__Child)) {
- IAtsTeamDefinition childTeamDef = services.getConfigItemFactory().getTeamDef(childArt);
- if (childTeamDef != null) {
- children.add(childTeamDef);
- }
- }
- } catch (OseeCoreException ex) {
- getLogger().error(ex, "Error getChildrenTeamDefinitions");
- }
- return children;
- }
-
- @Override
- public Collection<IAtsUser> getLeads(Collection<IAtsActionableItem> actionableItems) {
- Set<IAtsUser> leads = new HashSet<>();
- for (IAtsActionableItem aia : actionableItems) {
- if (this.equals(aia.getTeamDefinitionInherited())) {
- // If leads are specified for this aia, add them
- Collection<IAtsUser> leads2 = aia.getLeads();
- if (leads2.size() > 0) {
- leads.addAll(leads2);
- } else {
- if (aia.getTeamDefinitionInherited() != null) {
- Collection<IAtsUser> leads3 = aia.getTeamDefinitionInherited().getLeads();
- leads.addAll(leads3);
- }
- }
- }
- }
- if (leads.isEmpty()) {
- Collection<IAtsUser> leads2 = getLeads();
- leads.addAll(leads2);
- }
- return leads;
- }
-
- @Override
- public Collection<IAtsUser> getMembers() {
- return getRelatedUsers(AtsRelationTypes.TeamMember_Member);
- }
-
- @Override
- public Collection<IAtsUser> getMembersAndLeads() {
- Set<IAtsUser> results = new HashSet<>();
- results.addAll(getLeads());
- results.addAll(getMembers());
- return results;
- }
-
- @Override
- public Collection<IAtsUser> getPrivilegedMembers() {
- return getRelatedUsers(AtsRelationTypes.PrivilegedMember_Member);
- }
-
- @Override
- public boolean isAllowCommitBranch() {
- boolean set = false;
- try {
- set =
- services.getAttributeResolver().getSoleAttributeValue(artifact, AtsAttributeTypes.AllowCommitBranch, false);
- } catch (OseeCoreException ex) {
- getLogger().error(ex, "Error is allow commit branch");
- }
- return set;
- }
-
- @Override
- public Result isAllowCommitBranchInherited() {
- if (!isAllowCommitBranch()) {
- return new Result(false, "Team Definition [" + this + "] not configured to allow branch commit.");
- }
- if (getBaselineBranchId().isInvalid()) {
- return new Result(false, "Parent Branch not configured for Team Definition [" + this + "]");
- }
- return Result.TrueResult;
- }
-
- @Override
- public boolean isAllowCreateBranch() {
- boolean set = false;
- try {
- set =
- services.getAttributeResolver().getSoleAttributeValue(artifact, AtsAttributeTypes.AllowCreateBranch, false);
- } catch (OseeCoreException ex) {
- getLogger().error(ex, "Error get allow create branch");
- }
- return set;
- }
-
- @Override
- public Result isAllowCreateBranchInherited() {
- if (!isAllowCreateBranch()) {
- return new Result(false, "Branch creation disabled for Team Definition [" + this + "]");
- }
- if (getBaselineBranchId().isInvalid()) {
- return new Result(false, "Parent Branch not configured for Team Definition [" + this + "]");
- }
- return Result.TrueResult;
- }
-
- @Override
- public BranchId getBaselineBranchId() {
- return BranchId.valueOf((String) getAttributeValue(AtsAttributeTypes.BaselineBranchUuid, "0"));
- }
-
- @Override
- public BranchId getTeamBranchId() {
- BranchId branch = getBaselineBranchId();
- if (branch.isValid()) {
- return branch;
- } else {
- IAtsTeamDefinition parentTeamDef = getParentTeamDef();
- if (parentTeamDef instanceof TeamDefinition2) {
- return parentTeamDef.getTeamBranchId();
- }
- }
- return BranchId.SENTINEL;
- }
-
- @Override
- public String getCommitFullDisplayName() {
- return getName();
- }
-
- @Override
- public boolean isTeamUsesVersions() throws OseeCoreException {
- return getTeamDefinitionHoldingVersions() != null;
- }
-
- @Override
- public IAtsVersion getNextReleaseVersion() {
- IAtsVersion result = null;
- for (IAtsVersion version : getVersions()) {
- if (version.isNextVersion()) {
- result = version;
- break;
- }
- }
- return result;
- }
-
- @Override
- public IAtsTeamDefinition getTeamDefinitionHoldingVersions() throws OseeCoreException {
- IAtsTeamDefinition teamDef = null;
- if (getVersions().size() > 0) {
- teamDef = this;
- } else {
- IAtsTeamDefinition parentTda = getParentTeamDef();
- if (parentTda != null) {
- teamDef = parentTda.getTeamDefinitionHoldingVersions();
- }
- }
- return teamDef;
- }
-
- @Override
- public IAtsVersion getVersion(String name) {
- IAtsVersion result = null;
- for (IAtsVersion version : getVersions()) {
- if (version.getName().equals(name)) {
- result = version;
- break;
- }
- }
- return result;
- }
-
- @Override
- public Collection<IAtsVersion> getVersions() {
- Set<IAtsVersion> results = new HashSet<>();
- try {
- for (ArtifactId verArt : services.getRelationResolver().getRelated(artifact,
- AtsRelationTypes.TeamDefinitionToVersion_Version)) {
- IAtsVersion version = services.getConfigItemFactory().getVersion(verArt);
- results.add(version);
- }
- } catch (OseeCoreException ex) {
- getLogger().error(ex, "Error getting versions");
- }
- return results;
- }
-
- @Override
- public Collection<IAtsVersion> getVersions(VersionReleaseType releaseType, VersionLockedType lockedType) {
- return org.eclipse.osee.framework.jdk.core.util.Collections.setIntersection(getVersionsReleased(releaseType),
- getVersionsLocked(lockedType));
- }
-
- @Override
- public Collection<IAtsVersion> getVersionsFromTeamDefHoldingVersions(VersionReleaseType releaseType, VersionLockedType lockedType) throws OseeCoreException {
- IAtsTeamDefinition teamDef = getTeamDefinitionHoldingVersions();
- if (teamDef == null) {
- return new ArrayList<IAtsVersion>();
- }
- return teamDef.getVersions(releaseType, lockedType);
- }
-
- @Override
- public Collection<IAtsVersion> getVersionsLocked(VersionLockedType lockType) {
- ArrayList<IAtsVersion> versions = new ArrayList<>();
- for (IAtsVersion version : getVersions()) {
- if (version.isVersionLocked() && (lockType == VersionLockedType.Locked || lockType == VersionLockedType.Both)) {
- versions.add(version);
- } else if (!version.isVersionLocked() && lockType == VersionLockedType.UnLocked || lockType == VersionLockedType.Both) {
- versions.add(version);
- }
- }
- return versions;
- }
-
- @Override
- public Collection<IAtsVersion> getVersionsReleased(VersionReleaseType releaseType) {
- ArrayList<IAtsVersion> versions = new ArrayList<>();
- for (IAtsVersion version : getVersions()) {
- if (version.isReleased() && (releaseType == VersionReleaseType.Released || releaseType == VersionReleaseType.Both)) {
- versions.add(version);
- } else if (!version.isReleased() && releaseType == VersionReleaseType.UnReleased || releaseType == VersionReleaseType.Both) {
- versions.add(version);
- }
- }
- return versions;
- }
-
- @Override
- public String getWorkflowDefinition() {
- return getAttributeValue(AtsAttributeTypes.WorkflowDefinition, "");
- }
-
- @Override
- public String getRelatedTaskWorkDefinition() {
- return getAttributeValue(AtsAttributeTypes.RelatedTaskWorkDefinition, "");
- }
-
- @Override
- public String getRelatedPeerWorkDefinition() {
- return getAttributeValue(AtsAttributeTypes.RelatedPeerWorkflowDefinition, "");
- }
-
- @Override
- public Collection<String> getRules() {
- Collection<String> rules = new ArrayList<>();
- try {
- rules = services.getAttributeResolver().getAttributeValues(artifact, AtsAttributeTypes.RuleDefinition);
- } catch (OseeCoreException ex) {
- getLogger().error(ex, "Error getting rules");
- }
- return rules;
- }
-
- @Override
- public boolean hasRule(String rule) {
- boolean result = false;
- for (String rule2 : getRules()) {
- if (rule.equals(rule2)) {
- result = true;
- break;
- }
- }
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java
index 2c3cad12cb..b0545cc22b 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java
@@ -31,7 +31,7 @@ import org.eclipse.osee.logger.Log;
* @author Donald G Dunne
*/
public abstract class AtsConfigObject extends org.eclipse.osee.ats.core.model.impl.AtsObject implements IAtsConfigObject {
- protected final ArtifactToken artifact;
+ protected ArtifactToken artifact;
protected final Log logger;
protected final IAtsServices services;
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AbstractAtsAttributeResolverService.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AbstractAtsAttributeResolverService.java
index 299a260394..38dd7910f4 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AbstractAtsAttributeResolverService.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AbstractAtsAttributeResolverService.java
@@ -10,6 +10,9 @@
*******************************************************************************/
package org.eclipse.osee.ats.core.workflow;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
import org.eclipse.osee.ats.api.IAtsObject;
import org.eclipse.osee.ats.api.workdef.IAttributeResolver;
import org.eclipse.osee.framework.core.data.ArtifactId;
@@ -42,4 +45,15 @@ public abstract class AbstractAtsAttributeResolverService implements IAttributeR
return result;
}
+ @Override
+ public Collection<ArtifactId> getArtifactIdReferences(ArtifactToken artifact, AttributeTypeToken artifactReferencedAttributeType) {
+ List<ArtifactId> results = new LinkedList<>();
+ for (String id : getAttributesToStringList(artifact, artifactReferencedAttributeType)) {
+ if (Strings.isNumeric(id)) {
+ results.add(ArtifactId.valueOf(id));
+ }
+ }
+ return results;
+ }
+
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/TeamWorkflow.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/TeamWorkflow.java
index d657398c85..288ea943cb 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/TeamWorkflow.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/TeamWorkflow.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.ats.core.workflow;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.osee.ats.api.IAtsServices;
@@ -20,6 +21,7 @@ import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.logger.Log;
/**
@@ -34,14 +36,11 @@ public class TeamWorkflow extends WorkItem implements IAtsTeamWorkflow {
@Override
public Set<IAtsActionableItem> getActionableItems() throws OseeCoreException {
Set<IAtsActionableItem> ais = new HashSet<>();
- for (Object aiObj : services.getAttributeResolver().getAttributeValues(artifact,
- AtsAttributeTypes.ActionableItemReference)) {
- String aiId = (String) aiObj;
- IAtsActionableItem ai = services.getConfigItem(aiId);
- if (ai == null) {
- ArtifactId aiArt = services.getArtifact(Long.valueOf(aiId));
- ai = services.getConfigItemFactory().getActionableItem(aiArt);
- }
+ Collection<ArtifactId> artIds =
+ services.getAttributeResolver().getArtifactIdReferences(artifact, AtsAttributeTypes.ActionableItemReference);
+ for (ArtifactId artId : artIds) {
+ IAtsActionableItem ai = services.getConfigItem(artId);
+ Conditions.assertNotNull(ai, "ai can not be null for artId %s", artId);
ais.add(ai);
}
return ais;
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConfigJsonWriter.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConfigJsonWriter.java
index 2ecb27ca80..7e266be12b 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConfigJsonWriter.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConfigJsonWriter.java
@@ -98,7 +98,7 @@ public class ConfigJsonWriter implements MessageBodyWriter<IAtsConfigObject> {
}
public static void addProgramObject(IAtsServer atsServer, IAtsObject atsObject, Annotation[] annotations, JsonGenerator writer, boolean identityView, AttributeTypes attributeTypes) throws IOException, JsonGenerationException, JsonProcessingException {
- ArtifactReadable artifact = (ArtifactReadable) atsObject.getStoreObject();
+ ArtifactReadable artifact = atsServer.getArtifact(atsObject);
writer.writeStartObject();
writer.writeNumberField("uuid", getUuid(atsObject, atsServer));
writer.writeStringField("Name", atsObject.getName());
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsRelationResolverServiceImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsRelationResolverServiceImpl.java
index 76c160586d..37c0780799 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsRelationResolverServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsRelationResolverServiceImpl.java
@@ -41,13 +41,8 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
@Override
public Collection<ArtifactToken> getRelated(ArtifactId artifact, RelationTypeSide relationType) {
List<ArtifactToken> results = new ArrayList<>();
- if (artifact instanceof ArtifactReadable) {
- for (ArtifactReadable art : ((ArtifactReadable) artifact).getRelated(relationType)) {
- results.add(art);
- }
- } else if (artifact instanceof IAtsObject) {
- IAtsObject iAtsObject = (IAtsObject) artifact;
- for (ArtifactReadable art : ((ArtifactReadable) iAtsObject.getStoreObject()).getRelated(relationType)) {
+ for (ArtifactReadable art : getArtifact(artifact).getRelated(relationType)) {
+ if (art != null) {
results.add(art);
}
}
@@ -79,7 +74,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
public boolean areRelated(ArtifactId artifact1, RelationTypeSide relationType, ArtifactId artifact2) {
boolean related = false;
if (artifact1 instanceof ArtifactReadable && artifact2 instanceof ArtifactReadable) {
- related = ((ArtifactReadable) artifact1).areRelated(relationType, (ArtifactReadable) artifact2);
+ related = getArtifact(artifact1).areRelated(relationType, getArtifact(artifact2));
}
return related;
}
@@ -88,7 +83,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
public ArtifactToken getRelatedOrNull(ArtifactId artifact, RelationTypeSide relationType) {
ArtifactToken related = null;
try {
- related = ((ArtifactReadable) artifact).getRelated(relationType).getAtMostOneOrNull();
+ related = getArtifact(artifact).getRelated(relationType).getAtMostOneOrNull();
} catch (ArtifactDoesNotExist ex) {
// do nothing
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java
index de2b9287f7..7cbf234801 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java
@@ -29,7 +29,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactToken;
import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
import org.eclipse.osee.ats.core.client.IAtsClient;
-import org.eclipse.osee.ats.core.config.ActionableItem2;
+import org.eclipse.osee.ats.core.config.ActionableItem;
import org.eclipse.osee.ats.core.config.ActionableItems;
import org.eclipse.osee.ats.core.config.TeamDefinitions;
import org.eclipse.osee.ats.help.ui.AtsHelpContext;
@@ -159,7 +159,7 @@ public class NewActionPage1 extends WizardPage {
atsClient.getConfigurations().getTopActionableItem().getId()).getChildren()) {
JaxActionableItem jai = atsClient.getConfigurations().getIdToAi().get(aiId);
if (jai.isActive()) {
- activeActionableItemTree.add(new ActionableItem2(atsClient.getLogger(), atsClient, jai));
+ activeActionableItemTree.add(new ActionableItem(atsClient.getLogger(), atsClient, jai));
}
}
treeViewer.getViewer().setInput(activeActionableItemTree);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperation.java
index a723434811..e10defa410 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperation.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperation.java
@@ -16,7 +16,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.ats.api.IAtsConfigObject;
import org.eclipse.osee.ats.api.ai.IAtsActionableItem;
@@ -33,7 +32,6 @@ import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.core.util.result.XResultData;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI;
@@ -102,8 +100,6 @@ public class CopyAtsConfigurationOperation extends AbstractOperation {
AtsBulkLoad.reloadConfig(true);
persistOrUndoChanges(changes);
XResultDataUI.report(resultData, getName());
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
} finally {
monitor.subTask("Done");
}

Back to the top