diff options
32 files changed, 116 insertions, 147 deletions
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/IAtsClient.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/IAtsClient.java index 2fb85340e4d..e82e8eaa632 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/IAtsClient.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/IAtsClient.java @@ -52,7 +52,7 @@ import org.eclipse.osee.ats.core.client.internal.IArtifactProvider; import org.eclipse.osee.ats.core.client.internal.IAtsWorkItemArtifactServiceProvider; import org.eclipse.osee.ats.core.client.util.IArtifactMembersCache; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.column.IAtsColumnUtilities; +import org.eclipse.osee.ats.core.column.IAtsColumnService; import org.eclipse.osee.ats.core.config.IActionableItemFactory; import org.eclipse.osee.ats.core.config.IAtsConfigProvider; import org.eclipse.osee.ats.core.config.ITeamDefinitionFactory; @@ -133,7 +133,7 @@ public interface IAtsClient extends IAtsServices, IAtsNotifier, IAttributeResolv IAtsLogFactory getLogFactory(); - IAtsColumnUtilities getColumnUtilities(); + IAtsColumnService getColumnService(); IAtsUtilService getUtilService(); 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 bb63331f5ca..11ffaec3a88 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 @@ -100,7 +100,7 @@ import org.eclipse.osee.ats.core.client.validator.AtsXWidgetValidateManagerClien 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.column.IAtsColumnUtilities; +import org.eclipse.osee.ats.core.column.IAtsColumnService; import org.eclipse.osee.ats.core.config.IActionableItemFactory; import org.eclipse.osee.ats.core.config.IAtsConfig; import org.eclipse.osee.ats.core.config.ITeamDefinitionFactory; @@ -166,7 +166,7 @@ public class AtsClientImpl extends AtsCoreServiceImpl implements IAtsClient { private IAtsStateFactory atsStateFactory; private IAtsWorkStateFactory workStateFactory; private IAtsLogFactory logFactory; - private IAtsColumnUtilities columnUtilities; + private IAtsColumnService columnUtilities; private IAtsUtilService utilService; private JdbcService jdbcService; private IAtsWorkItemFactory workItemFactory; @@ -587,10 +587,10 @@ public class AtsClientImpl extends AtsCoreServiceImpl implements IAtsClient { } @Override - public IAtsColumnUtilities getColumnUtilities() { + public IAtsColumnService getColumnService() { final IAtsEarnedValueService fEarnedValueService = earnedValueService; if (columnUtilities == null) { - columnUtilities = AtsCoreFactory.getColumnUtilities(getReviewService(), getWorkItemService(), + columnUtilities = AtsCoreFactory.getColumnService(getReviewService(), getWorkItemService(), new IAtsEarnedValueServiceProvider() { @Override diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActivityIdColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActivityIdColumnTest.java index d0dcf3451d2..10269c06fe3 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActivityIdColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActivityIdColumnTest.java @@ -20,7 +20,7 @@ import org.eclipse.osee.ats.api.ev.IAtsWorkPackage; import org.eclipse.osee.ats.api.workflow.IAtsAction; import org.eclipse.osee.ats.api.workflow.IAtsTask; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; -import org.eclipse.osee.ats.core.internal.column.ev.ActivityIdUtility; +import org.eclipse.osee.ats.core.internal.column.ev.ActivityIdColumn; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; @@ -30,7 +30,7 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; /** - * Test case for {@link ActivityIdUtility} + * Test case for {@link ActivityIdColumn} * * @author Donald G. Dunne */ @@ -74,7 +74,7 @@ public class ActivityIdColumnTest { @Test public void testGetWorkPackages_teamWf1() throws OseeCoreException { - ActivityIdUtility col = new ActivityIdUtility(earnedValueServiceProvider); + ActivityIdColumn col = new ActivityIdColumn(earnedValueServiceProvider); Set<IAtsWorkPackage> workPackages = new HashSet<>(); col.getWorkPackage(teamWf1); @@ -85,7 +85,7 @@ public class ActivityIdColumnTest { @Test public void testGetWorkPackages_task() throws OseeCoreException { - ActivityIdUtility col = new ActivityIdUtility(earnedValueServiceProvider); + ActivityIdColumn col = new ActivityIdColumn(earnedValueServiceProvider); Set<IAtsWorkPackage> workPackages = new HashSet<>(); col.getWorkPackage(task1); @@ -96,7 +96,7 @@ public class ActivityIdColumnTest { @Test public void testGetWorkPackageStr() { - ActivityIdUtility col = new ActivityIdUtility(earnedValueServiceProvider); + ActivityIdColumn col = new ActivityIdColumn(earnedValueServiceProvider); Assert.assertEquals("ActId 1 - ActId 1 Name", col.getColumnText(teamWf1)); String workPackageStr = col.getColumnText(action); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/TeamColumnUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/TeamColumnUtilityTest.java index 2343e894339..ff227068952 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/TeamColumnUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/TeamColumnUtilityTest.java @@ -57,7 +57,7 @@ public class TeamColumnUtilityTest { @Test public void testGetColumnText() throws Exception { - TeamColumnUtility utility = new TeamColumnUtility(workItemService, reviewService); + TeamColumn utility = new TeamColumn(workItemService, reviewService); Assert.assertEquals(TEAM_NAME, utility.getColumnText(teamWf)); Assert.assertEquals(TEAM_NAME, utility.getColumnText(review)); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractWorkPackageUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractWorkPackageUtilityTest.java index 0731523a289..4a132ac661e 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractWorkPackageUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractWorkPackageUtilityTest.java @@ -15,7 +15,7 @@ import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.ev.IAtsEarnedValueService; import org.eclipse.osee.ats.api.ev.IAtsEarnedValueServiceProvider; import org.eclipse.osee.ats.api.ev.IAtsWorkPackage; -import org.eclipse.osee.ats.core.column.IAtsColumnUtility; +import org.eclipse.osee.ats.core.column.IAtsColumn; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.junit.Assert; @@ -43,7 +43,7 @@ public abstract class AbstractWorkPackageUtilityTest { when(earnedValueService.getWorkPackage(workItem)).thenReturn(workPkg); } - public abstract IAtsColumnUtility getUtil(); + public abstract IAtsColumn getUtil(); @Test public void testGetDescription() { diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidUtilityTest.java index 74a5e23da4b..a232388532d 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidUtilityTest.java @@ -11,26 +11,26 @@ package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; -import org.eclipse.osee.ats.core.column.IAtsColumnUtility; +import org.eclipse.osee.ats.core.column.IAtsColumn; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; /** - * Test case for {@link WorkPackageGuidUtility} + * Test case for {@link WorkPackageGuidColumn} * * @author Donald G. Dunne */ public class WorkPackageGuidUtilityTest extends AbstractWorkPackageUtilityTest { - WorkPackageGuidUtility util; + WorkPackageGuidColumn util; @Override @Before public void setup() throws OseeCoreException { super.setup(); - util = new WorkPackageGuidUtility(earnedValueServiceProvider); + util = new WorkPackageGuidColumn(earnedValueServiceProvider); } @Test @@ -43,7 +43,7 @@ public class WorkPackageGuidUtilityTest extends AbstractWorkPackageUtilityTest { } @Override - public IAtsColumnUtility getUtil() { + public IAtsColumn getUtil() { return util; } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtilityTest.java index a5238ec5679..450b8589a31 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtilityTest.java @@ -11,26 +11,26 @@ package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; -import org.eclipse.osee.ats.core.column.IAtsColumnUtility; +import org.eclipse.osee.ats.core.column.IAtsColumn; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; /** - * Test case for {@link WorkPackageIdUtility} + * Test case for {@link WorkPackageIdColumn} * * @author Donald G. Dunne */ public class WorkPackageIdUtilityTest extends AbstractWorkPackageUtilityTest { - WorkPackageIdUtility util; + WorkPackageIdColumn util; @Override @Before public void setup() throws OseeCoreException { super.setup(); - util = new WorkPackageIdUtility(earnedValueServiceProvider); + util = new WorkPackageIdColumn(earnedValueServiceProvider); } @Test @@ -43,7 +43,7 @@ public class WorkPackageIdUtilityTest extends AbstractWorkPackageUtilityTest { } @Override - public IAtsColumnUtility getUtil() { + public IAtsColumn getUtil() { return util; } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtilityTest.java index 7fe2f4bd3a5..67649937a26 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtilityTest.java @@ -11,26 +11,26 @@ package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; -import org.eclipse.osee.ats.core.column.IAtsColumnUtility; +import org.eclipse.osee.ats.core.column.IAtsColumn; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; /** - * Test case for {@link WorkPackageNameUtility} + * Test case for {@link WorkPackageNameColumn} * * @author Donald G. Dunne */ public class WorkPackageNameUtilityTest extends AbstractWorkPackageUtilityTest { - WorkPackageNameUtility util; + WorkPackageNameColumn util; @Override @Before public void setup() throws OseeCoreException { super.setup(); - util = new WorkPackageNameUtility(earnedValueServiceProvider); + util = new WorkPackageNameColumn(earnedValueServiceProvider); } @Test @@ -43,7 +43,7 @@ public class WorkPackageNameUtilityTest extends AbstractWorkPackageUtilityTest { } @Override - public IAtsColumnUtility getUtil() { + public IAtsColumn getUtil() { return util; } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtilityTest.java index fc731801c7e..bf536c5f2fb 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtilityTest.java @@ -11,26 +11,26 @@ package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; -import org.eclipse.osee.ats.core.column.IAtsColumnUtility; +import org.eclipse.osee.ats.core.column.IAtsColumn; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; /** - * Test case for {@link WorkPackageProgramUtility} + * Test case for {@link WorkPackageProgramColumn} * * @author Donald G. Dunne */ public class WorkPackageProgramUtilityTest extends AbstractWorkPackageUtilityTest { - WorkPackageProgramUtility util; + WorkPackageProgramColumn util; @Override @Before public void setup() throws OseeCoreException { super.setup(); - util = new WorkPackageProgramUtility(earnedValueServiceProvider); + util = new WorkPackageProgramColumn(earnedValueServiceProvider); } @Test @@ -43,7 +43,7 @@ public class WorkPackageProgramUtilityTest extends AbstractWorkPackageUtilityTes } @Override - public IAtsColumnUtility getUtil() { + public IAtsColumn getUtil() { return util; } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtilityTest.java index 2b34ba1ef24..d92c2799dc1 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtilityTest.java @@ -12,26 +12,26 @@ package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; import org.eclipse.osee.ats.api.ev.AtsWorkPackageType; -import org.eclipse.osee.ats.core.column.IAtsColumnUtility; +import org.eclipse.osee.ats.core.column.IAtsColumn; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; /** - * Test case for {@link WorkPackageTypeUtility} + * Test case for {@link WorkPackageTypeColumn} * * @author Donald G. Dunne */ public class WorkPackageTypeUtilityTest extends AbstractWorkPackageUtilityTest { - WorkPackageTypeUtility util; + WorkPackageTypeColumn util; @Override @Before public void setup() throws OseeCoreException { super.setup(); - util = new WorkPackageTypeUtility(earnedValueServiceProvider); + util = new WorkPackageTypeColumn(earnedValueServiceProvider); } @Test @@ -44,7 +44,7 @@ public class WorkPackageTypeUtilityTest extends AbstractWorkPackageUtilityTest { } @Override - public IAtsColumnUtility getUtil() { + public IAtsColumn getUtil() { return util; } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/IActivityIdUtility.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/IActivityIdUtility.java index d318b0288b5..1b310fcaa14 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/IActivityIdUtility.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/IActivityIdUtility.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; /** * @author Donald G. Dunne */ -public interface IActivityIdUtility extends IAtsColumnUtility { +public interface IActivityIdUtility extends IAtsColumn { IAtsWorkPackage getWorkPackage(IAtsObject atsObject) throws OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/IAtsColumnUtility.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/IAtsColumn.java index 9b5eaa9dd10..70f82c86c13 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/IAtsColumnUtility.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/IAtsColumn.java @@ -15,7 +15,7 @@ import org.eclipse.osee.ats.api.IAtsObject; /** * @author Donald G. Dunne */ -public interface IAtsColumnUtility { +public interface IAtsColumn { public String getColumnText(IAtsObject atsObject); diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/IAtsColumnUtilities.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/IAtsColumnService.java index ddc49a74866..9a780243359 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/IAtsColumnUtilities.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/IAtsColumnService.java @@ -13,19 +13,19 @@ package org.eclipse.osee.ats.core.column; /** * @author Donald G. Dunne */ -public interface IAtsColumnUtilities { +public interface IAtsColumnService { - IActivityIdUtility getActivityIdUtility(); + IActivityIdUtility getActivityIdColumn(); - IAtsColumnUtility getWorkPackageIdUtility(); + IAtsColumn getWorkPackageIdColumn(); - IAtsColumnUtility getWorkPackageNameUtility(); + IAtsColumn getWorkPackageNameColumn(); - IAtsColumnUtility getWorkPackageTypeUtility(); + IAtsColumn getWorkPackageTypeColumn(); - IAtsColumnUtility getWorkPackageProgramUtility(); + IAtsColumn getWorkPackageProgramColumn(); - IAtsColumnUtility getWorkPackageGuidUtility(); + IAtsColumn getWorkPackageGuidColumn(); - IAtsColumnUtility getTeamUtility(); + IAtsColumn getTeamColumn(); } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/TeamColumnUtility.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/TeamColumn.java index 6c705065d1d..cf9c69017c7 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/TeamColumnUtility.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/TeamColumn.java @@ -20,8 +20,8 @@ import org.eclipse.osee.ats.api.review.IAtsReviewService; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.IAtsWorkItemService; -import org.eclipse.osee.ats.core.column.IAtsColumnUtility; -import org.eclipse.osee.ats.core.internal.column.ev.AtsColumnUtilities; +import org.eclipse.osee.ats.core.column.IAtsColumn; +import org.eclipse.osee.ats.core.internal.column.ev.AtsColumnService; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -29,12 +29,12 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; /** * @author Donald G. Dunne */ -public class TeamColumnUtility implements IAtsColumnUtility { +public class TeamColumn implements IAtsColumn { private final IAtsWorkItemService workItemService; private final IAtsReviewService reviewService; - public TeamColumnUtility(IAtsWorkItemService workItemService, IAtsReviewService reviewService) { + public TeamColumn(IAtsWorkItemService workItemService, IAtsReviewService reviewService) { this.workItemService = workItemService; this.reviewService = reviewService; } @@ -63,7 +63,7 @@ public class TeamColumnUtility implements IAtsColumnUtility { } } } catch (OseeCoreException ex) { - return AtsColumnUtilities.CELL_ERROR_PREFIX + " - " + ex.getLocalizedMessage(); + return AtsColumnService.CELL_ERROR_PREFIX + " - " + ex.getLocalizedMessage(); } return result; } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractRelatedWorkPackageColumn.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractRelatedWorkPackageColumn.java index 45d14deb992..b3d9d6503c4 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractRelatedWorkPackageColumn.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractRelatedWorkPackageColumn.java @@ -14,7 +14,7 @@ import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.ev.IAtsEarnedValueServiceProvider; import org.eclipse.osee.ats.api.ev.IAtsWorkPackage; -import org.eclipse.osee.ats.core.column.IAtsColumnUtility; +import org.eclipse.osee.ats.core.column.IAtsColumn; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; /** @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; * * @author Donald G. Dunne */ -public abstract class AbstractRelatedWorkPackageColumn implements IAtsColumnUtility { +public abstract class AbstractRelatedWorkPackageColumn implements IAtsColumn { private final IAtsEarnedValueServiceProvider earnedValueServiceProvider; @@ -42,7 +42,7 @@ public abstract class AbstractRelatedWorkPackageColumn implements IAtsColumnUtil } } } catch (OseeCoreException ex) { - result = AtsColumnUtilities.CELL_ERROR_PREFIX + " - " + ex.getLocalizedMessage(); + result = AtsColumnService.CELL_ERROR_PREFIX + " - " + ex.getLocalizedMessage(); } return result; } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/ActivityIdUtility.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/ActivityIdColumn.java index c53efa3a863..242ea6f7e13 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/ActivityIdUtility.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/ActivityIdColumn.java @@ -22,11 +22,11 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; * * @author Donald G. Dunne */ -public class ActivityIdUtility implements IActivityIdUtility { +public class ActivityIdColumn implements IActivityIdUtility { private final IAtsEarnedValueServiceProvider earnedValueServiceProvider; - public ActivityIdUtility(IAtsEarnedValueServiceProvider earnedValueServiceProvider) { + public ActivityIdColumn(IAtsEarnedValueServiceProvider earnedValueServiceProvider) { this.earnedValueServiceProvider = earnedValueServiceProvider; } @@ -45,7 +45,7 @@ public class ActivityIdUtility implements IActivityIdUtility { result = getText(workPackage); } } catch (OseeCoreException ex) { - return AtsColumnUtilities.CELL_ERROR_PREFIX + " - " + ex.getLocalizedMessage(); + return AtsColumnService.CELL_ERROR_PREFIX + " - " + ex.getLocalizedMessage(); } return result; } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/AtsColumnUtilities.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/AtsColumnService.java index a64448eef40..87616ad4919 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/AtsColumnUtilities.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/AtsColumnService.java @@ -14,85 +14,85 @@ import org.eclipse.osee.ats.api.ev.IAtsEarnedValueServiceProvider; import org.eclipse.osee.ats.api.review.IAtsReviewService; import org.eclipse.osee.ats.api.workflow.IAtsWorkItemService; import org.eclipse.osee.ats.core.column.IActivityIdUtility; -import org.eclipse.osee.ats.core.column.IAtsColumnUtilities; -import org.eclipse.osee.ats.core.column.IAtsColumnUtility; -import org.eclipse.osee.ats.core.internal.column.TeamColumnUtility; +import org.eclipse.osee.ats.core.column.IAtsColumnService; +import org.eclipse.osee.ats.core.column.IAtsColumn; +import org.eclipse.osee.ats.core.internal.column.TeamColumn; /** * @author Donald G. Dunne */ -public class AtsColumnUtilities implements IAtsColumnUtilities { +public class AtsColumnService implements IAtsColumnService { private final IAtsEarnedValueServiceProvider earnedValueServiceProvider; - private WorkPackageIdUtility workPackageIdUtility; - private ActivityIdUtility activityIdUtility; - private WorkPackageNameUtility workPackageNameUtility; - private WorkPackageTypeUtility workPackageTypeUtility; - private WorkPackageProgramUtility workPackageProgramUtility; - private IAtsColumnUtility workPackageGuidUtility; - private TeamColumnUtility teamColumnUtility; + private WorkPackageIdColumn workPackageIdUtility; + private ActivityIdColumn activityIdUtility; + private WorkPackageNameColumn workPackageNameUtility; + private WorkPackageTypeColumn workPackageTypeUtility; + private WorkPackageProgramColumn workPackageProgramUtility; + private IAtsColumn workPackageGuidUtility; + private TeamColumn teamColumnUtility; private final IAtsWorkItemService workItemService; private final IAtsReviewService reviewService; public static final String CELL_ERROR_PREFIX = "!Error"; - public AtsColumnUtilities(IAtsReviewService reviewService, IAtsWorkItemService workItemService, IAtsEarnedValueServiceProvider earnedValueServiceProvider) { + public AtsColumnService(IAtsReviewService reviewService, IAtsWorkItemService workItemService, IAtsEarnedValueServiceProvider earnedValueServiceProvider) { this.reviewService = reviewService; this.workItemService = workItemService; this.earnedValueServiceProvider = earnedValueServiceProvider; } @Override - public IAtsColumnUtility getTeamUtility() { + public IAtsColumn getTeamColumn() { if (teamColumnUtility == null) { - teamColumnUtility = new TeamColumnUtility(workItemService, reviewService); + teamColumnUtility = new TeamColumn(workItemService, reviewService); } return teamColumnUtility; } @Override - public IActivityIdUtility getActivityIdUtility() { + public IActivityIdUtility getActivityIdColumn() { if (activityIdUtility == null) { - activityIdUtility = new ActivityIdUtility(earnedValueServiceProvider); + activityIdUtility = new ActivityIdColumn(earnedValueServiceProvider); } return activityIdUtility; } @Override - public IAtsColumnUtility getWorkPackageNameUtility() { + public IAtsColumn getWorkPackageNameColumn() { if (workPackageNameUtility == null) { - workPackageNameUtility = new WorkPackageNameUtility(earnedValueServiceProvider); + workPackageNameUtility = new WorkPackageNameColumn(earnedValueServiceProvider); } return workPackageNameUtility; } @Override - public IAtsColumnUtility getWorkPackageIdUtility() { + public IAtsColumn getWorkPackageIdColumn() { if (workPackageIdUtility == null) { - workPackageIdUtility = new WorkPackageIdUtility(earnedValueServiceProvider); + workPackageIdUtility = new WorkPackageIdColumn(earnedValueServiceProvider); } return workPackageIdUtility; } @Override - public IAtsColumnUtility getWorkPackageTypeUtility() { + public IAtsColumn getWorkPackageTypeColumn() { if (workPackageTypeUtility == null) { - workPackageTypeUtility = new WorkPackageTypeUtility(earnedValueServiceProvider); + workPackageTypeUtility = new WorkPackageTypeColumn(earnedValueServiceProvider); } return workPackageTypeUtility; } @Override - public IAtsColumnUtility getWorkPackageProgramUtility() { + public IAtsColumn getWorkPackageProgramColumn() { if (workPackageProgramUtility == null) { - workPackageProgramUtility = new WorkPackageProgramUtility(earnedValueServiceProvider); + workPackageProgramUtility = new WorkPackageProgramColumn(earnedValueServiceProvider); } return workPackageProgramUtility; } @Override - public IAtsColumnUtility getWorkPackageGuidUtility() { + public IAtsColumn getWorkPackageGuidColumn() { if (workPackageGuidUtility == null) { - workPackageGuidUtility = new WorkPackageGuidUtility(earnedValueServiceProvider); + workPackageGuidUtility = new WorkPackageGuidColumn(earnedValueServiceProvider); } return workPackageGuidUtility; } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidUtility.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidColumn.java index 60abef07ff8..1bd31f4365d 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidUtility.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidColumn.java @@ -16,9 +16,9 @@ import org.eclipse.osee.ats.api.ev.IAtsWorkPackage; /** * @author Donald G. Dunne */ -public class WorkPackageGuidUtility extends AbstractRelatedWorkPackageColumn { +public class WorkPackageGuidColumn extends AbstractRelatedWorkPackageColumn { - public WorkPackageGuidUtility(IAtsEarnedValueServiceProvider earnedValueServiceProvider) { + public WorkPackageGuidColumn(IAtsEarnedValueServiceProvider earnedValueServiceProvider) { super(earnedValueServiceProvider); } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtility.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdColumn.java index 2f86c5333bf..98573a141f5 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtility.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdColumn.java @@ -17,9 +17,9 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; /** * @author Donald G. Dunne */ -public class WorkPackageIdUtility extends AbstractRelatedWorkPackageColumn { +public class WorkPackageIdColumn extends AbstractRelatedWorkPackageColumn { - public WorkPackageIdUtility(IAtsEarnedValueServiceProvider earnedValueServiceProvider) { + public WorkPackageIdColumn(IAtsEarnedValueServiceProvider earnedValueServiceProvider) { super(earnedValueServiceProvider); } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtility.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameColumn.java index 48fcbbcf14e..f3bb02c67e4 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtility.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameColumn.java @@ -16,9 +16,9 @@ import org.eclipse.osee.ats.api.ev.IAtsWorkPackage; /** * @author Donald G. Dunne */ -public class WorkPackageNameUtility extends AbstractRelatedWorkPackageColumn { +public class WorkPackageNameColumn extends AbstractRelatedWorkPackageColumn { - public WorkPackageNameUtility(IAtsEarnedValueServiceProvider earnedValueServiceProvider) { + public WorkPackageNameColumn(IAtsEarnedValueServiceProvider earnedValueServiceProvider) { super(earnedValueServiceProvider); } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtility.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramColumn.java index 253d83d05ab..168622ad933 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtility.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramColumn.java @@ -17,9 +17,9 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; /** * @author Donald G. Dunne */ -public class WorkPackageProgramUtility extends AbstractRelatedWorkPackageColumn { +public class WorkPackageProgramColumn extends AbstractRelatedWorkPackageColumn { - public WorkPackageProgramUtility(IAtsEarnedValueServiceProvider earnedValueServiceProvider) { + public WorkPackageProgramColumn(IAtsEarnedValueServiceProvider earnedValueServiceProvider) { super(earnedValueServiceProvider); } @@ -28,7 +28,7 @@ public class WorkPackageProgramUtility extends AbstractRelatedWorkPackageColumn try { return workPkg.getWorkPackageProgram(); } catch (OseeCoreException ex) { - return AtsColumnUtilities.CELL_ERROR_PREFIX + " - " + ex.getLocalizedMessage(); + return AtsColumnService.CELL_ERROR_PREFIX + " - " + ex.getLocalizedMessage(); } } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtility.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeColumn.java index a836c0bd7f3..db7fc7e07e7 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtility.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeColumn.java @@ -17,9 +17,9 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; /** * @author Donald G. Dunne */ -public class WorkPackageTypeUtility extends AbstractRelatedWorkPackageColumn { +public class WorkPackageTypeColumn extends AbstractRelatedWorkPackageColumn { - public WorkPackageTypeUtility(IAtsEarnedValueServiceProvider earnedValueServiceProvider) { + public WorkPackageTypeColumn(IAtsEarnedValueServiceProvider earnedValueServiceProvider) { super(earnedValueServiceProvider); } @@ -28,7 +28,7 @@ public class WorkPackageTypeUtility extends AbstractRelatedWorkPackageColumn { try { return workPkg.getWorkPackageType().name(); } catch (OseeCoreException ex) { - return AtsColumnUtilities.CELL_ERROR_PREFIX + " - " + ex.getLocalizedMessage(); + return AtsColumnService.CELL_ERROR_PREFIX + " - " + ex.getLocalizedMessage(); } } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreFactory.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreFactory.java index 94c6a08e70d..94a714867d3 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreFactory.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreFactory.java @@ -20,8 +20,8 @@ import org.eclipse.osee.ats.api.workflow.IAtsWorkItemService; import org.eclipse.osee.ats.api.workflow.log.IAtsLogFactory; import org.eclipse.osee.ats.api.workflow.state.IAtsStateFactory; import org.eclipse.osee.ats.api.workflow.state.IAtsWorkStateFactory; -import org.eclipse.osee.ats.core.column.IAtsColumnUtilities; -import org.eclipse.osee.ats.core.internal.column.ev.AtsColumnUtilities; +import org.eclipse.osee.ats.core.column.IAtsColumnService; +import org.eclipse.osee.ats.core.internal.column.ev.AtsColumnService; import org.eclipse.osee.ats.core.internal.log.AtsLogFactory; import org.eclipse.osee.ats.core.internal.state.AtsStateFactory; import org.eclipse.osee.ats.core.internal.state.AtsWorkStateFactory; @@ -44,8 +44,8 @@ public final class AtsCoreFactory { return new AtsLogFactory(); } - public static IAtsColumnUtilities getColumnUtilities(IAtsReviewService reviewService, IAtsWorkItemService workItemService, IAtsEarnedValueServiceProvider earnedValueServiceProvider) { - return new AtsColumnUtilities(reviewService, workItemService, earnedValueServiceProvider); + public static IAtsColumnService getColumnService(IAtsReviewService reviewService, IAtsWorkItemService workItemService, IAtsEarnedValueServiceProvider earnedValueServiceProvider) { + return new AtsColumnService(reviewService, workItemService, earnedValueServiceProvider); } public static IAtsWorkStateFactory getWorkStateFactory(IAtsUserService userService) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OriginatingWorkFlowColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OriginatingWorkFlowColumn.java index fedbc311ae5..8cdc2a9e476 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OriginatingWorkFlowColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OriginatingWorkFlowColumn.java @@ -80,7 +80,7 @@ public class OriginatingWorkFlowColumn extends XViewerAtsColumn implements IXVie public static String getWorldViewOriginatingWorkflowStr(Artifact actionArt) throws OseeCoreException { Set<String> strs = new HashSet<>(); for (TeamWorkFlowArtifact team : getWorldViewOriginatingWorkflows(actionArt)) { - strs.add(AtsClientService.get().getColumnUtilities().getTeamUtility().getColumnText(team)); + strs.add(AtsClientService.get().getColumnService().getTeamColumn().getColumnText(team)); } return Collections.toString(";", strs); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TeamColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TeamColumn.java index 9f824d78fc0..209b339fe1e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TeamColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TeamColumn.java @@ -49,7 +49,7 @@ public class TeamColumn extends XViewerAtsColumn implements IXViewerValueColumn public String getColumnText(Object element, XViewerColumn column, int columnIndex) { String result = ""; if (element instanceof IAtsObject) { - result = AtsClientService.get().getColumnUtilities().getTeamUtility().getColumnText((IAtsObject) element); + result = AtsClientService.get().getColumnService().getTeamColumn().getColumnText((IAtsObject) element); } return result; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/ActivityIdColumnUI.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/ActivityIdColumnUI.java index aba32e0d2a7..593f4436630 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/ActivityIdColumnUI.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/ActivityIdColumnUI.java @@ -10,15 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.ats.column.ev; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import java.util.concurrent.TimeUnit; import org.eclipse.jface.window.Window; import org.eclipse.nebula.widgets.xviewer.IAltLeftClickProvider; import org.eclipse.nebula.widgets.xviewer.IMultiColumnEditProvider; @@ -29,22 +25,17 @@ import org.eclipse.osee.ats.api.ev.IAtsWorkPackage; import org.eclipse.osee.ats.api.workflow.IAtsAction; import org.eclipse.osee.ats.column.WorkPackageFilterTreeDialog; import org.eclipse.osee.ats.core.client.action.ActionManager; -import org.eclipse.osee.ats.core.client.ev.WorkPackageArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; -import org.eclipse.osee.framework.core.exception.OseeWrappedException; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; -import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.TreeColumn; @@ -84,33 +75,11 @@ public class ActivityIdColumnUI extends XViewerAtsColumn implements IMultiColumn public String getColumnText(Object element, XViewerColumn column, int columnIndex) { String result = ""; if (element instanceof IAtsObject) { - String workPackageGuid = - AtsClientService.get().getColumnUtilities().getActivityIdUtility().getWorkPackageId(element); - if (Strings.isValid(workPackageGuid)) { - try { - IAtsWorkPackage workPackage = workPackageGuidToWorkPackage.get(workPackageGuid); - result = AtsClientService.get().getColumnUtilities().getActivityIdUtility().getColumnText(workPackage); - } catch (Exception ex) { - throw new OseeWrappedException(ex); - } - } + result = AtsClientService.get().getColumnService().getActivityIdColumn().getColumnText((IAtsObject) element); } return result; } - // Cache work packages by guid so don't have to re search/create objects constantly. - private static final LoadingCache<String, IAtsWorkPackage> workPackageGuidToWorkPackage = - CacheBuilder.newBuilder().expireAfterWrite(10, TimeUnit.MINUTES).build( - new CacheLoader<String, IAtsWorkPackage>() { - - @Override - public IAtsWorkPackage load(String workPackageGuid) throws Exception { - Artifact workPkgArt = ArtifactQuery.getArtifactFromId(workPackageGuid, AtsUtilCore.getAtsBranch()); - return new WorkPackageArtifact(workPkgArt); - } - - }); - @Override public boolean handleAltLeftClick(TreeColumn treeColumn, TreeItem treeItem) { boolean modified = false; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageGuidColumnUI.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageGuidColumnUI.java index a2520dc8399..47a963d43c2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageGuidColumnUI.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageGuidColumnUI.java @@ -30,7 +30,7 @@ public class WorkPackageGuidColumnUI extends AbstractWorkPackageRelatedColumnUI private WorkPackageGuidColumnUI() { super(WorldXViewerFactory.COLUMN_NAMESPACE + ".workPackageGuid", "Work Package Guid", 80, SWT.LEFT, false, SortDataType.String, true, - AtsClientService.get().getColumnUtilities().getWorkPackageGuidUtility().getDescription()); + AtsClientService.get().getColumnService().getWorkPackageGuidColumn().getDescription()); } /** @@ -49,7 +49,7 @@ public class WorkPackageGuidColumnUI extends AbstractWorkPackageRelatedColumnUI String result = ""; if (element instanceof IAtsObject) { result = - AtsClientService.get().getColumnUtilities().getWorkPackageGuidUtility().getColumnText((IAtsObject) element); + AtsClientService.get().getColumnService().getWorkPackageGuidColumn().getColumnText((IAtsObject) element); } return result; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageIdColumnUI.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageIdColumnUI.java index c3d7b1fc5d5..a2e4889758a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageIdColumnUI.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageIdColumnUI.java @@ -30,7 +30,7 @@ public class WorkPackageIdColumnUI extends AbstractWorkPackageRelatedColumnUI { private WorkPackageIdColumnUI() { super(WorldXViewerFactory.COLUMN_NAMESPACE + ".workPackageId", "Work Package Id", 80, SWT.LEFT, false, SortDataType.String, true, - AtsClientService.get().getColumnUtilities().getWorkPackageIdUtility().getDescription()); + AtsClientService.get().getColumnService().getWorkPackageIdColumn().getDescription()); } /** @@ -49,7 +49,7 @@ public class WorkPackageIdColumnUI extends AbstractWorkPackageRelatedColumnUI { String result = ""; if (element instanceof IAtsObject) { result = - AtsClientService.get().getColumnUtilities().getWorkPackageIdUtility().getColumnText((IAtsObject) element); + AtsClientService.get().getColumnService().getWorkPackageIdColumn().getColumnText((IAtsObject) element); } return result; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageNameColumnUI.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageNameColumnUI.java index 6b2d417a728..7b01eb0fe02 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageNameColumnUI.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageNameColumnUI.java @@ -30,7 +30,7 @@ public class WorkPackageNameColumnUI extends AbstractWorkPackageRelatedColumnUI private WorkPackageNameColumnUI() { super(WorldXViewerFactory.COLUMN_NAMESPACE + ".workPackageName", "Work Package Name", 80, SWT.LEFT, false, SortDataType.String, true, - AtsClientService.get().getColumnUtilities().getWorkPackageNameUtility().getDescription()); + AtsClientService.get().getColumnService().getWorkPackageNameColumn().getDescription()); } /** @@ -49,7 +49,7 @@ public class WorkPackageNameColumnUI extends AbstractWorkPackageRelatedColumnUI String result = ""; if (element instanceof IAtsObject) { result = - AtsClientService.get().getColumnUtilities().getWorkPackageNameUtility().getColumnText((IAtsObject) element); + AtsClientService.get().getColumnService().getWorkPackageNameColumn().getColumnText((IAtsObject) element); } return result; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageProgramColumnUI.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageProgramColumnUI.java index f424ceed9a3..b3a97629ce5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageProgramColumnUI.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageProgramColumnUI.java @@ -30,7 +30,7 @@ public class WorkPackageProgramColumnUI extends AbstractWorkPackageRelatedColumn private WorkPackageProgramColumnUI() { super(WorldXViewerFactory.COLUMN_NAMESPACE + ".workPackageProgram", "Work Package Program", 80, SWT.LEFT, false, SortDataType.String, true, - AtsClientService.get().getColumnUtilities().getWorkPackageProgramUtility().getDescription()); + AtsClientService.get().getColumnService().getWorkPackageProgramColumn().getDescription()); } /** @@ -48,7 +48,7 @@ public class WorkPackageProgramColumnUI extends AbstractWorkPackageRelatedColumn public String getColumnText(Object element, XViewerColumn column, int columnIndex) { String result = ""; if (element instanceof IAtsObject) { - result = AtsClientService.get().getColumnUtilities().getWorkPackageProgramUtility().getColumnText( + result = AtsClientService.get().getColumnService().getWorkPackageProgramColumn().getColumnText( (IAtsObject) element); } return result; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageTypeColumnUI.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageTypeColumnUI.java index c3c061d9a62..077a6956308 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageTypeColumnUI.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ev/WorkPackageTypeColumnUI.java @@ -30,7 +30,7 @@ public class WorkPackageTypeColumnUI extends AbstractWorkPackageRelatedColumnUI private WorkPackageTypeColumnUI() { super(WorldXViewerFactory.COLUMN_NAMESPACE + ".workPackageType", "Work Package Type", 40, SWT.LEFT, false, SortDataType.String, true, - AtsClientService.get().getColumnUtilities().getWorkPackageTypeUtility().getDescription()); + AtsClientService.get().getColumnService().getWorkPackageTypeColumn().getDescription()); } /** @@ -49,7 +49,7 @@ public class WorkPackageTypeColumnUI extends AbstractWorkPackageRelatedColumnUI String result = ""; if (element instanceof IAtsObject) { result = - AtsClientService.get().getColumnUtilities().getWorkPackageTypeUtility().getColumnText((IAtsObject) element); + AtsClientService.get().getColumnService().getWorkPackageTypeColumn().getColumnText((IAtsObject) element); } return result; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java index 9cf64c64e94..014fe69e0bb 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java @@ -81,7 +81,7 @@ public class SMAPrint extends Action { AHTML.getLabelValueStr(AHTML.LABEL_FONT, "Current State: ", sma.getCurrentStateName()), // AHTML.getLabelValueStr(AHTML.LABEL_FONT, "Team: ", - AtsClientService.get().getColumnUtilities().getTeamUtility().getColumnText(sma)), + AtsClientService.get().getColumnService().getTeamColumn().getColumnText(sma)), // AHTML.getLabelValueStr(AHTML.LABEL_FONT, "Assignees: ", AssigneeColumn.instance.getAssigneeStr(sma)), // |