diff options
Diffstat (limited to 'plugins')
15 files changed, 55 insertions, 70 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/operations/LoadChangesOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/operations/LoadChangesOperation.java index fccb97f2ae5..e37137a138a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/operations/LoadChangesOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/operations/LoadChangesOperation.java @@ -22,7 +22,6 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.change.Change; import org.eclipse.osee.framework.skynet.core.revision.ChangeManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; public final class LoadChangesOperation extends AbstractOperation { @@ -30,7 +29,7 @@ public final class LoadChangesOperation extends AbstractOperation { private final Artifact workflowArtifact; public LoadChangesOperation(Artifact workflowArtifact, Collection<Change> changes) { - super("Load History Viewer - Changes", SkynetGuiPlugin.PLUGIN_ID); + super("Load History Viewer - Changes", AtsPlugin.PLUGIN_ID); this.workflowArtifact = workflowArtifact; this.changes = changes; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/AttributeRuleCheckOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/AttributeRuleCheckOperation.java index 1506a2300aa..0fc30718f8a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/AttributeRuleCheckOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/AttributeRuleCheckOperation.java @@ -14,10 +14,10 @@ import java.util.Collection; import java.util.List; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; /** * @author Donald G. Dunne @@ -28,7 +28,7 @@ final class AttributeRuleCheckOperation extends AbstractOperation { private final Set<AttributeSetRule> attributeSetRules; public AttributeRuleCheckOperation(Collection<Artifact> itemsToCheck, XResultData rd, Set<AttributeSetRule> attributeSetRules) { - super("Attribute Check", SkynetGuiPlugin.PLUGIN_ID); + super("Attribute Check", AtsPlugin.PLUGIN_ID); this.itemsToCheck = itemsToCheck; this.rd = rd; this.attributeSetRules = attributeSetRules; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationRuleCheckOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationRuleCheckOperation.java index 33c48785e6b..a6c382924f2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationRuleCheckOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationRuleCheckOperation.java @@ -14,11 +14,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; /** * @author Donald G. Dunne @@ -29,7 +29,7 @@ final class RelationRuleCheckOperation extends AbstractOperation { private final Set<RelationSetRule> relationSetRules; public RelationRuleCheckOperation(Collection<Artifact> itemsToCheck, XResultData rd, Set<RelationSetRule> relationSetRules) { - super("Relation Check", SkynetGuiPlugin.PLUGIN_ID); + super("Relation Check", AtsPlugin.PLUGIN_ID); this.itemsToCheck = itemsToCheck; this.rd = rd; this.relationSetRules = relationSetRules; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java index 3c13591a25b..65db3bc17b7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java @@ -31,7 +31,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.revision.ChangeData; import org.eclipse.osee.framework.skynet.core.revision.ChangeData.KindType; import org.eclipse.osee.framework.ui.skynet.ArtifactValidationCheckOperation; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.osee.framework.ui.swt.Displays; @@ -46,7 +45,7 @@ public class ValidationReportOperation extends AbstractOperation { final XResultData rd; public ValidationReportOperation(XResultData rd, TeamWorkFlowArtifact teamArt, Set<AttributeSetRule> attributeSetRules, Set<RelationSetRule> relationSetRules) { - super("Validate Requirement Changes - " + teamArt.getName(), SkynetGuiPlugin.PLUGIN_ID); + super("Validate Requirement Changes - " + teamArt.getName(), AtsPlugin.PLUGIN_ID); this.rd = rd; this.teamArt = teamArt; this.attributeSetRules = attributeSetRules; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java index 2594fba5af5..6b0c8d5dd15 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java @@ -22,7 +22,6 @@ import org.eclipse.osee.ats.core.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.team.TeamWorkFlowManager; import org.eclipse.osee.ats.core.type.AtsArtifactTypes; import org.eclipse.osee.ats.internal.AtsPlugin; -import org.eclipse.osee.ats.internal.ServiceProvider; import org.eclipse.osee.ats.util.AtsBranchManager; import org.eclipse.osee.framework.access.AccessControlData; import org.eclipse.osee.framework.access.AccessControlManager; @@ -48,7 +47,6 @@ import org.eclipse.osee.framework.skynet.core.event.model.BranchEvent; import org.eclipse.osee.framework.skynet.core.event.model.BranchEventType; import org.eclipse.osee.framework.skynet.core.event.model.Sender; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.ArtifactExplorer; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.widgets.GenericXWidget; @@ -209,39 +207,33 @@ public class XWorkingBranch extends GenericXWidget implements IArtifactWidget, I } }); - if (ServiceProvider.getOseeCmService() != null) { - createBranchButton.setImage(ImageManager.getImage(FrameworkImage.BRANCH)); - deleteBranchButton.setImage(ImageManager.getImage(FrameworkImage.TRASH)); - favoriteBranchButton.setImage(ImageManager.getImage(AtsImage.FAVORITE)); - } - if (SkynetGuiPlugin.getInstance() != null) { - showArtifactExplorer.setImage(ImageManager.getImage(FrameworkImage.ARTIFACT_EXPLORER)); - showChangeReport.setImage(ImageManager.getImage(FrameworkImage.BRANCH_CHANGE)); - } + createBranchButton.setImage(ImageManager.getImage(FrameworkImage.BRANCH)); + deleteBranchButton.setImage(ImageManager.getImage(FrameworkImage.TRASH)); + favoriteBranchButton.setImage(ImageManager.getImage(AtsImage.FAVORITE)); + showArtifactExplorer.setImage(ImageManager.getImage(FrameworkImage.ARTIFACT_EXPLORER)); + showChangeReport.setImage(ImageManager.getImage(FrameworkImage.BRANCH_CHANGE)); refreshLockImage(); refreshLabel(); refreshEnablement(); } private void refreshLockImage() { - if (SkynetGuiPlugin.getInstance() != null) { - boolean noBranch = false, someAccessControlSet = false; - Branch branch = null; - try { - branch = teamArt.getWorkingBranch(); - } catch (OseeCoreException ex) { - OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); - } - // just show normal icon if no branch yet - if (branch == null) { - noBranch = true; - } else { - someAccessControlSet = !AccessControlManager.getAccessControlList(branch).isEmpty(); - } - lockBranchButton.setImage(ImageManager.getImage((noBranch || someAccessControlSet) ? FrameworkImage.LOCK_LOCKED : FrameworkImage.LOCK_UNLOCKED)); - lockBranchButton.redraw(); - lockBranchButton.getParent().redraw(); + boolean noBranch = false, someAccessControlSet = false; + Branch branch = null; + try { + branch = teamArt.getWorkingBranch(); + } catch (OseeCoreException ex) { + OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); + } + // just show normal icon if no branch yet + if (branch == null) { + noBranch = true; + } else { + someAccessControlSet = !AccessControlManager.getAccessControlList(branch).isEmpty(); } + lockBranchButton.setImage(ImageManager.getImage((noBranch || someAccessControlSet) ? FrameworkImage.LOCK_LOCKED : FrameworkImage.LOCK_UNLOCKED)); + lockBranchButton.redraw(); + lockBranchButton.getParent().redraw(); } private void markWorkingBranchAsFavorite() { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerContentProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerContentProvider.java index 1656cd2c5bd..72577becb03 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerContentProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerContentProvider.java @@ -19,9 +19,9 @@ import org.eclipse.osee.ats.core.action.ActionArtifact; import org.eclipse.osee.ats.core.artifact.GoalArtifact; import org.eclipse.osee.ats.core.review.ReviewManager; import org.eclipse.osee.ats.core.team.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.zest.core.viewers.IGraphEntityContentProvider; /** @@ -79,7 +79,7 @@ public class ActionWalkerContentProvider implements IGraphEntityContentProvider } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); } return objs.toArray(); } @@ -124,7 +124,7 @@ public class ActionWalkerContentProvider implements IGraphEntityContentProvider return objs.toArray(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); } return new Object[] {}; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/action/OpenActionViewAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/action/OpenActionViewAction.java index 1dd9a415fd5..518df473835 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/action/OpenActionViewAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/action/OpenActionViewAction.java @@ -7,10 +7,10 @@ package org.eclipse.osee.ats.walker.action; import org.eclipse.jface.action.Action; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.walker.ActionWalkerView; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; @@ -27,7 +27,7 @@ public class OpenActionViewAction extends Action { try { PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(ActionWalkerView.VIEW_ID); } catch (PartInitException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Unable to open outline", ex); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Unable to open outline", ex); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/StateXWidgetPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/StateXWidgetPage.java index beb0d05a04c..be3fa13a2b8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/StateXWidgetPage.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/StateXWidgetPage.java @@ -51,7 +51,6 @@ 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.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; import org.eclipse.osee.framework.ui.skynet.widgets.XOption; @@ -104,7 +103,7 @@ public class StateXWidgetPage implements IDynamicWidgetLayoutListener, IWorkPage processXmlLayoutDatas(xWidgetsXml); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, "Error processing attributes", ex); + OseeLog.log(AtsPlugin.class, Level.SEVERE, "Error processing attributes", ex); } } @@ -145,7 +144,7 @@ public class StateXWidgetPage implements IDynamicWidgetLayoutListener, IWorkPage layoutData.getXWidget().dispose(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -173,7 +172,7 @@ public class StateXWidgetPage implements IDynamicWidgetLayoutListener, IWorkPage } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return OK_PAIR; } @@ -214,7 +213,7 @@ public class StateXWidgetPage implements IDynamicWidgetLayoutListener, IWorkPage page) ? " (return)" : "") + "\n"); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); } return sb.toString(); } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/params/CoverageParametersComposite.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/params/CoverageParametersComposite.java index 92148ba56f1..fe3f7420249 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/params/CoverageParametersComposite.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/params/CoverageParametersComposite.java @@ -13,6 +13,7 @@ import java.util.Collection; import java.util.Collections; import java.util.logging.Level; import org.eclipse.osee.coverage.editor.CoverageEditor; +import org.eclipse.osee.coverage.internal.Activator; import org.eclipse.osee.coverage.model.CoverageOption; import org.eclipse.osee.coverage.util.widget.XHyperlabelCoverageMethodSelection; import org.eclipse.osee.framework.core.exception.OseeArgumentException; @@ -20,7 +21,6 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox; import org.eclipse.osee.framework.ui.skynet.widgets.XMembersCombo; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; @@ -87,7 +87,7 @@ public class CoverageParametersComposite extends Composite { getRationaleXText().set(""); getCoverageMethodHyperlinkSelection().clear(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -110,7 +110,7 @@ public class CoverageParametersComposite extends Composite { try { coverageParameters.setAssignee(getAssignee()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }); @@ -122,7 +122,7 @@ public class CoverageParametersComposite extends Composite { try { coverageParameters.setNotes(getNotesStr()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }); @@ -133,7 +133,7 @@ public class CoverageParametersComposite extends Composite { try { coverageParameters.setWorkProductTasks(getWorkProductTasksStr()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }); @@ -144,7 +144,7 @@ public class CoverageParametersComposite extends Composite { try { coverageParameters.setName(getNameXText().get()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }); @@ -155,7 +155,7 @@ public class CoverageParametersComposite extends Composite { try { coverageParameters.setNamespace(getNamespaceStr()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }); @@ -166,7 +166,7 @@ public class CoverageParametersComposite extends Composite { try { coverageParameters.setRationale(getRationaleStr()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }); @@ -179,12 +179,12 @@ public class CoverageParametersComposite extends Composite { try { coverageParameters.setCoverageMethods(getCoverageMethodHyperlinkSelection().getSelectedCoverageMethods()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/XCoverageViewer.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/XCoverageViewer.java index 905bd60330e..b34b46f4814 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/XCoverageViewer.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/XCoverageViewer.java @@ -15,6 +15,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.osee.coverage.internal.Activator; import org.eclipse.osee.coverage.model.CoverageOptionManager; import org.eclipse.osee.coverage.model.ICoverage; import org.eclipse.osee.coverage.model.IWorkProductTaskProvider; @@ -23,7 +24,6 @@ import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.widgets.GenericXWidget; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Displays; @@ -144,7 +144,7 @@ public class XCoverageViewer extends GenericXWidget { xViewer.setInput(items); xViewer.refresh(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/WorkProductTaskFilteredTreeDialog.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/WorkProductTaskFilteredTreeDialog.java index e17fa05866a..ab31e1cdd71 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/WorkProductTaskFilteredTreeDialog.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/WorkProductTaskFilteredTreeDialog.java @@ -15,13 +15,13 @@ import java.util.Collection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.osee.coverage.internal.Activator; import org.eclipse.osee.coverage.model.WorkProductTask; import org.eclipse.osee.coverage.util.WorkProductActionLabelProvider; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.util.StringNameSorter; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.OSEEFilteredTreeDialog; import org.eclipse.swt.events.SelectionAdapter; @@ -71,7 +71,7 @@ public class WorkProductTaskFilteredTreeDialog extends OSEEFilteredTreeDialog<Co gd.heightHint = 400; getTreeViewer().getViewer().getTree().setLayoutData(gd); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return comp; } @@ -83,7 +83,7 @@ public class WorkProductTaskFilteredTreeDialog extends OSEEFilteredTreeDialog<Co return new Result("Must select Work Product Task."); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return Result.TrueResult; } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/XHyperlabelCoverageMethodSelection.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/XHyperlabelCoverageMethodSelection.java index 4e224d98ebd..aa9d1fa0e16 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/XHyperlabelCoverageMethodSelection.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/XHyperlabelCoverageMethodSelection.java @@ -12,6 +12,7 @@ package org.eclipse.osee.coverage.util.widget; import java.util.Collection; import java.util.HashSet; +import org.eclipse.osee.coverage.internal.Activator; import org.eclipse.osee.coverage.model.CoverageOption; import org.eclipse.osee.coverage.model.CoverageOptionManager; import org.eclipse.osee.coverage.model.CoverageOptionManager.EnabledOption; @@ -19,7 +20,6 @@ import org.eclipse.osee.coverage.util.dialog.CoverageMethodListDialog; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.widgets.XHyperlinkLabelCmdValueSelection; /** @@ -78,7 +78,7 @@ public class XHyperlabelCoverageMethodSelection extends XHyperlinkLabelCmdValueS } return true; } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return false; } diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesImportWizard.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesImportWizard.java index bcf267b2270..99e83ec7dc8 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesImportWizard.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesImportWizard.java @@ -21,7 +21,6 @@ import org.eclipse.osee.framework.core.dsl.ui.integration.operations.OseeTypesIm import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.core.services.IOseeCachingService; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.ui.IImportWizard; import org.eclipse.ui.IWorkbench; @@ -33,7 +32,6 @@ public class OseeTypesImportWizard extends Wizard implements IImportWizard { public OseeTypesImportWizard() { super(); - setDialogSettings(SkynetGuiPlugin.getInstance().getDialogSettings()); setWindowTitle("OSEE Types Import Wizard"); setNeedsProgressMonitor(true); setHelpAvailable(true); diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java index 2b8fcff57c0..84419011a7a 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java @@ -30,7 +30,6 @@ import org.eclipse.osee.framework.ui.admin.dbtabletab.SiteGssflRpcr; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -147,7 +146,7 @@ public class AdminView extends ViewPart implements IActionable { message)); AWorkbench.popup("Success", "Message sent."); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -161,7 +160,7 @@ public class AdminView extends ViewPart implements IActionable { ClientSessionManager.getSession().toString())); AWorkbench.popup("Success", "Ping Sent"); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java index ecf0d829450..4edc64f711d 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java @@ -32,7 +32,6 @@ import org.eclipse.osee.framework.skynet.core.event.model.BroadcastEvent; import org.eclipse.osee.framework.skynet.core.event.model.BroadcastEventType; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.FontManager; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -159,7 +158,7 @@ public class OseeClientsTab { selectedUsers, reason)); AWorkbench.popup("Success", "Shutdown request sent."); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } else { |